Resumen Mensual CMR
-|
- Estimado cliente, - A continuación le enviamos el resumen menual de CMR ',UPPER(MONTHNAME(util.VN_CURDATE() - INTERVAL 1 MONTH)),' ', YEAR(util.VN_CURDATE() - INTERVAL 1 MONTH), '. - Le rogamos que nos devuelva el resumen firmado a cmr@verdnatura.es - - |
- ||||
| CMR | -Ticket | -|||
| ', c.id, ' | ', c.ticketFk, ' | |||
- Saludos cordiales, Dpto administración. -
') - FROM vn.cmr c - JOIN vn.address a ON c.addressToFk = a.id - JOIN vn.client c2 ON a.clientFk = c2.id - WHERE c.state = 'Pending' - AND MONTH(c.created) = MONTH(util.VN_CURDATE() - INTERVAL 1 MONTH) - AND YEAR(c.created) = YEAR(util.VN_CURDATE() - INTERVAL 1 MONTH) - AND c2.email IS NOT NULL -- No cogemos los CMRs dirigidos a 'Verdnatura' - GROUP BY c2.id; - - -- Actualizamos el estado a 'Enviado' - UPDATE vn.cmr c - SET c.state = 'Sent' - WHERE c.state = 'Pending' - AND MONTH(c.created) = MONTH(util.VN_CURDATE() - INTERVAL 1 MONTH) - AND YEAR(c.created) = YEAR(util.VN_CURDATE() - INTERVAL 1 MONTH); --- END IF; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; /*!50003 DROP PROCEDURE IF EXISTS `collectionPlacement_get` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -51924,9 +50332,7 @@ BEGIN DECLARE vWarehouseFk INT; DECLARE vCurrentYear INT DEFAULT YEAR(util.VN_NOW()); - DROP TEMPORARY TABLE IF EXISTS tSale; - - CREATE TEMPORARY TABLE tSale + CREATE OR REPLACE TEMPORARY TABLE tSale (INDEX(ticketFk), INDEX(saleFk), INDEX(itemFk)) ENGINE = MEMORY SELECT s.ticketFk, s.id saleFk, s.itemFk, s.quantity @@ -51947,8 +50353,7 @@ BEGIN CALL cache.visible_refresh(vCalcFk, FALSE, vWarehouseFk); - DROP TEMPORARY TABLE IF EXISTS tGrouping; - CREATE TEMPORARY TABLE tGrouping + CREATE OR REPLACE TEMPORARY TABLE tGrouping (INDEX(itemFk)) ENGINE = MEMORY SELECT b.itemFk, @@ -51962,8 +50367,7 @@ BEGIN WHERE lb.warehouse_id = vWarehouseFk GROUP BY b.itemFk; - DROP TEMPORARY TABLE IF EXISTS tSalePlacementList; - CREATE TEMPORARY TABLE tSalePlacementList + CREATE OR REPLACE TEMPORARY TABLE tSalePlacementList (INDEX(saleFk), INDEX(`order`)) ENGINE = MEMORY SELECT ts.saleFk, @@ -51984,9 +50388,9 @@ BEGIN ish.created, ish.visible, IFNULL( - IF(sc.isPreviousPreparedByPacking, ish.packing, g.`grouping`), + IF(st.code = 'previousByPacking', ish.packing, g.`grouping`), 1) `grouping`, - sc.isPreviousPrepared, + st.code = 'previousPrepared' isPreviousPrepared, iss.id itemShelvingSaleFk, ts.ticketFk, iss.id, @@ -52003,6 +50407,7 @@ BEGIN JOIN shelving sh ON sh.code = ish.shelvingFk JOIN parking p ON p.id = sh.parkingFk JOIN sector sc ON sc.id = p.sectorFk + JOIN sectorType st ON st.id = sc.typeFk JOIN warehouse w ON w.id = sc.warehouseFk LEFT JOIN tGrouping g ON g.itemFk = ts.itemFk LEFT JOIN itemShelvingSale iss ON iss.saleFk = ts.saleFk @@ -52015,8 +50420,7 @@ BEGIN AND NOT sc.isHideForPickers HAVING (iss.id AND st.saleFk) OR salePreviousPrepared IS NULL; - DROP TEMPORARY TABLE IF EXISTS tSalePlacementList2; - CREATE TEMPORARY TABLE tSalePlacementList2 + CREATE OR REPLACE TEMPORARY TABLE tSalePlacementList2 (INDEX(saleFk), INDEX(olderPriority)) ENGINE = MEMORY SELECT saleFk, priority olderPriority @@ -52102,15 +50506,15 @@ BEGIN DATE_FORMAT(util.VN_NOW(), '%H:%i' ), ' ', i.name - ) INTO vConcept + ) INTO vConcept FROM item i WHERE i.id = vItemFk; SELECT name INTO vItemName FROM item WHERE id = vBarccodeFk; - SELECT CONCAT('Añadido articulo ', + SELECT CONCAT('Añadido articulo ', vItemName, - ' cantidad:', + ' cantidad:', vQuantity ) INTO vDescription; @@ -52146,75 +50550,91 @@ DELIMITER ; /*!50003 SET character_set_results = utf8mb4 */ ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; -CREATE DEFINER=`root`@`localhost` PROCEDURE `collection_assign`(vUserFk INT, OUT vCollectionFk INT) -proc:BEGIN -/* Comprueba si existen colecciones libres que se ajustan al perfil del usuario - * y le asigna la más antigua. - * Añade un registro al semillero de colecciones - */ - DECLARE vHasTooMuchCollections BOOL; - DECLARE vLockTime INT DEFAULT 15; - - -- Si hay colecciones sin terminar, sale del proceso - CALL vn.collection_get(vUserFk); - - SELECT (pc.maxNotReadyCollections - COUNT(*)) <= 0 - INTO vHasTooMuchCollections - FROM tCollection - JOIN vn.productionConfig pc ; - - DROP TEMPORARY TABLE tCollection; - - IF vHasTooMuchCollections THEN - CALL util.throw('Hay colecciones pendientes'); - LEAVE proc; - END IF; - - IF NOT GET_LOCK('collection_assign',vLockTime) THEN - LEAVE proc; - END IF; - - -- Se eliminan las colecciones sin asignar que estan obsoletas - INSERT INTO ticketTracking(stateFk, ticketFk) - SELECT s.id, tc.ticketFk - FROM vn.collection c - JOIN vn.ticketCollection tc ON tc.collectionFk = c.id - JOIN vn.state s ON s.code = 'PRINTED_AUTO' - JOIN vn.productionConfig pc - WHERE c.workerFk IS NULL - AND TIMEDIFF(util.VN_NOW(), c.created) > pc.maxNotAssignedCollectionLifeTime; - - DELETE c.* - FROM vn.collection c - JOIN vn.productionConfig pc - WHERE c.workerFk IS NULL - AND TIMEDIFF(util.VN_NOW(), c.created) > pc.maxNotAssignedCollectionLifeTime; - - -- Se a�ade registro al semillero - INSERT INTO vn.collectionHotbed(userFk) - VALUES(vUserFk); - - -- Comprueba si hay colecciones disponibles que se ajustan a su configuracion - SELECT MIN(c.id) - INTO vCollectionFk - FROM vn.collection c - JOIN vn.operator o - ON (o.itemPackingTypeFk = c.itemPackingTypeFk OR c.itemPackingTypeFk IS NULL) - AND o.numberOfWagons = c.wagons - AND o.trainFk = c.trainFk - AND o.warehouseFk = c.warehouseFk - AND c.workerFk IS NULL - WHERE o.workerFk = vUserFk; - - IF vCollectionFk IS NULL THEN - CALL vn.collection_new(vUserFk, vCollectionFk); - END IF; - - UPDATE vn.collection - SET workerFk = vUserFk - WHERE id = vCollectionFk; - - DO RELEASE_LOCK('collection_assign'); +CREATE DEFINER=`root`@`localhost` PROCEDURE `collection_assign`( + vUserFk INT, + OUT vCollectionFk INT +) +proc:BEGIN +/** + * Comprueba si existen colecciones libres que se ajustan + * al perfil del usuario y le asigna la más antigua. + * Añade un registro al semillero de colecciones. + * + * @param vUserFk Id de usuario + * @param vCollectionFk Id de colección + */ + DECLARE vHasTooMuchCollections BOOL; + DECLARE vLockTime INT DEFAULT 15; + + -- Si hay colecciones sin terminar, sale del proceso + CALL collection_get(vUserFk); + + SELECT (pc.maxNotReadyCollections - COUNT(*)) <= 0 + INTO vHasTooMuchCollections + FROM tCollection + JOIN productionConfig pc ; + + DROP TEMPORARY TABLE tCollection; + + IF vHasTooMuchCollections THEN + CALL util.throw('Hay colecciones pendientes'); + LEAVE proc; + END IF; + + IF NOT GET_LOCK('collection_assign',vLockTime) THEN + LEAVE proc; + END IF; + + -- Se eliminan las colecciones sin asignar que estan obsoletas + INSERT INTO ticketTracking(stateFk, ticketFk) + SELECT s.id, tc.ticketFk + FROM `collection` c + JOIN ticketCollection tc ON tc.collectionFk = c.id + JOIN `state` s ON s.code = 'PRINTED_AUTO' + JOIN productionConfig pc + WHERE c.workerFk IS NULL + AND TIMEDIFF(util.VN_NOW(), c.created) > pc.maxNotAssignedCollectionLifeTime; + + DELETE c.* + FROM `collection` c + JOIN productionConfig pc + WHERE c.workerFk IS NULL + AND TIMEDIFF(util.VN_NOW(), c.created) > pc.maxNotAssignedCollectionLifeTime; + + -- Se añade registro al semillero + INSERT INTO collectionHotbed(userFk) + VALUES(vUserFk); + + -- Comprueba si hay colecciones disponibles que se ajustan a su configuracion + SELECT MIN(c.id) + INTO vCollectionFk + FROM `collection` c + JOIN operator o + ON (o.itemPackingTypeFk = c.itemPackingTypeFk OR c.itemPackingTypeFk IS NULL) + AND o.numberOfWagons = c.wagons + AND o.trainFk = c.trainFk + AND o.warehouseFk = c.warehouseFk + AND c.workerFk IS NULL + AND (c.saleTotalCount <= o.linesLimit OR o.linesLimit IS NULL) + JOIN ( + SELECT tc.collectionFk, SUM(sv.volume) volume + FROM ticketCollection tc + JOIN saleVolume sv ON sv.ticketFk = tc.ticketFk + WHERE sv.shipped >= util.VN_CURDATE() + GROUP BY tc.collectionFk + ) sub ON sub.collectionFk = c.id + AND (volume <= o.volumeLimit OR o.volumeLimit IS NULL) + WHERE o.workerFk = vUserFk; + + IF vCollectionFk IS NULL THEN + CALL collection_new(vUserFk, vCollectionFk); + END IF; + + UPDATE `collection` + SET workerFk = vUserFk + WHERE id = vCollectionFk; + + DO RELEASE_LOCK('collection_assign'); END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -52245,18 +50665,18 @@ BEGIN SELECT c.id collectionFk, date(c.created) created, COUNT(DISTINCT tc.ticketFk) ticketTotalCount - FROM collection c - JOIN ticketCollection tc ON tc.collectionFk = c.id - JOIN sale s ON s.ticketFk = tc.ticketFk + FROM collection c + JOIN ticketCollection tc ON tc.collectionFk = c.id + JOIN sale s ON s.ticketFk = tc.ticketFk JOIN ticketState ts ON ts.ticketFk = tc.ticketFk JOIN state s2 ON s2.id = ts.stateFk JOIN productionConfig pc JOIN vn.state ss on ss.code = 'PREPARED' LEFT JOIN vn.saleTracking st on st.saleFk = s.id AND st.stateFk = ss.id - WHERE c.workerFk = vWorkerFk + WHERE c.workerFk = vWorkerFk AND TIMESTAMPDIFF(HOUR, c.created , util.VN_NOW()) < pc.pendingCollectionsAge AND s.quantity != 0 - AND s2.order < pc.pendingCollectionsOrder + AND s2.order < pc.pendingCollectionsOrder GROUP BY c.id HAVING COUNT(*) > COUNT(DISTINCT st.id); @@ -52283,15 +50703,15 @@ BEGIN * Selecciona los tickets de una colección/ticket * @param vParamFk ticketFk/collectionFk * @return Retorna ticketFk, level, agencyName, warehouseFk, salesPersonFk, observaciones - */ + */ DECLARE vItemPackingTypeFk VARCHAR(1); -- Si los sacadores son los de pruebas, pinta los colores SELECT itemPackingTypeFk INTO vItemPackingTypeFk - FROM vn.collection + FROM vn.collection WHERE id = vParamFk; - SELECT t.id ticketFk, + SELECT t.id ticketFk, IF (!(vItemPackingTypeFk <=> 'V'), cc.code,CONCAT(SUBSTRING('ABCDEFGH',tc.wagon, 1),'-',tc.`level` )) `level`, am.name agencyName, t.warehouseFk, @@ -52301,20 +50721,20 @@ BEGIN FROM vn.ticket t LEFT JOIN vn.ticketCollection tc ON t.id = tc.ticketFk LEFT JOIN vn.collection c2 ON c2.id = tc.collectionFk -- PAK 23/12/21 - LEFT JOIN vn.collectionColors cc - ON cc.wagon = tc.wagon - AND cc.shelve = tc.`level` + LEFT JOIN vn.collectionColors cc + ON cc.wagon = tc.wagon + AND cc.shelve = tc.`level` AND cc.trainFk = c2.trainFk -- PAK 23/12/21 - LEFT JOIN vn.zone z ON z.id = t.zoneFk + LEFT JOIN vn.zone z ON z.id = t.zoneFk LEFT JOIN vn.agencyMode am ON am.id = z.agencyModeFk LEFT JOIN vn.client c ON c.id = t.clientFk LEFT JOIN vn.worker w ON w.id = c.salesPersonFk - LEFT JOIN vn.ticketObservation tob ON tob.ticketFk = t.id + LEFT JOIN vn.ticketObservation tob ON tob.ticketFk = t.id AND tob.observationTypeFk = 1 - WHERE t.id = vParamFk + WHERE t.id = vParamFk AND t.shipped >= util.yesterday() UNION ALL - SELECT t.id ticketFk, + SELECT t.id ticketFk, IF(!(vItemPackingTypeFk <=> 'V'), cc.code, CONCAT(SUBSTRING('ABCDEFGH', tc.wagon, 1), '-', tc.`level`)) `level`, am.name agencyName, t.warehouseFk, @@ -52324,15 +50744,15 @@ BEGIN FROM vn.ticket t JOIN vn.ticketCollection tc ON t.id = tc.ticketFk LEFT JOIN vn.collection c2 ON c2.id = tc.collectionFk -- PAK 23/12/21 - LEFT JOIN vn.collectionColors cc - ON cc.wagon = tc.wagon - AND cc.shelve = tc.`level` + LEFT JOIN vn.collectionColors cc + ON cc.wagon = tc.wagon + AND cc.shelve = tc.`level` AND cc.trainFk = c2.trainFk -- PAK 23/12/21 - LEFT JOIN vn.zone z ON z.id = t.zoneFk + LEFT JOIN vn.zone z ON z.id = t.zoneFk LEFT JOIN vn.agencyMode am ON am.id = z.agencyModeFk LEFT JOIN vn.client c ON c.id = t.clientFk LEFT JOIN vn.worker w ON w.id = c.salesPersonFk - LEFT JOIN vn.ticketObservation tob ON tob.ticketFk = t.id + LEFT JOIN vn.ticketObservation tob ON tob.ticketFk = t.id AND tob.observationTypeFk = 1 WHERE tc.collectionFk = vParamFk; @@ -52453,14 +50873,14 @@ DELIMITER ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; /*!50003 DROP PROCEDURE IF EXISTS `collection_new` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; /*!50003 SET character_set_client = utf8mb4 */ ; /*!50003 SET character_set_results = utf8mb4 */ ; -/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET collation_connection = utf8mb4_general_ci */ ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `collection_new`(vUserFk INT, OUT vCollectionFk INT) proc:BEGIN @@ -52472,6 +50892,10 @@ proc:BEGIN DECLARE vWarehouseFk INT; DECLARE vWagons INT; DECLARE vTrainFk INT; + DECLARE vLinesLimit INT DEFAULT NULL; + DECLARE vTicketLines INT; + DECLARE vVolumeLimit DECIMAL DEFAULT NULL; + DECLARE vTicketVolume DECIMAL; DECLARE vMaxTickets INT; DECLARE vStateFk VARCHAR(45); DECLARE vFirstTicketFk INT; @@ -52487,12 +50911,11 @@ proc:BEGIN DECLARE vLockName VARCHAR(215); DECLARE vLockTime INT DEFAULT 15; DECLARE vFreeWagonFk INT; - DECLARE cur1 CURSOR FOR - SELECT ticketFk + DECLARE c1 CURSOR FOR + SELECT ticketFk, `lines`, m3 FROM tmp.productionBuffer WHERE ticketFk <> vFirstTicketFk - ORDER BY - HH, + ORDER BY HH, mm, productionOrder DESC, m3 DESC, @@ -52504,32 +50927,34 @@ proc:BEGIN DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; - SELECT - pc.ticketTrolleyMax * o.numberOfWagons, - pc.hasUniqueCollectionTime, - w.code, - o.warehouseFk, - o.itemPackingTypeFk, - st.code, - CONCAT('collection_new', o.warehouseFk, ':',o.itemPackingTypeFk), - o.numberOfWagons, - o.trainFk - INTO - vMaxTickets, - vHasUniqueCollectionTime, - vWorkerCode, - vWarehouseFk, - vItemPackingTypeFk, - vStateFk, - vLockName, - vWagons, - vTrainFk + SELECT pc.ticketTrolleyMax * o.numberOfWagons, + pc.hasUniqueCollectionTime, + w.code, + o.warehouseFk, + o.itemPackingTypeFk, + st.code, + CONCAT('collection_new', o.warehouseFk, ':',o.itemPackingTypeFk), + o.numberOfWagons, + o.trainFk, + o.linesLimit, + o.volumeLimit + INTO vMaxTickets, + vHasUniqueCollectionTime, + vWorkerCode, + vWarehouseFk, + vItemPackingTypeFk, + vStateFk, + vLockName, + vWagons, + vTrainFk, + vLinesLimit, + vVolumeLimit FROM productionConfig pc JOIN worker w ON w.id = vUserFk JOIN state st ON st.`code` = 'ON_PREPARATION' JOIN operator o ON o.workerFk = vUserFk; - IF NOT GET_LOCK(vLockName,vLockTime) THEN + IF NOT GET_LOCK(vLockName, vLockTime) THEN LEAVE proc; END IF; @@ -52585,16 +51010,16 @@ proc:BEGIN SELECT COUNT(*) INTO vHasAssignedTickets FROM tmp.productionBuffer pb JOIN state s ON s.id = pb.state - WHERE s.code = 'PICKER_DESIGNED' - AND pb.workerCode = vWorkerCode; + WHERE s.code = 'PICKER_DESIGNED' + AND pb.workerCode = vWorkerCode; -- Se dejan en la tabla tmp.productionBuffer sólo aquellos tickets adecuados IF vHasAssignedTickets THEN DELETE pb.* FROM tmp.productionBuffer pb JOIN state s ON s.id = pb.state - WHERE s.code <> 'PICKER_DESIGNED' - OR pb.workerCode <> vWorkerCode; + WHERE s.code <> 'PICKER_DESIGNED' + OR pb.workerCode <> vWorkerCode; ELSE DELETE pb.* FROM tmp.productionBuffer pb @@ -52603,23 +51028,32 @@ proc:BEGIN JOIN agency a ON a.id = am.agencyFk JOIN productionConfig pc WHERE pb.shipped <> util.VN_CURDATE() - OR (pb.ubicacion IS NULL AND a.isOwn = TRUE) - OR (s.isPreparable = FALSE AND s.isPrintable = FALSE) + OR (pb.ubicacion IS NULL AND a.isOwn) + OR (NOT s.isPreparable AND NOT s.isPrintable) OR pb.collectionH IS NOT NULL OR pb.collectionV IS NOT NULL OR pb.collectionN IS NOT NULL - OR (pb.H = 0 AND pb.V > 0 AND vItemPackingTypeFk = 'H') - OR (pb.V = 0 AND vItemPackingTypeFk = 'V') + OR (NOT pb.H AND pb.V > 0 AND vItemPackingTypeFk = 'H') + OR (NOT pb.V AND vItemPackingTypeFk = 'V') OR (pc.isPreviousPreparationRequired AND pb.previousWithoutParking) - OR LENGTH(pb.problem) > 0; + OR LENGTH(pb.problem) > 0 + OR (pb.lines >= vLinesLimit AND vLinesLimit IS NOT NULL) + OR (pb.m3 >= vVolumeLimit AND vVolumeLimit IS NOT NULL); END IF; -- Es importante que el primer ticket se coja en todos los casos - SELECT ticketFk, HH, mm - INTO vFirstTicketFk, vHour, vMinute - FROM tmp.productionBuffer - ORDER BY + SELECT ticketFk, HH, + mm, + `lines`, + m3 + INTO vFirstTicketFk, + vHour, + vMinute, + vTicketLines, + vTicketVolume + FROM tmp.productionBuffer + ORDER BY HH, mm, productionOrder DESC, m3 DESC, @@ -52631,90 +51065,104 @@ proc:BEGIN -- Hay que excluir aquellos que no tengan la misma hora de preparacion, si procede IF vHasUniqueCollectionTime THEN - DELETE - FROM tmp.productionBuffer + DELETE FROM tmp.productionBuffer WHERE HH <> vHour OR mm <> vMinute; END IF; SET vTicketFk = vFirstTicketFk; + SET @lines = 0; + SET @volume = 0; - OPEN cur1; - + OPEN c1; read_loop: LOOP SET vDone = FALSE; - CALL ticket_splitItemPackingType(vTicketFk, vItemPackingTypeFk); + -- Buscamos un ticket que cumpla con los requisitos en el listado + IF ((vTicketLines + @lines) <= vLinesLimit OR vLinesLimit IS NULL) + AND ((vTicketVolume + @volume) <= vVolumeLimit OR vVolumeLimit IS NULL) THEN - DROP TEMPORARY TABLE tmp.ticketIPT; + CALL ticket_splitItemPackingType(vTicketFk, vItemPackingTypeFk); + DROP TEMPORARY TABLE tmp.ticketIPT; - UPDATE tmp.productionBuffer pb - JOIN (SELECT @litros:= SUM(litros) liters, COUNT(*) `lines`, MAX(i.`size`) height - FROM saleVolume sv - JOIN sale s ON s.id = sv.saleFk - JOIN item i ON i.id = s.itemFk - WHERE sv.ticketFk = vTicketFk ) sub - SET pb.liters = sub.liters, pb.`lines` = sub.`lines`, pb.height = sub.height - WHERE pb.ticketFk = vTicketFk; + UPDATE tmp.productionBuffer pb + JOIN ( + SELECT SUM(litros) liters, + @lines:= COUNT(*) + @lines, + COUNT(*) `lines`, + MAX(i.`size`) height, + @volume := SUM(sv.volume) + @volume volume + FROM saleVolume sv + JOIN sale s ON s.id = sv.saleFk + JOIN item i ON i.id = s.itemFk + WHERE sv.ticketFk = vTicketFk + ) sub + SET pb.liters = sub.liters, + pb.`lines` = sub.`lines`, + pb.height = sub.height + WHERE pb.ticketFk = vTicketFk; - UPDATE tTrain tt - JOIN tmp.productionBuffer pb ON pb.ticketFk = vTicketFk - SET tt.ticketFk = pb.ticketFk - WHERE tt.liters >= pb.liters - AND tt.`lines` >= pb.`lines` - AND (tt.height >= pb.height OR vItemPackingTypeFk <> 'V') - AND tt.ticketFk IS NULL - ORDER BY - wagon, - shelve, - tt.liters, - tt.`lines`, - tt.height - LIMIT 1; - - -- Si no le encuentra una balda adecuada, intentamos darle un carro entero - -- si queda alguno libre - - IF NOT (SELECT COUNT(*) FROM tTrain WHERE ticketFk) THEN - SELECT tt.wagon - INTO vFreeWagonFk - FROM tTrain tt - LEFT JOIN (SELECT DISTINCT wagon - FROM tTrain - WHERE ticketFk IS NOT NULL - ) nn ON nn.wagon = tt.wagon - WHERE nn.wagon IS NULL - ORDER BY wagon + UPDATE tTrain tt + JOIN tmp.productionBuffer pb ON pb.ticketFk = vTicketFk + SET tt.ticketFk = pb.ticketFk + WHERE tt.liters >= pb.liters + AND tt.`lines` >= pb.`lines` + AND (tt.height >= pb.height OR vItemPackingTypeFk <> 'V') + AND tt.ticketFk IS NULL + ORDER BY wagon, + shelve, + tt.liters, + tt.`lines`, + tt.height LIMIT 1; - IF vFreeWagonFk THEN - UPDATE tTrain - SET ticketFk = vFirstTicketFk - WHERE wagon = vFreeWagonFk; - - -- Se anulan el resto de carros libres para que sólo uno lleve un pedido excesivo - DELETE tt.* + -- Si no le encuentra una balda adecuada, intentamos darle un carro entero si queda alguno libre + IF NOT (SELECT COUNT(*) FROM tTrain WHERE ticketFk) THEN + SELECT tt.wagon + INTO vFreeWagonFk FROM tTrain tt - LEFT JOIN (SELECT DISTINCT wagon - FROM tTrain + LEFT JOIN ( + SELECT DISTINCT wagon + FROM tTrain + WHERE ticketFk IS NOT NULL + ) nn ON nn.wagon = tt.wagon + WHERE nn.wagon IS NULL + ORDER BY wagon + LIMIT 1; + + IF vFreeWagonFk THEN + UPDATE tTrain + SET ticketFk = vFirstTicketFk + WHERE wagon = vFreeWagonFk; + + -- Se anulan el resto de carros libres para que sólo uno lleve un pedido excesivo + DELETE tt.* + FROM tTrain tt + LEFT JOIN ( + SELECT DISTINCT wagon + FROM tTrain WHERE ticketFk IS NOT NULL - ) nn ON nn.wagon = tt.wagon - WHERE nn.wagon IS NULL; + ) nn ON nn.wagon = tt.wagon + WHERE nn.wagon IS NULL; + END IF; END IF; - END IF; - FETCH cur1 INTO vTicketFk; - - IF vDone OR NOT (SELECT COUNT(*) FROM tTrain WHERE ticketFk IS NULL) THEN - LEAVE read_loop; + FETCH c1 INTO vTicketFk, vTicketLines, vTicketVolume; + IF vDone OR NOT (SELECT COUNT(*) FROM tTrain WHERE ticketFk IS NULL) THEN + LEAVE read_loop; + END IF; + ELSE + FETCH c1 INTO vTicketFk, vTicketLines, vTicketVolume; + IF vDone THEN + LEAVE read_loop; + END IF; END IF; END LOOP; - - CLOSE cur1; + CLOSE c1; IF (SELECT COUNT(*) FROM tTrain WHERE ticketFk) THEN UPDATE collection c - JOIN state st ON st.code = 'ON_PREPARATION' + JOIN state st ON st.code = 'ON_PREPARATION' SET c.stateFk = st.id WHERE c.id = vCollectionFk; @@ -52726,7 +51174,6 @@ proc:BEGIN ORDER BY tt.wagon, tt.shelve; -- Actualiza el estado de los tickets - CALL collection_setState(vCollectionFk, vStateFk); -- Aviso para la preparacion previa @@ -52737,24 +51184,23 @@ proc:BEGIN CALL sales_mergeByCollection(vCollectionFk); - UPDATE collection c - JOIN (SELECT count(*) saleTotalCount , - sum(s.isPicked != 0) salePickedCount - FROM ticketCollection tc - JOIN sale s ON s.ticketFk = tc.ticketFk - WHERE tc.collectionFk = vCollectionFk - AND s.quantity > 0 + UPDATE `collection` c + JOIN ( + SELECT COUNT(*) saleTotalCount, + SUM(s.isPicked <> 0) salePickedCount + FROM ticketCollection tc + JOIN sale s ON s.ticketFk = tc.ticketFk + WHERE tc.collectionFk = vCollectionFk + AND s.quantity > 0 ) sub SET c.saleTotalCount = sub.saleTotalCount, c.salePickedCount = sub.salePickedCount WHERE c.id = vCollectionFk; ELSE - - -- CALL util.throw('No ha sido posible obtener colección'); - DELETE FROM collection WHERE id = vCollectionFk; - SET vCollectionFk = NULL; - + DELETE FROM `collection` + WHERE id = vCollectionFk; + SET vCollectionFk = NULL; END IF; DO RELEASE_LOCK(vLockName); @@ -52864,7 +51310,7 @@ BEGIN DECLARE vDone INT DEFAULT FALSE; DECLARE vCursor CURSOR FOR SELECT DISTINCT ticketFk - FROM ticketCollection tc + FROM ticketCollection tc WHERE tc.collectionFk = vSelf; DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; @@ -52911,25 +51357,25 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `company_getFiscaldata`(workerFk INT) BEGIN - + DECLARE vCompanyFk INT; - - SELECT IFNULL(uc.companyFk, rc.defaultCompanyFk) + + SELECT IFNULL(uc.companyFk, rc.defaultCompanyFk) INTO vCompanyFk FROM vn.routeConfig rc LEFT JOIN userConfig uc ON uc.userFk = workerFk; - - + + SELECT s.name AS name , s.NIF AS nif , s.street AS street , s.city AS city , - s.postCode AS postCode - - FROM vn.company c + s.postCode AS postCode + + FROM vn.company c JOIN vn.worker w ON w.id = c.workerManagerFk - JOIN vn.supplier s ON s.id = c.id + JOIN vn.supplier s ON s.id = c.id WHERE c.id = vCompanyFk; END ;; DELIMITER ; @@ -52938,14 +51384,14 @@ DELIMITER ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; /*!50003 DROP PROCEDURE IF EXISTS `company_getSuppliersDebt` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; /*!50003 SET character_set_client = utf8mb4 */ ; /*!50003 SET character_set_results = utf8mb4 */ ; -/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET collation_connection = utf8mb4_general_ci */ ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `company_getSuppliersDebt`(vSelf INT, vMonthsAgo INT) BEGIN @@ -52955,81 +51401,81 @@ BEGIN * @param vSelf company id * @param vMonthAgo time interval to be consulted */ - DECLARE vStartingDate DATETIME DEFAULT TIMESTAMPADD (MONTH,- vMonthsAgo,util.VN_CURDATE()); - DECLARE vCurrencyEuroFk INT; - DECLARE vStartDate DATE; - DECLARE vInvalidBalances DOUBLE; + DECLARE vStartingDate DATETIME DEFAULT TIMESTAMPADD (MONTH,- vMonthsAgo,util.VN_CURDATE()); + DECLARE vCurrencyEuroFk INT; + DECLARE vStartDate DATE; + DECLARE vInvalidBalances DOUBLE; - SELECT dated, invalidBalances INTO vStartDate, vInvalidBalances FROM supplierDebtConfig; - SELECT id INTO vCurrencyEuroFk FROM currency WHERE code = 'EUR'; + SELECT dated, invalidBalances INTO vStartDate, vInvalidBalances FROM supplierDebtConfig; + SELECT id INTO vCurrencyEuroFk FROM currency WHERE code = 'EUR'; - DROP TEMPORARY TABLE IF EXISTS tOpeningBalances; - CREATE TEMPORARY TABLE tOpeningBalances ( - supplierFk INT NOT NULL, - companyFk INT NOT NULL, - openingBalances DOUBLE NOT NULL, - closingBalances DOUBLE NOT NULL, - currencyFk INT NOT NULL, - PRIMARY KEY (supplierFk, companyFk, currencyFk) - ) ENGINE = MEMORY; + DROP TEMPORARY TABLE IF EXISTS tOpeningBalances; + CREATE TEMPORARY TABLE tOpeningBalances ( + supplierFk INT NOT NULL, + companyFk INT NOT NULL, + openingBalances DOUBLE NOT NULL, + closingBalances DOUBLE NOT NULL, + currencyFk INT NOT NULL, + PRIMARY KEY (supplierFk, companyFk, currencyFk) + ) ENGINE = MEMORY; - -- Calculates the opening and closing balance for each supplier - INSERT INTO tOpeningBalances - SELECT supplierFk, - companyFk, - SUM(amount * isBeforeStarting) AS openingBalances, - SUM(amount) closingBalances, - currencyFk - FROM ( - SELECT p.supplierFk, + -- Calculates the opening and closing balance for each supplier + INSERT INTO tOpeningBalances + SELECT supplierFk, + companyFk, + SUM(amount * isBeforeStarting) AS openingBalances, + SUM(amount) closingBalances, + currencyFk + FROM ( + SELECT p.supplierFk, p.companyFk, IF (p.currencyFk = vCurrencyEuroFk, p.amount, p.divisa) AS amount, p.dueDated < vStartingDate isBeforeStarting, p.currencyFk - FROM payment p - WHERE p.received > vStartDate - AND p.companyFk = vSelf - UNION ALL - SELECT r.supplierFk, + FROM payment p + WHERE p.received > vStartDate + AND p.companyFk = vSelf + UNION ALL + SELECT r.supplierFk, r.companyFk, - IF (r.currencyFk = vCurrencyEuroFk, rv.amount, rv.foreignValue) AS Total, rv.dueDated < vStartingDate isBeforeStarting, - r.currencyFk - FROM invoiceIn r - INNER JOIN invoiceInDueDay rv ON r.id = rv.invoiceInFk - WHERE r.issued > vStartDate - AND r.isBooked - AND r.companyFk = vSelf - ) sub GROUP BY companyFk, supplierFk, currencyFk; + r.currencyFk + FROM invoiceIn r + INNER JOIN invoiceInDueDay rv ON r.id = rv.invoiceInFk + WHERE r.issued > vStartDate + AND r.isBooked + AND r.companyFk = vSelf + ) sub GROUP BY companyFk, supplierFk, currencyFk; - DROP TEMPORARY TABLE IF EXISTS tPendingDuedates; - CREATE TEMPORARY TABLE tPendingDuedates ( - id INT auto_increment, + DROP TEMPORARY TABLE IF EXISTS tPendingDuedates; + CREATE TEMPORARY TABLE tPendingDuedates ( + id INT auto_increment, expirationId INT, - dated DATE, - supplierFk INT NOT NULL, - companyFk INT NOT NULL, - amount DECIMAL(10, 2) NOT NULL, - currencyFk INT NOT NULL, - pending DECIMAL(10, 2) DEFAULT 0, - balance DECIMAL(10, 2) DEFAULT 0, - endingBalance DECIMAL(10, 2) DEFAULT 0, - isPayment BOOLEAN, - isReconciled BOOLEAN, - PRIMARY KEY (id), - INDEX (supplierFk, companyFk, currencyFk) - ) ENGINE = MEMORY; + dated DATE, + supplierFk INT NOT NULL, + companyFk INT NOT NULL, + amount DECIMAL(10, 2) NOT NULL, + currencyFk INT NOT NULL, + pending DECIMAL(10, 2) DEFAULT 0, + balance DECIMAL(10, 2) DEFAULT 0, + endingBalance DECIMAL(10, 2) DEFAULT 0, + isPayment BOOLEAN, + isReconciled BOOLEAN, + PRIMARY KEY (id), + INDEX (supplierFk, companyFk, currencyFk) + ) ENGINE = MEMORY; - INSERT INTO tPendingDuedates ( - expirationId, - dated, - supplierFk, - companyFk, - amount, - currencyFk, - isPayment, - isReconciled - )SELECT p.id, + INSERT INTO tPendingDuedates ( + expirationId, + dated, + supplierFk, + companyFk, + amount, + currencyFk, + isPayment, + isReconciled + )SELECT p.id, p.dueDated, p.supplierFk, p.companyFk, @@ -53048,80 +51494,80 @@ BEGIN -IF (r.currencyFk = vCurrencyEuroFk, rv.amount, rv.foreignValue), r.currencyFk, FALSE isPayment, - TRUE - FROM invoiceIn r + TRUE + FROM invoiceIn r LEFT JOIN tOpeningBalances si ON r.companyFk = si.companyFk AND r.supplierFk = si.supplierFk - AND r.currencyFk = si.currencyFk + AND r.currencyFk = si.currencyFk JOIN invoiceInDueDay rv ON r.id = rv.invoiceInFk WHERE rv.dueDated >= vStartingDate AND (si.closingBalances IS NULL OR si.closingBalances <> 0) AND r.isBooked AND r.companyFk = vSelf ORDER BY supplierFk, companyFk, companyFk, dueDated, isPayment DESC, id; - -- Now, we calculate the outstanding amount for each receipt in descending order - SET @risk := 0.0; - SET @supplier := 0.0; - SET @company := 0.0; - SET @moneda := 0.0; - SET @pending := 0.0; - SET @day := util.VN_CURDATE(); + -- Now, we calculate the outstanding amount for each receipt in descending order + SET @risk := 0.0; + SET @supplier := 0.0; + SET @company := 0.0; + SET @moneda := 0.0; + SET @pending := 0.0; + SET @day := util.VN_CURDATE(); - UPDATE tPendingDuedates vp - LEFT JOIN tOpeningBalances si ON vp.companyFk = si.companyFk - AND vp.supplierFk = si.supplierFk - AND vp.currencyFk = si.currencyFk - SET vp.balance = @risk := ( - IF ( - @company <> vp.companyFk - OR @supplier <> vp.supplierFk - OR @moneda <> vp.currencyFk, - IFNULL(si.openingBalances, 0), - @risk - ) + - vp.amount - ), - -- if there is a change of company or supplier or currency, the balance is reset - vp.pending = @pending := IF ( - @company <> vp.companyFk - OR @supplier <> vp.supplierFk - OR @moneda <> vp.currencyFk - OR @day <> vp.dated, - vp.amount * (NOT vp.isPayment), - @pending + vp.amount - ), - vp.companyFk = @company := vp.companyFk, - vp.supplierFk = @supplier := vp.supplierFk, - vp.currencyFk = @moneda := vp.currencyFk, - vp.dated = @day := vp.dated, - vp.balance = @risk, - vp.pending = @pending; + UPDATE tPendingDuedates vp + LEFT JOIN tOpeningBalances si ON vp.companyFk = si.companyFk + AND vp.supplierFk = si.supplierFk + AND vp.currencyFk = si.currencyFk + SET vp.balance = @risk := ( + IF ( + @company <> vp.companyFk + OR @supplier <> vp.supplierFk + OR @moneda <> vp.currencyFk, + IFNULL(si.openingBalances, 0), + @risk + ) + + vp.amount + ), + -- if there is a change of company or supplier or currency, the balance is reset + vp.pending = @pending := IF ( + @company <> vp.companyFk + OR @supplier <> vp.supplierFk + OR @moneda <> vp.currencyFk + OR @day <> vp.dated, + vp.amount * (NOT vp.isPayment), + @pending + vp.amount + ), + vp.companyFk = @company := vp.companyFk, + vp.supplierFk = @supplier := vp.supplierFk, + vp.currencyFk = @moneda := vp.currencyFk, + vp.dated = @day := vp.dated, + vp.balance = @risk, + vp.pending = @pending; - CREATE OR REPLACE TEMPORARY TABLE tRowsToDelete ENGINE = MEMORY - SELECT expirationId, - dated, - supplierFk, - companyFk, - currencyFk, - balance - FROM tPendingDuedates - WHERE balance < vInvalidBalances - AND balance > - vInvalidBalances; + CREATE OR REPLACE TEMPORARY TABLE tRowsToDelete ENGINE = MEMORY + SELECT expirationId, + dated, + supplierFk, + companyFk, + currencyFk, + balance + FROM tPendingDuedates + WHERE balance < vInvalidBalances + AND balance > - vInvalidBalances; - DELETE vp.* - FROM tPendingDuedates vp - JOIN tRowsToDelete rd ON ( - vp.dated < rd.dated - OR (vp.dated = rd.dated AND vp.expirationId <= rd.expirationId) - ) - AND vp.supplierFk = rd.supplierFk - AND vp.companyFk = rd.companyFk - AND vp.currencyFk = rd.currencyFk - WHERE vp.isPayment = FALSE; + DELETE vp.* + FROM tPendingDuedates vp + JOIN tRowsToDelete rd ON ( + vp.dated < rd.dated + OR (vp.dated = rd.dated AND vp.expirationId <= rd.expirationId) + ) + AND vp.supplierFk = rd.supplierFk + AND vp.companyFk = rd.companyFk + AND vp.currencyFk = rd.currencyFk + WHERE vp.isPayment = FALSE; - SELECT vp.expirationId, - vp.dated, - vp.supplierFk, + SELECT vp.expirationId, + vp.dated, + vp.supplierFk, vp.companyFk, vp.currencyFk, vp.amount, @@ -53131,16 +51577,208 @@ BEGIN vp.isPayment, vp.isReconciled, vp.endingBalance, - cr.amount clientRiskAmount - FROM tPendingDuedates vp - LEFT JOIN supplier s ON s.id = vp.supplierFk - LEFT JOIN client c ON c.fi = s.nif - LEFT JOIN clientRisk cr ON cr.clientFk = c.id - AND cr.companyFk = vp.companyFk; + cr.amount clientRiskAmount, + co.CEE + FROM tPendingDuedates vp + LEFT JOIN supplier s ON s.id = vp.supplierFk + LEFT JOIN client c ON c.fi = s.nif + LEFT JOIN clientRisk cr ON cr.clientFk = c.id + LEFT JOIN supplierAccount sa ON sa.supplierFk = s.id + LEFT JOIN bankEntity be ON be.id = sa.bankEntityFk + LEFT JOIN country co ON co.id = be.countryFk + AND cr.companyFk = vp.companyFk; - DROP TEMPORARY TABLE tOpeningBalances; - DROP TEMPORARY TABLE tPendingDuedates; - DROP TEMPORARY TABLE tRowsToDelete; + DROP TEMPORARY TABLE tOpeningBalances; + DROP TEMPORARY TABLE tPendingDuedates; + DROP TEMPORARY TABLE tRowsToDelete; +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 DROP PROCEDURE IF EXISTS `comparative_add` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`localhost` PROCEDURE `comparative_add`() +BEGIN +/** + * Inserts sales records less than one month old in comparative. + */ + DECLARE vMaxPeriod INT; + DECLARE vPeriod INT; + DECLARE vWeek INT; + DECLARE vConfigPeriod INT; + DECLARE vConfigWeek INT; + + SELECT period, week INTO vConfigPeriod, vConfigWeek + FROM comparativeAddConfig; + + SELECT IFNULL(MAX(timePeriod), 0) INTO vMaxPeriod + FROM comparative; + + SELECT period - vConfigPeriod, + week + INTO vPeriod, + vWeek + FROM `time` + WHERE dated = util.VN_CURDATE(); + + IF vMaxPeriod < vPeriod AND vWeek > vConfigWeek THEN + DELETE FROM comparative WHERE timePeriod BETWEEN vMaxPeriod AND vPeriod; + + INSERT INTO comparative( + timePeriod, + itemFk, + warehouseFk, + quantity, + price, + countryFk + ) + SELECT tm.period, + s.itemFk, + t.warehouseFk, + sum(s.quantity), + sum(v.importe), + p.countryFk + FROM bs.ventas v + JOIN time tm ON tm.dated = v.fecha + JOIN sale s ON s.id = v.Id_Movimiento + JOIN itemType tp ON tp.id = v.tipo_id + JOIN itemCategory ic ON ic.id = tp.categoryFk + JOIN ticket t ON t.id = s.ticketFk + JOIN client c ON c.id = t.clientFk + JOIN warehouse w ON w.id = t.warehouseFk + JOIN address ad ON ad.id = t.addressFk + LEFT JOIN province p ON p.id = ad.provinceFk + WHERE tm.period BETWEEN vMaxPeriod AND vPeriod + AND c.typeFk <> 'loses' + AND NOT w.code = 'inv' + GROUP BY p.countryFk, s.itemFk, tm.period, t.warehouseFk; + END IF; +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 DROP PROCEDURE IF EXISTS `confection_controlSource` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`localhost` PROCEDURE `confection_controlSource`( + vDated DATE, + vScopeDays INT, + vMaxAlertLevel INT, + vWarehouseFk INT +) +BEGIN +/** + * Obtiene la información para el control de confección, + * ya sean tickets y/o entradas. + * + * @param vDated Fecha a calcular + * @param vScopeDays Número de días desde hoy en adelante que entran en el cálculo. + * @param vMaxAlertLevel Id nivel de alerta + * @param vWarehouseFk Id de almacén + */ + DECLARE vEndingDate DATETIME DEFAULT util.dayEnd(vDated) + INTERVAL vScopeDays DAY; + + SELECT t.shipped, + t.id ticketFk, + s.id saleFk, + s.quantity, + s.concept, + ABS(s.reserved) isReserved, + i.category, + it.name itemType, + t.nickname, + wh.name warehouse, + t.warehouseFk warehouseFk, + a.provinceFk, + am.agencyFk, + ct.description, + stock.visible, + stock.available + FROM ticket t + JOIN agencyMode am ON am.id = t.agencyModeFk + JOIN warehouse wh ON wh.id = t.warehouseFk + JOIN sale s ON s.ticketFk = t.id + JOIN item i ON i.id = s.itemFk + JOIN itemType it ON it.id = i.typeFk + JOIN confectionType ct ON ct.id = it.making + JOIN `address` a on a.id = t.addressFk + LEFT JOIN ticketState tls on tls.ticketFk = t.id + LEFT JOIN + ( + SELECT item_id, + SUM(visible) visible, + SUM(available) available + FROM ( + SELECT a.item_id, + 0 visible, + a.available + FROM cache.cache_calc cc + LEFT JOIN cache.available a ON a.calc_id = cc.id + WHERE cc.cache_id IN ('visible', 'available') + AND cc.params = CONCAT(vWarehouseFk, "/", util.VN_CURDATE()) + UNION ALL + SELECT v.item_id, + v.visible, + 0 + FROM cache.cache_calc cc + LEFT JOIN cache.visible v ON v.calc_id = cc.id + WHERE cc.cacheName IN ('visible', 'available') + AND cc.params = vWarehouseFk + ) sub + GROUP BY item_id + ) stock ON stock.item_id = s.itemFk + WHERE it.making + AND tls.alertLevel < vMaxAlertLevel + AND wh.hasConfectionTeam + AND t.shipped BETWEEN vDated AND vEndingDate + AND s.quantity > 0 + UNION ALL + SELECT tr.shipped, + e.id, + NULL, + b.quantity, + i.name, + NULL, + i.category, + NULL, + whi.name, + who.name, + NULL, + NULL, + NULL, + ct.description, + NULL, + NULL + FROM buy b + JOIN `entry` e ON e.id = b.entryFk + JOIN travel tr ON tr.id = e.travelFk + JOIN warehouse whi ON whi.id = tr.warehouseInFk + JOIN warehouse who ON who.id = tr.warehouseOutFk + JOIN item i ON i.id = b.itemFk + JOIN itemType it ON it.id = i.typeFk + JOIN confectionType ct ON ct.id = it.making + WHERE who.hasConfectionTeam + AND it.making + AND tr.shipped BETWEEN vDated AND vEndingDate; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -53160,7 +51798,7 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `conveyorExpedition_Add`(vStarted DATETIME, vEnded DATETIME) BEGIN - + DECLARE startingMinute INT; TRUNCATE vn.conveyorExpedition; @@ -53177,23 +51815,23 @@ BEGIN conveyorBuildingClassFk) SELECT e.id, e.created, - 10 * p.depth as depth, + 10 * p.depth as depth, 10 * p.width as width, 10 * p.height as height, IFNULL(t.routeFk,am.agencyFk) routeFk, hour(e.created) * 60 + minute(e.created), IFNULL(et.description , a.name), IFNULL(t.routeFk,am.agencyFk) criterion, - IFNULL(p.conveyorBuildingClassFk , pc.defaultConveyorBuildingClass) + IFNULL(p.conveyorBuildingClassFk , pc.defaultConveyorBuildingClass) FROM vn.expedition e JOIN vn.ticket t ON t.id = e.ticketFk JOIN vn.packaging p ON p.id = e.packagingFk LEFT JOIN vn.zone z ON z.id = t.zoneFk LEFT JOIN vn.agencyMode am ON am.id = z.agencyModeFk - LEFT JOIN vn.agency a ON a.id = am.agencyFk - LEFT JOIN vn.routesMonitor rm ON rm.routeFk = t.routeFk - LEFT JOIN vn.expeditionTruck et ON et.id = rm.expeditionTruckFk - JOIN vn.packagingConfig pc + LEFT JOIN vn.agency a ON a.id = am.agencyFk + LEFT JOIN vn.routesMonitor rm ON rm.routeFk = t.routeFk + LEFT JOIN vn.expeditionTruck et ON et.id = rm.expeditionTruckFk + JOIN vn.packagingConfig pc WHERE t.warehouseFk IN (60,1,44) AND e.created BETWEEN vStarted AND vEnded AND p.height < 140 @@ -53202,8 +51840,8 @@ BEGIN SELECT MIN(productionMinute) INTO startingMinute FROM vn.conveyorExpedition ce ; - - UPDATE vn.conveyorExpedition + + UPDATE vn.conveyorExpedition SET productionMinute = productionMinute - startingMinute; END ;; @@ -53272,7 +51910,7 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `createPedidoInterno`(vItemFk INT,vQuantity INT) BEGIN - + UPDATE vn.item SET upToDown = vQuantity WHERE id = vItemFk; END ;; @@ -53295,52 +51933,52 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `crypt`(vText VARCHAR(255), vKey VAR BEGIN DECLARE vEncryptedText VARCHAR(255) DEFAULT ''; - + DECLARE vKeyLength INT; DECLARE vKeyPosition INT DEFAULT 1; DECLARE vKeyChar VARCHAR(1); - + DECLARE vTextLength INT; DECLARE vTextPosition INT DEFAULT 1; DECLARE vTextChar VARCHAR(1); - + DECLARE vEncryptedChar VARCHAR(1); DECLARE vEncryptedCharPosition INT; - + DECLARE vChain VARCHAR(255) DEFAULT '#$.-_0123456789abcdefghijklmnopqrstuvwxyz'; DECLARE vChainTextPosition INT; DECLARE vChainKeyPosition INT; DECLARE vChainLength INT; - + DECLARE vInvalidadChars VARCHAR(255) DEFAULT ''; - - SET vTextLength = LENGTH(vText); + + SET vTextLength = LENGTH(vText); SET vKeyLength = LENGTH(vKey); SET vChainLength = LENGTH(vChain); - + WHILE vTextPosition <= vTextLength DO - + SET vTextChar = MID(vText,vTextPosition,1); SET vKeyChar = MID(vKey,vKeyPosition,1); - + SET vChainTextPosition = LOCATE(vTextChar, vChain); SET vInvalidadChars = IF(vChainTextPosition, vInvalidadChars, CONCAT(vInvalidadChars,vTextChar)); SET vChainKeyPosition = LOCATE(vKeyChar, vChain); SET vEncryptedCharPosition = vChainTextPosition + vChainKeyPosition; - + IF vEncryptedCharPosition > vChainLength THEN - + SET vEncryptedCharPosition = vEncryptedCharPosition - vChainLength; - + END IF; - + SET vEncryptedChar = MID(vChain, vEncryptedCharPosition,1); - + SET vEncryptedText = CONCAT(vEncryptedText, vEncryptedChar); - + SET vKeyPosition = IF(vKeyPosition = vKeyLength, 1,vKeyPosition + 1); SET vTextPosition = vTextPosition + 1; - + END WHILE; SET vResult = IF(LENGTH(vInvalidadChars), CONCAT('Caracteres no válidos: ',vInvalidadChars),vEncryptedText); @@ -53365,49 +52003,49 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `cryptOff`(vText VARCHAR(255), vKey BEGIN DECLARE vUncryptedText VARCHAR(255) DEFAULT ''; - + DECLARE vKeyLength INT; DECLARE vKeyPosition INT DEFAULT 1; DECLARE vKeyChar VARCHAR(1); - + DECLARE vTextLength INT; DECLARE vTextPosition INT DEFAULT 1; DECLARE vTextChar VARCHAR(1); - + DECLARE vUncryptedChar VARCHAR(1); DECLARE vUncryptedCharPosition INT; - + DECLARE vChain VARCHAR(255) DEFAULT '#$.-_0123456789abcdefghijklmnopqrstuvwxyz'; DECLARE vChainTextPosition INT; DECLARE vChainKeyPosition INT; DECLARE vChainLength INT; - - SET vTextLength = LENGTH(vText); + + SET vTextLength = LENGTH(vText); SET vKeyLength = LENGTH(vKey); SET vChainLength = LENGTH(vChain); - + WHILE vTextPosition <= vTextLength DO - + SET vTextChar = MID(vText,vTextPosition,1); SET vKeyChar = MID(vKey,vKeyPosition,1); - + SET vChainTextPosition = LOCATE(vTextChar, vChain); SET vChainKeyPosition = LOCATE(vKeyChar, vChain); SET vUncryptedCharPosition = vChainTextPosition - vChainKeyPosition; - + IF vUncryptedCharPosition < 1 THEN - + SET vUncryptedCharPosition = vUncryptedCharPosition + vChainLength; - + END IF; - + SET vUncryptedChar = MID(vChain, vUncryptedCharPosition,1); - + SET vUncryptedText = CONCAT(vUncryptedText, vUncryptedChar); - + SET vKeyPosition = IF(vKeyPosition = vKeyLength, 1,vKeyPosition + 1); SET vTextPosition = vTextPosition + 1; - + END WHILE; SET vResult = vUncryptedText; @@ -53503,7 +52141,7 @@ BEGIN OR (vSelf IS NOT NULL AND parentFk = vSelf); DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; - + SET vSons = 0; OPEN vChildren; @@ -53514,11 +52152,11 @@ BEGIN IF vDone THEN LEAVE myLoop; END IF; - + SET vIndex = vIndex + 1; SET vLft = vIndex; SET vSons = vSons + 1; - + CALL department_calcTreeRec( vChildFk, CONCAT(vPath, vChildFk, '/'), @@ -53573,7 +52211,7 @@ proc: BEGIN SELECT isChanged INTO vIsChanged FROM department_recalc; - + IF vIsChanged THEN UPDATE department_recalc SET isChanged = FALSE; CALL vn.department_calcTree; @@ -53598,17 +52236,17 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `department_getHasMistake`() BEGIN - + /** * Obtiene los sectores a los cuales les ponemos errores * */ - + SELECT id, name FROM department WHERE hasToMistake <> FALSE; - - + + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -53667,19 +52305,19 @@ BEGIN FROM department g JOIN tChilds c ON c.id = g.id WHERE g.parentFk IS NOT NULL; - + INSERT IGNORE INTO tNodes SELECT id FROM tParents; - + IF ROW_COUNT() = 0 THEN LEAVE myLoop; END IF; - + DELETE FROM tChilds; INSERT INTO tChilds SELECT id FROM tParents; END LOOP; - + DROP TEMPORARY TABLE tChilds, tParents; @@ -53746,12 +52384,12 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `deviceProductionUser_exists`(vUserFk INT) BEGIN - + /* SELECT COUNT(*) AS UserExists - FROM vn.deviceProductionUser dpu + FROM vn.deviceProductionUser dpu WHERE dpu.userFk = vUserFk;*/ SELECT TRUE; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -53823,10 +52461,10 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `device_checkLogin`(vUserFk INT, vAndroidID VARCHAR(50)) BEGIN - + /* * Comprueba si está registrado el dispositivo mediante su androidId - * + * * @param vUSerFk el id del user * @param vAndroidID es el identificador android_id del dispositivo */ @@ -53838,20 +52476,20 @@ BEGIN SELECT dpc.isAllUsersallowed INTO vIsAllUsersAllowed FROM vn.deviceProductionConfig dpc; - IF NOT vIsAllUsersAllowed THEN - + IF NOT vIsAllUsersAllowed THEN + SELECT COUNT(*) INTO vIsDepartment - FROM vn.workerDepartment dp + FROM vn.workerDepartment dp JOIN department d ON d.id = dp.departmentFk WHERE dp.workerFk = vUserFk AND d.hasToCheckLogin; - + IF vIsDepartment THEN SELECT COUNT(*) INTO vIsAuthorized - FROM vn.deviceProductionUser dpu + FROM vn.deviceProductionUser dpu JOIN vn.deviceProduction dp ON dp.id = dpu.deviceProductionFk WHERE dpu.userFk = vUserFk AND dp.android_id = vAndroidID; - + IF NOT vIsAuthorized THEN SET vMessage = 'Usuario no autorizado'; END IF; @@ -53881,15 +52519,15 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `duaEntryValueUpdate`(vDuaFk INT) BEGIN UPDATE duaEntry de - JOIN + JOIN ( SELECT b.entryFk, sum(b.quantity * b.buyingValue) as total FROM buy b JOIN duaEntry de ON de.entryFk = b.entryFk WHERE duaFk = vDuaFk GROUP BY b.entryFk ) sub ON sub.entryFk = de.entryFk - - LEFT JOIN + + LEFT JOIN (SELECT e.id, sum(iit.taxableBase) as euros FROM entry e JOIN invoiceInTax iit ON iit.invoiceInFk = e.invoiceInFk @@ -53897,11 +52535,11 @@ BEGIN WHERE de.duaFk = vDuaFk GROUP BY e.id ) sub2 ON sub2.id = de.entryFk - + SET de.value = sub.total, de.euroValue = sub2.euros WHERE duaFk = vDuaFk; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -53920,18 +52558,22 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `duaInvoiceInBooking`(vDuaFk INT) BEGIN - +/** + * Genera el asiento de un DUA y marca las entradas como confirmadas + * + * @param vDuaFk Id del dua a recalcular + */ DECLARE done BOOL DEFAULT FALSE; DECLARE vInvoiceFk INT; - DECLARE vASIEN BIGINT DEFAULT 0; - DECLARE vCounter INT DEFAULT 0; + DECLARE vASIEN BIGINT DEFAULT 0; + DECLARE vCounter INT DEFAULT 0; DECLARE rs CURSOR FOR - SELECT e.invoiceInFk + SELECT DISTINCT e.invoiceInFk FROM entry e JOIN duaEntry de ON de.entryFk = e.id - JOIN invoiceIn ii ON ii.id = e.invoiceInFk - WHERE de.duaFk = vDuaFk + JOIN invoiceIn ii ON ii.id = e.invoiceInFk + WHERE de.duaFk = vDuaFk AND de.customsValue AND ii.isBooked = FALSE; @@ -53941,17 +52583,17 @@ BEGIN UPDATE invoiceIn ii JOIN entry e ON e.invoiceInFk = ii.id - JOIN duaEntry de ON de.entryFk = e.id - JOIN dua d ON d.id = de.duaFk + JOIN duaEntry de ON de.entryFk = e.id + JOIN dua d ON d.id = de.duaFk SET ii.isBooked = TRUE, ii.booked = IFNULL(ii.booked,d.booked), ii.operated = IFNULL(ii.operated,d.operated), - ii.issued = IFNULL(ii.issued,d.issued), - ii.bookEntried = IFNULL(ii.bookEntried,d.bookEntried), - e.isConfirmed = TRUE + ii.issued = IFNULL(ii.issued,d.issued), + ii.bookEntried = IFNULL(ii.bookEntried,d.bookEntried), + e.isConfirmed = TRUE WHERE d.id = vDuaFk; - SELECT IFNULL(ASIEN,0) INTO vASIEN + SELECT IFNULL(ASIEN,0) INTO vASIEN FROM dua WHERE id = vDuaFk; @@ -53961,29 +52603,29 @@ BEGIN CALL invoiceIn_booking(vInvoiceFk); - IF vCounter > 0 OR vASIEN > 0 THEN + IF vCounter > 0 OR vASIEN > 0 THEN - UPDATE vn2008.XDiario x - JOIN vn.ledgerConfig lc ON lc.lastBookEntry = x.ASIEN - SET x.ASIEN = vASIEN; + UPDATE XDiario x + JOIN ledgerConfig lc ON lc.lastBookEntry = x.ASIEN + SET x.ASIEN = vASIEN; - ELSE + ELSE - SELECT lastBookEntry INTO vASIEN FROM vn.ledgerConfig; + SELECT lastBookEntry INTO vASIEN FROM ledgerConfig; END IF; - SET vCounter = vCounter + 1; + SET vCounter = vCounter + 1; FETCH rs INTO vInvoiceFk; END WHILE; - CLOSE rs; + CLOSE rs; - UPDATE dua - SET ASIEN = vASIEN - WHERE id = vDuaFk; + UPDATE dua + SET ASIEN = vASIEN + WHERE id = vDuaFk; END ;; DELIMITER ; @@ -54006,18 +52648,18 @@ BEGIN DECLARE vNewDuaFk INT; - INSERT INTO dua(awbFk,companyFk) - SELECT awbFk,companyFk + INSERT INTO dua(companyFk) + SELECT companyFk FROM dua WHERE id = vDuaFk; - + SELECT LAST_INSERT_ID() INTO vNewDuaFk; - + INSERT INTO duaEntry(duaFk, entryFk, value, customsValue) SELECT vNewDuaFk, entryFk, value, value - customsValue FROM duaEntry WHERE duaFk = vDuaFk - AND value != customsValue; + AND value != customsValue; END ;; DELIMITER ; @@ -54041,11 +52683,11 @@ BEGIN DECLARE vBookDated DATE; DECLARE vDiff DECIMAL(10,2); DECLARE vApunte BIGINT; - + SELECT ASIEN, IFNULL(bookEntried, util.VN_CURDATE()) INTO vBookNumber, vBookDated - FROM dua + FROM dua WHERE id = vDuaFk; - + IF vBookNumber IS NULL OR NOT vBookNumber THEN CALL ledger_next(vBookNumber); END IF; @@ -54056,14 +52698,14 @@ BEGIN ASIEN, FECHA, SUBCTA, - CONCEPTO, + CONCEPTO, EUROHABER, SERIE, empresa_id, CLAVE, FACTURA) - SELECT + SELECT vBookNumber, d.bookEntried, '4700000999', @@ -54076,20 +52718,20 @@ BEGIN FROM duaTax dt JOIN dua d ON d.id = dt.duaFk WHERE dt.duaFk = vDuaFk; - + -- Apuntes por tipo de IVA y proveedor - + INSERT INTO XDiario( ASIEN, FECHA, SUBCTA, - CONTRA, + CONTRA, EURODEBE, BASEEURO, - CONCEPTO, - FACTURA, + CONCEPTO, + FACTURA, IVA, - AUXILIAR, + AUXILIAR, SERIE, FECHA_EX, FECHA_OP, @@ -54109,17 +52751,17 @@ BEGIN FECREGCON ) - SELECT + SELECT vBookNumber ASIEN, vBookDated FECHA, tr.account SUBCTA, '4330002067' CONTRA, sum(dt.tax) EURODEBE, - sum(dt.base) BASEEURO, + sum(dt.base) BASEEURO, CONCAT('DUA nº',d.code) CONCEPTO, d.id FACTURA, dt.rate IVA, - '*' AUXILIAR, + '*' AUXILIAR, 'D' SERIE, d.issued FECHA_EX, d.operated FECHA_OP, @@ -54146,10 +52788,10 @@ BEGIN WHERE ta.effectived <= vBookDated AND taxAreaFk = 'WORLD' ORDER BY ta.effectived DESC - LIMIT 10000000000000000000 + LIMIT 10000000000000000000 ) tba GROUP BY rate - ) tr ON tr.rate = dt.rate + ) tr ON tr.rate = dt.rate JOIN supplier s ON s.id = d.companyFk JOIN country c ON c.id = s.countryFk WHERE d.id = vDuaFk @@ -54158,16 +52800,16 @@ BEGIN SELECT SUM(EURODEBE) -SUM(EUROHABER), MAX(id) INTO vDiff, vApunte FROM XDiario WHERE ASIEN = vBookNumber; - + UPDATE XDiario SET BASEEURO = 100 * (EURODEBE - vDiff) / IVA, - EURODEBE = EURODEBE - vDiff + EURODEBE = EURODEBE - vDiff WHERE id = vApunte; UPDATE dua SET ASIEN = vBookNumber WHERE id = vDuaFk; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -54188,48 +52830,53 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `duaTax_doRecalc`(vDuaFk INT) BEGIN /** * Borra los valores de duaTax y los vuelve a crear en base a la tabla duaEntry - * + * * @param vDuaFk Id del dua a recalcular -**/ + */ DELETE FROM duaTax WHERE duaFk = vDuaFk; - - INSERT INTO duaTax(duaFk, supplierFk, taxClassFk, base) - SELECT vDuaFk, supplierFk, taxClassFk, sum(sub.Base) as Base + + INSERT INTO duaTax(duaFk, taxClassFk, base) + SELECT vDuaFk, taxClassFk, SUM(sub.totalBase) FROM intrastat ist JOIN - (SELECT - e.supplierFk, - i.intrastatFk, - CAST(sum(b.quantity * b.buyingValue * de.customsValue / de.value) * di.amount/ tei.Base AS DECIMAL(10,2)) as Base - FROM buy b + (SELECT i.intrastatFk, + CAST(SUM(b.quantity * + b.buyingValue * + de.customsValue / + de.value) + * di.totalAmount / + bi.totalAmount AS DECIMAL(10,2) + ) totalBase + FROM buy b JOIN item i ON i.id = b.itemFk JOIN entry e ON e.id = b.entryFk JOIN duaEntry de ON de.entryFk = e.id - JOIN - ( - SELECT i.intrastatFk, - CAST(sum(b.quantity * b.buyingValue * de.customsValue / de.value) AS DECIMAL(10,2)) as Base - FROM buy b - JOIN item i ON i.id = b.itemFk - JOIN entry e ON e.id = b.entryFk - JOIN duaEntry de ON de.entryFk = e.id - WHERE de.duaFk = vDuaFk - GROUP BY i.intrastatFk - - ) tei ON tei.intrastatFk = i.intrastatFk - JOIN - ( - SELECT intrastatFk, sum(amount) as amount - FROM duaIntrastat - WHERE duaFk = vDuaFk - GROUP BY intrastatFK - ) di ON di.intrastatFk = i.intrastatFk + JOIN( + SELECT i.intrastatFk, + CAST(SUM(b.quantity * + b.buyingValue * + de.customsValue / + de.value) AS DECIMAL(10,2) + ) totalAmount + FROM buy b + JOIN item i ON i.id = b.itemFk + JOIN entry e ON e.id = b.entryFk + JOIN duaEntry de ON de.entryFk = e.id + WHERE de.duaFk = vDuaFk + GROUP BY i.intrastatFk + ) bi ON bi.intrastatFk = i.intrastatFk + JOIN( + SELECT intrastatFk, SUM(amount) totalAmount + FROM duaIntrastat + WHERE duaFk = vDuaFk + GROUP BY intrastatFK + ) di ON di.intrastatFk = i.intrastatFk WHERE de.duaFk = vDuaFk - GROUP BY e.supplierFk, i.intrastatFk - HAVING Base - ) sub ON ist.id = sub.intrastatFk - GROUP BY ist.taxClassFk, sub.supplierFk; + GROUP BY i.intrastatFk + HAVING totalBase + )sub ON ist.id = sub.intrastatFk + GROUP BY ist.taxClassFk; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -54248,13 +52895,13 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `ediTables_Update`() BEGIN - - INSERT IGNORE INTO vn.genus(name) + + INSERT IGNORE INTO vn.genus(name) SELECT latin_genus_name FROM edi.genus ; - INSERT IGNORE INTO vn.specie(name) - SELECT LCASE(latin_species_name) + INSERT IGNORE INTO vn.specie(name) + SELECT LCASE(latin_species_name) FROM edi.specie ; END ;; DELIMITER ; @@ -54294,71 +52941,71 @@ DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE; OPEN cur1; read_loop: LOOP - + SET done = FALSE; SET vEntryFk = 0; - + FETCH cur1 INTO vId; - + IF done THEN LEAVE read_loop; END IF; - + SELECT IFNULL(e.id,0) INTO vEntryFk FROM vn.entry e JOIN vn.travel tr ON tr.id = e.travelFk - JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk + JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk AND ea.warehouseInFk = tr.warehouseInFk AND ea.agencyModeFk = tr.agencyModeFk AND ea.supplierFk = e.supplierFk WHERE ea.id = vId AND tr.landed = vLanded LIMIT 1; - + IF NOT vEntryFk THEN - + SELECT IFNULL(e.id,0) INTO vEntryFk FROM vn.entry e JOIN vn.travel tr ON tr.id = e.travelFk - JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk + JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk AND ea.warehouseInFk = tr.warehouseInFk AND ea.agencyModeFk = tr.agencyModeFk WHERE ea.id = vId AND tr.landed = vLanded AND ea.supplierFk IS NULL LIMIT 1; - + END IF; - + IF NOT vEntryFk THEN - + SET vTravelFk = 0; - - SELECT IFNULL(MAX(tr.id),0) INTO vTravelFk + + SELECT IFNULL(MAX(tr.id),0) INTO vTravelFk FROM vn.travel tr - JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk + JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk AND ea.warehouseInFk = tr.warehouseInFk AND ea.agencyModeFk = tr.agencyModeFk WHERE ea.id = vId AND tr.landed = vLanded; - + IF NOT vTravelFk THEN - + INSERT INTO vn.travel(landed, shipped, warehouseInFk, warehouseOutFk, agencyModeFk) SELECT vLanded, vLanded, warehouseInFk, warehouseOutFk, agencyModeFk - FROM vn.ektEntryAssign + FROM vn.ektEntryAssign WHERE id = vId; - - SELECT MAX(tr.id) INTO vTravelFk + + SELECT MAX(tr.id) INTO vTravelFk FROM vn.travel tr - JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk + JOIN vn.ektEntryAssign ea ON ea.warehouseOutFk = tr.warehouseOutFk AND ea.warehouseInFk = tr.warehouseInFk - AND ea.agencyModeFk = tr.agencyFk + AND ea.agencyModeFk = tr.agencyModeFk WHERE ea.id = vId AND tr.landed = vLanded; - + END IF; - + INSERT INTO vn.entry(travelFk, supplierFk, companyFk, currencyFk) SELECT vTravelFk, IFNULL(ea.supplierFk,s.id), c.id, cu.id FROM vn.supplier s @@ -54366,13 +53013,13 @@ OPEN cur1; JOIN vn.currency cu ON cu.code = 'EUR' JOIN vn.ektEntryAssign ea ON ea.id = vId WHERE s.name = 'KONINKLIJE COOPERATIEVE BLOEMENVEILING FLORAHOLLAN'; - - SELECT MAX(id) INTO vEntryFk + + SELECT MAX(id) INTO vEntryFk FROM vn.entry WHERE travelFk = vTravelFk; - + END IF; - + UPDATE vn.ektEntryAssign SET entryFk = vEntryFk WHERE id = vId; @@ -54380,7 +53027,7 @@ OPEN cur1; END LOOP; CLOSE cur1; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -54400,18 +53047,18 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `energyMeter_record`(vInput INT, vActiveTime INT) BEGIN DECLARE vConsumption INT; - + SELECT consumption INTO vConsumption FROM energyInput WHERE input = vInput; - INSERT INTO vn.energyMeter - SET - `input` = vInput, - `period` = DATE_FORMAT(util.VN_NOW(), '%Y-%m-%d %H:00:00'), + INSERT INTO vn.energyMeter + SET + `input` = vInput, + `period` = DATE_FORMAT(util.VN_NOW(), '%Y-%m-%d %H:00:00'), `activeTime` = vActiveTime, `consumption` = CAST(IFNULL((vConsumption / 3600) * vActiveTime, 0) AS DECIMAL(10,2)) - ON DUPLICATE KEY UPDATE + ON DUPLICATE KEY UPDATE `activeTime` = `activeTime` + vActiveTime, `consumption` = `consumption` + CAST(VALUES(`consumption`) AS DECIMAL(10,2)); END ;; @@ -54434,28 +53081,28 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `entryDelivered`(vDated DATE, vEntry BEGIN DECLARE vTravelFk INT; - + SELECT travelFk INTO vTravelFk - FROM vn.entry + FROM vn.entry WHERE id = vEntryFk; - + IF (SELECT COUNT(*) FROM vn.entry WHERE travelFk = vTravelFk) = 1 THEN - + UPDATE vn.travel SET shipped = LEAST(shipped, vDated), landed = vDated WHERE id = vTravelFk; - + ELSE - + INSERT INTO vn.travel(shipped, landed, warehouseInFk, warehouseOutFk, agencyModeFk, ref, isDelivered, isReceived) SELECT LEAST(shipped, vDated), vDated, warehouseInFk, warehouseOutFk, agencyModeFk, CONCAT(account.myUser_getName(),' ', vEntryFk), TRUE, TRUE FROM vn.travel WHERE id = vTravelFk; - + SELECT LAST_INSERT_ID() INTO vTravelFk; - - UPDATE vn.entry - SET travelFk = vTravelFk + + UPDATE vn.entry + SET travelFk = vTravelFk WHERE id = vEntryFk; - + END IF; END ;; @@ -54481,29 +53128,29 @@ BEGIN DECLARE vEntry INT; DECLARE vBucket VARCHAR(10); DECLARE vSupplierFk INT; - + SET vSupplierFk = IF (vLandingWarehouse = 1, 850, 963); -- seleccionamos travel SELECT t.id, e.id INTO vTravel, vEntry FROM travel t LEFT JOIN entry e ON t.id = e.travelFk - WHERE t.landed = vInOutDate AND t.shipped = vInOutDate AND t.warehouseOutFk = vShipmentWarehouse + WHERE t.landed = vInOutDate AND t.shipped = vInOutDate AND t.warehouseOutFk = vShipmentWarehouse AND t.warehouseInFk = vLandingWarehouse AND t.agencyModeFk IS NULL AND e.supplierFk = vSupplierFk - LIMIT 1; - + LIMIT 1; + -- creamos el travel si es necesario IF IFNULL(vTravel, FALSE) = FALSE THEN INSERT INTO travel (shipped, landed, warehouseInFk, warehouseOutFk) VALUES (vInOutDate, vInOutDate, vLandingWarehouse, vShipmentWarehouse); SELECT LAST_INSERT_ID() INTO vTravel; END IF; - + -- creamos la Entrada si es necesario IF IFNULL(vEntry, FALSE) = FALSE THEN INSERT INTO entry (supplierFk, travelFk) VALUES (vSupplierFk, vTravel); -- proveedor 'CONFECCION ARTIFICIAL' SELECT LAST_INSERT_ID() INTO vEntry; END IF; - + -- creamos el cubo si es necesario SELECT id INTO vBucket FROM packaging WHERE volume = vVolume LIMIT 1; IF vBucket IS NULL THEN @@ -54513,7 +53160,7 @@ BEGIN SELECT id INTO vBucket FROM packaging WHERE volume = vVolume LIMIT 1; END IF; - INSERT INTO buy(itemFk,quantity, entryFk, packageFk, packing, stickers, buyingValue, price2, price3) + INSERT INTO buy(itemFk,quantity, entryFk, packagingFk, packing, stickers, buyingValue, price2, price3) SELECT itemFk, quantity, vEntry, @@ -54532,20 +53179,20 @@ DELIMITER ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; /*!50003 DROP PROCEDURE IF EXISTS `entry_checkPackaging` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8mb4 */ ; -/*!50003 SET character_set_results = utf8mb4 */ ; -/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET character_set_client = utf8mb3 */ ; +/*!50003 SET character_set_results = utf8mb3 */ ; +/*!50003 SET collation_connection = utf8mb3_general_ci */ ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `entry_checkPackaging`(vEntryFk INT) BEGIN /** * Comprueba que los campos package y packaging no sean nulos - * + * * @param vEntryFk Id de entrada */ DECLARE vpackageOrPackingNull INT; @@ -54553,7 +53200,7 @@ BEGIN SELECT count(*) INTO vpackageOrPackingNull FROM buy b WHERE b.entryFk = vEntryFk - AND (b.packing IS NULL OR b.packageFk IS NULL); + AND (b.packing IS NULL OR b.packagingFk IS NULL); IF vpackageOrPackingNull THEN CALL util.throw("packageOrPackingNull"); @@ -54629,7 +53276,8 @@ BEGIN commission, currencyFk, companyFk, - clonedFrom + clonedFrom, + typeFk ) SELECT IFNULL(vTravelFk, travelFk), supplierFk, @@ -54639,7 +53287,8 @@ BEGIN commission, currencyFk, companyFk, - vSelf + vSelf, + typeFk FROM entry WHERE id = vSelf; @@ -54716,7 +53365,7 @@ BEGIN containerFk, comissionValue, packageValue, - packageFk, + packagingFk, price1, price2, price3, @@ -54739,7 +53388,7 @@ BEGIN containerFk, comissionValue, packageValue, - packageFk, + packagingFk, price1, price2, price3, @@ -54797,7 +53446,7 @@ BEGIN comissionValue, packageValue, location, - packageFk, + packagingFk, price1, price2, price3, @@ -54817,7 +53466,7 @@ BEGIN comissionValue, packageValue, location, - packageFk, + packagingFk, price1, price2, price3, @@ -54847,7 +53496,7 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `entry_getRate`(vSelf INT) BEGIN /** - * Prepara una tabla con las tarifas aplicables en funcion de la fecha + * Prepara una tabla con las tarifas aplicables en funcion de la fecha * y el almacén * * @param vSelf Id de la tabla entry @@ -54857,7 +53506,7 @@ BEGIN DECLARE vWarehouseFk INT; SELECT t.landed, t.warehouseInFk INTO vDated, vWarehouseFk - FROM entry e + FROM entry e JOIN travel t ON t.id = e.travelFk WHERE e.id = vSelf; @@ -54870,6 +53519,225 @@ DELIMITER ; /*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 DROP PROCEDURE IF EXISTS `entry_getTransfer` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`localhost` PROCEDURE `entry_getTransfer`( + vSelf INT +) +BEGIN +/** + * Retorna los artículos trasladables a partir de una entrada. + * + * @param vSelf Id de entrada + */ + DECLARE vDateShipped DATE; + DECLARE vDateLanded DATE; + DECLARE vWarehouseIn INT; + DECLARE vWarehouseOut INT; + DECLARE vCalcVisible INT; + DECLARE vInventoryDate DATE DEFAULT getInventoryDate(); + + SELECT shipped, landed, warehouseInFk, warehouseOutFk + INTO vDateShipped, vDateLanded, vWarehouseIn, vWarehouseOut + FROM travel t + JOIN entry e ON e.travelFk = t.id + WHERE e.id = vSelf; + + CALL rate_getPrices(vDateShipped, vWarehouseIn); + + -- Traslado en almacen origen + CREATE OR REPLACE TEMPORARY TABLE tBuy + (PRIMARY KEY (itemFk), INDEX(buyFk)) + ENGINE = MEMORY + SELECT * + FROM ( + SELECT b.itemFk, b.id buyFk + FROM buy b + JOIN entry e ON e.id = b.entryFk + JOIN travel t ON t.id = e.travelFk + WHERE t.landed BETWEEN vInventoryDate AND vDateShipped + AND NOT b.isIgnored + AND b.price2 >= 0 + ORDER BY (vWarehouseOut = t.warehouseInFk) DESC, t.landed DESC + LIMIT 10000000000000000000 + ) sub + GROUP BY itemFk; + + IF vDateShipped >= util.VN_CURDATE() THEN + CALL `cache`.visible_refresh(vCalcVisible, TRUE, vWarehouseOut); + + CREATE OR REPLACE TEMPORARY TABLE tItem ( + `itemFk` int(10) unsigned NOT NULL, + `visible` int(11) NOT NULL DEFAULT 0, + `available` int(11) NOT NULL DEFAULT 0, + `visibleLanding` int(11) NOT NULL DEFAULT 0, + `availableLanding` int(11) NOT NULL DEFAULT 0, + UNIQUE INDEX i USING HASH (itemFk) + ) ENGINE = MEMORY; + + INSERT INTO tItem(itemFk, visible) + SELECT item_id itemFk, visible + FROM `cache`.visible + WHERE calc_id = vCalcVisible + AND visible; + + CALL `cache`.visible_refresh(vCalcVisible, TRUE, vWarehouseIn); + + INSERT INTO tItem(itemFk, visibleLanding) + SELECT item_id, `visible` + FROM `cache`.`visible` v + WHERE v.calc_id = vCalcVisible + AND v.`visible` + ON DUPLICATE KEY UPDATE visibleLanding = v.`visible`; + + CALL vn2008.availableTraslate(vWarehouseOut, vDateShipped, NULL); + + INSERT INTO tItem(itemFk, available) + SELECT a.item_id, a.available + FROM vn2008.availableTraslate a + WHERE a.available + ON DUPLICATE KEY UPDATE available = a.available; + + CALL vn2008.availableTraslate(vWarehouseIn, vDateLanded, vWarehouseOut); + + INSERT INTO tItem(itemFk, availableLanding) + SELECT a.item_id, a.available + FROM vn2008.availableTraslate a + WHERE a.available + ON DUPLICATE KEY UPDATE availableLanding = a.available; + ELSE + CALL item_getStock(vWarehouseOut, vDateShipped, NULL); + + CREATE OR REPLACE TEMPORARY TABLE tItem + (UNIQUE INDEX i USING HASH (itemFk)) + ENGINE = MEMORY + SELECT itemFk, + `visible`, + available, + 0 visibleLanding, + 0 availableLanding + FROM tmp.itemList; + END IF; + + CALL buyUltimateFromInterval(vWarehouseIn,vInventoryDate, vDateLanded); + + CREATE OR REPLACE TEMPORARY TABLE tTransfer + ENGINE = MEMORY + SELECT it.code `type`, + it.categoryFk, + i.typeFk, + i.id itemFk, + i.name item, + i.`size`, + i.category, + i.inkFk, + o.code originCode, + b2.quantity, + i.stems, + CAST(ti.visible AS DECIMAL(10,0)) vis1, + CAST(ti.available AS DECIMAL(10,0)) ava1, + CAST(ti.visibleLanding AS DECIMAL(10,0)) vis2, + CAST(ti.availableLanding AS DECIMAL(10,0)) ava2, + COALESCE(b2.`grouping`, b.`grouping`) `grouping`, + COALESCE(b2.packing, b.packing) packing, + COALESCE(b3.groupingMode, b2.groupingMode, b.groupingMode) package, + IFNULL(p.name, s.nickname) productor, + TRUE tinta, + b.packagingFk, + b2.id buyFk, + b2.stickers, + b.ektFk, + it.workerFk, + pa.volume, + IFNULL(pa.width, 0) width, + IFNULL(pa.`depth`, 0) `depth`, + IFNULL(pa.height, 0) height, + IFNULL(b.buyingValue, 0) buyingValue, + IFNULL(b.comissionValue, 0) comissionValue, + IFNULL(b.freightValue, 0) freightValue, + am.m3, + e.commission, + pa.isPackageReturnable, + IFNULL(pa2.value, pa.value) `value`, + r.rate3 r3, + r.rate2 r2, + it.promo, + b.`grouping` groupingOrigin, + b.packing packingOrigin, + b.id buyFkOrigin, + pa.returnCost, + b.weight + FROM item i + JOIN tItem ti ON ti.itemFk = i.id + LEFT JOIN producer p ON p.id = i.producerFk + LEFT JOIN itemType it ON it.id = i.typeFk + JOIN itemCategory ic ON ic.id = it.categoryFk + LEFT JOIN origin o ON o.id = i.originFk + LEFT JOIN tBuy lb ON lb.itemFk = i.id + LEFT JOIN buy b ON b.id = lb.buyFk + LEFT JOIN packaging pa ON pa.id = b.packagingFk + LEFT JOIN entry e2 ON e2.id = b.entryFk + LEFT JOIN supplier s ON s.id = e2.supplierFk + LEFT JOIN entry e ON e.id = vSelf + LEFT JOIN travel tr ON tr.id = e.travelFk + LEFT JOIN agencyMode am ON am.id = tr.agencyModeFk + LEFT JOIN buy b2 ON b2.itemFk = i.id + AND b2.entryFk = vSelf + LEFT JOIN packaging pa2 ON pa2.id = b.packagingFk + LEFT JOIN tmp.rate r ON TRUE + LEFT JOIN tmp.buyUltimateFromInterval bufi ON bufi.itemFk = i.id + LEFT JOIN buy b3 ON b3.id = bufi.buyFk + WHERE ic.display + AND NOT e.isRaid + AND (ti.visible OR ti.available) + ORDER BY i.typeFk, i.name, i.id, i.size, i.category, o.name; + + CREATE INDEX tIndex USING HASH ON tTransfer (itemFk); + + SELECT *, + quantity - MOD(quantity , `grouping`) subQuantity, + MOD(quantity, `grouping`) soll, + ROUND((IF(volume > 0,volume, width * `depth` * + IF(height = 0, `size` + 10, height))) / + packing, 0) cm3, + buyingValue + comissionValue + freightValue cost, + @carriage := ROUND((IF(volume > 0, volume, width * `depth` * + IF(height = 0, `size` + 10, height))) * + m3 / 1000000 / Packing, 3) carriage, + @comission := ROUND((buyingValue + comissionValue + freightValue) * + commission / 100, 3) commission, + ROUND(@packaging := (returnCost + IF(isPackageReturnable, 0, value)) + / packing, 3) packaging, + @cost := IFNULL((buyingValue + comissionValue + freightValue), 0) + + IFNULL(@packaging, 0) + + IFNULL(@carriage, 0) + + IFNULL(@comission, 0) expense, + @rate3 := ROUND(@cost / ( (100 - r3 - promo) / 100), 2) rate3, + ROUND(@rate3 * (1 + ((r2 - r3)/100)), 2) rate2, + FALSE selected + FROM tTransfer; + + DROP TEMPORARY TABLE IF EXISTS + tTransfer, + tItem, + tBuy, + tmp.buyUltimateFromInterval, + tmp.rate, + tmp.itemList; +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; /*!50003 DROP PROCEDURE IF EXISTS `entry_lock` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -54915,6 +53783,7 @@ BEGIN * * @param vSelf Identificador de entry * @param vDays Número de dias a futuro que se quiere la nueva entrada + * @param vChangeEntry Si se modifica la entrada original * * @return vNewEntryFk Identificador de la nueva entrada */ @@ -54922,8 +53791,12 @@ BEGIN DECLARE vTravelFk INT; DECLARE vInvoiceAmountOldEntryFk DECIMAL(10,2); DECLARE vInvoiceAmountNewEntry DECIMAL(10,2); + DECLARE vIsOrdered BOOL; + DECLARE vIsConfirmed BOOL; + DECLARE vInvoiceNumber VARCHAR(50); + DECLARE vTypeFk VARCHAR(100); - SELECT travelFk INTO vTravelFk + SELECT travelFk, isOrdered, isConfirmed, invoiceNumber, typeFk INTO vTravelFk, vIsOrdered, vIsConfirmed, vInvoiceNumber, vTypeFk FROM entry WHERE id = vSelf; @@ -54932,7 +53805,11 @@ BEGIN UPDATE entry e SET e.travelFk = vNewTravelFk, - e.evaNotes = CONCAT('No impresas de: ', vSelf, ' ', IFNULL(e.evaNotes,'')) + e.evaNotes = CONCAT('No impresas de: ', vSelf, ' ', IFNULL(e.evaNotes,'')), + e.isOrdered = vIsOrdered, + e.isConfirmed = vIsConfirmed, + e.invoiceNumber = vInvoiceNumber, + e.typeFk = vTypeFk WHERE e.id = vNewEntryFk; IF vChangeEntry THEN @@ -54955,7 +53832,7 @@ BEGIN containerFk, comissionValue, packageValue, - packageFk, + packagingFk, price1, price2, price3, @@ -54976,7 +53853,7 @@ BEGIN containerFk, comissionValue, packageValue, - packageFk, + packagingFk, price1, price2, price3, @@ -54987,7 +53864,7 @@ BEGIN FROM buy b WHERE b.entryFk = vSelf AND b.printedStickers != b.stickers; - + IF vChangeEntry THEN UPDATE buy SET stickers = printedStickers, @@ -54999,7 +53876,7 @@ BEGIN FROM item i WHERE i.description = 'MISFIT' LIMIT 1; - + INSERT INTO buy(entryFk, itemFk, quantity, @@ -55014,7 +53891,7 @@ BEGIN comissionValue, packageValue, location, - packageFk, + packagingFk, price1, price2, price3, @@ -55033,7 +53910,7 @@ BEGIN comissionValue, packageValue, location, - packageFk, + packagingFk, price1, price2, price3, @@ -55066,7 +53943,7 @@ BEGIN UPDATE entry SET gestDocFk = (SELECT gestDocFk FROM entry WHERE id = vSelf LIMIT 1) WHERE id = vNewEntryFk; - + INSERT INTO duaEntry (duaFk, entryFk) SELECT duaFk, vNewEntryFk FROM duaEntry WHERE entryFk = vSelf LIMIT 1; END ;; @@ -55140,12 +54017,12 @@ BEGIN */ DECLARE v_done BOOL DEFAULT FALSE; DECLARE vEntryFk INTEGER; - + DECLARE vCur CURSOR FOR SELECT id FROM tmp.recalcEntryCommision; DECLARE CONTINUE HANDLER FOR NOT FOUND - SET v_done = TRUE; + SET v_done = TRUE; OPEN vCur; @@ -55156,7 +54033,7 @@ BEGIN IF v_done THEN LEAVE l; END IF; - + CALL vn2008.buy_tarifas_entry(vEntryFk); END LOOP; @@ -55181,7 +54058,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `entry_splitByShelving`(vShelvingFk BEGIN /** * Divide las compras entre dos entradas de acuerdo con lo ubicado en una matr�cula - * + * * @param vShelvingFk Identificador de vn.shelving * @param vFromEntryFk Entrada origen * @param vToEntryFk Entrada destino @@ -55191,49 +54068,49 @@ BEGIN DECLARE vBuyStickers INT; DECLARE vDone BOOLEAN DEFAULT FALSE; - DECLARE cur CURSOR FOR + DECLARE cur CURSOR FOR SELECT bb.id buyFk, FLOOR(ish.visible / ish.packing) ishStickers, bb.stickers buyStickers FROM vn.itemShelving ish - JOIN (SELECT b.id, b.itemFk, b.stickers - FROM vn.buy b + JOIN (SELECT b.id, b.itemFk, b.stickers + FROM vn.buy b WHERE b.entryFk = vFromEntryFk ORDER BY b.stickers DESC - LIMIT 10000000000000000000) bb ON bb.itemFk = ish.itemFk + LIMIT 10000000000000000000) bb ON bb.itemFk = ish.itemFk AND bb.stickers >= FLOOR(ish.visible / ish.packing) WHERE shelvingFk = vShelvingFk COLLATE utf8_general_ci GROUP BY ish.id; - + DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; - - -- Cantidades de la matrícula que exceden la de las entradas - SELECT ish.itemFk, - i.longName, + + -- Cantidades de la matrícula que exceden la de las entradas + SELECT ish.itemFk, + i.longName, FLOOR(ish.visible / ish.packing) AS etiEnMatricula, bb.stickers etiEnEntrada FROM vn.itemShelving ish - JOIN vn.item i ON i.id = ish.itemFk - LEFT JOIN (SELECT b.id, b.itemFk, b.stickers - FROM vn.buy b + JOIN vn.item i ON i.id = ish.itemFk + LEFT JOIN (SELECT b.id, b.itemFk, b.stickers + FROM vn.buy b WHERE b.entryFk = vFromEntryFk ORDER BY b.stickers DESC LIMIT 10000000000000000000) bb ON bb.itemFk = ish.itemFk WHERE shelvingFk = vShelvingFk COLLATE utf8_general_ci AND IFNULL(bb.stickers,0) < FLOOR(ish.visible / ish.packing) GROUP BY ish.id; - + OPEN cur; read_loop: LOOP SET vDone = FALSE; - + FETCH cur INTO vBuyFk, vIshStickers, vBuyStickers; - + IF vDone THEN LEAVE read_loop; END IF; - + IF vIshStickers = vBuyStickers THEN UPDATE vn.buy SET entryFk = vToEntryFk @@ -55241,9 +54118,9 @@ BEGIN ELSE UPDATE vn.buy SET stickers = stickers - vIshStickers, - quantity = stickers * packing + quantity = stickers * packing WHERE id = vBuyFk; - + INSERT INTO vn.buy(entryFk, itemFk, quantity, @@ -55258,7 +54135,7 @@ BEGIN comissionValue, packageValue, location, - packageFk, + packagingFk, price1, price2, price3, @@ -55285,7 +54162,7 @@ BEGIN comissionValue, packageValue, location, - packageFk, + packagingFk, price1, price2, price3, @@ -55323,16 +54200,16 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `entry_splitMisfit`(vSelf INT) BEGIN - + /* Divide una entrada, pasando los registros que ha insertado vn.entry_fixMisfit de la entrada original * a la nueva */ - + DECLARE vNewEntryFk INT; DECLARE vBuyFk INT; SELECT MAX(b.id) INTO vBuyFk - FROM vn.buy b + FROM vn.buy b JOIN vn.item i ON i.id = b.itemFk WHERE b.entryFk = vSelf AND i.description = 'MISFIT'; @@ -55341,17 +54218,17 @@ BEGIN SELECT supplierFk, dated, travelFk, currencyFk, companyFk FROM vn.entry e WHERE e.id = vSelf; + + SET vNewEntryFk = LAST_INSERT_ID(); - SET vNewEntryFk = LAST_INSERT_ID(); - - UPDATE vn.buy b + UPDATE vn.buy b SET b.entryFk = vNewEntryFk WHERE b.entryFk = vSelf AND b.id > vBuyFk; - + SELECT vNewEntryFk; - - + + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -55374,7 +54251,7 @@ BEGIN * Unlock the indicated entry * @vSelf params entry id */ - UPDATE `entry` + UPDATE `entry` SET lockerUserFk = NULL, locked = NULL WHERE id = vSelf; @@ -55405,21 +54282,21 @@ BEGIN DECLARE vComission INT; CREATE OR REPLACE TEMPORARY TABLE tmp.recalcEntryCommision - SELECT e.id + SELECT e.id FROM vn.entry e JOIN vn.travel t ON t.id = e.travelFk - JOIN vn.warehouse w ON w.id = t.warehouseInFk + JOIN vn.warehouse w ON w.id = t.warehouseInFk WHERE t.shipped >= util.VN_CURDATE() AND e.currencyFk = vCurrency; SET vComission = currency_getCommission(vCurrency); - UPDATE vn.entry e + UPDATE vn.entry e JOIN tmp.recalcEntryCommision tmp ON tmp.id = e.id SET e.commission = vComission; - SELECT `name` INTO vCurrencyName - FROM currency + SELECT `name` INTO vCurrencyName + FROM currency WHERE id = vCurrency; CALL entry_recalc(); @@ -55438,246 +54315,6 @@ DELIMITER ; /*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; -/*!50003 DROP PROCEDURE IF EXISTS `errorProduction_add` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8mb4 */ ; -/*!50003 SET character_set_results = utf8mb4 */ ; -/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`localhost` PROCEDURE `errorProduction_add`( - vAction VARCHAR(25), - vDatedFrom DATETIME, - vDatedTo DATETIME) -BEGIN -/** - * Rellena la tabla vn.errorProduction - * - * @param vAction Accion que se quiere añadir - * @param vDatedFrom Fecha desde - * @param vDatedTo Fecha hasta - */ - DECLARE vDepartment VARCHAR(255); - - CASE - WHEN vAction = 'SACAR' THEN - SET vDepartment = 'Sacadores'; - WHEN vAction = 'ENCAJAR' THEN - SET vDepartment = 'Encajadores'; - WHEN vAction = 'CONTROLAR' THEN - SET vDepartment = 'Revisadores'; - END CASE; - - IF (vDepartment = 'Encajadores') THEN - CREATE OR REPLACE TEMPORARY TABLE total - ENGINE = MEMORY - SELECT e.workerFk, - COUNT(DISTINCT t.id) ticketCount, - COUNT(s.id) lineCount - FROM expedition e - JOIN ticket t ON e.ticketFk = t.id - JOIN sale s ON s.ticketFk = t.id - WHERE t.shipped BETWEEN vDatedFrom AND vDatedTo - GROUP BY e.workerFk; - ELSE - CREATE OR REPLACE TEMPORARY TABLE total - ENGINE = MEMORY - SELECT st.workerFk, - COUNT(DISTINCT t.id) ticketCount, - COUNT(s.id) lineCount - FROM saleTracking st - JOIN `state` s2 ON s2.id = st.stateFk - JOIN sale s ON s.id = st.saleFk - JOIN ticket t ON s.ticketFk = t.id - WHERE (t.shipped BETWEEN vDatedFrom AND vDatedTo) - AND s2.code IN ('OK','PREVIOUS_PREPARATION','PREPARED','CHECKED') - GROUP BY st.workerFk; - END IF; - - CALL timeControl_calculateAll(vDatedFrom, vDatedTo); - - CREATE OR REPLACE TEMPORARY TABLE errorsByClaim - ENGINE = MEMORY - SELECT COUNT(c.ticketFk) errors, - cd.workerFk - FROM claimDevelopment cd - JOIN claim c ON cd.claimFk = c.id - JOIN ticket t ON c.ticketFk = t.id - JOIN claimResponsible cr ON cd.claimResponsibleFk = cr.id - WHERE t.shipped BETWEEN vDatedFrom AND vDatedTo - AND cr.description = vDepartment - GROUP BY cd.workerFk; - - CREATE OR REPLACE TEMPORARY TABLE volume - ENGINE = MEMORY - SELECT SUM(w.volume) volume, - w.workerFk - FROM bs.workerProductivity w - WHERE w.dated BETWEEN vDatedFrom AND vDatedTo - GROUP BY w.workerFk; - - CREATE OR REPLACE TEMPORARY TABLE errorsByChecker - ENGINE = MEMORY - SELECT sub1.workerFk, COUNT(id) errors - FROM ( - SELECT st.workerFk, - t.id - FROM saleMistake sm - JOIN saleTracking st ON sm.saleFk = st.saleFk - JOIN `state` s2 ON s2.id = st.stateFk - JOIN sale s ON s.id = sm.saleFk - JOIN ticket t on t.id = s.ticketFk - WHERE (t.shipped BETWEEN vDatedFrom AND vDatedTo) - AND s2.code IN ('OK','PREVIOUS_PREPARATION','PREPARED','CHECKED') - ) sub1 - GROUP BY sub1.workerFk; - - CREATE OR REPLACE TEMPORARY TABLE expeditionErrors - ENGINE = MEMORY - SELECT COUNT(t.id) errors, - e.workerFk - FROM vn.expeditionMistake pm - JOIN vn.expedition e ON e.id = pm.expeditionFk - JOIN vn.ticket t ON t.id = e.ticketFk - WHERE t.shipped BETWEEN vDatedFrom AND vDatedTo - GROUP BY e.workerFk; - - IF (vDepartment = 'Sacadores') THEN - - INSERT INTO errorProduction(userFk, - firstname, - lastname, - rol, - ticketNumber, - lineNumber, - error, - volume, - hourStart, - hourEnd, - hourWorked, - dated) - SELECT w.id, - w.firstName, - w.lastName, - vDepartment, - t.ticketCount totalTickets, - t.lineCount, - IFNULL(ec.errors,0) + IFNULL(ec2.errors,0) errors, - IF(vDepartment = 'Revisadores', NULL, v.volume) volume, - SUBSTRING(tc.timed, 1, 5) hourStart, - SUBSTRING(tc.timed, LENGTH(tc.timed)-4, 5) hourEnd, - IFNULL(CAST(tc.timeWorkDecimal AS DECIMAL (10,2)) , 0) hourWorked, - vDatedFrom dated - FROM total t - LEFT JOIN worker w ON w.id = t.workerFk - LEFT JOIN tmp.timeControlCalculate tc ON tc.userFk = t.workerFk - LEFT JOIN errorsByClaim ec ON ec.workerFk = t.workerFk - LEFT JOIN volume v ON v.workerFk = t.workerFk - LEFT JOIN errorsByChecker ec2 ON ec2.workerFk = t.workerFk - JOIN (SELECT DISTINCT w.id -- Verificamos que son sacadores - FROM vn.collection c - JOIN vn.state s ON s.id = c.stateFk - JOIN vn.train tn ON tn.id = c.trainFk - JOIN vn.worker w ON w.id = c.workerFk - WHERE c.created BETWEEN vDatedFrom AND vDatedTo) sub ON sub.id = w.id - GROUP BY w.id; - - CREATE OR REPLACE TEMPORARY TABLE itemPickerErrors -- Errores de los sacadores, derivadores de los revisadores - ENGINE = MEMORY - SELECT COUNT(c.ticketFk) errors, - tt.workerFk - FROM claimDevelopment cd - JOIN claim c ON cd.claimFk = c.id - JOIN ticket t ON c.ticketFk = t.id - JOIN claimResponsible cr ON cd.claimResponsibleFk = cr.id - JOIN ticketTracking tt ON tt.ticketFk = t.id - JOIN `state` s ON s.id = tt.stateFk - WHERE t.shipped BETWEEN vDatedFrom AND vDatedTo - AND cr.description = 'Revisadores' - AND s.code = 'ON_PREPARATION' - GROUP BY workerFk; - - UPDATE errorProduction ep - JOIN itemPickerErrors ipe ON ipe.workerFk = ep.userFk - SET ep.error = ep.error + ipe.errors - WHERE vDatedFrom = ep.dated AND ep.rol = 'Sacadores'; - - DROP TEMPORARY TABLE itemPickerErrors; - ELSE - INSERT INTO errorProduction(userFk, - firstname, - lastname, - rol, - ticketNumber, - lineNumber, - error, - volume, - hourStart, - hourEnd, - hourWorked, - dated) - SELECT w.id, - w.firstName, - w.lastName, - vDepartment, - t.ticketCount totalTickets, - t.lineCount, - IFNULL(ec.errors,0) + IFNULL(ec2.errors,0) + IFNULL(pe.errors,0) errors, - IF(vDepartment = 'Revisadores', NULL, v.volume) volume, - SUBSTRING(tc.timed, 1, 5) hourStart, - SUBSTRING(tc.timed, LENGTH(tc.timed)-4, 5) hourEnd, - IFNULL(CAST(tc.timeWorkDecimal AS DECIMAL (10,2)) , 0) hourWorked, - vDatedFrom dated - FROM total t - LEFT JOIN worker w ON w.id = t.workerFk - LEFT JOIN tmp.timeControlCalculate tc ON tc.userFk = t.workerFk - LEFT JOIN errorsByClaim ec ON ec.workerFk = t.workerFk - LEFT JOIN volume v ON v.workerFk = t.workerFk - LEFT JOIN errorsByChecker ec2 ON ec2.workerFk = t.workerFk - LEFT JOIN expeditionErrors pe ON pe.workerFk = t.workerFk - GROUP BY w.id; - END IF; - - DROP TEMPORARY TABLE total, - errorsByClaim, - volume, - errorsByChecker, - expeditionErrors; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; -/*!50003 DROP PROCEDURE IF EXISTS `errorProduction_addLauncher` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8mb4 */ ; -/*!50003 SET character_set_results = utf8mb4 */ ; -/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`localhost` PROCEDURE `errorProduction_addLauncher`() -BEGIN - DECLARE vDatedFrom DATETIME; - DECLARE vDatedTo DATETIME; - - SELECT DATE_SUB(util.VN_CURDATE(),INTERVAL 1 DAY), CONCAT(DATE_SUB(util.VN_CURDATE(),INTERVAL 1 DAY),' 23:59:59') INTO vDatedFrom, vDatedTo; - - CALL vn.errorProduction_add('SACAR', vDatedFrom, vDatedTo); - CALL vn.errorProduction_add('ENCAJAR', vDatedFrom, vDatedTo); - CALL vn.errorProduction_add('CONTROLAR', vDatedFrom, vDatedTo); -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; /*!50003 DROP PROCEDURE IF EXISTS `expeditionGetFromRoute` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -55695,7 +54332,7 @@ BEGIN DECLARE vRouteFk INT DEFAULT 0; SELECT t.routeFk INTO vRouteFk - FROM vn.expedition exp + FROM vn.expedition exp INNER JOIN ticket t on t.id = exp.ticketFk WHERE exp.id = vExpeditionFk; @@ -55898,14 +54535,14 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `expeditionPallet_printLabel`(vSelf INT) BEGIN /** - * Calls the report_print procedure and passes it + * Calls the report_print procedure and passes it * the necessary parameters for printing. * * @param vSelf expeditioPallet id. */ DECLARE vPrinterFk INT; DECLARE vUserFk INT DEFAULT account.myUser_getId(); - + SELECT o.labelerFk INTO vPrinterFk FROM operator o WHERE o.workerFk = vUserFk; @@ -55972,22 +54609,22 @@ BEGIN DECLARE vTotal INT DEFAULT 0; IF vPalletFk = 0 THEN -- Nuevo pallet - - INSERT INTO vn.expeditionPallet(truckFk) + + INSERT INTO vn.expeditionPallet(truckFk) VALUES(vTruckFk); - + SELECT LAST_INSERT_ID() INTO vPalletFk; - + END IF; - + SELECT COUNT(expeditionFk) INTO vTotal FROM vn.expeditionScan WHERE palletFk = vPalletFk; - + IF vTotal <> 0 THEN - SELECT expeditionFk, + SELECT expeditionFk, palletFk - FROM vn.expeditionScan + FROM vn.expeditionScan WHERE palletFk = vPalletFk; - ELSE + ELSE SELECT 0 expeditionFk,vPalletFk palletFk; END IF; END ;; @@ -56060,12 +54697,12 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `expeditionScan_Put`(vPalletFk INT, vExpeditionFk INT) BEGIN - - REPLACE vn.expeditionScan(expeditionFk, palletFk) + + REPLACE vn.expeditionScan(expeditionFk, palletFk) VALUES(vExpeditionFk, vPalletFk); - + SELECT LAST_INSERT_ID() INTO vPalletFk; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -56084,32 +54721,32 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `expeditionState_add`(vParam INT, vStateCode VARCHAR(100)) BEGIN - + /** * Inserta nuevos registros en la tabla vn.expeditionState, segun el parámetro - * + * * @param vParam Identificador de vn.expedition o de vn.route * @param vStateCode Corresponde a vn.expeditionStateType.code */ - + IF (SELECT COUNT(*) FROM vn.route r WHERE r.id = vParam) THEN - + INSERT INTO vn.expeditionState(expeditionFk, typeFk) SELECT e.id, est.id FROM vn.expedition e JOIN vn.ticket t ON t.id = e.ticketFk JOIN vn.expeditionStateType est ON est.code = vStateCode WHERE t.routeFk = vParam; - + ELSE - + INSERT INTO vn.expeditionState(expeditionFk, typeFk) SELECT vParam, est.id FROM vn.expeditionStateType est WHERE est.code = vStateCode; - + END IF; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -56141,7 +54778,7 @@ BEGIN SELECT e.id, est.id FROM vn.expedition e JOIN vn.expeditionStateType est ON est.code = vStateCode - JOIN vn.ticket t ON t.id = e.ticketFk + JOIN vn.ticket t ON t.id = e.ticketFk WHERE t.addressFk = vAdressFk AND t.routeFk = vRouteFk; END ;; @@ -56162,14 +54799,14 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `expeditionState_addByExpedition`(vExpeditionFk INT, vStateCode VARCHAR(100)) BEGIN - + /** * Inserta nuevos registros en la tabla vn.expeditionState - * + * * @param vExpeditionFk Identificador de vn.expedition * @param vStateCode Corresponde a vn.expeditionStateType.code */ - + INSERT INTO vn.expeditionState(expeditionFk, typeFk) SELECT vExpeditionFk, est.id FROM vn.expeditionStateType est @@ -56195,7 +54832,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `expeditionState_addByPallet`(vPalle BEGIN /** * Inserta nuevos registros en la tabla vn.expeditionState - * + * * @param vPalletFk Identificador de vn.expedition * @param vStateCode Corresponde a vn.expeditionStateType.code */ @@ -56212,7 +54849,7 @@ BEGIN IF NOT hasExpeditions THEN DROP TEMPORARY TABLE tExpeditionScan; - CALL util.throw('palletDoesNotExist'); + CALL util.throw('palletDoesNotExist'); END IF; INSERT INTO vn.expeditionState(expeditionFk, typeFk) @@ -56237,21 +54874,21 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `expeditionState_addByRoute`(vRouteFk INT, vStateCode VARCHAR(100)) BEGIN - + /** * Inserta nuevos registros en la tabla vn.expeditionState, por rutas - * + * * @param vRouteFk Identificador de vn.route * @param vStateCode Corresponde a vn.expeditionStateType.code */ - + INSERT INTO vn.expeditionState(expeditionFk, typeFk) SELECT e.id, est.id FROM vn.expedition e JOIN vn.ticket t ON t.id = e.ticketFk JOIN vn.expeditionStateType est ON est.code = vStateCode WHERE t.routeFk = vRouteFk; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -56293,8 +54930,8 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `expeditionTruck_List`() BEGIN - SELECT id truckFk, - eta, + SELECT id truckFk, + eta, description Destino FROM expeditionTruck WHERE eta BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE()) @@ -56338,7 +54975,7 @@ BEGIN JOIN address a ON t.addressFk = a.id JOIN route r ON r.id = t.routeFk LEFT JOIN warehouse w ON t.warehouseFk = w.id - LEFT JOIN (SELECT sub.ticketFk, + LEFT JOIN (SELECT sub.ticketFk, CONCAT('(', GROUP_CONCAT(DISTINCT sub.itemPackingTypeFk ORDER BY sub.items DESC SEPARATOR ','), ') ') itemPackingTypeConcat FROM (SELECT s.ticketFk , i.itemPackingTypeFk, COUNT(*) items FROM ticket t @@ -56369,7 +55006,7 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `expedition_getState`(vExpeditionFk INT) BEGIN - + DECLARE vTicketsPendientes INT; DECLARE vEtiquetasTotales INT; DECLARE vEtiquetasEscaneadas INT; @@ -56379,24 +55016,24 @@ BEGIN FROM vn.ticket t JOIN vn.expedition e ON e.ticketFk = t.id WHERE e.id = vExpeditionFk; - + SELECT COUNT(*) INTO vTicketsPendientes FROM vn.ticket t LEFT JOIN vn.expedition e ON e.ticketFk = t.id WHERE t.routeFk = vRouteFk AND ISNULL(e.id); - + SELECT COUNT(*) INTO vEtiquetasTotales - FROM vn.expedition e + FROM vn.expedition e JOIN vn.ticket t ON t.id = e.ticketFk WHERE t.routeFk = vRouteFk; - + SELECT COUNT(*) INTO vEtiquetasEscaneadas - FROM vn.expeditionScan es + FROM vn.expeditionScan es JOIN vn.expedition e ON e.id = es.expeditionFk - JOIN vn.ticket t ON t.id = e.ticketFk + JOIN vn.ticket t ON t.id = e.ticketFk WHERE t.routeFk = vRouteFk; - + SELECT e.ticketFk ticket, t.nickname cliente, a.city ciudad, @@ -56410,17 +55047,17 @@ BEGIN vTicketsPendientes AS ticketsPendientes, vEtiquetasTotales AS etiquetasTotales, vEtiquetasEscaneadas AS etiquetasEscaneadas - FROM vn.expedition e - JOIN vn.ticket t ON t.id = e.ticketFk - JOIN vn.address a ON a.id = t.addressFk - JOIN vn.province p ON p.id = a.provinceFk - JOIN vn.`zone`z ON z.id = t.zoneFk - LEFT JOIN vn.route r ON r.id = t.routeFk - LEFT JOIN vn.agencyMode am ON am.id = r.agencyModeFk - LEFT JOIN vn.routesMonitor rm ON rm.routeFk = r.id - LEFT JOIN vn.expeditionTruck et ON et.id = rm.expeditionTruckFk + FROM vn.expedition e + JOIN vn.ticket t ON t.id = e.ticketFk + JOIN vn.address a ON a.id = t.addressFk + JOIN vn.province p ON p.id = a.provinceFk + JOIN vn.`zone`z ON z.id = t.zoneFk + LEFT JOIN vn.route r ON r.id = t.routeFk + LEFT JOIN vn.agencyMode am ON am.id = r.agencyModeFk + LEFT JOIN vn.routesMonitor rm ON rm.routeFk = r.id + LEFT JOIN vn.expeditionTruck et ON et.id = rm.expeditionTruckFk WHERE e.id = vExpeditionFk; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -56439,12 +55076,12 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `expedition_StateGet`(vExpeditionFk INT) BEGIN - + /* Devuelve una "ficha" con todos los datos relativos a la expedición - * - * param vExpeditionFk + * + * param vExpeditionFk */ - + DECLARE vTicketsPendientes INT; DECLARE vEtiquetasTotales INT; DECLARE vEtiquetasEscaneadas INT; @@ -56455,34 +55092,34 @@ BEGIN FROM vn.ticket t JOIN vn.expedition e ON e.ticketFk = t.id WHERE e.id = vExpeditionFk; - + SELECT COUNT(*) INTO vTicketsPendientes FROM vn.ticket t LEFT JOIN vn.expedition e ON e.ticketFk = t.id WHERE t.routeFk = vRouteFk AND ISNULL(e.id); - + SELECT COUNT(*) INTO vEtiquetasTotales - FROM vn.expedition e + FROM vn.expedition e JOIN vn.ticket t ON t.id = e.ticketFk WHERE t.routeFk = vRouteFk; - + SELECT COUNT(*) INTO vEtiquetasEscaneadas - FROM vn.expeditionScan es + FROM vn.expeditionScan es JOIN vn.expedition e ON e.id = es.expeditionFk - JOIN vn.ticket t ON t.id = e.ticketFk + JOIN vn.ticket t ON t.id = e.ticketFk WHERE t.routeFk = vRouteFk; - + SELECT COUNT(*) INTO vEtiquetasLeidasSorter - FROM srt.expedition e + FROM srt.expedition e JOIN vn.expedition ve ON ve.id = e.id LEFT JOIN vn.expeditionScan es ON es.expeditionFk = e.id - JOIN vn.ticket t ON t.id = ve.ticketFk + JOIN vn.ticket t ON t.id = ve.ticketFk WHERE t.routeFk = vRouteFk AND e.created != e.updated - AND ISNULL(es.expeditionFk); - - + AND ISNULL(es.expeditionFk); + + SELECT e.ticketFk ticket, t.nickname cliente, a.city ciudad, @@ -56497,17 +55134,17 @@ BEGIN vEtiquetasTotales AS etiquetasTotales, vEtiquetasEscaneadas AS etiquetasEscaneadas, vEtiquetasLeidasSorter AS etiquetasSorter - FROM vn.expedition e - JOIN vn.ticket t ON t.id = e.ticketFk - JOIN vn.address a ON a.id = t.addressFk - JOIN vn.province p ON p.id = a.provinceFk - JOIN vn.`zone`z ON z.id = t.zoneFk - LEFT JOIN vn.route r ON r.id = t.routeFk - LEFT JOIN vn.agencyMode am ON am.id = r.agencyModeFk - LEFT JOIN vn.routesMonitor rm ON rm.routeFk = r.id - LEFT JOIN vn.expeditionTruck et ON et.id = rm.expeditionTruckFk + FROM vn.expedition e + JOIN vn.ticket t ON t.id = e.ticketFk + JOIN vn.address a ON a.id = t.addressFk + JOIN vn.province p ON p.id = a.provinceFk + JOIN vn.`zone`z ON z.id = t.zoneFk + LEFT JOIN vn.route r ON r.id = t.routeFk + LEFT JOIN vn.agencyMode am ON am.id = r.agencyModeFk + LEFT JOIN vn.routesMonitor rm ON rm.routeFk = r.id + LEFT JOIN vn.expeditionTruck et ON et.id = rm.expeditionTruckFk WHERE e.id = vExpeditionFk; - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -56543,147 +55180,6 @@ DELIMITER ; /*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; -/*!50003 DROP PROCEDURE IF EXISTS `fustControl` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8mb4 */ ; -/*!50003 SET character_set_results = utf8mb4 */ ; -/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`localhost` PROCEDURE `fustControl`(vFromDated DATE, vToDated DATE) -BEGIN - - DECLARE vSijsnerClientFk INT DEFAULT 19752; - - DECLARE vDateStart DATETIME; - DECLARE vDateEnd DATETIME; - - SET vDateStart = vFromDated; - SET vDateEnd = util.Dayend(vToDated); - - SELECT p.id FustCode, - CAST(sent.stucks AS DECIMAL(10,0)) FH, - CAST(tp.stucks AS DECIMAL(10,0)) Tickets, - CAST(-sj.stucks AS DECIMAL(10,0)) Sijsner, - CAST(IFNULL(sent.stucks,0) - IFNULL(tp.stucks,0) + IFNULL(sj.stucks,0) AS DECIMAL(10,0)) saldo - FROM vn.packaging p - LEFT JOIN ( - SELECT FustCode, sum(fustQuantity) stucks - FROM ( - SELECT IFNULL(pe.equivalentFk ,b.packageFk) FustCode, s.quantity / b.packing AS fustQuantity - FROM vn.sale s - JOIN vn.ticket t ON t.id = s.ticketFk - JOIN vn.warehouse w ON w.id = t.warehouseFk - JOIN vn.warehouseAlias wa ON wa.id = w.aliasFk - JOIN cache.last_buy lb ON lb.item_id = s.itemFk AND lb.warehouse_id = t.warehouseFk - JOIN vn.buy b ON b.id = lb.buy_id - JOIN vn.packaging p ON p.id = b.packageFk - LEFT JOIN vn.packageEquivalent pe ON pe.packagingFk = p.id - JOIN vn.address a ON a.id = t.addressFk - JOIN vn.province p2 ON p2.id = a.provinceFk - JOIN vn.country c ON c.id = p2.countryFk - WHERE t.shipped BETWEEN vDateStart AND vDateEnd - AND wa.name = 'VNH' - AND p.isPackageReturnable - AND c.country = 'FRANCIA') sub - GROUP BY FustCode) sent ON sent.FustCode = p.id - LEFT JOIN ( - SELECT FustCode, sum(quantity) stucks - FROM ( - SELECT IFNULL(pe.equivalentFk ,tp.packagingFk) FustCode, tp.quantity - FROM vn.ticketPackaging tp - JOIN vn.ticket t ON t.id = tp.ticketFk - JOIN vn.warehouse w ON w.id = t.warehouseFk - JOIN vn.warehouseAlias wa ON wa.id = w.aliasFk - JOIN vn.packaging p ON p.id = tp.packagingFk - LEFT JOIN vn.packageEquivalent pe ON pe.packagingFk = p.id - JOIN vn.address a ON a.id = t.addressFk - JOIN vn.province p2 ON p2.id = a.provinceFk - JOIN vn.country c ON c.id = p2.countryFk - WHERE t.shipped BETWEEN vDateStart AND vDateEnd - AND wa.name = 'VNH' - AND p.isPackageReturnable - AND c.country = 'FRANCIA' - AND t.clientFk != vSijsnerClientFk - AND tp.quantity > 0) sub - GROUP BY FustCode) tp ON tp.FustCode = p.id - LEFT JOIN ( - SELECT FustCode, sum(quantity) stucks - FROM ( - SELECT IFNULL(pe.equivalentFk ,tp.packagingFk) FustCode, tp.quantity - FROM vn.ticketPackaging tp - JOIN vn.ticket t ON t.id = tp.ticketFk - JOIN vn.warehouse w ON w.id = t.warehouseFk - JOIN vn.warehouseAlias wa ON wa.id = w.aliasFk - JOIN vn.packaging p ON p.id = tp.packagingFk - LEFT JOIN vn.packageEquivalent pe ON pe.packagingFk = p.id - WHERE t.shipped BETWEEN TIMESTAMPADD(DAY, 1, vDateStart ) AND TIMESTAMPADD(DAY, 1, vDateEnd ) - AND wa.name = 'VNH' - AND p.isPackageReturnable - AND t.clientFk = vSijsnerClientFk) sub - GROUP BY FustCode) sj ON sj.FustCode = p.id - WHERE sent.stucks - OR tp.stucks - OR sj.stucks; - -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; -/*!50003 DROP PROCEDURE IF EXISTS `fustControlDetail` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8mb4 */ ; -/*!50003 SET character_set_results = utf8mb4 */ ; -/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`localhost` PROCEDURE `fustControlDetail`(vFromDated DATE, vToDated DATE) -BEGIN - - DECLARE vSijsnerClientFk INT DEFAULT 19752; - - DECLARE vDateStart DATETIME; - DECLARE vDateEnd DATETIME; - - SET vDateStart = vFromDated; - SET vDateEnd = util.Dayend(vToDated); - - SELECT a.nickname shopName, - a.city , - IFNULL(pe.equivalentFk ,tp.packagingFk) FustCode, - tp.quantity, - tp.ticketFk, - CONCAT('From ', vFromDated,' to ', vToDated) AS dateRange - FROM vn.ticketPackaging tp - JOIN vn.ticket t ON t.id = tp.ticketFk - JOIN vn.warehouse w ON w.id = t.warehouseFk - JOIN vn.warehouseAlias wa ON wa.id = w.aliasFk - JOIN vn.packaging p ON p.id = tp.packagingFk - LEFT JOIN vn.packageEquivalent pe ON pe.packagingFk = p.id - JOIN vn.address a ON a.id = t.addressFk - JOIN vn.province p2 ON p2.id = a.provinceFk - JOIN vn.country c ON c.id = p2.countryFk - WHERE t.shipped BETWEEN vFromDated AND util.dayend(vToDated) - AND wa.name = 'VNH' - AND p.isPackageReturnable - AND c.country = 'FRANCIA' - AND t.clientFk != vSijsnerClientFk - AND tp.quantity > 0; - -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; /*!50003 DROP PROCEDURE IF EXISTS `fv_pca` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -56701,8 +55197,8 @@ DECLARE vTicketFk INT; DECLARE vSaleFk INT; DECLARE vClonTicket INT DEFAULT 0; -DECLARE cur1 CURSOR FOR -SELECT s.ticketFk, s.id +DECLARE cur1 CURSOR FOR +SELECT s.ticketFk, s.id FROM vn.sale s JOIN vn.ticket t ON t.id = s.ticketFk JOIN vn.item i ON i.id = s.itemFk @@ -56718,17 +55214,17 @@ OPEN cur1; FETCH cur1 INTO vTicketFk, vSaleFk; WHILE done = 0 DO - + SELECT t.id INTO vClonTicket FROM vn.ticket t JOIN (SELECT addressFk, shipped FROM vn.ticket WHERE id = vTicketFk) sub USING(addressFk, shipped) WHERE t.warehouseFk = 44 LIMIT 1; - + SELECT vTicketFk, vClonTicket; - + IF vClonTicket = 0 THEN - + INSERT INTO ticket ( clientFk, shipped, @@ -56756,12 +55252,12 @@ FETCH cur1 INTO vTicketFk, vSaleFk; zonePrice, zoneBonus, routeFk - + FROM ticket WHERE id = vTicketFk; SET vClonTicket = LAST_INSERT_ID(); - + SELECT 'lstID', vClonTicket; /* INSERT INTO ticketObservation(ticketFk, observationTypeFk, description) @@ -56771,20 +55267,20 @@ FETCH cur1 INTO vTicketFk, vSaleFk; WHERE t.id = vClonTicket; */ INSERT INTO ticketLog - SET originFk = vTicketFk, userFk = account.myUser_getId(), `action` = 'insert', + SET originFk = vTicketFk, userFk = account.myUser_getId(), `action` = 'insert', description = CONCAT('Ha creado el ticket:', ' ', vClonTicket, ' clonando el ', vTicketFk); - + END IF; - + UPDATE vn.sale SET ticketFk = vClonTicket WHERE id = vSaleFk; SET vClonTicket = 0; - + SET done = 0; FETCH cur1 INTO vTicketFk, vSaleFk; - + END WHILE; CLOSE cur1; @@ -56809,14 +55305,14 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `getDayExpeditions`() BEGIN - SELECT - e.expeditions_id as expeditionFk, - date_format(e.odbc_date,'%Y-%m-%d') as expeditionDate, - e.ticket_id as ticketFk, + SELECT + e.id as expeditionFk, + date_format(e.created,'%Y-%m-%d') as expeditionDate, + e.ticketFk, t.routeFk as routeFk - FROM vn2008.expeditions e - INNER JOIN vn.ticket t ON t.id = e.ticket_id - WHERE DATE(odbc_date) = util.VN_CURDATE(); + FROM expedition e + INNER JOIN ticket t ON t.id = e.ticketFk + WHERE DATE(e.created) = util.VN_CURDATE(); END ;; DELIMITER ; @@ -56862,6 +55358,51 @@ BEGIN SELECT id,name as description,upToDown as quantity FROM vn.item WHERE upToDown; +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 DROP PROCEDURE IF EXISTS `getTaxBases` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb3 */ ; +/*!50003 SET character_set_results = utf8mb3 */ ; +/*!50003 SET collation_connection = utf8mb3_general_ci */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`localhost` PROCEDURE `getTaxBases`() +BEGIN +/** +* Calcula y devuelve en número de bases imponibles postivas y negativas +* Requiere la tabla temporal tmp.ticketToInvoice(id) +* +* returns tmp.taxBases +*/ + + CREATE OR REPLACE TEMPORARY TABLE tmp.ticket + (KEY (ticketFk)) + ENGINE = MEMORY + SELECT id ticketFk + FROM tmp.ticketToInvoice; + + CALL ticket_getTax(NULL); + + DROP TEMPORARY TABLE IF EXISTS tmp.taxBases; + CREATE TEMPORARY TABLE tmp.taxBases + ENGINE = MEMORY + SELECT + SUM(taxableBase > 0) as positive, + SUM(taxableBase < 0) as negative + FROM( + SELECT SUM(taxableBase) taxableBase + FROM tmp.ticketTax + GROUP BY pgcFk + ) t; + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -56887,7 +55428,7 @@ BEGIN SELECT DATE_SUB(util.VN_CURDATE(), INTERVAL yearsToDelete YEAR) INTO vDated FROM vn.greugeConfig; - + INSERT INTO vn.greuge(clientFk, description, amount, shipped, created, greugeTypeFk) SELECT clientFk, 'Suma agrupada', SUM(amount), MAX(shipped), MAX(created), greugeTypeFk FROM vn.greuge @@ -57005,8 +55546,8 @@ DECLARE done BOOL DEFAULT FALSE; DECLARE vTicketFk INT; DECLARE rs CURSOR FOR - SELECT id FROM vn.ticket - WHERE shipped = util.yesterday() + SELECT id FROM vn.ticket + WHERE shipped = util.yesterday() AND clientFk = 400 AND warehouseFk IN (1,44); @@ -57017,13 +55558,13 @@ OPEN rs; FETCH rs INTO vTicketFk; WHILE NOT done DO - + INSERT INTO vn.inventoryFailure(dated, itemFk, quantity, value, warehouseFk, throwerFk) - SELECT t.shipped, - s.itemFk, - s.quantity, + SELECT t.shipped, + s.itemFk, + s.quantity, b.buyingValue + b.freightValue + b.packageValue + b.comissionValue, - t.warehouseFk, + t.warehouseFk, w.id FROM vn.ticket t JOIN vn.sale s ON s.ticketFk = t.id @@ -57034,7 +55575,7 @@ WHILE NOT done DO AND s.quantity > 0; FETCH rs INTO vTicketFk; - + END WHILE; @@ -57059,184 +55600,177 @@ DELIMITER ; /*!50003 SET character_set_results = utf8mb4 */ ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; -CREATE DEFINER=`root`@`localhost` PROCEDURE `inventoryMake`(vDate DATE, vWh INT) -proc: BEGIN +CREATE DEFINER=`root`@`localhost` PROCEDURE `inventoryMake`(vInventoryDate DATE) +BEGIN /** -* Recalcula los inventarios de todos los almacenes, si vWh = 0 +* Recalculate the inventories * -* @param vDate Fecha de los nuevos inventarios -* @param vWh almacen al cual hacer el inventario +* @param vInventoryDate date for the new inventory */ - DECLARE vDone BOOL; DECLARE vEntryFk INT; DECLARE vTravelFk INT; DECLARE vDateLastInventory DATE; - DECLARE vDateYesterday DATETIME DEFAULT vDate - INTERVAL 1 SECOND; + DECLARE vDateYesterday DATETIME DEFAULT vInventoryDate - INTERVAL 1 SECOND; DECLARE vWarehouseOutFkInventory INT; DECLARE vInventorySupplierFk INT; DECLARE vAgencyModeFkInventory INT; + DECLARE vMaxRecentInventories INT; + DECLARE vWarehouseFk INT; DECLARE cWarehouses CURSOR FOR SELECT id FROM warehouse - WHERE isInventory - AND vWh IN (0,id); + WHERE isInventory; + + DECLARE CONTINUE HANDLER FOR SQLEXCEPTION + BEGIN + ROLLBACK; + RESIGNAL; + END; DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; + SELECT inventorySupplierFk INTO vInventorySupplierFk FROM entryConfig LIMIT 1; + SELECT inventoried INTO vDateLastInventory FROM config LIMIT 1; + SELECT maxRecentInventories, + warehouseOutFk, + agencyModeFk + INTO vMaxRecentInventories, + vWarehouseOutFkInventory, + vAgencyModeFkInventory + FROM inventoryConfig + LIMIT 1; + + IF vDateLastInventory IS NULL + OR vInventorySupplierFk IS NULL + OR vMaxRecentInventories IS NULL + OR vInventoryDate IS NULL + OR vWarehouseOutFkInventory IS NULL + OR vAgencyModeFkInventory IS NULL THEN + CALL util.throw('Some config parameters are not set'); + END IF; + + START TRANSACTION; + OPEN cWarehouses; + -- Environment variable to disable the triggers of the affected tables SET @isModeInventory := TRUE; l: LOOP - SET vDone = FALSE; - FETCH cWarehouses INTO vWh; + SET vEntryFk = NULL; + SET vTravelFk = NULL; + + FETCH cWarehouses INTO vWarehouseFk; IF vDone THEN LEAVE l; END IF; - SELECT w.id INTO vWarehouseOutFkInventory - FROM warehouse w - WHERE w.code = 'inv'; - - SELECT inventorySupplierFk INTO vInventorySupplierFk - FROM entryConfig; - - SELECT am.id INTO vAgencyModeFkInventory - FROM agencyMode am - where code = 'inv'; - - SELECT MAX(landed) INTO vDateLastInventory - FROM travel tr - JOIN entry e ON e.travelFk = tr.id - JOIN buy b ON b.entryFk = e.id - WHERE warehouseOutFk = vWarehouseOutFkInventory - AND landed < vDate - AND e.supplierFk = vInventorySupplierFk - AND warehouseInFk = vWh - AND NOT isRaid; - - IF vDateLastInventory IS NULL THEN - SELECT inventoried INTO vDateLastInventory FROM config; - END IF; - - -- Generamos travel, si no existe. - SET vTravelFK = 0; - + -- Generate travel, if it does not exist SELECT id INTO vTravelFk FROM travel WHERE warehouseOutFk = vWarehouseOutFkInventory - AND warehouseInFk = vWh - AND landed = vDate + AND warehouseInFk = vWarehouseFk + AND landed = vInventoryDate AND agencyModeFk = vAgencyModeFkInventory AND ref = 'inventario' LIMIT 1; - IF NOT vTravelFK THEN - - INSERT INTO travel SET - warehouseOutFk = vWarehouseOutFkInventory, - warehouseInFk = vWh, - shipped = vDate, - landed = vDate, - agencyModeFk = vAgencyModeFkInventory, - ref = 'inventario', - isDelivered = TRUE, - isReceived = TRUE; + IF vTravelFk IS NULL THEN + INSERT INTO travel + SET warehouseOutFk = vWarehouseOutFkInventory, + warehouseInFk = vWarehouseFk, + shipped = vInventoryDate, + landed = vInventoryDate, + agencyModeFk = vAgencyModeFkInventory, + ref = 'inventario', + isDelivered = TRUE, + isReceived = TRUE; SELECT LAST_INSERT_ID() INTO vTravelFk; - END IF; - -- Generamos entrada si no existe, o la vaciamos. - SET vEntryFk = 0; - + -- Generate an entry if it does not exist, or we empty it SELECT id INTO vEntryFk FROM entry WHERE supplierFk = vInventorySupplierFk AND travelFk = vTravelFk; - IF NOT vEntryFk THEN - - INSERT INTO entry SET - supplierFk = vInventorySupplierFk, - isConfirmed = TRUE, - isOrdered = TRUE, - travelFk = vTravelFk; + IF vEntryFk IS NULL THEN + INSERT INTO entry + SET supplierFk = vInventorySupplierFk, + isConfirmed = TRUE, + isOrdered = TRUE, + travelFk = vTravelFk; SELECT LAST_INSERT_ID() INTO vEntryFk; - ELSE - DELETE FROM buy WHERE entryFk = vEntryFk; - END IF; - -- Preparamos tabla auxilar - CREATE OR REPLACE TEMPORARY TABLE tmp.inventory ( - itemFk INT(11) NOT NULL PRIMARY KEY, - quantity int(11) DEFAULT '0', - buyingValue decimal(10,3) DEFAULT '0.000', - freightValue decimal(10,3) DEFAULT '0.000', - packing int(11) DEFAULT '0', - `grouping` smallint(5) unsigned NOT NULL DEFAULT '1', - groupingMode tinyint(4) NOT NULL DEFAULT 0 , - comissionValue decimal(10,3) DEFAULT '0.000', - packageValue decimal(10,3) DEFAULT '0.000', - packageFk varchar(10) COLLATE utf8_unicode_ci DEFAULT '--', - price1 decimal(10,2) DEFAULT '0.00', - price2 decimal(10,2) DEFAULT '0.00', - price3 decimal(10,2) DEFAULT '0.00', - minPrice decimal(10,2) DEFAULT '0.00', - producer varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL, - INDEX (itemFK)) ENGINE = MEMORY; + -- Prepare the auxiliary table + CREATE OR REPLACE TEMPORARY TABLE tInventory ( + itemFk INT(11) NOT NULL PRIMARY KEY, + quantity int(11) DEFAULT '0', + buyingValue decimal(10,4) DEFAULT '0.0000', + freightValue decimal(10,3) DEFAULT '0.000', + packing int(11) DEFAULT '0', + `grouping` smallint(5) unsigned NOT NULL DEFAULT '1', + groupingMode tinyint(4) NOT NULL DEFAULT 0 , + comissionValue decimal(10,3) DEFAULT '0.000', + packageValue decimal(10,3) DEFAULT '0.000', + packageFk varchar(10) COLLATE utf8_unicode_ci DEFAULT '--', + price1 decimal(10,2) DEFAULT '0.00', + price2 decimal(10,2) DEFAULT '0.00', + price3 decimal(10,2) DEFAULT '0.00', + minPrice decimal(10,2) DEFAULT '0.00', + producer varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL, + INDEX (itemFK) + ) ENGINE = MEMORY; - -- Compras - INSERT INTO tmp.inventory(itemFk,quantity) + -- Buys + INSERT INTO tInventory(itemFk, quantity) SELECT b.itemFk, SUM(b.quantity) FROM buy b JOIN entry e ON e.id = b.entryFk JOIN travel tr ON tr.id = e.travelFk - WHERE tr.warehouseInFk = vWh - AND tr.landed BETWEEN vDateLastInventory - AND vDateYesterday + WHERE tr.warehouseInFk = vWarehouseFk + AND tr.landed BETWEEN vDateLastInventory AND vDateYesterday AND NOT isRaid GROUP BY b.itemFk; - SELECT vDateLastInventory , vDateYesterday; - -- Traslados - INSERT INTO tmp.inventory(itemFk, quantity) + -- Transfers + INSERT INTO tInventory(itemFk, quantity) SELECT itemFk, quantityOut - FROM ( + FROM ( SELECT b.itemFk,- SUM(b.quantity) quantityOut FROM buy b JOIN entry e ON e.id = b.entryFk JOIN travel tr ON tr.id = e.travelFk - WHERE tr.warehouseOutFk = vWh - AND tr.shipped BETWEEN vDateLastInventory - AND vDateYesterday + WHERE tr.warehouseOutFk = vWarehouseFk + AND tr.shipped BETWEEN vDateLastInventory AND vDateYesterday AND NOT isRaid GROUP BY b.itemFk ) sub ON DUPLICATE KEY UPDATE quantity = IFNULL(quantity, 0) + sub.quantityOut; - -- Ventas - INSERT INTO tmp.inventory(itemFk,quantity) + -- Sales + INSERT INTO tInventory(itemFk, quantity) SELECT itemFk, saleOut - FROM ( + FROM ( SELECT s.itemFk, - SUM(s.quantity) saleOut FROM sale s JOIN ticket t ON t.id = s.ticketFk - WHERE t.warehouseFk = vWh + WHERE t.warehouseFk = vWarehouseFk AND t.shipped BETWEEN vDateLastInventory AND vDateYesterday GROUP BY s.itemFk ) sub ON DUPLICATE KEY UPDATE quantity = IFNULL(quantity,0) + sub.saleOut; - -- Actualiza valores de la ultima compra - UPDATE tmp.inventory inv - JOIN cache.last_buy lb ON lb.item_id = inv.itemFk AND lb.warehouse_id = vWh + -- Update values of the last purchase + UPDATE tInventory inv + JOIN cache.last_buy lb ON lb.item_id = inv.itemFk AND lb.warehouse_id = vWarehouseFk JOIN buy b ON b.id = lb.buy_id JOIN item i ON i.id = b.itemFk LEFT JOIN producer p ON p.id = i.producerFk @@ -57247,14 +55781,14 @@ proc: BEGIN inv.groupingMode = b.groupingMode, inv.comissionValue = b.comissionValue, inv.packageValue = b.packageValue, - inv.packageFk = b.packageFk, + inv.packageFk = b.packagingFk, inv.price1 = b.price1, inv.price2 = b.price2, inv.price3 = b.price3, inv.minPrice = b.minPrice, inv.producer = p.name; - INSERT INTO buy( itemFk, + INSERT INTO buy(itemFk, quantity, buyingValue, freightValue, @@ -57263,64 +55797,75 @@ proc: BEGIN groupingMode, comissionValue, packageValue, - packageFk, + packagingFk, price1, price2, price3, minPrice, entryFk) SELECT itemFk, - GREATEST(quantity, 0), - buyingValue, - freightValue, - packing, - `grouping`, - groupingMode, - comissionValue, - packageValue, - packageFk, - price1, - price2, - price3, - minPrice, - vEntryFk - FROM tmp.inventory; + GREATEST(quantity, 0), + buyingValue, + freightValue, + packing, + `grouping`, + groupingMode, + comissionValue, + packageValue, + packageFk, + price1, + price2, + price3, + minPrice, + vEntryFk + FROM tInventory; - SELECT vWh, COUNT(*), util.VN_NOW() FROM tmp.inventory; - - -- Actualizamos el campo lastUsed de item - UPDATE item i - JOIN tmp.inventory i2 ON i2.itemFk = i.id - SET i.lastUsed = NOW() - WHERE i2.quantity; - - -- DROP TEMPORARY TABLE tmp.inventory; + -- Update the 'lastUsed' field of the item + UPDATE item i + JOIN tInventory i2 ON i2.itemFk = i.id + SET i.lastUsed = NOW() + WHERE i2.quantity; + + DROP TEMPORARY TABLE tInventory; END LOOP; - + CLOSE cWarehouses; - UPDATE config SET inventoried = vDate; - SET @isModeInventory := FALSE; + UPDATE config SET inventoried = vInventoryDate; - DROP TEMPORARY TABLE IF EXISTS tmp.entryToDelete; - CREATE TEMPORARY TABLE tmp.entryToDelete - (INDEX(entryId) USING BTREE) ENGINE = MEMORY - SELECT e.id as entryId, - t.id as travelId + SET @isModeInventory := FALSE; + + CREATE OR REPLACE TEMPORARY TABLE tEntryToDelete + (INDEX(entryId)) ENGINE = MEMORY + SELECT e.id entryId, + t.id travelId FROM travel t JOIN `entry` e ON e.travelFk = t.id + JOIN ( + SELECT t.shipped + FROM travel t + JOIN `entry` e ON e.travelFk = t.id + WHERE e.supplierFk = vInventorySupplierFk + AND t.shipped <= vInventoryDate + GROUP BY t.shipped + ORDER BY t.shipped DESC + OFFSET vMaxRecentInventories ROWS + ) sub WHERE e.supplierFk = vInventorySupplierFk - AND t.shipped <= util.VN_CURDATE() - INTERVAL 12 DAY - AND (DAY(t.shipped) <> 1 OR shipped < util.VN_CURDATE() - INTERVAL 12 DAY); + AND t.shipped IN (sub.shipped); - DELETE e + DELETE e FROM `entry` e - JOIN tmp.entryToDelete tmp ON tmp.entryId = e.id; + JOIN tEntryToDelete tmp ON tmp.entryId = e.id; DELETE IGNORE t FROM travel t - JOIN tmp.entryToDelete tmp ON tmp.travelId = t.id; + JOIN tEntryToDelete tmp ON tmp.travelId = t.id; + + DROP TEMPORARY TABLE IF EXISTS tEntryToDelete; + + COMMIT; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -57340,11 +55885,12 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `inventoryMakeLauncher`() BEGIN /** - * Recalcula los inventarios de todos los almacenes. + * Recalculate the inventories of all warehouses */ - - call vn.inventoryMake(TIMESTAMPADD(DAY, -10, util.VN_CURDATE()), 0); - + CALL inventoryMake( + util.VN_CURDATE() - + INTERVAL (SELECT daysInPastForInventory FROM inventoryConfig LIMIT 1) DAY + ); END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -57352,14 +55898,14 @@ DELIMITER ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; /*!50003 DROP PROCEDURE IF EXISTS `inventory_repair` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8mb4 */ ; -/*!50003 SET character_set_results = utf8mb4 */ ; -/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET character_set_client = utf8mb3 */ ; +/*!50003 SET character_set_results = utf8mb3 */ ; +/*!50003 SET collation_connection = utf8mb3_general_ci */ ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `inventory_repair`() BEGIN @@ -57375,7 +55921,7 @@ BEGIN b.id AS buyFk, b.entryFk, b.isIgnored, - b.price2, + b.price2, b.price3, b.stickers, b.packing, @@ -57385,24 +55931,24 @@ BEGIN i.stems, b.quantity, b.buyingValue, - b.packageFk , + b.packagingFk , s.id AS supplierFk, s.name AS supplier FROM itemType it - RIGHT JOIN (entry e + RIGHT JOIN (entry e LEFT JOIN supplier s ON s.id = e.supplierFk RIGHT JOIN buy b ON b.entryFk = e.id LEFT JOIN item i ON i.id = b.itemFk - LEFT JOIN ink ON ink.id = i.inkFk + LEFT JOIN ink ON ink.id = i.inkFk LEFT JOIN travel tr ON tr.id = e.travelFk LEFT JOIN warehouse w ON w.id = tr.warehouseInFk LEFT JOIN origin o ON o.id = i.originFk ) ON it.id = i.typeFk LEFT JOIN edi.ekt ek ON b.ektFk = ek.id - WHERE (b.packageFk = "--" OR b.price2 = 0 OR b.packing = 0 OR b.buyingValue = 0) AND tr.landed > util.firstDayOfMonth(TIMESTAMPADD(MONTH,-1,util.VN_CURDATE())) AND s.name = 'INVENTARIO'; - + WHERE (b.packagingFk = "--" OR b.price2 = 0 OR b.packing = 0 OR b.buyingValue = 0) AND tr.landed > util.firstDayOfMonth(TIMESTAMPADD(MONTH,-1,util.VN_CURDATE())) AND s.name = 'INVENTARIO'; + DROP TEMPORARY TABLE IF EXISTS tmp.lastEntryOk; - CREATE TEMPORARY TABLE tmp.lastEntryOk + CREATE TEMPORARY TABLE tmp.lastEntryOk (PRIMARY KEY (buyFk)) SELECT i.id AS itemFk, @@ -57412,7 +55958,7 @@ BEGIN b.id AS buyFk, b.entryFk, b.isIgnored, - b.price2, + b.price2, b.price3, b.stickers, b.packing, @@ -57422,50 +55968,50 @@ BEGIN i.stems, b.quantity, b.buyingValue, - b.packageFk , + b.packagingFk, s.id AS supplierFk, s.name AS supplier FROM itemType it - RIGHT JOIN (entry e + RIGHT JOIN (entry e LEFT JOIN supplier s ON s.id = e.supplierFk RIGHT JOIN buy b ON b.entryFk = e.id LEFT JOIN item i ON i.id = b.itemFk - LEFT JOIN ink ON ink.id = i.inkFk + LEFT JOIN ink ON ink.id = i.inkFk LEFT JOIN travel tr ON tr.id = e.travelFk LEFT JOIN warehouse w ON w.id = tr.warehouseInFk LEFT JOIN origin o ON o.id = i.originFk ) ON it.id = i.typeFk LEFT JOIN edi.ekt ek ON b.ektFk = ek.id - WHERE b.packageFk != "--" AND b.price2 != 0 AND b.packing != 0 AND b.buyingValue > 0 AND tr.landed > util.firstDayOfMonth(TIMESTAMPADD(MONTH,-2,util.VN_CURDATE())) + WHERE b.packagingFk != "--" AND b.price2 != 0 AND b.packing != 0 AND b.buyingValue > 0 AND tr.landed > util.firstDayOfMonth(TIMESTAMPADD(MONTH,-2,util.VN_CURDATE())) ORDER BY tr.landed DESC; - + DROP TEMPORARY TABLE IF EXISTS tmp.lastEntryOkGroup; - CREATE TEMPORARY TABLE tmp.lastEntryOkGroup + CREATE TEMPORARY TABLE tmp.lastEntryOkGroup (INDEX (warehouseFk,itemFk)) SELECT * FROM tmp.lastEntryOk tmp GROUP BY tmp.itemFk,tmp.warehouseFk; - + UPDATE buy b JOIN tmp.lastEntry lt ON lt.buyFk = b.id JOIN tmp.lastEntryOkGroup eo ON eo.itemFk = lt.itemFk AND eo.warehouseFk = lt.warehouseFk - SET b.packageFk = eo.packageFk WHERE b.packageFk = "--"; - + SET b.packagingFk = eo.packagingFk WHERE b.packagingFk = "--"; + UPDATE buy b JOIN tmp.lastEntry lt ON lt.buyFk = b.id JOIN tmp.lastEntryOkGroup eo ON eo.itemFk = lt.itemFk AND eo.warehouseFk = lt.warehouseFk SET b.price2 = eo.price2 WHERE b.price2 = 0 ; - + UPDATE buy b JOIN tmp.lastEntry lt ON lt.buyFk = b.id JOIN tmp.lastEntryOkGroup eo ON eo.itemFk = lt.itemFk AND eo.warehouseFk = lt.warehouseFk SET b.packing = eo.packing WHERE b.packing = 0; - + UPDATE buy b JOIN tmp.lastEntry lt ON lt.buyFk = b.id JOIN tmp.lastEntryOkGroup eo ON eo.itemFk = lt.itemFk AND eo.warehouseFk = lt.warehouseFk SET b.buyingValue = eo.buyingValue WHERE b.buyingValue = 0; - + DROP TEMPORARY TABLE tmp.lastEntry; DROP TEMPORARY TABLE tmp.lastEntryOk; DROP TEMPORARY TABLE tmp.lastEntryOkGroup; @@ -57477,7 +56023,7 @@ DELIMITER ; /*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; -/*!50003 DROP PROCEDURE IF EXISTS `invoiceExpenceMake` */; +/*!50003 DROP PROCEDURE IF EXISTS `invoiceExpenseMake` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; @@ -57485,28 +56031,28 @@ DELIMITER ; /*!50003 SET character_set_results = utf8mb4 */ ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; -CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceExpenceMake`(IN vInvoice INT) +CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceExpenseMake`(IN vInvoice INT) BEGIN /* Inserta las partidas de gasto correspondientes a la factura * REQUIERE tabla tmp.ticketToInvoice * @param vInvoice Numero de factura */ - DELETE FROM invoiceOutExpence + DELETE FROM invoiceOutExpense WHERE invoiceOutFk = vInvoice; - INSERT INTO invoiceOutExpence(invoiceOutFk, expenceFk, amount) + INSERT INTO invoiceOutExpense(invoiceOutFk, expenseFk, amount) SELECT vInvoice, - expenceFk, + expenseFk, SUM(ROUND(quantity * price * (100 - discount)/100,2)) amount FROM tmp.ticketToInvoice t JOIN sale s ON s.ticketFk = t.id JOIN item i ON i.id = s.itemFk - GROUP BY i.expenceFk + GROUP BY i.expenseFk HAVING amount != 0; - INSERT INTO invoiceOutExpence(invoiceOutFk, expenceFk, amount) + INSERT INTO invoiceOutExpense(invoiceOutFk, expenseFk, amount) SELECT vInvoice, - tst.expenceFk, + tst.expenseFk, SUM(ROUND(ts.quantity * ts.price ,2)) amount FROM tmp.ticketToInvoice t JOIN ticketService ts ON ts.ticketFk = t.id @@ -57533,7 +56079,7 @@ BEGIN DECLARE vMinDateTicket DATE DEFAULT TIMESTAMPADD(MONTH, -3, util.VN_CURDATE()); - SET vMaxTicketDate = vn2008.DAYEND(vMaxTicketDate); + SET vMaxTicketDate = util.dayEnd(vMaxTicketDate); DROP TEMPORARY TABLE IF EXISTS `tmp`.`ticketToInvoice`; @@ -57625,7 +56171,7 @@ DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceInDueDay_calculate`(vInvoiceInFk INT) BEGIN /** - * Calcula los vctos. de una factura recibida + * Calcula los vctos. de una factura recibida * En caso de haberlos informado previamente o que el proveedor sea español, no los recalculará * * @param vInvoiceInFk Factura recibida @@ -57646,46 +56192,46 @@ BEGIN WHERE ii.id = vInvoiceInFk; SELECT COUNT(*) INTO vHasDueDay - FROM invoiceInDueDay iid + FROM invoiceInDueDay iid WHERE iid.invoiceInFk = vInvoiceInFk; IF NOT vHasDueDay AND vCompanyCountryCode = 'ES' THEN SET @cont := 0; INSERT INTO invoiceInDueDay ( - invoiceInFk, - dueDated, - amount, + invoiceInFk, + dueDated, + amount, foreignValue ) SELECT vInvoiceInFk, - IF(payDay, + IF(payDay, IF(getNextDueDate(issued, pdd.detail, payDay) < created, created, - getNextDueDate(issued, pdd.detail, payDay)), + getNextDueDate(issued, pdd.detail, payDay)), GREATEST(created, issued + INTERVAL pdd.detail DAY)), - IF((@cont := @cont + 1) < cont, - TRUNCATE(venc / cont, 2), - venc - (TRUNCATE(venc / cont, 2) * (cont - 1))), - IF(@cont < cont, - TRUNCATE(foreignValue / cont, 2), - foreignValue - (TRUNCATE(foreignValue / cont, 2) * (cont - 1))) - FROM ( - SELECT SUM((1 + (IFNULL(ti.PorcentajeIva, 0) / 100) * vHasDueDayTax) - * iit.taxableBase) / COUNT(DISTINCT(pdd.detail)) venc, + IF((@cont := @cont + 1) < cont, + TRUNCATE(venc / cont, 2), + venc - (TRUNCATE(venc / cont, 2) * (cont - 1))), + IF(@cont < cont, + TRUNCATE(foreignValue / cont, 2), + foreignValue - (TRUNCATE(foreignValue / cont, 2) * (cont - 1))) + FROM ( + SELECT SUM((1 + (IFNULL(ti.PorcentajeIva, 0) / 100) * vHasDueDayTax) + * iit.taxableBase) / COUNT(DISTINCT(pdd.detail)) venc, SUM(iit.foreignValue) / COUNT(DISTINCT(pdd.detail)) foreignValue, - s.payDemFk, + s.payDemFk, ii.companyFk, COUNT(DISTINCT(pdd.detail)) cont, s.payDay, ii.issued, DATE(ii.created) + INTERVAL 2 DAY created - FROM invoiceIn ii - JOIN invoiceInTax iit ON iit.invoiceInFk = ii.id - LEFT JOIN sage.TiposIva ti ON ti.CodigoIva= iit.taxTypeSageFk - JOIN supplier s ON s.id = ii.supplierFk - JOIN payDemDetail pdd ON pdd.id = s.payDemFk - WHERE ii.id = vInvoiceInFk + FROM invoiceIn ii + JOIN invoiceInTax iit ON iit.invoiceInFk = ii.id + LEFT JOIN sage.TiposIva ti ON ti.CodigoIva= iit.taxTypeSageFk + JOIN supplier s ON s.id = ii.supplierFk + JOIN payDemDetail pdd ON pdd.id = s.payDemFk + WHERE ii.id = vInvoiceInFk GROUP BY ii.id )sub JOIN payDemDetail pdd ON pdd.id = sub.payDemFk @@ -57713,9 +56259,9 @@ BEGIN DELETE FROM invoiceInDueDay WHERE invoiceInFk = vInvoiceInFk; - + CALL invoiceInDueDay_calculate(vInvoiceInFk); - + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -57732,35 +56278,90 @@ DELIMITER ; /*!50003 SET character_set_results = utf8mb4 */ ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; -CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceInTaxMakeByDua`(vDuaFk INT) +CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceInTaxMakeByDua`( + vDuaFk INT +) BEGIN - - DECLARE done BOOL DEFAULT FALSE; +/** + * Borra los valores de duaTax y sus vctos. y los vuelve a + * crear en base a la tabla duaEntry. + * + * @param vDuaFk Id del dua a recalcular + */ + DECLARE vDone BOOL DEFAULT FALSE; DECLARE vInvoiceInFk INT; - DECLARE rs CURSOR FOR - SELECT invoiceInFk - FROM entry e - JOIN duaEntry de ON de.entryFk = e.id - WHERE de.duaFk = vDuaFk; + DECLARE vInvoices CURSOR FOR + SELECT DISTINCT invoiceInFk + FROM entry e + JOIN duaEntry de ON de.entryFk = e.id + WHERE de.duaFk = vDuaFk; - DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE; + DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; - OPEN rs; + OPEN vInvoices; + l: LOOP + SET vDone = FALSE; + FETCH vInvoices INTO vInvoiceInFk; - FETCH rs INTO vInvoiceInFk; + IF vDone THEN + LEAVE l; + END IF; - WHILE NOT done DO - - CALL vn2008.recibidaIvaInsert(vInvoiceInFk); + CALL invoiceInTax_recalc(vInvoiceInFk); CALL invoiceInDueDay_recalc(vInvoiceInFk); - FETCH rs INTO vInvoiceInFk; + END LOOP; + CLOSE vInvoices; +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 DROP PROCEDURE IF EXISTS `invoiceInTax_afterUpsert` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceInTax_afterUpsert`(vInvoiceInFk INT) +BEGIN +/** + * Triggered actions when a invoiceInTax is updated or inserted. + * + * @param vInvoiceInFk The invoiceIn id + */ + DECLARE vTaxRowLimit INT; + DECLARE vLines INT; + DECLARE vHasDistinctTransactions INT; - END WHILE; + SELECT taxRowLimit INTO vTaxRowLimit FROM invoiceInConfig; + + SELECT COUNT(*) INTO vLines + FROM invoiceInTax + WHERE invoiceInFk = vInvoiceInFk + AND (taxTypeSageFk OR transactionTypeSageFk); + + IF vLines >= vTaxRowLimit THEN + CALL util.throw (CONCAT('The maximum number of lines is ', vTaxRowLimit)); + END IF; - CLOSE rs; + SELECT COUNT(DISTINCT transactionTypeSageFk) INTO vHasDistinctTransactions + FROM invoiceIn ii + JOIN invoiceInTax iit ON iit.invoiceInFk = ii.id + JOIN invoiceInSerial iis ON iis.code = ii.serial + WHERE ii.id = vInvoiceInFk + AND iis.taxAreaFk = 'CEE' + AND transactionTypeSageFk; + IF vHasDistinctTransactions > 1 THEN + CALL util.throw ('This invoice does not allow different types of transactions'); + END IF; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -57779,33 +56380,36 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceInTax_getFromDua`(vDuaFk INT) BEGIN - - DECLARE done BOOL DEFAULT FALSE; +/** + * Borra los valores de duaTax y sus vctos. y los vuelve a crear en base a la tabla duaEntry + * + * @param vDuaFk Id del dua a recalcular + */ + DECLARE vDone BOOL DEFAULT FALSE; DECLARE vInvoiceInFk INT; - DECLARE rs CURSOR FOR - SELECT invoiceInFk + DECLARE vInvoices CURSOR FOR + SELECT DISTINCT invoiceInFk FROM entry e JOIN duaEntry de ON de.entryFk = e.id WHERE de.duaFk = vDuaFk; - DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE; + DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; - OPEN rs; + OPEN vInvoices; + l: LOOP + SET vDone = FALSE; + FETCH vInvoices INTO vInvoiceInFk; - FETCH rs INTO vInvoiceInFk; - - WHILE NOT done DO + IF vDone THEN + LEAVE l; + END IF; CALL invoiceInTax_getFromEntries(vInvoiceInFk); CALL invoiceInDueDay_calculate(vInvoiceInFk); - FETCH rs INTO vInvoiceInFk; - - END WHILE; - - CLOSE rs; - + END LOOP; + CLOSE vInvoices; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -57822,16 +56426,25 @@ DELIMITER ; /*!50003 SET character_set_results = utf8mb4 */ ; /*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; DELIMITER ;; -CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceInTax_getFromEntries`(IN vId INT) +CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceInTax_getFromEntries`(IN vInvoiceInFk INT) BEGIN DECLARE vRate DOUBLE DEFAULT 1; DECLARE vDated DATE; - DECLARE vExpenceFk VARCHAR(10); + DECLARE vExpenseFk VARCHAR(10); + DECLARE vIsBooked BOOLEAN DEFAULT FALSE; + SELECT isBooked INTO vIsBooked + FROM invoiceIn ii + WHERE id = vInvoiceInFk; + + IF vIsBooked THEN + CALL util.throw('A booked invoice cannot be modified'); + END IF; + SELECT MAX(rr.dated) INTO vDated FROM referenceRate rr - JOIN invoiceIn ii ON ii.id = vId - WHERE rr.dated <= ii.issued + JOIN invoiceIn ii ON ii.id = vInvoiceInFk + WHERE rr.dated <= ii.issued AND rr.currencyFk = ii.currencyFk ; IF vDated THEN @@ -57840,19 +56453,19 @@ BEGIN WHERE dated = vDated; END IF; - SELECT id INTO vExpenceFk - FROM vn.expence - WHERE `name` = 'Adquisición mercancia Extracomunitaria' - GROUP BY id + SELECT id INTO vExpenseFk + FROM vn.expense + WHERE `name` = 'Adquisición mercancia Extracomunitaria' + GROUP BY id LIMIT 1; + + DELETE FROM invoiceInTax + WHERE invoiceInFk = vInvoiceInFk; - DELETE FROM invoiceInTax - WHERE invoiceInFk = vId; - - INSERT INTO invoiceInTax(invoiceInFk, taxableBase, expenceFk, foreignValue, taxTypeSageFk, transactionTypeSageFk) + INSERT INTO invoiceInTax(invoiceInFk, taxableBase, expenseFk, foreignValue, taxTypeSageFk, transactionTypeSageFk) SELECT ii.id, SUM(b.buyingValue * b.quantity) / IFNULL(vRate,1) taxableBase, - vExpenceFk, + vExpenseFk, IF(ii.currencyFk = 1,NULL,SUM(b.buyingValue * b.quantity )) divisa, taxTypeSageFk, transactionTypeSageFk @@ -57860,10 +56473,85 @@ BEGIN JOIN entry e ON e.invoiceInFk = ii.id JOIN supplier s ON s.id = e.supplierFk JOIN buy b ON b.entryFk = e.id + LEFT JOIN referenceRate rr ON rr.currencyFk = ii.currencyFk + AND rr.dated = ii.issued + WHERE ii.id = vInvoiceInFk + HAVING taxableBase IS NOT NULL; +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +/*!50003 DROP PROCEDURE IF EXISTS `invoiceInTax_recalc` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceInTax_recalc`( + vInvoiceInFk INT +) +BEGIN +/** + * Recalcula y actualiza los impuestos de la factura + * usando la última tasa de cambio y detalles de compra. + * + * @param vInvoiceInFk Id de factura recibida + */ + DECLARE vRate DOUBLE DEFAULT 1; + DECLARE vDated DATE; + DECLARE vExpenseFk VARCHAR(10); + + SELECT MAX(rr.dated) INTO vDated + FROM referenceRate rr + JOIN invoiceIn ii ON ii.id = vInvoiceInFk + WHERE rr.dated <= ii.issued + AND rr.currencyFk = ii.currencyFk; + + IF vDated THEN + SELECT `value` INTO vRate + FROM referenceRate + WHERE dated = vDated; + END IF; + + DELETE FROM invoiceInTax WHERE invoiceInFk = vInvoiceInFk; + + SELECT id INTO vExpenseFk + FROM expense + WHERE code = 'extraCommGoodsAcquisition'; + + IF vExpenseFk IS NULL THEN + CALL util.throw('Expense extraCommGoodsAcquisition not exists'); + END IF; + + INSERT INTO invoiceInTax( + invoiceInFk, + taxableBase, + expenseFk, + foreignValue, + taxTypeSageFk, + transactionTypeSageFk + ) + SELECT ii.id, + SUM(b.buyingValue * b.quantity) / vRate bi, + vExpenseFk, + IF(c.code = 'EUR', NULL, SUM(b.buyingValue * b.quantity)), + s.taxTypeSageFk, + s.transactionTypeSageFk + FROM invoiceIn ii + JOIN currency c ON c.id = ii.currencyFk + JOIN `entry` e ON e.invoiceInFk = ii.id + JOIN supplier s ON s.id = e.supplierFk + JOIN buy b ON b.entryFk = e.id LEFT JOIN referenceRate rr ON rr.currencyFk = ii.currencyFk AND rr.dated = ii.issued - WHERE ii.id = vId - HAVING taxableBase IS NOT NULL; + WHERE ii.id = vInvoiceInFk + HAVING bi IS NOT NULL; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -57889,17 +56577,17 @@ BEGIN SELECT ii.bookEntried, iit.foreignValue, ii.companyFk, - ii.expenceFkDeductible, + ii.expenseFkDeductible, iit.taxableBase, iit.transactionTypeSageFk, ii.serial, ii.issued, ii.operated, ii.supplierRef, - ii.cplusTrascendency472Fk, + ii.siiTrascendencyInvoiceInFk, ii.cplusTaxBreakFk, ii.cplusSubjectOpFk, - ii.cplusInvoiceType472Fk, + ii.siiTypeInvoiceInFk, ii.cplusRectificationTypeFk, ii.booked, IFNULL(a.isUeeMember, c.isUeeMember) isUeeMember, @@ -57919,8 +56607,8 @@ BEGIN cit.id invoicesCount, e.code, e.isWithheld, - e.id expenceFk, - e.name expenceName + e.id expenseFk, + e.name expenseName FROM invoiceIn ii JOIN supplier s ON s.id = ii.supplierFk LEFT JOIN province p ON p.id = s.provinceFk @@ -57928,11 +56616,11 @@ BEGIN JOIN country c ON c.id = s.countryFk JOIN supplier sc ON sc.id = ii.companyFk JOIN country cc ON cc.id = sc.countryFk - JOIN invoiceInSerial iis ON iis.code = ii.serial - JOIN cplusInvoiceType472 cit ON cit.id = ii.cplusInvoiceType472Fk + JOIN invoiceInSerial iis ON iis.code = ii.serial + JOIN siiTypeInvoiceIn cit ON cit.id = ii.siiTypeInvoiceInFk LEFT JOIN invoiceInTax iit ON iit.invoiceInFk = ii.id LEFT JOIN sage.TiposTransacciones ttr ON ttr.CodigoTransaccion = iit.transactionTypeSageFk - LEFT JOIN expence e ON e.id = iit.expenceFk + LEFT JOIN expense e ON e.id = iit.expenseFk LEFT JOIN sage.TiposIva ti ON ti.CodigoIva = iit.taxTypeSageFk LEFT JOIN sage.taxType tt ON tt.id = ti.CodigoIva WHERE ii.id = vSelf; @@ -57951,18 +56639,18 @@ BEGIN NFACTICK, CLAVE, empresa_id) - SELECT + SELECT vBookNumber ASIEN, tii.bookEntried FECHA, tii.supplierAccount SUBCTA, - SUM(tii.taxableBase * - IF(tii.serial= 'R' AND ((tii.taxCode IS NULL OR tii.taxCode <> 'ISP21') - AND tii.taxTypeSageFk IS NOT NULL), - 1 + (tii.PorcentajeIva / 100), - 1)) EUROHABER, - CONCAT('s/fra', - RIGHT(tii.supplierRef, 8), - ':', + SUM(tii.taxableBase * + IF(tii.serial= 'R' AND ((tii.taxCode IS NULL OR tii.taxCode <> 'ISP21') + AND tii.taxTypeSageFk IS NOT NULL), + 1 + (tii.PorcentajeIva / 100), + 1)) EUROHABER, + CONCAT('s/fra', + RIGHT(tii.supplierRef, 8), + ':', LEFT(tii.supplierName, 10)) CONCEPTO, CAST(tii.taxableBase / tii.foreignValue AS DECIMAL (10,4)) CAMBIO, SUM(tii.foreignValue * IF(tii.serial = 'R', 1 + (tii.PorcentajeIva / 100), 1)) HABERME, @@ -57979,7 +56667,7 @@ BEGIN CONTRA, EURODEBE, EUROHABER, - CONCEPTO, + CONCEPTO, CAMBIO, DEBEME, HABERME, @@ -57987,13 +56675,13 @@ BEGIN empresa_id) SELECT vBookNumber ASIEN, tii.bookEntried FECHA, - IF(tii.isWithheld, LPAD(RIGHT(tii.supplierAccount, 5), 10, tii.expenceFk),tii.expenceFk) SUBCTA, + IF(tii.isWithheld, LPAD(RIGHT(tii.supplierAccount, 5), 10, tii.expenseFk),tii.expenseFk) SUBCTA, tii.supplierAccount CONTRA, IF(tii.isWithheld AND tii.taxableBase < 0, NULL, ROUND(SUM(tii.taxableBase),2)) EURODEBE, IF(tii.isWithheld AND tii.taxableBase < 0, ROUND(SUM(-tii.taxableBase), 2), NULL) EUROHABER, - CONCAT('s/fra', - RIGHT(tii.supplierRef, 8), - ':', + CONCAT('s/fra', + RIGHT(tii.supplierRef, 8), + ':', LEFT(tii.supplierName, 10)) CONCEPTO, CAST(tii.taxableBase / tii.foreignValue AS DECIMAL (10, 4)) CAMBIO, IF(tii.isWithheld, NULL,ABS(ROUND(SUM(tii.foreignValue), 2))) DEBEME, @@ -58002,20 +56690,20 @@ BEGIN tii.companyFk empresa_id FROM tInvoiceIn tii WHERE tii.code IS NULL OR tii.code <> 'suplido' - GROUP BY tii.expenceFk; + GROUP BY tii.expenseFk; -- Líneas de IVA - INSERT INTO XDiario( + INSERT INTO XDiario( ASIEN, FECHA, SUBCTA, - CONTRA, + CONTRA, EURODEBE, BASEEURO, CONCEPTO, - FACTURA, + FACTURA, IVA, - AUXILIAR, + AUXILIAR, SERIE, TIPOOPE, FECHA_EX, @@ -58036,11 +56724,11 @@ BEGIN empresa_id) SELECT vBookNumber ASIEN, tii.bookEntried FECHA, - IF(tii.expenceFkDeductible>0, tii.expenceFkDeductible, tii.CuentaIvaSoportado) SUBCTA, + IF(tii.expenseFkDeductible>0, tii.expenseFkDeductible, tii.CuentaIvaSoportado) SUBCTA, tii.supplierAccount CONTRA, SUM(ROUND(tii.PorcentajeIva * tii.taxableBase / 100, 2)) EURODEBE, SUM(tii.taxableBase) BASEEURO, - GROUP_CONCAT(DISTINCT tii.expenceName SEPARATOR ', ') CONCEPTO, + GROUP_CONCAT(DISTINCT tii.expenseName SEPARATOR ', ') CONCEPTO, vSelf FACTURA, tii.PorcentajeIva IVA, IF(tii.isUeeMember AND eWithheld.id IS NULL, '', '*') AUXILIAR, @@ -58052,10 +56740,10 @@ BEGIN tii.supplierRef FACTURAEX, TRUE L340, (tii.isSameCountry OR NOT tii.isUeeMember) LRECT349, - tii.cplusTrascendency472Fk TIPOCLAVE, + tii.siiTrascendencyInvoiceInFk TIPOCLAVE, tii.cplusTaxBreakFk TIPOEXENCI, tii.cplusSubjectOpFk TIPONOSUJE, - tii.cplusInvoiceType472Fk TIPOFACT, + tii.siiTypeInvoiceInFk TIPOFACT, tii.cplusRectificationTypeFk TIPORECTIF, tii.cplusTerIdNifFk TERIDNIF, tii.nif TERNIF, @@ -58064,28 +56752,28 @@ BEGIN tii.companyFk FROM tInvoiceIn tii LEFT JOIN ( - SELECT e.id + SELECT e.id FROM tInvoiceIn tii - JOIN expence e ON e.id = tii.expenceFk + JOIN expense e ON e.id = tii.expenseFk WHERE e.isWithheld LIMIT 1 - ) eWithheld ON TRUE - WHERE tii.taxTypeSageFk IS NOT NULL - AND (tii.taxCode IS NULL OR tii.taxCode NOT IN ('import10', 'import21')) - GROUP BY tii.PorcentajeIva, tii.expenceFk; + ) eWithheld ON TRUE + WHERE tii.taxTypeSageFk IS NOT NULL + AND (tii.taxCode IS NULL OR tii.taxCode NOT IN ('import10', 'import21')) + GROUP BY tii.PorcentajeIva, tii.expenseFk; -- Línea iva inversor sujeto pasivo - INSERT INTO XDiario( + INSERT INTO XDiario( ASIEN, FECHA, SUBCTA, - CONTRA, + CONTRA, EUROHABER, BASEEURO, CONCEPTO, - FACTURA, + FACTURA, IVA, - AUXILIAR, + AUXILIAR, SERIE, TIPOOPE, FECHA_EX, @@ -58109,7 +56797,7 @@ BEGIN tii.supplierAccount CONTRA, SUM(ROUND(tii.PorcentajeIva * tii.taxableBase / 100,2)) EUROHABER, ROUND(SUM(tii.taxableBase),2) BASEEURO, - GROUP_CONCAT(DISTINCT tii.expenceName SEPARATOR ', ') CONCEPTO, + GROUP_CONCAT(DISTINCT tii.expenseName SEPARATOR ', ') CONCEPTO, vSelf FACTURA, tii.PorcentajeIva IVA, '*' AUXILIAR, @@ -58124,7 +56812,7 @@ BEGIN 1 TIPOCLAVE, tii.cplusTaxBreakFk TIPOEXENCI, tii.cplusSubjectOpFk TIPONOSUJE, - tii.cplusInvoiceType472Fk TIPOFACT, + tii.siiTypeInvoiceInFk TIPOFACT, tii.cplusRectificationTypeFk TIPORECTIF, tii.cplusTerIdNifFk TERIDNIF, tii.nif TERNIF, @@ -58134,31 +56822,31 @@ BEGIN JOIN sage.config c WHERE tii.taxCode = 'ISP21' OR MID(tii.supplierAccount, 4, 1) = '1' AND tii.taxTypeSageFk IS NOT NULL - AND NOT(tii.isVies - AND c.nontaxableTransactionTypeFk = tii.transactionTypeSageFk + AND NOT(tii.isVies + AND c.nontaxableTransactionTypeFk = tii.transactionTypeSageFk AND tii.taxCode = 'nonTaxable') - GROUP BY tii.PorcentajeIva, tii.expenceFk; - - -- Actualización del registro original + GROUP BY tii.PorcentajeIva, tii.expenseFk; + + -- Actualización del registro original UPDATE invoiceIn ii SET ii.isBooked = TRUE WHERE ii.id = vSelf; - + -- Problemas derivados de la precisión en los decimales al calcular los impuestos - UPDATE XDiario - SET EURODEBE = EURODEBE - + UPDATE XDiario + SET EURODEBE = EURODEBE - (SELECT IF(ABS(sub.difference) = 0.01, sub.difference, 0) FROM( - SELECT SUM(IFNULL(ROUND(EURODEBE, 2),0)) - SUM(IFNULL(ROUND(EUROHABER, 2), 0)) difference + SELECT SUM(IFNULL(ROUND(EURODEBE, 2),0)) - SUM(IFNULL(ROUND(EUROHABER, 2), 0)) difference FROM XDiario WHERE ASIEN = vBookNumber )sub ) - WHERE ASIEN = vBookNumber + WHERE ASIEN = vBookNumber AND EURODEBE <> 0 ORDER BY id DESC LIMIT 1; - + DROP TEMPORARY TABLE tInvoiceIn; END ;; DELIMITER ; @@ -58210,14 +56898,14 @@ BEGIN FROM ticket WHERE refFk = vInvoiceRef; - CALL invoiceExpenceMake(vInvoiceFk); + CALL invoiceExpenseMake(vInvoiceFk); CALL invoiceTaxMake(vInvoiceFk,vTaxArea); UPDATE invoiceOut io JOIN ( SELECT SUM(amount) AS total - FROM invoiceOutExpence + FROM invoiceOutExpense WHERE invoiceOutFk = vInvoiceFk ) base JOIN ( @@ -58253,7 +56941,7 @@ BEGIN * param vInvoice factura_id */ DECLARE vBookNumber INT; - DECLARE vExpenceConcept VARCHAR(50); + DECLARE vExpenseConcept VARCHAR(50); DECLARE vSpainCountryFk INT; DECLARE vOldBookNumber INT; @@ -58273,7 +56961,7 @@ BEGIN DROP TEMPORARY TABLE IF EXISTS rs; CREATE TEMPORARY TABLE rs - SELECT + SELECT c.accountingAccount AS clientBookingAccount, io.amount as totalAmount, CONCAT('n/fra ', io.ref) as simpleConcept, @@ -58284,10 +56972,10 @@ BEGIN io.issued AS FECHA, 1 AS NFACTICK, IF(ic.correctingFk,'D','') AS TIPOOPE, - io.cplusTrascendency477Fk AS TIPOCLAVE, + io.siiTrascendencyInvoiceOutFk AS TIPOCLAVE, io.cplusTaxBreakFk AS TIPOEXENCI, io.cplusSubjectOpFk AS TIPONOSUJE, - io.cplusInvoiceType477Fk AS TIPOFACT, + io.siiTypeInvoiceOutFk AS TIPOFACT, ic.cplusRectificationTypeFk AS TIPORECTIF, io.companyFk, RIGHT(io.ref, LENGTH(io.ref) - 1) AS invoiceNum, @@ -58307,19 +56995,19 @@ BEGIN WHERE io.id = vInvoice; CALL vn.ledger_next(vBookNumber); - + -- Linea del cliente INSERT INTO XDiario( ASIEN, FECHA, - SUBCTA, + SUBCTA, EURODEBE, - CONCEPTO, + CONCEPTO, FECHA_EX, FECHA_OP, empresa_id ) - SELECT + SELECT vBookNumber AS ASIEN, rs.FECHA, rs.clientBookingAccount AS SUBCTA, @@ -58335,17 +57023,17 @@ BEGIN ASIEN, FECHA, SUBCTA, - CONTRA, + CONTRA, EUROHABER, - CONCEPTO, + CONCEPTO, FECHA_EX, FECHA_OP, empresa_id ) - SELECT + SELECT vBookNumber AS ASIEN, rs.FECHA, - ioe.expenceFk AS SUBCTA, + ioe.expenseFk AS SUBCTA, rs.clientBookingAccount AS CONTRA, ioe.amount AS EUROHABER, rs.Concept AS CONCEPTO, @@ -58353,13 +57041,13 @@ BEGIN rs.FECHA_OP, rs.companyFk AS empresa_id FROM rs - JOIN invoiceOutExpence ioe + JOIN invoiceOutExpense ioe WHERE ioe.invoiceOutFk = vInvoice; - SELECT GROUP_CONCAT(`name` SEPARATOR ',') - INTO vExpenceConcept - FROM expence e - JOIN invoiceOutExpence ioe ON ioe.expenceFk = e.id + SELECT GROUP_CONCAT(`name` SEPARATOR ',') + INTO vExpenseConcept + FROM expense e + JOIN invoiceOutExpense ioe ON ioe.expenseFk = e.id WHERE ioe.invoiceOutFk = vInvoice; -- Lineas de IVA @@ -58367,7 +57055,7 @@ BEGIN ASIEN, FECHA, SUBCTA, - CONTRA, + CONTRA, EUROHABER, BASEEURO, CONCEPTO, @@ -58395,14 +57083,14 @@ BEGIN TIPORECTIF, empresa_id ) - SELECT + SELECT vBookNumber AS ASIEN, rs.FECHA, iot.pgcFk AS SUBCTA, rs.clientBookingAccount AS CONTRA, iot.vat AS EUROHABER, iot.taxableBase AS BASEEURO, - CONCAT(vExpenceConcept,' : ',rs.Concept) AS CONCEPTO, + CONCAT(vExpenseConcept,' : ',rs.Concept) AS CONCEPTO, rs.invoiceNum AS FACTURA, IF(pe2.equFk,0,pgc.rate) AS IVA, IF(pe2.equFk,0,pgce.rate) AS RECEQUIV, @@ -58415,25 +57103,25 @@ BEGIN rs.FECHA_OP, rs.FECHA_EX, rs.TIPOOPE, - rs.NFACTICK, + rs.NFACTICK, rs.TERIDNIF, rs.TERNIF, rs.TERNOM, - pgc.mod340 AS L340, - pgc.cplusTrascendency477Fk AS TIPOCLAVE, + pgc.mod340 AS L340, + pgc.siiTrascendencyInvoiceOutFk AS TIPOCLAVE, pgc.cplusTaxBreakFk as TIPOEXENCI, rs.TIPONOSUJE, rs.TIPOFACT, rs.TIPORECTIF, rs.companyFk AS empresa_id FROM rs - JOIN invoiceOutTax iot + JOIN invoiceOutTax iot JOIN pgc ON pgc.code = iot.pgcFk LEFT JOIN pgcEqu pe ON pe.vatFk = iot.pgcFk -- --------------- Comprueba si la linea es de iva con rec.equiv. asociado - LEFT JOIN pgc pgce ON pgce.code = pe.equFk + LEFT JOIN pgc pgce ON pgce.code = pe.equFk LEFT JOIN pgcEqu pe2 ON pe2.equFk = iot.pgcFk -- --------------- Comprueba si la linea es de rec.equiv. WHERE iot.invoiceOutFk = vInvoice; - + UPDATE invoiceOut SET booked = util.VN_CURDATE() WHERE id = vInvoice; @@ -58465,7 +57153,7 @@ BEGIN DECLARE done BOOL DEFAULT FALSE; - DECLARE rs CURSOR FOR + DECLARE rs CURSOR FOR SELECT io.id FROM invoiceOut io WHERE RIGHT(ref,7) BETWEEN 1724215 AND 1724224 @@ -58480,15 +57168,15 @@ BEGIN WHILE NOT done DO CALL invoiceOutBooking(vInvoice); - + FETCH rs INTO vInvoice ; - + SET vContador = vContador + 1; - + IF vContador MOD 50 = 0 THEN - + SELECT CONCAT(vContador, ' de momento') AS FACTURAS_ASENTADAS; - + END IF; END WHILE; @@ -58497,85 +57185,6 @@ BEGIN SELECT CONCAT(vContador, ' total') AS FACTURAS_ASENTADAS; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; -/*!50003 DROP PROCEDURE IF EXISTS `invoiceOutDelete` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8mb4 */ ; -/*!50003 SET character_set_results = utf8mb4 */ ; -/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceOutDelete`(vRef VARCHAR(15)) -BEGIN - DECLARE vAsien INTEGER; - DECLARE vSendMail BOOL; - DECLARE vBody TEXT; - - SELECT ASIEN INTO vAsien - FROM XDiario - WHERE SERIE = SUBSTRING(vRef, 1, 1) - AND FACTURA = SUBSTRING(vRef, 2, LENGTH(vRef)-1) - LIMIT 1; - - SELECT IF(enlazado OR enlazadoSage, TRUE, FALSE), - CONCAT( - '| FECHA | -SUBCTA | -CONTRA | -CONCEPTO | -EURODEBE | -EUROHABER | -
| ', IFNULL(FECHA,''), ' | -', IFNULL(SUBCTA,''), ' | -', IFNULL(CONTRA,''), ' | -', IFNULL(CONCEPTO,''), ' | -', IFNULL(EURODEBE,''), ' | -', IFNULL(EUROHABER,''), ' | -
-
'
- )
- );
- END IF;
-
- UPDATE ticket
- SET refFk = NULL
- WHERE refFk = vRef;
-
- DELETE
- FROM invoiceOut
- WHERE ref = vRef;
-
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -58595,7 +57204,7 @@ DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceOutListByCompany`(vCompany INT, vStarted DATE, vEnded DATE)
BEGIN
-SELECT
+SELECT
c.socialName as RazonSocial,
c.fi as NIF,
io.ref as Factura,
@@ -58607,7 +57216,7 @@ SELECT
pgc.rate as Tipo,
iot.vat as Cuota,
pgc.name as Concepto
-
+
FROM vn.invoiceOut io
JOIN vn.invoiceOutTax iot ON iot.invoiceOutFk = io.id
JOIN vn.client c ON c.id = io.clientFk
@@ -58624,7 +57233,7 @@ DELIMITER ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `invoiceOutTaxAndExpence` */;
+/*!50003 DROP PROCEDURE IF EXISTS `invoiceOutTaxAndExpense` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
@@ -58632,7 +57241,7 @@ DELIMITER ;
/*!50003 SET character_set_results = utf8mb4 */ ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceOutTaxAndExpence`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceOutTaxAndExpense`()
BEGIN
/* Para tickets ya facturados, vuelve a repetir el proceso de facturación.
@@ -58686,7 +57295,7 @@ BEGIN
FROM ticket
WHERE refFk = vInvoiceRef;
- CALL invoiceExpenceMake(vInvoice);
+ CALL invoiceExpenseMake(vInvoice);
CALL invoiceTaxMake(vInvoice,vCountry,vTaxArea);
FETCH rs INTO vInvoice ,vInvoiceRef;
@@ -58867,7 +57476,7 @@ BEGIN
clientFk,
dued,
companyFk,
- cplusInvoiceType477Fk
+ siiTypeInvoiceOutFk
)
SELECT
1,
@@ -58911,22 +57520,22 @@ BEGIN
DROP TEMPORARY TABLE IF EXISTS tmp.updateInter;
CREATE TEMPORARY TABLE tmp.updateInter ENGINE = MEMORY
- SELECT s.id,ti.id ticket_id,vWorker Id_Trabajador
+ SELECT s.id, ti.id ticket_id, vWorker Id_Trabajador
FROM tmp.ticketToInvoice ti
- LEFT JOIN ticketState ts ON ti.id = ts.ticket
+ LEFT JOIN ticketState ts ON ti.id = ts.ticketFk
JOIN state s
- WHERE IFNULL(ts.alertLevel,0) < 3 and s.`code` = getAlert3State(ti.id);
+ WHERE IFNULL(ts.alertLevel, 0) < 3 and s.`code` = getAlert3State(ti.id);
- INSERT INTO ticketTracking(stateFk,ticketFk,workerFk)
+ INSERT INTO ticketTracking(stateFk, ticketFk, userFk)
SELECT * FROM tmp.updateInter;
- CALL invoiceExpenceMake(vNewInvoiceId);
- CALL invoiceTaxMake(vNewInvoiceId,vTaxArea);
+ CALL invoiceExpenseMake(vNewInvoiceId);
+ CALL invoiceTaxMake(vNewInvoiceId, vTaxArea);
UPDATE invoiceOut io
JOIN (
SELECT SUM(amount) total
- FROM invoiceOutExpence
+ FROM invoiceOutExpense
WHERE invoiceOutFk = vNewInvoiceId
) base
JOIN (
@@ -58963,15 +57572,15 @@ BEGIN
SET @vTaxableBaseServices := 0.00;
SET @vTaxCodeGeneral := NULL;
- INSERT INTO invoiceInTax(invoiceInFk, taxableBase, expenceFk, taxTypeSageFk, transactionTypeSageFk)
+ INSERT INTO invoiceInTax(invoiceInFk, taxableBase, expenseFk, taxTypeSageFk, transactionTypeSageFk)
SELECT vNewInvoiceInFk,
@vTaxableBaseServices,
- sub.expenceFk,
+ sub.expenseFk,
sub.taxTypeSageFk,
sub.transactionTypeSageFk
FROM (
SELECT @vTaxableBaseServices := SUM(tst.taxableBase) taxableBase,
- i.expenceFk,
+ i.expenseFk,
i.taxTypeSageFk,
i.transactionTypeSageFk,
@vTaxCodeGeneral := i.taxClassCodeFk
@@ -58981,11 +57590,11 @@ BEGIN
HAVING taxableBase
) sub;
- INSERT INTO invoiceInTax(invoiceInFk, taxableBase, expenceFk, taxTypeSageFk, transactionTypeSageFk)
+ INSERT INTO invoiceInTax(invoiceInFk, taxableBase, expenseFk, taxTypeSageFk, transactionTypeSageFk)
SELECT vNewInvoiceInFk,
SUM(tt.taxableBase) - IF(tt.code = @vTaxCodeGeneral,
@vTaxableBaseServices, 0) taxableBase,
- i.expenceFk,
+ i.expenseFk,
i.taxTypeSageFk ,
i.transactionTypeSageFk
FROM tmp.ticketTax tt
@@ -59052,17 +57661,17 @@ DELIMITER ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceOut_newFromClient`(
- IN vClientFk INT,
- IN vSerial CHAR(2),
+ IN vClientFk INT,
+ IN vSerial CHAR(2),
IN vMaxShipped DATE,
- IN vCompanyFk INT,
+ IN vCompanyFk INT,
IN vTaxArea VARCHAR(25),
- IN vRef VARCHAR(25),
+ IN vRef VARCHAR(25),
OUT vInvoiceId INT)
BEGIN
/**
* Factura los tickets de un cliente hasta una fecha dada
- * @param vClientFk Id del cliente a facturar
+ * @param vClientFk Id del cliente a facturar
* @param vSerial Serie de factura
* @param vMaxShipped Fecha hasta la cual cogera tickets para facturar
* @param vCompanyFk Id de la empresa desde la que se factura
@@ -59081,11 +57690,11 @@ BEGIN
IF NOT vIsRefEditable THEN
CALL util.throw('serial non editable');
END IF;
- END IF;
+ END IF;
SELECT COUNT(*) INTO vIsExportation
FROM vn.invoiceOutSerial
- WHERE taxAreaFk = 'WORLD'
+ WHERE taxAreaFk = 'WORLD'
AND `code` = vSerial;
IF vIsExportation THEN
@@ -59098,7 +57707,7 @@ BEGIN
UPDATE invoiceOut
SET `ref` = vRef
- WHERE id = vInvoiceId
+ WHERE id = vInvoiceId
AND vRef IS NOT NULL;
IF vSerial <> 'R' AND NOT ISNULL(vInvoiceId) AND vInvoiceId <> 0 THEN
@@ -59127,7 +57736,7 @@ BEGIN
* Factura un ticket
* @param vTicketFk Id del ticket
* @param vSerial Serie de factura
- * @param vTaxArea Area de la factura en caso de querer forzarlo,
+ * @param vTaxArea Area de la factura en caso de querer forzarlo,
* en la mayoria de los casos poner NULL
* @return vInvoiceId
*/
@@ -59142,11 +57751,11 @@ BEGIN
IF NOT vIsRefEditable THEN
CALL util.throw('serial non editable');
END IF;
-
- UPDATE invoiceOut
+
+ UPDATE invoiceOut
SET `ref` = vRef
WHERE id = vInvoiceId;
- END IF;
+ END IF;
IF vSerial <> 'R' AND NOT ISNULL(vInvoiceId) AND vInvoiceId <> 0 THEN
CALL invoiceOutBooking(vInvoiceId);
@@ -59228,50 +57837,10 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `itemBarcode_update`(vItemFk INT,vCo
BEGIN
IF vDelete THEN
DELETE FROM vn.itemBarcode WHERE itemFk = vItemFk AND code = vCode;
-ELSE
+ELSE
INSERT INTO vn.itemBarcode(itemFk,code) VALUES (vItemFk,vCode);
END IF;
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `itemFreight_Show` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `itemFreight_Show`(vItemFk INT, vWarehouseFk INT)
-BEGIN
-
- SELECT cm3 Volumen_Entrada,
- cm3delivery Volumen_Salida,
- p.volume Volumen_del_embalaje,
- p.width Ancho_del_embalaje,
- p.`depth` Largo_del_embalaje,
- b.packageFk ,
- IFNULL(p.height, i.`size`) + 10 Altura,
- b.packing Packing_Entrada,
- i.packingOut Packing_Salida,
- i.id itemFk,
- b.id buyFk,
- b.entryFk,
- w.name warehouseFk
- FROM vn.itemCost ic
- JOIN vn.item i ON i.id = ic.itemFk
- LEFT JOIN cache.last_buy lb ON lb.item_id = ic.itemFk AND lb.warehouse_id = ic.warehouseFk
- LEFT JOIN vn.buy b ON b.id = lb.buy_id
- LEFT JOIN vn.packaging p ON p.id = b.packageFk
- LEFT JOIN vn.warehouse w ON w.id = ic.warehouseFk
- WHERE ic.itemFk = vItemFk
- AND ic.warehouseFk = vWarehouseFk;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -59292,33 +57861,33 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `itemFuentesBalance`(vDaysInFuture I
BEGIN
/* Se utiliza para calcular la necesidad de mover mercancia entre el almacén de fuentes y el nuestro
- *
+ *
* @param vDaysInFuture Rango de dias para calcular entradas y salidas
- *
+ *
*/
-
+
DECLARE vWarehouseFk INT;
SELECT s.warehouseFk INTO vWarehouseFk
- FROM vn.sector s
+ FROM vn.sector s
WHERE s.code = 'FUENTES_PICASSE';
-
+
CALL cache.stock_refresh(FALSE);
- SELECT i.id itemFk,
+ SELECT i.id itemFk,
i.longName,
i.size,
i.subName,
- v.amount - IFNULL(fue.Fuentes,0) - IFNULL(alb.albenfruit,0) as visible,
- fue.Fuentes,
+ v.amount - IFNULL(fue.Fuentes,0) - IFNULL(alb.albenfruit,0) as visible,
+ fue.Fuentes,
alb.Albenfruit,
- sale.venta,
- IFNULL(buy.compra,0) + IFNULL(mov.traslado,0) as compra,
- IFNULL(v.amount,0) + IFNULL(sale.venta,0) + IFNULL(buy.compra,0) + IFNULL(mov.traslado,0)
+ sale.venta,
+ IFNULL(buy.compra,0) + IFNULL(mov.traslado,0) as compra,
+ IFNULL(v.amount,0) + IFNULL(sale.venta,0) + IFNULL(buy.compra,0) + IFNULL(mov.traslado,0)
- IFNULL(fue.Fuentes,0) - IFNULL(alb.albenfruit,0) as saldo
- FROM vn.item i
- JOIN vn.itemType it ON it.id = i.typeFk
- JOIN vn.itemCategory ic ON ic.id = it.categoryFk
+ FROM vn.item i
+ JOIN vn.itemType it ON it.id = i.typeFk
+ JOIN vn.itemCategory ic ON ic.id = it.categoryFk
LEFT JOIN (
SELECT ish.itemFk, CAST(SUM(ish.visible) AS DECIMAL(10,0)) AS Fuentes
FROM vn.itemShelving ish
@@ -59326,7 +57895,7 @@ BEGIN
JOIN vn.parking p ON p.id = sh.parkingFk
JOIN vn.sector s ON s.id = p.sectorFk
WHERE s.code = 'FUENTES_PICASSE'
- GROUP BY ish.itemFk
+ GROUP BY ish.itemFk
) fue ON fue.itemFk = i.id
LEFT JOIN (
SELECT ish.itemFk, CAST(SUM(ish.visible) AS DECIMAL(10,0)) AS Albenfruit
@@ -59335,35 +57904,34 @@ BEGIN
JOIN vn.parking p ON p.id = sh.parkingFk
JOIN vn.sector s ON s.id = p.sectorFk
WHERE s.code = 'ALBENFRUIT'
- GROUP BY ish.itemFk
+ GROUP BY ish.itemFk
) alb ON alb.itemFk = i.id
LEFT JOIN cache.stock v ON i.id = v.item_id AND v.warehouse_id = vWarehouseFk
LEFT JOIN (
- SELECT item_id, CAST(sum(amount)AS DECIMAL(10,0)) as venta
- FROM vn2008.item_out
- WHERE dat BETWEEN util.VN_CURDATE() AND TIMESTAMPADD(DAY,vDaysInFuture , util.dayend(util.VN_CURDATE()))
- AND warehouse_id = vWarehouseFk
- GROUP BY item_id
+ SELECT itemFk item_id, CAST(sum(quantity)AS DECIMAL(10,0)) as venta
+ FROM itemTicketOut
+ WHERE shipped BETWEEN util.VN_CURDATE() AND TIMESTAMPADD(DAY,vDaysInFuture , util.dayend(util.VN_CURDATE()))
+ AND warehouseFk = vWarehouseFk
+ GROUP BY itemFk
) sale ON sale.item_id = i.id
LEFT JOIN (
- SELECT item_id, CAST(sum(amount)AS DECIMAL(10,0)) as compra
- FROM vn2008.item_entry_in
- WHERE dat BETWEEN util.VN_CURDATE() AND TIMESTAMPADD(DAY,vDaysInFuture , util.dayend(util.VN_CURDATE()))
- AND warehouse_id = vWarehouseFk
+ SELECT itemFk item_id, CAST(sum(quantity)AS DECIMAL(10,0)) as compra
+ FROM itemEntryIn
+ WHERE landed BETWEEN util.VN_CURDATE() AND TIMESTAMPADD(DAY,vDaysInFuture , util.dayend(util.VN_CURDATE()))
+ AND warehouseInFk = vWarehouseFk
AND isVirtualStock = FALSE
- GROUP BY item_id
+ GROUP BY itemFk
) buy ON buy.item_id = i.id
LEFT JOIN (
- SELECT item_id, CAST(sum(amount)AS DECIMAL(10,0)) as traslado
- FROM vn2008.item_entry_out
- WHERE dat BETWEEN util.VN_CURDATE() AND TIMESTAMPADD(DAY,vDaysInFuture , util.dayend(util.VN_CURDATE()))
- AND warehouse_id = vWarehouseFk
- GROUP BY item_id
+ SELECT itemFk item_id, CAST(sum(quantity)AS DECIMAL(10,0)) as traslado
+ FROM itemEntryOut
+ WHERE shipped BETWEEN util.VN_CURDATE() AND TIMESTAMPADD(DAY,vDaysInFuture , util.dayend(util.VN_CURDATE()))
+ AND warehouseOutFk = vWarehouseFk
+ GROUP BY itemFk
) mov ON mov.item_id = i.id
- WHERE (v.amount OR fue.Fuentes OR alb.Albenfruit)
+ WHERE (v.amount OR fue.Fuentes OR alb.Albenfruit)
AND i.itemPackingTypeFk = 'H'
- AND ic.shortLife
- ;
+ AND ic.shortLife;
END ;;
DELIMITER ;
@@ -59384,7 +57952,7 @@ DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `itemPlacementFromTicket`(vTicket INT)
BEGIN
/**
- * Llama a itemPlacementUpdateVisible
+ * Llama a itemPlacementUpdateVisible
* de los articulos de la tabla temporal tmp.itemPlacement(itemFk)
* @treturn tmp.itemPlacement
* @param vTicket Id del Ticket
@@ -59398,9 +57966,9 @@ BEGIN
FROM ticket t
JOIN sale s ON s.ticketFk = t.id
WHERE t.id = vTicket;
-
+
CALL itemPlacementUpdateVisible();
-
+
DROP TEMPORARY TABLE tmp.itemPlacement;
END ;;
DELIMITER ;
@@ -59433,7 +58001,7 @@ BEGIN
CAST(FLOOR(LEAST(ish.stock,quantity) / ish.packing) AS DECIMAL(10,0)),
' x ',
ish.packing,
- IF (
+ IF (
LEAST(ish.stock,quantity) MOD ish.packing,
CONCAT(' + ',CAST(LEAST(ish.stock,quantity) MOD ish.packing AS DECIMAL(10,0))),
''
@@ -59464,7 +58032,7 @@ DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `itemPlacementSupplyCloseOrder`(vId INT, vQuantity INT)
BEGIN
- UPDATE vn.itemPlacementSupply
+ UPDATE vn.itemPlacementSupply
SET priority = 10
WHERE id = vId;
@@ -59490,7 +58058,7 @@ BEGIN
DECLARE vId INT;
DECLARE vLastParkingFk INT;
DECLARE vNextParkingFk INT;
-
+
SELECT sh.parkingFk INTO vLastParkingFk
FROM vn.itemShelvingPlacementSupply isps
JOIN vn.itemShelving ish ON ish.id = isps.itemShelvingFk
@@ -59498,9 +58066,9 @@ BEGIN
WHERE isps.userFk = getUser()
ORDER BY isps.created DESC
LIMIT 1;
-
+
SET vNextParkingFk = vn.itemShelvingPlacementSupply_ClosestGet(vLastParkingFk);
-
+
SELECT ipsl.id INTO vId
FROM vn.itemPlacementSupplyList ipsl
JOIN vn.itemShelvingPlacementSupplyStock ispss ON ispss.itemFk = ipsl.itemFk
@@ -59509,13 +58077,13 @@ BEGIN
AND ipsl.sectorFk = vSector
ORDER BY ipsl.repoUserFk DESC, ipsl.priority DESC, (ispss.parkingFk = vNextParkingFk) DESC, ispss.parking DESC, ipsl.created
LIMIT 1;
-
+
UPDATE vn.itemPlacementSupply
SET repoUserFk = getUser()
WHERE id = vId;
-
- SELECT * FROM vn.itemPlacementSupplyList
- WHERE id = vId
+
+ SELECT * FROM vn.itemPlacementSupplyList
+ WHERE id = vId
AND sectorFk = vSector;
END ;;
@@ -59543,289 +58111,23 @@ BEGIN
* @param vItemFk Identificador de vn.item
* @param vSectorFk Identificador de vn.sector
*/
- DECLARE vWarehouseAliasFk INT;
-
- SELECT w.aliasFk INTO vWarehouseAliasFk
- FROM vn.sector s
- JOIN vn.warehouse w ON w.id = s.warehouseFk
- WHERE s.id = vSectorFk;
-
SELECT ish.shelvingFk shelving,
- p.code parking,
- sum(ish.visible) as stockTotal,
- ish.created,
- p.pickingOrder
+ p.code parking,
+ SUM(ish.visible) stockTotal,
+ ish.created,
+ p.pickingOrder
FROM vn.itemShelving ish
JOIN vn.shelving sh ON sh.code = ish.shelvingFk
JOIN vn.parking p ON p.id = sh.parkingFk
JOIN vn.sector sc ON sc.id = p.sectorFk
JOIN vn.warehouse w ON w.id = sc.warehouseFk
- WHERE w.aliasFk = vWarehouseAliasFk
- AND ish.visible > 0
- AND ish.itemFk = vItemFk
+ WHERE sc.id = vSectorFk
+ AND ish.visible > 0
+ AND ish.itemFk = vItemFk
GROUP BY ish.id
- ORDER BY (sc.id = vSectorFk) DESC, sh.priority DESC;
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `itemProposal` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `itemProposal`(vItemFk INT, vTicketFk INT,vShowType BOOL)
-BEGIN
-
-/**
- * Propone articulos disponible ordenado, con la cantidad de veces usado y segun sus caracteristicas
- *
- * @param vItemFk item id
- * @param vTicketFk ticket id
- * @param vShowType mostrar tipos
- */
-
- DECLARE vWarehouseFk INT;
- DECLARE vShipped DATE;
- DECLARE vCalcFk INT;
- DECLARE vTypeFk INT;
-
-
- DECLARE vTag1 VARCHAR(25);
- DECLARE vTag5 VARCHAR(25);
- DECLARE vTag6 VARCHAR(25);
- DECLARE vTag7 VARCHAR(25);
- DECLARE vTag8 VARCHAR(25);
-
- DECLARE vValue1 VARCHAR(50);
- DECLARE vValue5 VARCHAR(50);
- DECLARE vValue6 VARCHAR(50);
- DECLARE vValue7 VARCHAR(50);
- DECLARE vValue8 VARCHAR(50);
-
- SELECT warehouseFk, shipped INTO vWarehouseFk, vShipped
- FROM vn.ticket
- WHERE id = vTicketFk;
-
- SELECT typeFk, tag5, value5, tag6, value6, tag7, value7, tag8, value8, t1.name, it1.value
- INTO vTypeFk, vTag5, vValue5, vTag6, vValue6, vTag7, vValue7, vTag8, vValue8, vTag1, vValue1
- FROM vn.item i
- LEFT JOIN vn.itemTag it1 ON it1.itemFk = i.id AND it1.priority = 1
- LEFT JOIN vn.tag t1 ON t1.id = it1.tagFk
- WHERE i.id = vItemFk;
-
- CALL cache.available_refresh(vCalcFk, FALSE, vWarehouseFk, vShipped);
-
- SELECT i.id itemFk,
- i.longName,
- i.subName,
- i.tag5,
- i.value5,
- (i.value5 <=> vValue5 COLLATE utf8_general_ci) match5,
- i.tag6,
- i.value6,
- (i.value6 <=> vValue6 COLLATE utf8_general_ci) match6,
- i.tag7,
- i.value7,
- (i.value7 <=> vValue7 COLLATE utf8_general_ci) match7,
- i.tag8,
- i.value8,
- (i.value8 <=> vValue8 COLLATE utf8_general_ci) match8,
- a.available,
- IFNULL(ip.counter,0) counter,
- IF(b.groupingMode = 1, b.grouping, b.packing) as minQuantity
- FROM vn.item i
- JOIN cache.available a ON a.item_id = i.id
- LEFT JOIN vn.itemProposal ip ON ip.mateFk = i.id AND ip.itemFk = vItemFk
- LEFT JOIN vn.itemTag it1 ON it1.itemFk = i.id AND it1.priority = 1
- LEFT JOIN vn.tag t1 ON t1.id = it1.tagFk
- LEFT JOIN cache.last_buy lb ON lb.item_id = i.id AND lb.warehouse_id = vWarehouseFk
- LEFT JOIN vn.buy b ON b.id = lb.buy_id
- WHERE a.calc_id = vCalcFk
- AND available > 0
- AND IF(vShowType,i.typeFk = vTypeFk,true)
- AND i.id != vItemFk
- ORDER BY counter DESC,
- (t1.name = vTag1 COLLATE utf8_general_ci) DESC,
- (it1.value = vValue1 COLLATE utf8_general_ci) DESC,
- (i.tag6 = vTag6 COLLATE utf8_general_ci) DESC,
- (i.value6 = vValue6 COLLATE utf8_general_ci) DESC,
- (i.tag5 = vTag5 COLLATE utf8_general_ci) DESC,
- (i.value5 = vValue5 COLLATE utf8_general_ci) DESC,
- (i.tag7 = vTag7 COLLATE utf8_general_ci) DESC,
- (i.value7 = vValue7 COLLATE utf8_general_ci) DESC,
- (i.tag8 = vTag8 COLLATE utf8_general_ci) DESC,
- (i.value8 = vValue8 COLLATE utf8_general_ci) DESC;
-
-
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `itemProposal_Add` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `itemProposal_Add`(vSaleFk INT, vMateFk INT, vQuantity INT)
-BEGIN
-/**
- * Añade un nuevo articulo para sustituir a otro, y actualiza la memoria de sustituciones.
- *
- * @param vSaleFk id de la tabla sale
- * @param vMateFk articulo sustituto
- * @ param vQuantity cantidad que se va a sustituir
- */
- DECLARE vTicketFk INT;
- DECLARE vItemFk INT;
- DECLARE vWarehouseFk SMALLINT;
- DECLARE vDate DATE;
- DECLARE vGrouping INT;
- DECLARE vBox INT;
- DECLARE vPacking INT;
- DECLARE vRoundQuantity INT DEFAULT 1;
-
- SELECT s.ticketFk, LEAST(s.quantity, vQuantity), s.itemFk,t.shipped,t.warehouseFk
- INTO vTicketFk, vQuantity, vItemFk,vDate,vWarehouseFk
- FROM vn.sale s
- JOIN vn.ticket t ON t.id = s.ticketFk
- WHERE s.id = vSaleFk;
-
- UPDATE vn.sale
- SET quantity = quantity - vQuantity
- WHERE id = vSaleFk;
-
- CALL vn.buyUltimate(vWarehouseFk, vDate);
-
- SELECT `grouping`, groupingMode, packing
- INTO vGrouping,vBox,vPacking
- FROM buy b
- JOIN tmp.buyUltimate tmp ON b.id = tmp.buyFk
- WHERE tmp.itemFk = vMateFk AND tmp.WarehouseFk = vWarehouseFk;
-
- IF vBox = 2 AND vPacking > 0 THEN
- SET vRoundQuantity = vPacking;
- END IF;
- IF vBox = 1 AND vGrouping > 0 THEN
- SET vRoundQuantity = vGrouping;
- END IF;
-
- INSERT INTO vn.sale(ticketFk, itemFk, quantity, concept)
- SELECT vTicketFk, vMateFk, CEIL(vQuantity / vRoundQuantity) * vRoundQuantity, CONCAT('+ ',i.longName)
- FROM vn.item i
- WHERE id = vMateFk;
-
- SELECT LAST_INSERT_ID() INTO vSaleFk;
-
- CALL vn.sale_calculateComponent(vSaleFk, NULL);
-
- INSERT INTO vn.itemProposal(itemFk, mateFk, counter)
- VALUES(vItemFk, vMateFk, 1)
- ON DUPLICATE KEY UPDATE counter = counter + 1;
-
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `itemProposal_beta` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `itemProposal_beta`(vItemFk INT, vTicketFk INT)
-BEGIN
-
- DECLARE vWarehouseFk INT;
- DECLARE vShipped DATE;
- DECLARE vCalcFk INT;
- DECLARE vTypeFk INT;
- DECLARE vResultsMax INT DEFAULT 10;
-
- DECLARE vTag1 VARCHAR(25);
- DECLARE vTag5 VARCHAR(25);
- DECLARE vTag6 VARCHAR(25);
- DECLARE vTag7 VARCHAR(25);
- DECLARE vTag8 VARCHAR(25);
-
- DECLARE vValue1 VARCHAR(50);
- DECLARE vValue5 VARCHAR(50);
- DECLARE vValue6 VARCHAR(50);
- DECLARE vValue7 VARCHAR(50);
- DECLARE vValue8 VARCHAR(50);
-
- SELECT warehouseFk, shipped INTO vWarehouseFk, vShipped
- FROM vn.ticket
- WHERE id = vTicketFk;
-
- SELECT typeFk, tag5, value5, tag6, value6, tag7, value7, tag8, value8, t1.name, it1.value
- INTO vTypeFk, vTag5, vValue5, vTag6, vValue6, vTag7, vValue7, vTag8, vValue8, vTag1, vValue1
- FROM vn.item i
- LEFT JOIN vn.itemTag it1 ON it1.itemFk = i.id AND it1.priority = 1
- LEFT JOIN vn.tag t1 ON t1.id = it1.tagFk
- WHERE i.id = vItemFk;
-
- CALL cache.available_refresh(vCalcFk, FALSE, vWarehouseFk, vShipped);
-
- SELECT i.id itemFk,
- i.longName,
- i.subName,
- i.tag5,
- i.value5,
- (i.value5 <=> vValue5 COLLATE utf8_general_ci) match5,
- i.tag6,
- i.value6,
- (i.value6 <=> vValue6 COLLATE utf8_general_ci) match6,
- i.tag7,
- i.value7,
- (i.value7 <=> vValue7 COLLATE utf8_general_ci) match7,
- i.tag8,
- i.value8,
- (i.value8 <=> vValue8 COLLATE utf8_general_ci) match8,
- a.available,
- IFNULL(ip.counter,0) counter
- FROM vn.item i
- JOIN cache.available a ON a.item_id = i.id
- LEFT JOIN vn.itemProposal ip ON ip.mateFk = i.id AND ip.itemFk = vItemFk
- LEFT JOIN vn.itemTag it1 ON it1.itemFk = i.id AND it1.priority = 1
- LEFT JOIN vn.tag t1 ON t1.id = it1.tagFk
- WHERE a.calc_id = vCalcFk
- AND available > 0
- AND i.typeFk = vTypeFk
- AND i.id != vItemFk
- ORDER BY counter DESC,
- (t1.name = vTag1 COLLATE utf8_general_ci) DESC,
- (it1.value = vValue1 COLLATE utf8_general_ci) DESC,
- (i.tag5 = vTag5 COLLATE utf8_general_ci) DESC,
- (i.value5 = vValue5 COLLATE utf8_general_ci) DESC,
- (i.tag6 = vTag6 COLLATE utf8_general_ci) DESC,
- (i.value6 = vValue6 COLLATE utf8_general_ci) DESC,
- (i.tag7 = vTag7 COLLATE utf8_general_ci) DESC,
- (i.value7 = vValue7 COLLATE utf8_general_ci) DESC,
- (i.tag8 = vTag8 COLLATE utf8_general_ci) DESC,
- (i.value8 = vValue8 COLLATE utf8_general_ci) DESC
- LIMIT vResultsMax;
-
+ ORDER BY sh.priority DESC,
+ ish.created,
+ p.pickingOrder;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -59854,7 +58156,7 @@ BEGIN
CREATE TEMPORARY TABLE tmp.item
SELECT vItem id;
-
+
CALL item_refreshTags();
DROP TEMPORARY TABLE tmp.item;
@@ -59877,23 +58179,23 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `itemSale_byWeek`(vWeek INT, IN vYear INT, vItemFk INT, vWarehouseFk INT)
BEGIN
-
+
DECLARE vStarted DATE;
DECLARE vEnded DATETIME;
SELECT MIN(dated), util.dayEnd(MAX(dated)) INTO vStarted, vEnded
- FROM `time` t
+ FROM `time` t
WHERE CONCAT(vYear, LPAD(vWeek, 2, 0)) = t.period;
SELECT t.shipped,
w.name warehouse,
- s.ticketFk,
+ s.ticketFk,
t.nickname client,
- am.name agencyName,
+ am.name agencyName,
wk.code salesPerson,
s.itemFk,
- IFNULL(CONCAT(ig.longName,' ',ig.`size`,' ',ig.subName), s.concept) AS concept,
- s.quantity,
+ IFNULL(CONCAT(ig.longName,' ',ig.`size`,' ',ig.subName), s.concept) AS concept,
+ s.quantity,
s.price,
s.priceFixed,
s.discount,
@@ -59903,15 +58205,15 @@ BEGIN
wk.id salesPersonFk
FROM sale s
JOIN ticket t ON t.id = s.ticketFk
- JOIN warehouse w ON w.id = t.warehouseFk
+ JOIN warehouse w ON w.id = t.warehouseFk
JOIN address a ON a.id = t.addressFk
LEFT JOIN agencyMode am ON am.id = t.agencyModeFk
JOIN `client` c ON c.id = a.clientFk
- LEFT JOIN worker wk ON wk.id = c.salesPersonFk
+ LEFT JOIN worker wk ON wk.id = c.salesPersonFk
LEFT JOIN ticketLastState tls ON tls.ticketFk = t.id
- LEFT JOIN saleBuy sb ON sb.saleFk = s.id
- LEFT JOIN buy b ON b.id = sb.buyFk
- LEFT JOIN item ig ON ig.id = b.itemOriginalFk
+ LEFT JOIN saleBuy sb ON sb.saleFk = s.id
+ LEFT JOIN buy b ON b.id = sb.buyFk
+ LEFT JOIN item ig ON ig.id = b.itemOriginalFk
WHERE s.itemFk = vItemFk
AND t.shipped BETWEEN vStarted AND vEnded
AND IF(vWarehouseFk = 0, w.hasComission , t.warehouseFk = vWarehouseFk)
@@ -59938,9 +58240,9 @@ BEGIN
DECLARE vItemFk INT;
SELECT vn.barcodeToItem(vBarcode) INTO vItemFk;
-
+
UPDATE vn.item SET minimum = min WHERE id = vItemFk;
-
+
END ;;
@@ -59962,8 +58264,8 @@ DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `itemSearchShelving`(`vShelvingFk` VARCHAR(3))
BEGIN
SELECT p.`column` AS col , p.`row`
- FROM vn.shelving s
- JOIN parking p ON s.parkingFk = p.id
+ FROM vn.shelving s
+ JOIN parking p ON s.parkingFk = p.id
WHERE s.`code` = vShelvingFk COLLATE utf8_general_ci;
END ;;
DELIMITER ;
@@ -60004,36 +58306,36 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelvingLog_get`(vShelvingFk VARCHAR(10) )
BEGIN
-
+
/**
* Devuelve el log de los item en cada carro
*
- * @param vShelvingFk Matrícula del carro
- *
+ * @param vShelvingFk Matrícula del carro
+ *
*/
-
- SELECT isl.itemShelvingFk,
- isl.created,
- isl.accion,
- isl.itemFk,
- isl.shelvingFk,
- isl.quantity,
+
+ SELECT isl.itemShelvingFk,
+ isl.created,
+ isl.accion,
+ isl.itemFk,
+ isl.shelvingFk,
+ isl.quantity,
isl.visible,
- isl.available,
- isl.grouping,
- isl.packing,
- isl.stars,
- item.longName,
- item.size,
- item.subName,
- worker.code,
+ isl.available,
+ isl.grouping,
+ isl.packing,
+ isl.stars,
+ item.longName,
+ item.size,
+ item.subName,
+ worker.code,
isl.accion
- FROM item
- JOIN itemShelvingLog isl ON item.id = isl.itemFk
+ FROM item
+ JOIN itemShelvingLog isl ON item.id = isl.itemFk
JOIN worker ON isl.workerFk = worker.id
WHERE shelvingFk = vShelvingFk OR isl.itemFk = vShelvingFk
ORDER BY isl.created DESC;
-
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -60041,18 +58343,18 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `itemShelvingMakeFromDate` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelvingMakeFromDate`(IN `vShelvingFk` VARCHAR(8), IN `vBarcode` VARCHAR(22), IN `vQuantity` INT, IN `vPackagingFk` VARCHAR(10), IN `vGrouping` INT, IN `vPacking` INT, IN `vWarehouseFk` INT, `vCreated` VARCHAR(22))
BEGIN
-
+
DECLARE vItemFk INT;
SELECT vn.barcodeToItem(vBarcode) INTO vItemFk;
@@ -60071,9 +58373,9 @@ BEGIN
END IF;
- IF (SELECT COUNT(*) FROM vn.itemShelving
- WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk
- AND itemFk = vItemFk
+ IF (SELECT COUNT(*) FROM vn.itemShelving
+ WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk
+ AND itemFk = vItemFk
AND packing = vPacking) = 1 THEN
UPDATE vn.itemShelving
@@ -60098,13 +58400,13 @@ BEGIN
vCreated,
IF(vGrouping = 0, IFNULL(b.packing, vPacking), vGrouping) `grouping`,
IF(vPacking = 0, b.packing, vPacking) packing,
- IF(vPackagingFk = '', b.packageFk, vPackagingFk) packaging
+ IF(vPackagingFk = '', b.packagingFk, vPackagingFk) packaging
FROM vn.item i
LEFT JOIN cache.last_buy lb ON i.id = lb.item_id AND lb.warehouse_id = vWarehouseFk
LEFT JOIN vn.buy b ON b.id = lb.buy_id
WHERE i.id = vItemFk;
- END IF;
-
+ END IF;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -60125,9 +58427,9 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelvingMatch`(vEntryFk INT, vA
BEGIN
DECLARE vTravelFk INT;
-
- SELECT travelFk INTO vTravelFk
- FROM entry
+
+ SELECT travelFk INTO vTravelFk
+ FROM entry
WHERE id = vEntryFk;
SELECT i.id, i.longName, i.size, i.subName, b.stickers, ish.etiquetas, b.printed
@@ -60140,7 +58442,7 @@ BEGIN
GROUP BY itemFk
) b ON b.itemFk = i.id
LEFT JOIN (
- SELECT itemFk, sum(cast(visible / packing AS DECIMAL(10,0))) AS etiquetas
+ SELECT itemFk, sum(cast(visible / packing AS DECIMAL(10,0))) AS etiquetas
FROM itemShelving ish
JOIN shelving sh ON sh.code = ish.shelvingFk
LEFT JOIN parking pk ON pk.id = sh.parkingFk
@@ -60180,7 +58482,7 @@ BEGIN
UPDATE vn.itemShelving
SET visible = visible - vQuantity
WHERE id = vItemShelvingFk;
-
+
END ;;
DELIMITER ;
@@ -60203,47 +58505,47 @@ BEGIN
DECLARE vVisibleCache INT;
DECLARE vWarehouseFk INT;
-
+
SELECT warehouseFk INTO vWarehouseFk
FROM vn.sector
WHERE id = vSectorFk;
CALL cache.visible_refresh (vVisibleCache, FALSE, vWarehouseFk);
-
- SELECT t.id as ticketFk,
- CAST(s.quantity AS DECIMAL(10,0)) as Cantidad,
- s.itemFk,
- s.concept,
- v.visible - GREATEST(0,iss.visible) + IFNULL(sub3.transit,0) as Nicho,
+
+ SELECT t.id as ticketFk,
+ CAST(s.quantity AS DECIMAL(10,0)) as Cantidad,
+ s.itemFk,
+ s.concept,
+ v.visible - GREATEST(0,iss.visible) + IFNULL(sub3.transit,0) as Nicho,
i.subName,
- GREATEST(0,iss.visible - IFNULL(sub3.transit,0)) as Altillo,
+ GREATEST(0,iss.visible - IFNULL(sub3.transit,0)) as Altillo,
s.id as saleFk,
IFNULL(sub3.transit,0) transit,
v.visible, s.isPicked, s.reserved, t.shipped, tst.productionOrder, mm.Id_Movimiento
- FROM vn.ticket t
+ FROM vn.ticket t
JOIN vn.ticketState tst ON tst.ticketFk = t.id
JOIN vn.sale s ON s.ticketFk = t.id
JOIN vn.item i ON i.id = s.itemFk
JOIN cache.visible v ON s.itemFk = v.item_id AND v.calc_id = vVisibleCache
LEFT JOIN vn2008.Movimientos_mark mm ON mm.Id_Movimiento = s.id AND mm.stateFk = 26
- JOIN vn.itemShelvingStock iss ON iss.itemFk = v.item_id
+ JOIN vn.itemShelvingStock iss ON iss.itemFk = v.item_id
LEFT JOIN
- (SELECT itemFk, sum(saldo) as transit
- FROM vn.itemPlacementSupplyList
- WHERE saldo > 0
+ (SELECT itemFk, sum(saldo) as transit
+ FROM vn.itemPlacementSupplyList
+ WHERE saldo > 0
AND sectorFk = vSectorFk
GROUP BY itemFk) sub3 ON sub3.itemFk = i.id
- WHERE v.visible + IFNULL(sub3.transit,0) - GREATEST(0,iss.visible) < s.quantity
+ WHERE v.visible + IFNULL(sub3.transit,0) - GREATEST(0,iss.visible) < s.quantity
AND IFNULL(sub3.transit,0) < s.quantity
- AND s.isPicked = FALSE
+ AND s.isPicked = FALSE
AND s.reserved = FALSE
- AND t.shipped BETWEEN util.VN_CURDATE() AND MIDNIGHT(util.VN_CURDATE())
+ AND t.shipped BETWEEN util.VN_CURDATE() AND MIDNIGHT(util.VN_CURDATE())
AND tst.isPreviousPreparable = TRUE
AND t.warehouseFk = vWarehouseFk
AND iss.sectorFk = vSectorFk
AND mm.Id_Movimiento IS NULL
ORDER BY itemFk;
-
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -60260,9 +58562,15 @@ DELIMITER ;
/*!50003 SET character_set_results = utf8mb4 */ ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelvingRadar`(vSectorFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelvingRadar`(
+ vSectorFk INT
+)
proc:BEGIN
-
+/**
+ * Calcula la información detallada respecto un sector.
+ *
+ * @param vSectorFk Id de sector
+ */
DECLARE vCalcVisibleFk INT;
DECLARE vCalcAvailableFk INT;
DECLARE hasFatherSector BOOLEAN;
@@ -60270,106 +58578,98 @@ proc:BEGIN
DECLARE vWarehouseFk INT DEFAULT 0;
DECLARE vSonSectorFk INT;
DECLARE vWorkerFk INT;
-
- SELECT s.workerFk
- INTO vWorkerFk
+
+ SELECT s.workerFk
+ INTO vWorkerFk
FROM vn.sector s
WHERE s.id = vSectorFk;
SELECT w.id, s.warehouseFk INTO vBuyerFk, vWarehouseFk
- FROM vn.worker w
+ FROM vn.worker w
JOIN vn.sector s ON s.code = w.code
WHERE s.id = vSectorFk;
-
+
SELECT s.id INTO vSectorFk
FROM vn.sector s
WHERE s.warehouseFk = vWarehouseFk
AND s.isMain;
-
SELECT COUNT(*) INTO hasFatherSector
FROM vn.sector
WHERE sonFk = vSectorFk;
-
+
SELECT warehouseFk, sonFk INTO vWarehouseFk, vSonSectorFk
FROM vn.sector
WHERE id = vSectorFk;
-
+
CALL cache.visible_refresh(vCalcVisibleFk, TRUE, vWarehouseFk);
CALL cache.available_refresh(vCalcAvailableFk, FALSE, vWarehouseFk, util.VN_CURDATE());
-
+
DROP TEMPORARY TABLE IF EXISTS tmp.itemShelvingRadar;
-
+
IF hasFatherSector THEN
-
CREATE TEMPORARY TABLE tmp.itemShelvingRadar
(PRIMARY KEY (itemFk))
- ENGINE = MEMORY
- SELECT * FROM (
- SELECT iss.itemFk,
- i.longName,
- i.size,
- i.subName producer,
- IFNULL(a.available,0) available,
- SUM(IF(s.sonFk = vSectorFk, IFNULL(iss.visible,0), 0)) upstairs,
- SUM(IF(iss.sectorFk = vSectorFk, IFNULL(iss.visible,0), 0)) downstairs,
- IF(it.isPackaging, null, IFNULL(v.visible,0)) as visible,
- vSectorFk as sectorFk
-
- FROM vn.itemShelvingStock iss
- JOIN vn.sector s ON s.id = iss.sectorFk
- JOIN vn.item i on i.id = iss.itemFk
- JOIN vn.itemType it ON it.id = i.typeFk AND vBuyerFk IN (0,it.workerFk)
- LEFT JOIN cache.available a ON a.item_id = iss.itemFk AND a.calc_id = vCalcAvailableFk
- LEFT JOIN cache.visible v ON v.item_id = iss.itemFk AND v.calc_id = vCalcVisibleFk
- WHERE vSectorFk IN (iss.sectorFk, s.sonFk)
- AND it.workerFk != 3366
-
- GROUP BY iss.itemFk
-
- UNION ALL
-
- SELECT v.item_id,
- i.longName,
- i.size,
- i.subName producer,
- IFNULL(a.available,0) as available,
- 0 upstairs,
- 0 downstairs,
- IF(it.isPackaging, NULL, v.visible) visible,
- vSectorFk as sectorFk
- FROM cache.visible v
- JOIN vn.item i on i.id = v.item_id
- JOIN vn.itemType it ON it.id = i.typeFk AND vBuyerFk IN (0,it.workerFk)
- LEFT JOIN vn.itemShelvingStock iss ON iss.itemFk = v.item_id AND iss.warehouseFk = vWarehouseFk
- LEFT JOIN cache.available a ON a.item_id = v.item_id AND a.calc_id = vCalcAvailableFk
- WHERE v.calc_id = vCalcVisibleFk
- AND iss.itemFk IS NULL
- AND it.isInventory
- ) sub GROUP BY itemFk;
-
- SELECT ishr.*,
+ ENGINE = MEMORY
+ SELECT *
+ FROM (
+ SELECT iss.itemFk,
+ i.longName,
+ i.size,
+ i.subName producer,
+ IFNULL(a.available,0) available,
+ SUM(IF(s.sonFk = vSectorFk, IFNULL(iss.visible,0), 0)) upstairs,
+ SUM(IF(iss.sectorFk = vSectorFk, IFNULL(iss.visible,0), 0)) downstairs,
+ IF(it.isPackaging, NULL, IFNULL(v.visible,0)) as visible,
+ vSectorFk sectorFk
+ FROM vn.itemShelvingStock iss
+ JOIN vn.sector s ON s.id = iss.sectorFk
+ JOIN vn.item i on i.id = iss.itemFk
+ JOIN vn.itemType it ON it.id = i.typeFk AND vBuyerFk IN (0,it.workerFk)
+ LEFT JOIN cache.available a ON a.item_id = iss.itemFk AND a.calc_id = vCalcAvailableFk
+ LEFT JOIN cache.visible v ON v.item_id = iss.itemFk AND v.calc_id = vCalcVisibleFk
+ WHERE vSectorFk IN (iss.sectorFk, s.sonFk)
+ GROUP BY iss.itemFk
+
+ UNION ALL
+
+ SELECT v.item_id,
+ i.longName,
+ i.size,
+ i.subName producer,
+ IFNULL(a.available,0) as available,
+ 0 upstairs,
+ 0 downstairs,
+ IF(it.isPackaging, NULL, v.visible) visible,
+ vSectorFk as sectorFk
+ FROM cache.visible v
+ JOIN vn.item i on i.id = v.item_id
+ JOIN vn.itemType it ON it.id = i.typeFk AND vBuyerFk IN (0,it.workerFk)
+ LEFT JOIN vn.itemShelvingStock iss ON iss.itemFk = v.item_id AND iss.warehouseFk = vWarehouseFk
+ LEFT JOIN cache.available a ON a.item_id = v.item_id AND a.calc_id = vCalcAvailableFk
+ WHERE v.calc_id = vCalcVisibleFk
+ AND iss.itemFk IS NULL
+ AND it.isInventory
+ ) sub GROUP BY itemFk;
+
+ SELECT ishr.*,
CAST(visible - upstairs - downstairs AS DECIMAL(10,0)) AS nicho,
CAST(downstairs - IFNULL(notPickedYed,0) AS DECIMAL(10,0)) as pendiente
FROM tmp.itemShelvingRadar ishr
JOIN vn.item i ON i.id = ishr.itemFk
LEFT JOIN (SELECT s.itemFk, sum(s.quantity) as notPickedYed
FROM vn.ticket t
- JOIN vn.ticketStateToday tst ON tst.ticket = t.id
+ JOIN vn.ticketStateToday tst ON tst.ticketFk = t.id
JOIN vn.sale s ON s.ticketFk = t.id
WHERE t.warehouseFk = vWarehouseFk
AND tst.alertLevel = 0
GROUP BY s.itemFk
) sub ON sub.itemFk = ishr.itemFk
- ORDER BY i.typeFk, i.longName
- ;
-
-
+ ORDER BY i.typeFk, i.longName;
ELSE
-
CREATE TEMPORARY TABLE tmp.itemShelvingRadar
(PRIMARY KEY (itemFk))
- ENGINE = MEMORY
+ ENGINE = MEMORY
SELECT iss.itemFk,
0 `hour`,
0 `minute`,
@@ -60381,81 +58681,78 @@ proc:BEGIN
IFNULL(a.available,0) available,
IFNULL(v.visible - iss.visible,0) dayEndVisible,
IFNULL(v.visible - iss.visible,0) firstNegative,
- IFNULL(v.visible - iss.visible,0) itemPlacementVisible,
+ IFNULL(v.visible - iss.visible,0) itemPlacementVisible,
IFNULL(i.minimum * b.packing,0) itemPlacementSize,
ips.onTheWay,
iss.visible itemShelvingStock,
IFNULL(v.visible,0) visible,
b.isPickedOff,
iss.sectorFk
- FROM vn.itemShelvingStock iss
- JOIN vn.item i on i.id = iss.itemFk
- LEFT JOIN cache.last_buy lb ON lb.item_id = iss.itemFk AND lb.warehouse_id = vWarehouseFk
- LEFT JOIN vn.buy b ON b.id = lb.buy_id
- LEFT JOIN cache.available a ON a.item_id = iss.itemFk AND a.calc_id = vCalcAvailableFk
- LEFT JOIN cache.visible v ON v.item_id = iss.itemFk AND v.calc_id = vCalcVisibleFk
- LEFT JOIN (SELECT itemFk, sum(saldo) as onTheWay
- FROM vn.itemPlacementSupplyList
- WHERE saldo > 0
- GROUP BY itemFk
- ) ips ON ips.itemFk = i.id
- WHERE IFNULL(iss.sectorFk,0) IN (0, vSectorFk)
- OR iss.sectorFk = vSectorFk;
- /*
- UPDATE tmp.itemShelvingRadar isr
- JOIN vn.itemShelvingStock iss ON iss.itemFk = isr.itemFk
- SET isr.dayEndVisible = isr.dayEndVisible + iss.visible,
- isr.firstNegative = isr.firstNegative + iss.visible,
- isr.itemPlacementVisible = isr.itemPlacementVisible + iss.visible
- WHERE iss.sectorFk = vSonSectorFk;
- */
+ FROM vn.itemShelvingStock iss
+ JOIN vn.item i on i.id = iss.itemFk
+ LEFT JOIN cache.last_buy lb ON lb.item_id = iss.itemFk AND lb.warehouse_id = vWarehouseFk
+ LEFT JOIN vn.buy b ON b.id = lb.buy_id
+ LEFT JOIN cache.available a ON a.item_id = iss.itemFk AND a.calc_id = vCalcAvailableFk
+ LEFT JOIN cache.visible v ON v.item_id = iss.itemFk AND v.calc_id = vCalcVisibleFk
+ LEFT JOIN (SELECT itemFk, sum(saldo) as onTheWay
+ FROM vn.itemPlacementSupplyList
+ WHERE saldo > 0
+ GROUP BY itemFk
+ ) ips ON ips.itemFk = i.id
+ WHERE IFNULL(iss.sectorFk,0) IN (0, vSectorFk)
+ OR iss.sectorFk = vSectorFk;
+
DROP TEMPORARY TABLE IF EXISTS tmp.itemOutTime;
CREATE TEMPORARY TABLE tmp.itemOutTime
SELECT *,SUM(amount) quantity
- FROM
- (SELECT item_id itemFk,
- amount,
- IF(HOUR(t.shipped), HOUR(t.shipped), HOUR(z.`hour`)) as hours,
+ FROM
+ (SELECT io.itemFk,
+ io.quantity amount,
+ IF(HOUR(t.shipped), HOUR(t.shipped), HOUR(z.`hour`)) as hours,
IF(MINUTE(t.shipped), MINUTE(t.shipped), MINUTE(z.`hour`)) as minutes
- FROM vn2008.item_out io
- JOIN tmp.itemShelvingRadar isr ON isr.itemFk = io.item_id
+ FROM itemTicketOut io
+ JOIN tmp.itemShelvingRadar isr ON isr.itemFk = io.itemFk
JOIN vn.ticket t on t.id= io.ticketFk
JOIN vn.ticketState ts on ts.ticketFk = io.ticketFk
JOIN vn.state s ON s.id = ts.stateFk
LEFT JOIN vn.zone z ON z.id = t.zoneFk
- LEFT JOIN (SELECT DISTINCT saleFk
- FROM vn.saleTracking st
- WHERE st.created > util.VN_CURDATE()
+ LEFT JOIN (SELECT DISTINCT saleFk
+ FROM vn.saleTracking st
+ WHERE st.created > util.VN_CURDATE()
AND st.isChecked
) stPrevious ON `stPrevious`.`saleFk` = io.saleFk
WHERE t.warehouseFk = vWarehouseFk
- AND s.isPicked = 0
- AND NOT io.Reservado
+ AND s.isPicked = 0
+ AND NOT io.reserved
AND stPrevious.saleFk IS NULL
- AND io.dat >= util.VN_CURDATE()
- AND io.dat < util.VN_CURDATE() + INTERVAL 1 DAY
+ AND io.shipped >= util.VN_CURDATE()
+ AND io.shipped < util.VN_CURDATE() + INTERVAL 1 DAY
) sub
GROUP BY itemFk, hours, minutes;
-
+
INSERT INTO tmp.itemShelvingRadar (itemFk)
SELECT itemFk FROM tmp.itemOutTime
- ON DUPLICATE KEY UPDATE dayEndVisible = dayEndVisible + quantity,
+ ON DUPLICATE KEY UPDATE dayEndVisible = dayEndVisible + quantity,
firstNegative = if (firstNegative < 0, firstNegative, firstNegative + quantity),
`hour` = ifnull(if (firstNegative > 0 , `hour`, hours),0),
`minute` = ifnull(if (firstNegative > 0, `minute`, minutes),0);
-/*
- UPDATE tmp.itemShelvingRadar
- SET itemPlacementVisible = 0,
- dayEndVisible = 0,
- firstNegative = 0
- WHERE itemPlacementVisible = - itemShelvingStock;
-*/
- SELECT * FROM tmp.itemShelvingRadar;
+ UPDATE tmp.itemShelvingRadar isr
+ JOIN (SELECT s.itemFk, sum(s.quantity) amount
+ FROM sale s
+ JOIN ticket t ON t.id = s.ticketFk
+ JOIN ticketLastState tls ON tls.ticketFk = t.id
+ WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
+ AND tls.name = 'Prep Camara'
+ GROUP BY s.itemFk) sub ON sub.itemFk = isr.itemFk
+ SET isr.dayEndVisible = dayEndVisible + sub.amount,
+ firstNegative = firstNegative + sub.amount;
+
+ SELECT * FROM tmp.itemShelvingRadar;
END IF;
DROP TEMPORARY TABLE tmp.itemShelvingRadar;
-
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -60479,24 +58776,24 @@ BEGIN
DECLARE vCalcVisibleFk INT;
DECLARE vCalcAvailableFk INT;
DECLARE vTodayDayEnd DATETIME DEFAULT util.dayEnd(util.VN_CURDATE());
-
+
CALL cache.visible_refresh(vCalcVisibleFk, FALSE, 1);
CALL cache.available_refresh(vCalcAvailableFk, FALSE, vWarehouseFk, util.VN_CURDATE());
-
+
DROP TEMPORARY TABLE IF EXISTS tmp.item;
CREATE TEMPORARY TABLE tmp.item
ENGINE = MEMORY
SELECT DISTINCT itemFk
- FROM vn.buy
+ FROM vn.buy
WHERE entryFk = vEntryFk;
-
+
DROP TEMPORARY TABLE IF EXISTS tmp.item2;
CREATE TEMPORARY TABLE tmp.item2
ENGINE = MEMORY
SELECT *
FROM tmp.item;
-
- SELECT i.id as itemFk,
+
+ SELECT i.id as itemFk,
i.minimum,
CAST(IFNULL(v.visible,0) - IFNULL(iss.visible,0) AS DECIMAL(10,0)) as enNicho,
CAST(IFNULL(a.available,0) AS DECIMAL(10,0)) as disponible,
@@ -60516,11 +58813,11 @@ BEGIN
AND IFNULL(tst.productionOrder,0) < 5
GROUP BY s.itemFK
) ts ON ts.itemFk = i.id;
-
-
+
+
DROP TEMPORARY TABLE tmp.item;
DROP TEMPORARY TABLE tmp.item2;
-
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -60544,34 +58841,34 @@ BEGIN
DECLARE vCalcVisibleFk INT;
DECLARE vCalcAvailableFk INT;
DECLARE vTodayDayEnd DATETIME DEFAULT util.dayEnd(util.VN_CURDATE());
-
+
CALL cache.visible_refresh(vCalcVisibleFk, FALSE, 1);
CALL cache.available_refresh(vCalcAvailableFk, FALSE, vWarehouseFk, util.VN_CURDATE());
-
+
DROP TEMPORARY TABLE IF EXISTS tmp.item;
CREATE TEMPORARY TABLE tmp.item
ENGINE = MEMORY
SELECT DISTINCT itemFk
- FROM vn.buy
+ FROM vn.buy
WHERE entryFk = vEntryFk;
-
+
DROP TEMPORARY TABLE IF EXISTS tmp.item2;
CREATE TEMPORARY TABLE tmp.item2
ENGINE = MEMORY
SELECT *
FROM tmp.item;
-
- SELECT i.id as itemFk,
+
+ SELECT i.id as itemFk,
CAST(IFNULL(iss.visible,0) - IFNULL(v.visible,0) AS DECIMAL(10,0)) as outShelving
FROM vn.item i
JOIN tmp.item ti ON ti.itemFk = i.id
LEFT JOIN cache.visible v ON v.calc_id = vCalcVisibleFk AND v.item_id = i.id
LEFT JOIN vn.itemShelvingStock iss ON iss.itemFk = i.id;
-
-
+
+
DROP TEMPORARY TABLE tmp.item;
DROP TEMPORARY TABLE tmp.item2;
-
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -60592,10 +58889,10 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelvingSale_Add`(vItemShelving
BEGIN
/**
* Añade línea a itemShelvingSale y regulariza el carro
- *
+ *
* @param vItemShelvingFk Id itemShelving
* @param vSaleFk Id de sale
- * @param vQuantity cantidad a regularizar
+ * @param vQuantity cantidad a regularizar
*/
INSERT INTO itemShelvingSale(itemShelvingFk,
saleFk,
@@ -60622,6 +58919,318 @@ DELIMITER ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `itemShelvingSale_reserve` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelvingSale_reserve`()
+BEGIN
+/**
+ * Reserva cantidades con ubicaciones para un conjunto de sales del mismo
+ * almacen.
+ *
+ * @table tmp.sale(saleFk, userFk)
+ */
+ DECLARE vCalcFk INT;
+ DECLARE vWarehouseFk INT;
+ DECLARE vCurrentYear INT DEFAULT YEAR(util.VN_NOW());
+ DECLARE vLastPickingOrder INT;
+
+ SELECT t.warehouseFk, MAX(p.pickingOrder)
+ INTO vWarehouseFk, vLastPickingOrder
+ FROM ticket t
+ JOIN sale s ON s.ticketFk = t.id
+ JOIN tmp.sale ts ON ts.saleFk = s.id
+ LEFT JOIN itemShelvingSale iss ON iss.saleFk = ts.saleFk
+ LEFT JOIN itemShelving ish ON ish.id = iss.itemShelvingFk
+ LEFT JOIN shelving sh ON sh.code = ish.shelvingFk
+ LEFT JOIN parking p ON p.id = sh.parkingFk
+ WHERE t.warehouseFk IS NOT NULL;
+
+ IF vWarehouseFk IS NULL THEN
+ CALL util.throw('Warehouse not set');
+ END IF;
+
+ CALL cache.visible_refresh(vCalcFk, FALSE, vWarehouseFk);
+
+ SET @outstanding = 0;
+ SET @oldsaleFk = 0;
+
+ CREATE OR REPLACE TEMPORARY TABLE tSalePlacementQuantity
+ (INDEX(saleFk))
+ ENGINE = MEMORY
+ SELECT saleFk, userFk, quantityToReserve, itemShelvingFk
+ FROM( SELECT saleFk,
+ sub.userFk,
+ itemShelvingFk ,
+ IF(saleFk <> @oldsaleFk, @outstanding := quantity, @outstanding),
+ @qtr := LEAST(@outstanding, available) quantityToReserve,
+ @outStanding := @outStanding - @qtr,
+ @oldsaleFk := saleFk
+ FROM(
+ SELECT ts.saleFk,
+ ts.userFk,
+ s.quantity,
+ ish.id itemShelvingFk,
+ ish.visible - IFNULL(ishr.reservedQuantity, 0) available
+ FROM tmp.sale ts
+ JOIN sale s ON s.id = ts.saleFk
+ JOIN itemShelving ish ON ish.itemFk = s.itemFk
+ LEFT JOIN (
+ SELECT itemShelvingFk, SUM(quantity) reservedQuantity
+ FROM itemShelvingSale
+ WHERE NOT isPicked
+ GROUP BY itemShelvingFk) ishr ON ishr.itemShelvingFk = ish.id
+ JOIN shelving sh ON sh.code = ish.shelvingFk
+ JOIN parking p ON p.id = sh.parkingFk
+ JOIN sector sc ON sc.id = p.sectorFk
+ JOIN warehouse w ON w.id = sc.warehouseFk
+ JOIN productionConfig pc
+ WHERE w.id = vWarehouseFk
+ AND NOT sc.isHideForPickers
+ ORDER BY
+ s.id,
+ p.pickingOrder >= vLastPickingOrder,
+ sh.priority DESC,
+ ish.visible >= s.quantity DESC,
+ s.quantity MOD ish.grouping = 0 DESC,
+ ish.grouping DESC,
+ IF(pc.orderMode = 'Location', p.pickingOrder, ish.created)
+ )sub
+ )sub2
+ WHERE quantityToReserve > 0;
+
+ INSERT INTO itemShelvingSale(
+ itemShelvingFk,
+ saleFk,
+ quantity,
+ userFk)
+ SELECT itemShelvingFk,
+ saleFk,
+ quantityToReserve,
+ IFNULL(userFk, getUser())
+ FROM tSalePlacementQuantity spl;
+
+ DROP TEMPORARY TABLE tmp.sale;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `itemShelvingSale_reserveByCollection` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelvingSale_reserveByCollection`(
+ vCollectionFk INT(11)
+)
+BEGIN
+/**
+ * Reserva cantidades con ubicaciones para el contenido de una colección
+ *
+ * @param vCollectionFk Identificador de collection
+ */
+ CREATE OR REPLACE TEMPORARY TABLE tmp.sale
+ (INDEX(saleFk))
+ ENGINE = MEMORY
+ SELECT s.id saleFk, NULL userFk
+ FROM ticketCollection tc
+ JOIN sale s ON s.ticketFk = tc.ticketFk
+ LEFT JOIN (
+ SELECT DISTINCT saleFk
+ FROM saleTracking st
+ JOIN state s ON s.id = st.stateFk
+ WHERE st.isChecked
+ AND s.semaphore = 1)st ON st.saleFk = s.id
+ WHERE tc.collectionFk = vCollectionFk
+ AND st.saleFk IS NULL
+ AND NOT s.isPicked;
+
+ CALL itemShelvingSale_reserve();
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `itemShelvingSale_reserveBySale` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelvingSale_reserveBySale`(
+ vSelf INT ,
+ vQuantity INT,
+ vUserFk INT
+)
+BEGIN
+/**
+ * Reserva cantida y ubicación para una saleFk
+ *
+ * @param vSelf Identificador de la venta
+ * @param vQuantity Cantidad a reservar
+ * @param vUserFk Id de usuario que realiza la reserva
+ */
+ CREATE OR REPLACE TEMPORARY TABLE tmp.sale
+ ENGINE = MEMORY
+ SELECT vSelf saleFk, vUserFk userFk;
+
+ CALL itemShelvingSale_reserve();
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `itemShelvingSale_setQuantity` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelvingSale_setQuantity`(
+ vItemShelvingSaleFk INT(10),
+ vQuantity DECIMAL(10,0),
+ vIsItemShelvingSaleEmpty BOOLEAN
+)
+BEGIN
+/**
+ * Gestiona la reserva de un itemShelvingFk, actualizando isPicked y quantity
+ * en vn.itemShelvingSale y vn.sale.isPicked en caso necesario.
+ * Si la reserva de la ubicación es fallida, se regulariza la situación
+ *
+ * @param vItemShelvingSaleFk Id itemShelvingSaleFK
+ * @param vQuantity Cantidad real que se ha cogido de la ubicación
+ * @param vIsItemShelvingSaleEmpty determina si ka ubicación itemShelvingSale se ha
+ * quedado vacio tras el movimiento
+ */
+ DECLARE vSaleFk INT;
+ DECLARE vCursorSaleFk INT;
+ DECLARE vItemShelvingFk INT;
+ DECLARE vReservedQuantity INT;
+ DECLARE vRemainingQuantity INT;
+ DECLARE vItemFk INT;
+ DECLARE vUserFk INT;
+ DECLARE vDone BOOLEAN DEFAULT FALSE;
+ DECLARE vSales CURSOR FOR
+ SELECT iss.saleFk, iss.userFk
+ FROM itemShelvingSale iss
+ JOIN sale s ON s.id = iss.saleFk
+ WHERE iss.id = vItemShelvingSaleFk
+ AND s.itemFk = vItemFk
+ AND NOT iss.isPicked;
+
+ DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
+
+ IF (SELECT isPicked FROM itemShelvingSale WHERE id = vItemShelvingSaleFk) THEN
+ CALL util.throw('Booking completed');
+ END IF;
+
+ SELECT s.itemFk, iss.saleFk, iss.itemShelvingFk
+ INTO vItemFk, vSaleFk, vItemShelvingFk
+ FROM itemShelvingSale iss
+ JOIN sale s ON s.id = iss.saleFk
+ WHERE iss.id = vItemShelvingSaleFk
+ AND NOT iss.isPicked;
+
+ UPDATE itemShelvingSale
+ SET isPicked = TRUE,
+ quantity = vQuantity
+ WHERE id = vItemShelvingSaleFk;
+
+ UPDATE itemShelving
+ SET visible = IF(vIsItemShelvingSaleEmpty, 0, GREATEST(0,visible - vQuantity))
+ WHERE id = vItemShelvingFk;
+
+ IF vIsItemShelvingSaleEmpty THEN
+ OPEN vSales;
+l: LOOP
+ SET vDone = FALSE;
+ FETCH vSales INTO vCursorSaleFk, vUserFk;
+ IF vDone THEN
+ LEAVE l;
+ END IF;
+
+ CREATE OR REPLACE TEMPORARY TABLE tmp.sale
+ (INDEX(saleFk, userFk))
+ ENGINE = MEMORY
+ SELECT vCursorSaleFk, vUserFk;
+
+ CALL itemShelvingSale_reserveWhitUser();
+ DROP TEMPORARY TABLE tmp.sale;
+
+ END LOOP;
+ CLOSE vSales;
+
+ DELETE iss
+ FROM itemShelvingSale iss
+ JOIN sale s ON s.id = iss.saleFk
+ WHERE iss.id = vItemShelvingSaleFk
+ AND s.itemFk = vItemFk
+ AND NOT iss.isPicked;
+ END IF;
+
+ SELECT SUM(quantity) INTO vRemainingQuantity
+ FROM itemShelvingSale
+ WHERE saleFk = vSaleFk
+ AND NOT isPicked;
+
+ IF vRemainingQuantity THEN
+ CALL itemShelvingSale_reserveBySale (vSaleFk, vRemainingQuantity, NULL);
+
+ SELECT SUM(quantity) INTO vRemainingQuantity
+ FROM itemShelvingSale
+ WHERE saleFk = vSaleFk
+ AND NOT isPicked;
+
+ IF NOT vRemainingQuantity <=> 0 THEN
+ SELECT SUM(iss.quantity)
+ INTO vReservedQuantity
+ FROM itemShelvingSale iss
+ WHERE iss.saleFk = vSaleFk;
+
+ CALL saleTracking_new(
+ vSaleFk,
+ TRUE,
+ vReservedQuantity,
+ `account`.`myUser_getId`(),
+ NULL,
+ 'PREPARED',
+ TRUE);
+
+ UPDATE sale s
+ SET s.quantity = vReservedQuantity
+ WHERE s.id = vSaleFk ;
+ END IF;
+ END IF;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `itemShelvingTransfer` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
@@ -60679,75 +59288,75 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `itemShelving_add` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
/*!50003 SET character_set_client = utf8mb4 */ ;
/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelving_add`(IN vShelvingFk VARCHAR(8), IN vBarcode VARCHAR(22), IN vQuantity INT, IN vPackagingFk VARCHAR(10), IN vGrouping INT, IN vPacking INT, IN vWarehouseFk INT)
-BEGIN
-
-
-/**
- * Añade registro o lo actualiza si ya existe.
- *
- * @param vShelvingFk matrícula del carro
- * @param vBarcode el id del registro
- * @param vQuantity indica la cantidad del producto
- * @param vPackagingFk el packaging del producto en itemShelving, NULL para coger el de la ultima compra
- * @param vGrouping el grouping del producto en itemShelving, NULL para coger el de la ultima compra
- * @param vPacking el packing del producto, NULL para coger el de la ultima compra
- * @param vWarehouseFk indica el sector
- *
- **/
-
- DECLARE vItemFk INT;
-
- SELECT barcodeToItem(vBarcode) INTO vItemFk;
-
- IF (SELECT COUNT(*) FROM shelving WHERE code = vShelvingFk COLLATE utf8_unicode_ci) = 0 THEN
-
- INSERT IGNORE INTO parking(code) VALUES(vShelvingFk);
- INSERT INTO shelving(code, parkingFk)
- SELECT vShelvingFk, id
- FROM parking
- WHERE `code` = vShelvingFk COLLATE utf8_unicode_ci;
-
- END IF;
-
- IF (SELECT COUNT(*) FROM itemShelving
- WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk
- AND itemFk = vItemFk
- AND packing = vPacking) = 1 THEN
-
- UPDATE itemShelving
- SET visible = visible+vQuantity
- WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk AND itemFk = vItemFk AND packing = vPacking;
-
- ELSE
- CALL cache.last_buy_refresh(FALSE);
- INSERT INTO itemShelving( itemFk,
- shelvingFk,
- visible,
- grouping,
- packing,
- packagingFk)
-
- SELECT vItemFk,
- vShelvingFk,
- vQuantity,
- IFNULL(vGrouping, b.grouping),
- IFNULL(vPacking, b.packing),
- IFNULL(vPackagingFk, b.packageFk)
- FROM item i
- LEFT JOIN cache.last_buy lb ON i.id = lb.item_id AND lb.warehouse_id = vWarehouseFk
- LEFT JOIN buy b ON b.id = lb.buy_id
- WHERE i.id = vItemFk;
- END IF;
+BEGIN
+
+
+/**
+ * Añade registro o lo actualiza si ya existe.
+ *
+ * @param vShelvingFk matrícula del carro
+ * @param vBarcode el id del registro
+ * @param vQuantity indica la cantidad del producto
+ * @param vPackagingFk el packaging del producto en itemShelving, NULL para coger el de la ultima compra
+ * @param vGrouping el grouping del producto en itemShelving, NULL para coger el de la ultima compra
+ * @param vPacking el packing del producto, NULL para coger el de la ultima compra
+ * @param vWarehouseFk indica el sector
+ *
+ **/
+
+ DECLARE vItemFk INT;
+
+ SELECT barcodeToItem(vBarcode) INTO vItemFk;
+
+ IF (SELECT COUNT(*) FROM shelving WHERE code = vShelvingFk COLLATE utf8_unicode_ci) = 0 THEN
+
+ INSERT IGNORE INTO parking(code) VALUES(vShelvingFk);
+ INSERT INTO shelving(code, parkingFk)
+ SELECT vShelvingFk, id
+ FROM parking
+ WHERE `code` = vShelvingFk COLLATE utf8_unicode_ci;
+
+ END IF;
+
+ IF (SELECT COUNT(*) FROM itemShelving
+ WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk
+ AND itemFk = vItemFk
+ AND packing = vPacking) = 1 THEN
+
+ UPDATE itemShelving
+ SET visible = visible+vQuantity
+ WHERE shelvingFk COLLATE utf8_unicode_ci = vShelvingFk AND itemFk = vItemFk AND packing = vPacking;
+
+ ELSE
+ CALL cache.last_buy_refresh(FALSE);
+ INSERT INTO itemShelving( itemFk,
+ shelvingFk,
+ visible,
+ grouping,
+ packing,
+ packagingFk)
+
+ SELECT vItemFk,
+ vShelvingFk,
+ vQuantity,
+ IFNULL(vGrouping, b.grouping),
+ IFNULL(vPacking, b.packing),
+ IFNULL(vPackagingFk, b.packagingFk)
+ FROM item i
+ LEFT JOIN cache.last_buy lb ON i.id = lb.item_id AND lb.warehouse_id = vWarehouseFk
+ LEFT JOIN buy b ON b.id = lb.buy_id
+ WHERE i.id = vItemFk;
+ END IF;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -60859,27 +59468,6 @@ DELIMITER ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `itemShelving_BuyerGet` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelving_BuyerGet`( )
-BEGIN
-
- SELECT * FROM vn.buyer;
-
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `itemShelving_filterBuyer` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
@@ -60901,7 +59489,7 @@ proc:BEGIN
CALL cache.visible_refresh(vCalcVisibleFk, TRUE, vWarehouseFk);
- SELECT * FROM
+ SELECT * FROM
(SELECT sub.itemFk,
sub.longName,
CONCAT('Hoy saldrán ', CAST(sub2.pendiente AS DECIMAL(10,0)), ' unidades.') `size`,
@@ -60912,17 +59500,17 @@ proc:BEGIN
CAST(visible - upstairs - downstairs AS DECIMAL(10,0)) nicho,
sub.name itemColour
FROM (SELECT iss.itemFk,
- CONCAT(i.longName, ' ', i.size,' ', IFNULL(i.subName,'') ) longName,
+ CONCAT(i.longName, ' ', IFNULL(i.size, ''),' ', IFNULL(i.subName, '') ) longName,
'' size,
CONCAT(iss.parkingCode, ' ', iss.shelvingFk) producer,
0 upstairs,
SUM(IFNULL(iss.visible,0)) downstairs,
IF(it.isPackaging, null, IFNULL(v.visible, 0)) visible,
- ik.name
+ ik.name
FROM itemShelvingStock iss
JOIN sector s ON s.id = iss.sectorFk
JOIN item i on i.id = iss.itemFk
- LEFT JOIN ink ik ON ik.id = i.inkFk
+ LEFT JOIN ink ik ON ik.id = i.inkFk
JOIN itemType it ON it.id = i.typeFk
LEFT JOIN cache.visible v ON v.item_id = iss.itemFk AND v.calc_id = vCalcVisibleFk
WHERE s.warehouseFk = vWarehouseFk
@@ -60931,16 +59519,15 @@ proc:BEGIN
) sub LEFT JOIN (SELECT s.itemFk, SUM(s.quantity) pendiente
FROM sale s
LEFT JOIN saleTracking st ON st.saleFk = s.id
- JOIN ticket t ON t.id = s.ticketFk
+ JOIN ticket t ON t.id = s.ticketFk
JOIN client c on c.id = t.clientFk
- JOIN clientType ct ON ct.id = c.clientTypeFk
WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
AND st.saleFk IS NULL
- AND ct.code IN ('normal', 'trust')
+ AND c.typeFk IN ('normal', 'trust')
GROUP BY s.itemFk
) sub2 ON sub2.itemFk = sub.itemFk
UNION ALL
- SELECT v.item_id ,
+ SELECT v.item_id,
i.longName,
CONCAT('Hoy saldrán ', CAST(sub5.pendiente AS DECIMAL(10,0)), ' unidades.') `size`,
CONCAT(IF(sub5.pendiente,'(0) ','(3) ')) producer,
@@ -60957,12 +59544,11 @@ proc:BEGIN
LEFT JOIN (SELECT s.itemFk, SUM(s.quantity) pendiente
FROM sale s
LEFT JOIN saleTracking st ON st.saleFk = s.id
- JOIN ticket t ON t.id = s.ticketFk
+ JOIN ticket t ON t.id = s.ticketFk
JOIN client c on c.id = t.clientFk
- JOIN clientType ct ON ct.id = c.clientTypeFk
WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
AND st.saleFk IS NULL
- AND ct.code IN ('normal', 'trust')
+ AND c.typeFk IN ('normal', 'trust')
GROUP BY s.itemFk
) sub5 ON sub5.itemFk = v.item_id
WHERE v.calc_id = vCalcVisibleFk
@@ -60990,12 +59576,12 @@ DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelving_get`(IN vSelf VARCHAR(8))
BEGIN
/**
-* Lista artículos de itemshelving
+* Lista artículos de itemshelving
*
* @param vSelf matrícula del carro
**/
- SELECT ish.itemFk item,
- IFNULL(i.longName, CONCAT(i.name, ' ', i.size)) description,
+ SELECT ish.itemFk item,
+ IFNULL(i.longName, CONCAT(i.name, ' ', i.size)) description,
ish.visible,
CEIL(ish.visible/ish.packing) stickers,
ish.packing,
@@ -61003,11 +59589,13 @@ BEGIN
p.code,
ish.id,
s.priority,
- ish.isChecked
+ ish.isChecked,
+ ic.url
FROM itemShelving ish
JOIN item i ON i.id = ish.itemFk
JOIN shelving s ON vSelf = s.code COLLATE utf8_unicode_ci
LEFT JOIN parking p ON s.parkingFk = p.id
+ JOIN hedera.imageConfig ic
WHERE ish.shelvingFk COLLATE utf8_unicode_ci = vSelf;
END ;;
DELIMITER ;
@@ -61033,7 +59621,7 @@ BEGIN
*
* @param vShelvingFk matricula del carro
*/
- SELECT is2.id,is2.shelvingFk , p.code, is2.itemFk , is2.visible, p.pickingOrder
+ SELECT is2.id,is2.shelvingFk , p.code, is2.itemFk , is2.visible, p.pickingOrder
FROM itemShelving is2
JOIN shelving sh ON sh.code = is2.shelvingFk
JOIN parking p ON p.id = sh.parkingFk
@@ -61098,92 +59686,167 @@ DELIMITER ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelving_getSaleDate`(vShelvingFk VARCHAR(3))
-BEGIN
-
- /* Devuelve la minima fecha en que se necesita cada producto en esa matricula.
- *
- * @param vShelvingFk Matrícula del carro o pallet
- */
-
- DECLARE vWarehouseFk INT;
-
- SELECT warehouseFk INTO vWarehouseFk
- FROM shelving s
- JOIN parking p ON s.parkingFk = p.id
- JOIN sector st ON st.id = p.sectorFk
- WHERE s.code = vShelvingFk COLLATE utf8_unicode_ci;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.itemShelvingDistinct;
- CREATE TEMPORARY TABLE tmp.itemShelvingDistinct
- (PRIMARY KEY (itemFk))
- ENGINE = MEMORY
- SELECT itemFk, SUM(visible) visible
- FROM vn.itemShelving
- WHERE shelvingFk = vShelvingFk COLLATE utf8_unicode_ci
- GROUP BY itemFk;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.item;
- CREATE TEMPORARY TABLE tmp.item
- (PRIMARY KEY (itemFk))
- ENGINE = MEMORY
- SELECT * FROM tmp.itemShelvingDistinct;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.stockByDay;
- CREATE TEMPORARY TABLE tmp.stockByDay
- (index (itemFk, dated))
- ENGINE = MEMORY
- SELECT t3.amount, dated,
- @stock := IF(@itemFk = t3.itemFk, @stock + t3.amount, t3.amount) stock,
- @itemFk := t3.itemFk itemFk
- FROM (
- SELECT * FROM (
- SELECT t2.* FROM (
- SELECT item_id itemFk, amount, util.VN_CURDATE() dated
- FROM cache.stock
- WHERE warehouse_id = vWarehouseFk
- UNION ALL
- SELECT ish.itemFk, - sum(visible), util.VN_CURDATE()
- FROM vn.itemShelving ish
- JOIN shelving sh ON sh.code = ish.shelvingFk
- JOIN parking p ON sh.parkingFk = p.id
- JOIN sector s ON s.id = p.sectorFk
- WHERE s.isReserve
- GROUP BY ish.itemFk
- UNION ALL
- SELECT item_id, sum(iei.amount), dat
- FROM vn2008.item_entry_in iei
- WHERE dat >= util.VN_CURDATE()
- AND warehouse_id = vWarehouseFk
- AND isVirtualStock = FALSE
- GROUP BY item_id, dat
- UNION ALL
- SELECT item_id, sum(ieo.amount), dat
- FROM vn2008.item_entry_out ieo
- WHERE dat >= util.VN_CURDATE()
- AND warehouse_id = vWarehouseFk
- GROUP BY item_id, dat
- UNION ALL
- SELECT i.itemFk, sum(io.amount), dat
- FROM vn2008.item_out io
- JOIN tmp.item i ON i.itemFk = io.item_id
- WHERE io.dat >= util.VN_CURDATE()
- AND io.warehouse_id = vWarehouseFk
- GROUP BY io.item_id, io.dat
- ) t2
- JOIN tmp.itemShelvingDistinct ish ON ish.itemFk = t2.itemFk) t
- order by t.itemFk, DATE(t.dated), t.amount DESC) t3;
-
- SELECT sbd.itemFk, i.longName, DATE(dated) dated, ish.visible amount, sbd.stock
- FROM tmp.stockByDay sbd
- JOIN vn.item i ON i.id = sbd.itemFk
- JOIN tmp.itemShelvingDistinct ish ON ish.itemFk = sbd.itemFk
- WHERE ish.visible >= sbd.stock
- GROUP BY itemFk
- ORDER BY dated;
-
- DROP TEMPORARY TABLE tmp.stockByDay,
- tmp.itemShelvingDistinct,
- tmp.item;
+BEGIN
+
+ /* Devuelve la mínima fecha en que se necesita cada producto en esa matrícula.
+ *
+ * @param vShelvingFk Matrícula del carro o pallet
+ */
+
+ DECLARE vWarehouseFk INT;
+ DECLARE vStockScopeDays INT;
+
+ SELECT s.warehouseFk, stockScopeDays
+ INTO vWarehouseFk, vStockScopeDays
+ FROM sector s
+ JOIN operator o ON s.id = o.sectorFk
+ JOIN productionConfig pc
+ WHERE o.workerFk = account.myUser_getId();
+
+ IF vWarehouseFk IS NULL
+ THEN CALL util.throw('WarehouseFk not setted');
+ END IF;
+
+ IF vStockScopeDays IS NULL
+ THEN CALL util.throw('StockScopeDays not setted');
+ END IF;
+
+ CREATE OR REPLACE TEMPORARY TABLE tmp.tItems
+ (PRIMARY KEY (itemFk))
+ ENGINE = MEMORY
+ SELECT itemFk, SUM(visible) visible
+ FROM itemShelving
+ WHERE shelvingFk = vShelvingFk COLLATE utf8_unicode_ci
+ GROUP BY itemFk;
+
+ CREATE OR REPLACE TEMPORARY TABLE tmp.tStockByDay
+ (INDEX (itemFk, dated))
+ ENGINE = MEMORY
+ SELECT dated,
+ SUM(t3.amount) OVER (PARTITION BY t3.itemFk ORDER BY dated) stock,
+ t3.itemFk
+ FROM (
+ SELECT t.itemFk, dated, SUM(amount) amount
+ FROM (
+ SELECT t2.itemFk, t2.amount, t2.dated
+ FROM (
+ SELECT item_id itemFk, amount, util.VN_CURDATE() dated
+ FROM cache.stock s
+ JOIN tmp.tItems i ON i.itemFk = s.item_id
+ WHERE s.warehouse_id = vWarehouseFk
+ UNION ALL
+ SELECT ish.itemFk, - SUM(ish.visible), util.VN_CURDATE()
+ FROM itemShelving ish
+ JOIN tmp.tItems i ON i.itemFk = ish.itemFk
+ JOIN shelving sh ON sh.code = ish.shelvingFk
+ JOIN parking p ON sh.parkingFk = p.id
+ JOIN sector s ON s.id = p.sectorFk
+ WHERE s.isReserve
+ GROUP BY ish.itemFk
+ UNION ALL
+ SELECT iei.itemFk, SUM(quantity), landed
+ FROM itemEntryIn iei
+ JOIN tmp.tItems i ON i.itemFk = iei.itemFk
+ WHERE iei.landed BETWEEN util.VN_CURDATE() AND util.VN_CURDATE() + INTERVAL vStockScopeDays DAY
+ AND iei.warehouseInFk = vWarehouseFk
+ AND NOT isVirtualStock
+ GROUP BY iei.itemFk, iei.landed
+ UNION ALL
+ SELECT ieo.itemFk, SUM(quantity), shipped
+ FROM itemEntryOut ieo
+ JOIN tmp.tItems i ON i.itemFk = ieo.itemFk
+ WHERE ieo.shipped BETWEEN util.VN_CURDATE() AND util.VN_CURDATE() + INTERVAL vStockScopeDays DAY
+ AND ieo.warehouseOutFk = vWarehouseFk
+ GROUP BY ieo.itemFk, ieo.shipped
+ UNION ALL
+ SELECT i.itemFk, SUM(ito.quantity), DATE(ito.shipped)
+ FROM itemTicketOut ito
+ JOIN tmp.tItems i ON i.itemFk = ito.itemFk
+ WHERE ito.shipped BETWEEN util.VN_CURDATE() AND util.VN_CURDATE() + INTERVAL vStockScopeDays DAY
+ AND ito.warehouseFk = vWarehouseFk
+ GROUP BY ito.itemFk, ito.shipped
+ ) t2
+ JOIN tmp.tItems i ON i.itemFk = t2.itemFk)t
+ GROUP BY t.itemFk, dated
+ ) t3;
+
+ -- Se restan las entradas de hoy
+ UPDATE tmp.tStockByDay sbd
+ JOIN (SELECT iei.itemFk, SUM(quantity) todayEntry
+ FROM itemEntryIn iei
+ JOIN tmp.tItems i ON i.itemFk = iei.itemFk
+ WHERE iei.landed = util.VN_CURDATE()
+ AND iei.warehouseInFk = vWarehouseFk
+ AND NOT iei.isVirtualStock) sub ON sub.itemFk = sbd.itemFk
+ SET sbd.stock = sbd.stock - sub.todayEntry
+ WHERE sbd.dated = util.VN_CURDATE();
+
+ -- Se añaden las lineas de venta servidas
+ UPDATE tmp.tStockByDay sbd
+ JOIN (SELECT s.itemFK, SUM(quantity) amount
+ FROM sale s
+ JOIN ticket t ON t.id = s.ticketFk
+ WHERE t.warehouseFk = vWarehouseFk
+ AND t.shipped BETWEEN util.VN_CURDATE() AND util.midnight()
+ AND s.isPicked
+ GROUP BY s.itemFk) sub ON sub.itemFk = sbd.itemFk
+ SET sbd.stock = sbd.stock + sub.amount;
+
+ -- Se añaden los items ubicados hoy
+ UPDATE tmp.tStockByDay sbd
+ JOIN (SELECT ish.itemFK, SUM(ish.visible) amount
+ FROM itemShelving ish
+ JOIN shelving sh ON sh.code = ish.shelvingFk
+ JOIN parking p ON p.id = sh.parkingFk
+ JOIN sector s ON s.id = p.sectorFk
+ WHERE s.warehouseFk = vWarehouseFk
+ AND NOT s.isReserve
+ AND ish.created BETWEEN util.VN_CURDATE() AND util.midnight()
+ GROUP BY ish.itemFk) sub ON sub.itemFk = sbd.itemFk
+ SET sbd.stock = sbd.stock + sub.amount;
+
+ SELECT ts.itemFk,
+ i.longName,
+ IF(ts.stock<=0, ts.dated, NULL) dated,
+ ts.stock,
+ sub4.visible,
+ sub4.shelvingFk
+ FROM(
+ SELECT IFNULL(sub2.minDated, sub.minDated) dated,
+ IFNULL(sub2.itemFk, sub.itemFk) itemFk
+ FROM(SELECT sbd.itemFk,
+ MIN(dated) minDated,
+ sbd.stock
+ FROM tmp.tItems ti
+ LEFT JOIN tmp.tStockByDay sbd ON sbd.itemFk = ti.itemFk
+ GROUP BY itemFk)sub
+ LEFT JOIN (
+ SELECT sbd.itemFk,
+ MIN(dated) minDated,
+ sbd.stock
+ FROM tmp.tItems ti
+ LEFT JOIN tmp.tStockByDay sbd ON sbd.itemFk = ti.itemFk
+ WHERE sbd.stock <= 0
+ GROUP BY itemFk)sub2 ON sub2.itemFk =sub.itemFk
+ WHERE sub2.itemFk IS NOT NULL
+ OR (sub2.itemFk IS NULL AND sub.itemFk IS NOT NULL)) sub3
+ LEFT JOIN tmp.tStockByDay ts ON ts.itemFk = sub3.itemFk AND ts.dated = sub3.dated
+ JOIN (SELECT ish.itemFk,
+ ish.visible,
+ p.sectorFk,
+ ish.shelvingFk
+ FROM itemShelving ish
+ JOIN vn.shelving sh ON sh.code = ish.shelvingFk
+ LEFT JOIN parking p ON p.id = parkingFk
+ LEFT JOIN vn.sector s ON s.id = p.sectorFk
+ WHERE ish.shelvingFk = vShelvingFk COLLATE utf8_unicode_ci
+ ) sub4 ON sub4.itemFk = ts.itemFk
+ LEFT JOIN sector s ON s.id = sub4.sectorFk
+ LEFT JOIN item i ON i.id = ts.itemFk
+ WHERE NOT s.isReserve;
+
+ DROP TEMPORARY TABLE tmp.tStockByDay, tmp.tItems;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -61231,10 +59894,11 @@ BEGIN
ish.visible,
p.sectorFk,
it.workerFk buyer,
- CONCAT('http:',ic.url, '/catalog/1600x900/',i.image) urlImage,
+ ic.url,
+ i.image,
ish.isChecked,
CASE
- WHEN s.notPrepared > sm.parked THEN 0
+ WHEN IFNULL (s.notPrepared, 0) > sm.parked THEN 0
WHEN sm.visible > sm.parked THEN 1
ELSE 2
END priority
@@ -61244,7 +59908,7 @@ BEGIN
JOIN tmp.stockMisfit sm ON sm.itemFk = ish.itemFk
JOIN shelving sh ON sh.code = ish.shelvingFk
JOIN parking p ON p.id = sh.parkingFk
- JOIN (
+ LEFT JOIN (
SELECT s.itemFk, sum(s.quantity) notPrepared
FROM sale s
JOIN ticket t ON t.id = s.ticketFk
@@ -61276,15 +59940,15 @@ DELIMITER ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `itemShelving_selfConsumption`(
- vShelvingFk VARCHAR(10) COLLATE utf8_general_ci,
- vItemFk INT,
+ vShelvingFk VARCHAR(10) COLLATE utf8_general_ci,
+ vItemFk INT,
vQuantity INT
)
-BEGIN
+BEGIN
/**
- * Leave the indicated amount on the shelf
+ * Leave the indicated amount on the shelf
* and create a ticket with the difference.
- *
+ *
* @param vShelvingFk id of the shelf where the item is located.
* @param vItemFk article of which the self-consumption ticket is to be created.
* @param vQuantity amount that will stay on the shelf
@@ -61296,19 +59960,23 @@ BEGIN
DECLARE vCompanyFk INT;
DECLARE vAgencyModeFk INT;
DECLARE vItemShelvingFk INT;
+ DECLARE vAddressFk INT;
SELECT c.id,
- c.clientFk,
- s.warehouseFk
+ pc.clientSelfConsumptionFk,
+ s.warehouseFk,
+ pc.addressSelfConsumptionFk
INTO vCompanyFk,
vClientFk,
- vWarehouseFk
+ vWarehouseFk,
+ vAddressFk
FROM company c
JOIN address a ON a.clientFk = c.clientFk
JOIN warehouse w ON w.addressFk = a.id
JOIN sector s ON s.warehouseFk = w.id
JOIN parking p ON p.sectorFk = s.id
JOIN shelving s2 ON s2.parkingFk = p.id
+ JOIN productionConfig pc
WHERE s2.code = vShelvingFk;
IF vClientFk IS NULL THEN
@@ -61328,10 +59996,10 @@ BEGIN
END IF;
SELECT SUM(visible), id INTO vVisible, vItemShelvingFk
- FROM itemShelving
+ FROM itemShelving
WHERE shelvingFk = vShelvingFk
AND itemFk = vItemFk;
-
+
IF vVisible IS NULL THEN
CALL util.throw('The item is not on the shelf.');
END IF;
@@ -61340,7 +60008,7 @@ BEGIN
vClientFk,
vWarehouseFk,
CURDATE(),
- NULL,
+ vAddressFk,
vCompanyFk,
NULL,
vTicketFk
@@ -61384,9 +60052,9 @@ BEGIN
* @param vGrouping el grouping del producto en itemShelving
*/
UPDATE itemShelving
- SET visible = vVisible,
- packing = vPacking,
- grouping = vGrouping
+ SET visible = vVisible,
+ packing = vPacking,
+ grouping = vGrouping
WHERE id = vShelf;
END ;;
@@ -61408,7 +60076,7 @@ DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `itemTagMake`(vItemFk INT)
BEGIN
-/* * Crea los tags usando la tabla plantilla itemTag
+/* * Crea los tags usando la tabla plantilla itemTag
* y si no existe a partir de la ficha del artículo.
* @param vItemFk El item al que se le añaden los tags
*/
@@ -61418,33 +60086,33 @@ BEGIN
DECLARE vProducer VARCHAR(50);
DECLARE vOrigin VARCHAR(20);
DECLARE vTypeFk INTEGER;
-
- DELETE FROM itemTag
+
+ DELETE FROM itemTag
WHERE itemFk = vItemFk;
-
- SELECT typeFk INTO vTypeFk
+
+ SELECT typeFk INTO vTypeFk
FROM item
WHERE id = vItemFk;
-
+
INSERT INTO itemTag(itemFk, tagFk, value, priority)
SELECT vItemFk, itt.tagFk, NULL, itt.priority
FROM itemTag it
LEFT JOIN itemTypeTag itt ON itt.itemTypeFk = vTypeFk
WHERE it.itemFk = vItemFk;
-
+
IF (SELECT COUNT(*) FROM itemTag WHERE itemFk = vItemFk LIMIT 1) = 0 THEN
- SELECT ik.name, i.size, i.category, p.name, o.name
+ SELECT ik.name, i.size, i.category, p.name, o.name
INTO vInk, vSize, vCategory, vProducer, vOrigin
FROM item i
LEFT JOIN ink ik ON ik.id = i.inkFk
LEFT JOIN producer p ON p.id = i.producerFk AND p.isVisible
LEFT JOIN origin o ON o.id = i.originFk
WHERE i.id = vItemFk;
-
+
INSERT IGNORE INTO itemTag(itemFk, tagFk, value, priority)
VALUES(vItemFk, 1, vInk, 1);
-
+
INSERT IGNORE INTO itemTag(itemFk, tagFk, value, priority)
VALUES (vItemFk, 8, vSize, 2);
@@ -61453,11 +60121,11 @@ BEGIN
INSERT IGNORE INTO itemTag(itemFk, tagFk, value, priority)
VALUES(vItemFk, 37, vProducer, 4);
-
+
INSERT IGNORE INTO itemTag(itemFk, tagFk, value, priority)
VALUES(vItemFk, 35, vOrigin, 5);
END IF;
-
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -61478,12 +60146,12 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `itemTagReorder`(itemTypeFk INT)
BEGIN
SET @isTriggerDisabled = TRUE;
-
+
-- No se puede usar temporary porque da error Error Code: 1137. No puedo reabrir tabla: 'i
DROP TABLE IF EXISTS tmp.item;
CREATE TABLE tmp.item
SELECT DISTINCT i.id
- FROM vn.item i
+ FROM vn.item i
WHERE i.typeFk = itemTypeFk;
UPDATE itemTag it
@@ -61492,8 +60160,8 @@ BEGIN
JOIN itemTypeTag itt ON itt.itemTypeFk = item.typeFk AND itt.tagFk = it.tagFk
SET it.priority = itt.priority
WHERE itt.itemTypeFk = itemTypeFk;
-
- CALL item_refreshTags();
+
+ CALL item_refreshTags();
SET @isTriggerDisabled = FALSE;
@@ -61518,12 +60186,12 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `itemTagReorderByName`(vName VARCHAR
BEGIN
SET @isTriggerDisabled = TRUE;
-
+
-- No se puede usar temporary porque da error Error Code: 1137. No puedo reabrir tabla: 'i
DROP TABLE IF EXISTS tmp.item;
CREATE TABLE tmp.item
SELECT DISTINCT i.id
- FROM vn.item i
+ FROM vn.item i
WHERE i.`name` LIKE CONCAT(vName,'%');
UPDATE itemTag it
@@ -61532,8 +60200,8 @@ BEGIN
JOIN itemTypeTag itt ON itt.itemTypeFk = item.typeFk AND itt.tagFk = it.tagFk
SET it.priority = itt.priority
WHERE itt.itemTypeFk = itemTypeFk;
-
- CALL item_refreshTags();
+
+ CALL item_refreshTags();
SET @isTriggerDisabled = FALSE;
@@ -61556,36 +60224,36 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `itemTag_replace`(vItemFromFk INT, vItemToFk INT, vPicture VARCHAR(100))
BEGIN
-
+
/* Reemplaza los tags de un artículo por los de otro, así como su imagen
- *
+ *
* @param vItemFromFk id de vn.item con el artículo del que se toman los tags
* @param vItemToFk id de vn.item con el artículo del que se toman los tags
* @param vPicture imagen del artículo. Opcional. Si no se especifica, hereada la del vItemFromFk
*/
- DELETE FROM vn.itemTag
+ DELETE FROM vn.itemTag
WHERE itemFk = vItemToFk;
-
+
INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
SELECT vItemToFk, tagFk, value, priority
- FROM vn.itemTag
+ FROM vn.itemTag
WHERE itemFk = vItemFromFk;
-
+
IF ISNULL(vPicture) THEN
-
- SELECT image INTO vPicture
- FROM vn.item
+
+ SELECT image INTO vPicture
+ FROM vn.item
WHERE id = vItemFromFk;
-
+
END IF;
- UPDATE vn.item i
+ UPDATE vn.item i
SET i.image = vPicture
WHERE i.id = vItemToFk;
-
+
CALL vn.itemRefreshTags(vItemToFk);
-
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -61610,9 +60278,9 @@ BEGIN
SELECT DISTINCT id
FROM vn.itemCategory
WHERE merchandise <> FALSE;
-
+
DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
- DECLARE EXIT HANDLER FOR SQLEXCEPTION BEGIN
+ DECLARE EXIT HANDLER FOR SQLEXCEPTION BEGIN
RESIGNAL;
END;
@@ -61623,45 +60291,45 @@ BEGIN
INNER JOIN bs.ventas v ON v.Id_Movimiento = s.id
WHERE v.fecha BETWEEN TIMESTAMPADD(DAY, - 7, util.VN_CURDATE()) AND util.VN_CURDATE()
GROUP BY s.itemFk;
-
+
DROP TABLE IF EXISTS tmp.topSeller;
- CREATE TEMPORARY TABLE tmp.topSeller
- (
+ CREATE TEMPORARY TABLE tmp.topSeller
+ (
`id` int(11) NOT NULL DEFAULT '0',
`typeFk` smallint(5) unsigned NOT NULL,
`itemCategoryFk` int(10) unsigned NOT NULL,
`total` bigint(21) NOT NULL DEFAULT '0'
) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-
+
OPEN rs;
read_loop: LOOP
FETCH rs INTO vCategoryFk;
-
+
IF vDone THEN
LEAVE read_loop;
END IF;
-
+
INSERT INTO tmp.topSeller
SELECT tsm.itemFk, tsm.typeFk, it.categoryFk, tsm.total
FROM tmp.topSellerMin tsm
INNER JOIN vn.itemType it ON it.id = tsm.typeFk
WHERE it.categoryFk = vCategoryFk
ORDER BY tsm.itemFk ,tsm.total DESC
- LIMIT 5;
+ LIMIT 5;
END LOOP;
CLOSE rs;
-
+
SELECT i.name ,i.id, i.image, i.typeFk, it.categoryFk AS itemCategoryFk,
ic.name AS itemCategoryName, it.name AS itemTypeName, ts.total
FROM tmp.topSeller ts
INNER JOIN vn.item i ON i.id = ts.id
INNER JOIN vn.itemType it ON it.id = ts.typeFk
INNER JOIN vn.itemCategory ic ON ic.id = it.categoryFk;
-
+
DROP TABLE IF EXISTS topSellerMin;
DROP TABLE IF EXISTS tmp.topSeller;
-
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -61771,7 +60439,7 @@ SET tag6 = t.name, value6 = it.value
WHERE it.priority = 2
AND (vItem IS NULL OR vItem = it.itemFk);
-UPDATE item i
+UPDATE item i
JOIN itemTag it ON it.itemFk = i.id
JOIN tag t ON t.id = it.tagFk
SET tag7 = t.name, value7 = it.value
@@ -61804,7 +60472,7 @@ DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `item_cleanFloramondo`()
BEGIN
/**
-* Elimina todos los items repetidos de floramondo
+* Elimina todos los items repetidos de floramondo
* y los sustituye por el que tiene menor id
*/
DECLARE vItemFrom INT;
@@ -61870,7 +60538,7 @@ BEGIN
AND i2.EmbalageCode <=> i.EmbalageCode
AND i2.quality <=> i.quality
JOIN (
- SELECT DISTINCT b.itemFk
+ SELECT DISTINCT b.itemFk
FROM buy b
JOIN item i ON i.id = b.itemFk
WHERE i.isFloramondo
@@ -61878,7 +60546,7 @@ BEGIN
)sub2 ON sub2.itemFk = GREATEST(i.id, i2.id)
WHERE i.isFloramondo
AND i.id <> i2.id;
-
+
DECLARE EXIT HANDLER FOR SQLEXCEPTION SET vDone = TRUE;
BEGIN
SET vDone = TRUE;
@@ -62009,6 +60677,316 @@ DELIMITER ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `item_comparative` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `item_comparative`(
+ vDate DATETIME,
+ vDayRange TINYINT,
+ vWarehouseFk TINYINT,
+ vAvailableSince DATE,
+ vBuyerFk INT,
+ vIsFloramondo BOOL,
+ vCountryFk INT
+)
+proc: BEGIN
+/**
+ * Genera una tabla de comparativa de artículos por itemType/comprador/fecha.
+ * Los datos se calculan en función de los parámetros proporcionados.
+ *
+ * @param vDate La fecha para la cual se generará la comparativa.
+ * @param vDayRange El rango de días a considerar para la comparativa.
+ * @param vWarehouseFk El identificador del almacén para filtrar los artículos.
+ * @param vAvailableSince La fecha de disponibilidad desde la cual se consideran los artículos disponibles.
+ * @param vBuyerFk El identificador del comprador para filtrar los artículos.
+ * @param vIsFloramondo Indica si se deben incluir solo los artículos de Floramondo (opcional).
+ * @param vCountryFk El identificador del país.
+ * @param tmp.comparativeFilterType(filterFk INT ,itemTypeFk INT)
+ * @return tmp.comparative
+ */
+
+ DECLARE vDayRangeStart DATE;
+ DECLARE vDayRangeEnd DATE;
+ DECLARE w1, w2, w3, w4, w5, w6, w7 INT;
+ DECLARE y1, y2, y3, y4, y5, y6, y7 INT;
+ DECLARE z1, z2, z3, z4, z5, z6, z7 INT;
+ DECLARE vPeriod INT;
+ DECLARE i INT DEFAULT 0;
+ DECLARE vHasTypeFilter BOOL;
+ DECLARE vWeekRange INT;
+ DECLARE vWeekCount TINYINT;
+ DECLARE vMaxDayRange INT;
+ DECLARE vMinDayRange INT;
+ DECLARE vDefaultDayRange INT;
+
+ IF NOT(SELECT COUNT(*) FROM comparativeConfig)THEN
+ LEAVE proc;
+ END IF;
+
+ SELECT weekRange,
+ weekRange * 2 + 1,
+ maxDayRange,
+ minDayRange,
+ defaultDayRange
+ INTO vWeekRange,
+ vWeekCount,
+ vMaxDayRange,
+ vMinDayRange,
+ vDefaultDayRange
+ FROM comparativeConfig;
+
+ IF vDayRange < vMinDayRange OR vDayRange > vMaxDayRange THEN
+ SET vDayRange = vDefaultDayRange;
+ END IF;
+
+ SELECT MIN(dated) INTO vDayRangeStart
+ FROM vn.time
+ WHERE dated <= vDate
+ GROUP BY period
+ ORDER BY dated desc
+ LIMIT 1 OFFSET vWeekRange;
+
+ SELECT MAX(dated) INTO vDayRangeEnd
+ FROM vn.time
+ WHERE dated >= vDate
+ GROUP BY period
+ ORDER BY dated ASC
+ LIMIT 1 OFFSET vWeekRange;
+
+ SELECT COUNT(itemTypeFk) > 0 INTO vHasTypeFilter
+ FROM tmp.comparativeFilterType;
+
+ CREATE OR REPLACE TEMPORARY TABLE tmp.itemInventory
+ (PRIMARY KEY (id))
+ ENGINE = MEMORY
+ SELECT i.id
+ FROM item i
+ JOIN itemType t ON t.id = i.typeFk
+ JOIN itemCategory c ON c.id = t.categoryFk
+ LEFT JOIN worker w ON w.id = t.workerFk
+ WHERE (NOT vHasTypeFilter
+ OR t.id IN (SELECT itemTypeFk FROM tmp.comparativeFilterType))
+ AND (vBuyerFk IS NULL
+ OR t.workerFk = vBuyerFk)
+ AND (vIsFloramondo IS NULL
+ OR i.isFloramondo = vIsFloramondo);
+
+ IF vDate < util.VN_CURDATE() THEN
+ ALTER TABLE tmp.itemInventory
+ ADD `buy_id` INT NOT NULL DEFAULT 0,
+ ADD `buy_date` DATE DEFAULT '2000-01-01',
+ ADD `life` INT DEFAULT 0,
+ ADD `sd` INT DEFAULT 0,
+ ADD `avalaible` INT DEFAULT 0,
+ ADD `visible` INT DEFAULT 0;
+ ELSE
+ CALL multipleInventory(vAvailableSince, vWarehouseFk, vDayRange);
+ CALL item_multipleBuy(vDate, vWarehouseFk);
+ CALL item_multipleBuyByDate(vDate, vWarehouseFk);
+ END IF;
+
+ CREATE OR REPLACE TEMPORARY TABLE tTable (
+ cy INT(6) PRIMARY KEY,
+ ly INT(6),
+ zy INT(6),
+ INDEX (ly)
+ );
+
+ REPEAT
+ SET i = i + 1;
+
+ SELECT t.period INTO vPeriod
+ FROM vn.`time` t
+ WHERE t.dated = vDayRangeStart + INTERVAL (vWeekCount * (i - 1)) DAY;
+
+ INSERT IGNORE INTO tTable(cy, ly, zy) VALUES(vPeriod, vPeriod - 100, vPeriod - 200);
+ UNTIL i = vWeekCount END REPEAT;
+
+ SELECT cy, ly, zy INTO w1, y1, z1 FROM tTable LIMIT 1;
+ SELECT cy, ly, zy INTO w2, y2, z2 FROM tTable WHERE cy > w1 LIMIT 1;
+ SELECT cy, ly, zy INTO w3, y3, z3 FROM tTable WHERE cy > w2 LIMIT 1;
+ SELECT cy, ly, zy INTO w4, y4, z4 FROM tTable WHERE cy > w3 LIMIT 1;
+ SELECT cy, ly, zy INTO w5, y5, z5 FROM tTable WHERE cy > w4 LIMIT 1;
+ SELECT cy, ly, zy INTO w6, y6, z6 FROM tTable WHERE cy > w5 LIMIT 1;
+ SELECT cy, ly, zy INTO w7, y7, z7 FROM tTable WHERE cy > w6 LIMIT 1;
+
+ -- Genera una tabla con los datos del año pasado.
+
+ CREATE OR REPLACE TEMPORARY TABLE tLastYear
+ (KEY (lItemFk))
+ ENGINE = MEMORY
+ SELECT c.itemFk lItemFk,
+ SUM(IF(c.timePeriod = y1, c.quantity, 0)) lweek1,
+ SUM(IF(c.timePeriod = y2, c.quantity, 0)) lweek2,
+ SUM(IF(c.timePeriod = y3, c.quantity, 0)) lweek3,
+ SUM(IF(c.timePeriod = y4, c.quantity, 0)) lweek4,
+ SUM(IF(c.timePeriod = y5, c.quantity, 0)) lweek5,
+ SUM(IF(c.timePeriod = y6, c.quantity, 0)) lweek6,
+ SUM(IF(c.timePeriod = y7, c.quantity, 0)) lweek7,
+ SUM(IF(c.timePeriod = y1, c.price, 0)) lprice1,
+ SUM(IF(c.timePeriod = y2, c.price, 0)) lprice2,
+ SUM(IF(c.timePeriod = y3, c.price, 0)) lprice3,
+ SUM(IF(c.timePeriod = y4, c.price, 0)) lprice4,
+ SUM(IF(c.timePeriod = y5, c.price, 0)) lprice5,
+ SUM(IF(c.timePeriod = y6, c.price, 0)) lprice6,
+ SUM(IF(c.timePeriod = y7, c.price, 0)) lprice7
+ FROM tmp.itemInventory ai
+ JOIN comparative c ON c.itemFk = ai.id
+ JOIN warehouse w on w.id = c.warehouseFk
+ JOIN tTable wt ON c.timePeriod = wt.ly
+ WHERE IFNULL(vWarehouseFk, c.warehouseFk) = c.warehouseFk
+ AND w.isComparative
+ AND (vCountryFk IS NULL OR c.countryFk = vCountryFk)
+ GROUP BY ai.id;
+
+ -- Genera una tabla con los datos de hace DOS años.
+
+ CREATE OR REPLACE TEMPORARY TABLE tTwoYearsAgo
+ (KEY (tItemFk))
+ ENGINE = MEMORY
+ SELECT c.itemFk tItemFk,
+ SUM(IF(c.timePeriod = z1, c.quantity, 0)) vlweek1,
+ SUM(IF(c.timePeriod = z2, c.quantity, 0)) vlweek2,
+ SUM(IF(c.timePeriod = z3, c.quantity, 0)) vlweek3,
+ SUM(IF(c.timePeriod = z4, c.quantity, 0)) vlweek4,
+ SUM(IF(c.timePeriod = z5, c.quantity, 0)) vlweek5,
+ SUM(IF(c.timePeriod = z6, c.quantity, 0)) vlweek6,
+ SUM(IF(c.timePeriod = z7, c.quantity, 0)) vlweek7,
+ SUM(IF(c.timePeriod = z1, c.price, 0)) vlprice1,
+ SUM(IF(c.timePeriod = z2, c.price, 0)) vlprice2,
+ SUM(IF(c.timePeriod = z3, c.price, 0)) vlprice3,
+ SUM(IF(c.timePeriod = z4, c.price, 0)) vlprice4,
+ SUM(IF(c.timePeriod = z5, c.price, 0)) vlprice5,
+ SUM(IF(c.timePeriod = z6, c.price, 0)) vlprice6,
+ SUM(IF(c.timePeriod = z7, c.price, 0)) vlprice7
+ FROM tmp.itemInventory ai
+ JOIN comparative c ON c.itemFk = ai.id
+ JOIN warehouse w on w.id = c.warehouseFk
+ JOIN tTable wt ON c.timePeriod = wt.zy
+ WHERE IFNULL(vWarehouseFk, c.warehouseFk) = c.warehouseFk
+ AND w.isComparative
+ AND (vCountryFk IS NULL OR c.countryFk = vCountryFk)
+ GROUP BY ai.id;
+
+ -- Genera una tabla con los datos de este año.ss
+
+ CREATE OR REPLACE TEMPORARY TABLE tCurrentYear
+ (KEY (cItemFk))
+ ENGINE = MEMORY
+ SELECT t.itemFk cItemFk,
+ SUM(IF(week = w1, total, 0)) cweek1,
+ SUM(IF(week = w2, total, 0)) cweek2,
+ SUM(IF(week = w3, total, 0)) cweek3,
+ SUM(IF(week = w4, total, 0)) cweek4,
+ SUM(IF(week = w5, total, 0)) cweek5,
+ SUM(IF(week = w6, total, 0)) cweek6,
+ SUM(IF(week = w7, total, 0)) cweek7,
+ SUM(IF(week = w1, price, 0)) cprice1,
+ SUM(IF(week = w2, price, 0)) cprice2,
+ SUM(IF(week = w3, price, 0)) cprice3,
+ SUM(IF(week = w4, price, 0)) cprice4,
+ SUM(IF(week = w5, price, 0)) cprice5,
+ SUM(IF(week = w6, price, 0)) cprice6,
+ SUM(IF(week = w7, price, 0)) cprice7
+ FROM (
+ SELECT s.itemFk,
+ ti.period `week`,
+ SUM(s.quantity) total,
+ TRUNCATE(SUM(s.quantity * s.priceFixed),0) price
+ FROM ticket t
+ JOIN sale s ON t.id = s.ticketFk
+ JOIN tmp.itemInventory it ON it.id = s.itemFk
+ JOIN time ti ON ti.dated = DATE(t.shipped)
+ JOIN item i ON i.id = s.itemFk
+ JOIN itemType tp ON tp.id = i.typeFk
+ JOIN itemCategory ic ON ic.id = tp.categoryFk
+ JOIN warehouse w ON w.id = t.warehouseFk
+ STRAIGHT_JOIN address ad ON ad.id = t.addressFk
+ JOIN province p ON p.id = ad.provinceFk
+ JOIN `client` c ON c.id = ad.clientFk
+ WHERE t.shipped BETWEEN vDayRangeStart AND util.dayEnd(vDayRangeEnd)
+ AND c.typeFk IN ('Normal','handMaking')
+ AND w.id = COALESCE(vWarehouseFk, w.id)
+ AND w.isComparative
+ AND (vCountryFk IS NULL OR p.countryFk = vCountryFk)
+ GROUP BY i.id, week
+ ) t
+ GROUP BY t.itemFk;
+
+ -- Genera la tabla con la comparativa.
+ CREATE OR REPLACE TEMPORARY TABLE tmp.comparative
+ ENGINE = MEMORY
+ SELECT it.subName productor,
+ b.packing,
+ b.buyingValue costefijo,
+ b.groupingMode caja,
+ it.image ArticleImage,
+ IFNULL(it.inkFk,"?") color,
+ tp.code tipo,
+ it.typeFk tipo_id,
+ o.code origen,
+ it.category categoria,
+ it.stems tallos,
+ it.size medida,
+ it.name article,
+ w.code codigoTrabajador,
+ tp.categoryFk reino_id,
+ ly.*,
+ cy.*,
+ zy.*,
+ it.*,
+ it.id Id_Article,
+ i.buy_id,
+ tp.life,
+ IFNULL(i.sd,0) sd,
+ i.avalaible,
+ i.visible,
+ i.buy_date,
+ e.id provider_id,
+ it.comment comments,
+ it.description itemDescription,
+ IF(cy.cItemFk IS NULL AND i.visible = 0 AND i.avalaible = 0
+ AND IFNULL(i.sd, 0) = 0, FALSE, TRUE) filtret,
+ IF(it.hasMinPrice, FORMAT(it.minPrice, 2), "") pvp,
+ s.company_name
+ FROM tmp.itemInventory i
+ JOIN item it ON it.id = i.id
+ LEFT JOIN itemType tp ON tp.id = it.typeFk
+ LEFT JOIN worker w ON w.id = tp.workerFk
+ LEFT JOIN buy b ON b.id = i.buy_id
+ LEFT JOIN entry e ON e.id = b.entryFk
+ LEFT JOIN origin o ON o.id = it.originFk
+ LEFT JOIN tLastYear ly ON ly.lItemFk = it.id
+ LEFT JOIN tCurrentYear cy ON cy.cItemFk = it.id
+ LEFT JOIN tTwoYearsAgo zy ON zy.tItemFk = it.id
+ LEFT JOIN edi.ekt e2 ON e2.id = b.ektFk
+ LEFT JOIN edi.supplier s ON s.supplier_id = e2.pro
+ WHERE i.avalaible
+ OR i.visible
+ OR i.sd
+ OR cy.cweek1 OR cy.cweek2 OR cy.cweek3 OR cy.cweek4 OR cy.cweek5 OR cy.cweek6 OR cy.cweek7
+ OR ly.lweek1 OR ly.lweek2 OR ly.lweek3 OR ly.lweek4 OR ly.lweek5 OR ly.lweek6 OR ly.lweek7
+ OR zy.vlweek1 OR zy.vlweek2 OR zy.vlweek3 OR zy.vlweek4 OR zy.vlweek5 OR zy.vlweek6 OR zy.vlweek7;
+
+ -- Elimina las tablas temporales creadas...
+ DROP TEMPORARY TABLE IF EXISTS tmp.itemInventory,
+ tTwoYearsAgo,
+ tLastYear,
+ tCurrentYear,
+ tTable;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `item_deactivateUnused` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
@@ -62062,51 +61040,50 @@ DELIMITER ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `item_getAtp`(vDated DATE)
-BEGIN
-/**
- * Calcula el valor mínimo acumulado para cada artículo ordenado por fecha y
- * almacén.
- *
- * @param vDated Si no hay movimientos en la fecha indicada, debe devolver 0
- * @table tmp.itemCalc(itemFk, wareHouseFk, dated, quantity)
- * @return tmp.itemAtp(itemFk, warehouseFk, quantity)
- */
- DROP TEMPORARY TABLE IF EXISTS tItemOrdered;
- CREATE TEMPORARY TABLE tItemOrdered
- (UNIQUE(itemFk, warehouseFk, dated))
- ENGINE = MEMORY
- SELECT itemFk, warehouseFk, dated, SUM(quantity) quantity
- FROM (
- SELECT itemFk, warehouseFk, dated, quantity
- FROM tmp.itemCalc
- UNION ALL
- SELECT itemFk, warehouseFk, vDated, 0
- FROM (SELECT DISTINCT itemFk, warehouseFk FROM tmp.itemCalc) t2
- ) t1
- GROUP BY itemFk, warehouseFk, dated
- ORDER BY itemFk, warehouseFk, dated;
-
- SET @lastItemFk := 0;
- SET @lastWareHouseFk := 0;
- SET @lastQuantity := 0;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.itemAtp;
- CREATE TEMPORARY TABLE tmp.itemAtp
- SELECT itemFk, wareHouseFk, MIN(quantityAccumulated) quantity
- FROM (
- SELECT
- itemFk,
- IF(itemFk <> @lastItemFk OR wareHouseFk <> @lastWareHouseFk,
- @lastQuantity := quantity,
- @lastQuantity := @lastQuantity + quantity) quantityAccumulated,
- wareHouseFk,
- @lastItemFk := itemFk,
- @lastWareHouseFk := wareHouseFk
- FROM tItemOrdered
- )sub
- GROUP BY itemFk, wareHouseFk;
-
- DROP TEMPORARY TABLE tItemOrdered;
+BEGIN
+/**
+ * Calcula el valor mínimo acumulado para cada artículo ordenado por fecha y
+ * almacén.
+ *
+ * @param vDated Si no hay movimientos en la fecha indicada, debe devolver 0
+ * @table tmp.itemCalc(itemFk, wareHouseFk, dated, quantity)
+ * @return tmp.itemAtp(itemFk, warehouseFk, quantity)
+ */
+ CREATE OR REPLACE TEMPORARY TABLE tItemOrdered
+ (UNIQUE(itemFk, warehouseFk, dated))
+ ENGINE = MEMORY
+ SELECT itemFk, warehouseFk, dated, SUM(quantity) quantity
+ FROM (
+ SELECT itemFk, warehouseFk, dated, quantity
+ FROM tmp.itemCalc
+ UNION ALL
+ SELECT itemFk, warehouseFk, vDated, 0
+ FROM (SELECT DISTINCT itemFk, warehouseFk FROM tmp.itemCalc) t2
+ ) t1
+ GROUP BY itemFk, warehouseFk, dated
+ ORDER BY itemFk, warehouseFk, dated;
+
+ SET @lastItemFk := 0;
+ SET @lastWareHouseFk := 0;
+ SET @lastQuantity := 0;
+
+ CREATE OR REPLACE TEMPORARY TABLE tmp.itemAtp
+ (INDEX (itemFk, wareHouseFk))
+ SELECT itemFk, wareHouseFk, MIN(quantityAccumulated) quantity
+ FROM (
+ SELECT
+ itemFk,
+ IF(itemFk <> @lastItemFk OR wareHouseFk <> @lastWareHouseFk,
+ @lastQuantity := quantity,
+ @lastQuantity := @lastQuantity + quantity) quantityAccumulated,
+ wareHouseFk,
+ @lastItemFk := itemFk,
+ @lastWareHouseFk := wareHouseFk
+ FROM tItemOrdered
+ )sub
+ GROUP BY itemFk, wareHouseFk;
+
+ DROP TEMPORARY TABLE tItemOrdered;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -62132,13 +61109,13 @@ BEGIN
/**
* @vItemFk item a buscar
* @vWarehouseFk almacen donde buscar
- * @vDate Si la fecha es null, muestra el histórico desde el inventario.
+ * @vDate Si la fecha es null, muestra el histórico desde el inventario.
* Si la fecha no es null, muestra histórico desde la fecha pasada.
*/
DECLARE vDateInventory DATETIME;
IF vDate IS NULL THEN
- SELECT inventoried INTO vDateInventory
+ SELECT inventoried INTO vDateInventory
FROM config;
ELSE
SELECT mockUtcTime INTO vDateInventory
@@ -62164,7 +61141,7 @@ BEGIN
inventorySupplierFk INT(10)
);
- INSERT INTO tItemDiary
+ INSERT INTO tItemDiary
SELECT tr.landed shipped,
b.quantity `in`,
NULL `out`,
@@ -62185,14 +61162,14 @@ 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
- JOIN state st ON st.`code` = IF( tr.landed < util.VN_CURDATE()
+ JOIN state st ON st.`code` = IF( tr.landed < util.VN_CURDATE()
OR (util.VN_CURDATE() AND tr.isReceived),
- 'DELIVERED',
+ 'DELIVERED',
'FREE')
JOIN entryConfig ec
WHERE tr.landed >= vDateInventory
AND vWarehouseFk = tr.warehouseInFk
- AND (s.id <> ec.inventorySupplierFk OR vDate IS NULL)
+ AND (s.id <> ec.inventorySupplierFk OR vDate IS NULL)
AND b.itemFk = vItemFk
AND e.isExcludedFromAvailable = FALSE
AND e.isRaid = FALSE
@@ -62218,14 +61195,14 @@ BEGIN
JOIN travel tr ON tr.id = e.travelFk
JOIN warehouse w ON w.id = tr.warehouseOutFk
JOIN supplier s ON s.id = e.supplierFk
- JOIN state st ON st.`code` = IF(tr.shipped < util.VN_CURDATE()
+ JOIN state st ON st.`code` = IF(tr.shipped < util.VN_CURDATE()
OR (tr.shipped = util.VN_CURDATE() AND tr.isReceived),
- 'DELIVERED',
+ 'DELIVERED',
'FREE')
JOIN entryConfig ec
WHERE tr.shipped >= vDateInventory
AND vWarehouseFk = tr.warehouseOutFk
- AND (s.id <> ec.inventorySupplierFk OR vDate IS NULL)
+ AND (s.id <> ec.inventorySupplierFk OR vDate IS NULL)
AND b.itemFk = vItemFk
AND e.isExcludedFromAvailable = FALSE
AND w.isFeedStock = FALSE
@@ -62244,22 +61221,21 @@ BEGIN
TRUE,
s.id,
st.`order`,
- ct.`code`,
+ c.typeFk,
cb.claimFk,
NULL
FROM sale s
JOIN ticket t ON t.id = s.ticketFk
- LEFT JOIN ticketState ts ON ts.ticket = t.id
+ LEFT JOIN ticketState ts ON ts.ticketFk = t.id
LEFT JOIN state st ON st.`code` = ts.`code`
JOIN client c ON c.id = t.clientFk
- JOIN clientType ct ON ct.id = c.clientTypeFk
JOIN state st2 ON st2.`code` = IF(t.shipped < util.VN_CURDATE(),
- 'DELIVERED',
+ 'DELIVERED',
IF (t.shipped > util.dayEnd(util.VN_CURDATE()),
'FREE',
IFNULL(ts.code, 'FREE')))
LEFT JOIN state stPrep ON stPrep.`code` = 'PREPARED'
- LEFT JOIN saleTracking stk ON stk.saleFk = s.id
+ LEFT JOIN saleTracking stk ON stk.saleFk = s.id
AND stk.stateFk = stPrep.id
LEFT JOIN claimBeginning cb ON s.id = cb.saleFk
WHERE t.shipped >= vDateInventory
@@ -62275,7 +61251,7 @@ BEGIN
`out` DESC;
IF vDate IS NULL THEN
-
+
SET @a := 0;
SET @currentLineFk := 0;
SET @shipped := '';
@@ -62290,9 +61266,9 @@ BEGIN
`in` invalue,
`out`,
@a := @a + IFNULL(`in`, 0) - IFNULL(`out`, 0) balance,
- @currentLineFk := IF (@shipped < util.VN_CURDATE()
+ @currentLineFk := IF (@shipped < util.VN_CURDATE()
OR (@shipped = util.VN_CURDATE() AND (isPicked OR a.`code` >= 'ON_PREPARATION')),
- lineFk,
+ lineFk,
@currentLineFk) lastPreparedLineFk,
isTicket,
lineFk,
@@ -62324,25 +61300,25 @@ BEGIN
0 clientType,
0 claimFk
UNION ALL
- SELECT shipped,
- alertlevel,
- stateName,
- origin,
- reference,
- clientFk,
- name, `in`,
- `out`,
- @a := @a + IFNULL(`in`, 0) - IFNULL(`out`, 0),
- 0,
- isTicket,
- lineFk,
- isPicked,
- clientType,
+ SELECT shipped,
+ alertlevel,
+ stateName,
+ origin,
+ reference,
+ clientFk,
+ name, `in`,
+ `out`,
+ @a := @a + IFNULL(`in`, 0) - IFNULL(`out`, 0),
+ 0,
+ isTicket,
+ lineFk,
+ isPicked,
+ clientType,
claimFk
FROM tItemDiary
WHERE shipped >= vDate;
END IF;
-
+
DROP TEMPORARY TABLE tItemDiary;
END ;;
DELIMITER ;
@@ -62449,7 +61425,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `item_getLack`(IN vForce BOOLEAN, IN
BEGIN
/**
* Calcula una tabla con el máximo negativo visible para cada producto y almacen
- *
+ *
* @param vForce Fuerza el recalculo del stock
* @param vDays Numero de dias a considerar
**/
@@ -62457,42 +61433,48 @@ BEGIN
CALL `cache`.stock_refresh(vForce);
CALL item_getMinacum(NULL, util.VN_CURDATE(), vDays, NULL);
CALL item_getMinETD();
+ CALL item_zoneClosure();
- SELECT i.id itemFk,
+ SELECT i.id itemFk,
i.longName,
w.id warehouseFk,
- p.`name` producer,
+ p.`name` producer,
i.`size`,
i.category,
- w.name warehouse,
+ w.name warehouse,
SUM(IFNULL(sub.amount,0)) lack,
i.inkFk,
- IFNULL(im.timed, util.midnight()) timed
- FROM (SELECT item_id,
- warehouse_id,
+ IFNULL(im.timed, util.midnight()) timed,
+ IFNULL(izc.timed, util.midnight()) minTimed,
+ o.name originFk
+ FROM (SELECT item_id,
+ warehouse_id,
amount
FROM cache.stock
WHERE amount > 0
UNION ALL
- SELECT itemFk,
- warehouseFk,
+ SELECT itemFk,
+ warehouseFk,
amount
FROM tmp.itemMinacum
) sub
JOIN warehouse w ON w.id = sub.warehouse_id
JOIN item i ON i.id = sub.item_id
- LEFT JOIN producer p ON p.id = i.producerFk
- JOIN itemType it ON it.id = i.typeFk
+ LEFT JOIN producer p ON p.id = i.producerFk
+ JOIN itemType it ON it.id = i.typeFk
JOIN itemCategory ic ON ic.id = it.categoryFk
LEFT JOIN tmp.itemMinETD im ON im.itemFk = i.id
+ LEFT JOIN tmp.itemZoneClosure izc ON izc.itemFk = i.id
+ JOIN origin o ON o.id = i.originFk
WHERE w.isForTicket
- AND ic.display <> 0
+ AND ic.display
AND it.code != 'GEN'
GROUP BY i.id, w.id
HAVING lack < 0;
DROP TEMPORARY TABLE tmp.itemMinacum;
DROP TEMPORARY TABLE tmp.itemMinETD;
+ DROP TEMPORARY TABLE tmp.itemZoneClosure;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -62603,12 +61585,12 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `item_getMinETD`()
BEGIN
-
+
/* Devuelve una tabla temporal con la primera ETD, para todos los artículos con salida hoy.
- *
+ *
* @return tmp.itemMinETD(itemFk, timed)
*/
-
+
DECLARE vMidnight DATETIME DEFAULT util.midnight();
DROP TEMPORARY TABLE IF EXISTS tmp.itemMinETD;
@@ -62619,7 +61601,7 @@ BEGIN
SELECT s.itemFk, MIN(TIME(IFNULL(z.`hour`,vMidnight))) timed
FROM ticket t
JOIN sale s ON s.ticketFk = t.id
- LEFT JOIN `zone` z ON z.id = t.zoneFk
+ LEFT JOIN `zone` z ON z.id = t.zoneFk
WHERE t.shipped BETWEEN util.VN_CURDATE() AND vMidnight
GROUP BY s.itemFk;
END ;;
@@ -62638,87 +61620,98 @@ DELIMITER ;
/*!50003 SET character_set_results = utf8mb4 */ ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `item_getSimilar`(vItemFk INT, vWarehouseFk INT, vDate DATE, vIsShowedByType BOOL)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `item_getSimilar`(
+ vSelf INT,
+ vWarehouseFk INT,
+ vDated DATE,
+ vShowType BOOL
+)
BEGIN
-
/**
- * Propone articulos similares para posible cambio,
- * ordenado con la cantidad de veces usado y segun sus caracteristicas
- *
- * @param vItemFk item id
- * @param vWarehouseFk warehouse id
- * @param vDate fecha para revisar disponible
- * @param vIsShowedByType para mostrar solo artículos de ese tipo
- */
+* Propone articulos disponibles ordenados, con la cantidad
+* de veces usado y segun sus caracteristicas.
+*
+* @param vSelf Id de artículo
+* @param vWarehouseFk Id de almacen
+* @param vDated Fecha
+* @param vShowType Mostrar tipos
+*/
+ DECLARE vCalcFk INT;
+ DECLARE vTypeFk INT;
+ DECLARE vPriority INT DEFAULT 1;
- DECLARE vCalcFk INT;
- DECLARE vTypeFk INT;
+ CALL cache.available_refresh(vCalcFk, FALSE, vWarehouseFk, vDated);
- DECLARE vTag1 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
- DECLARE vTag5 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
- DECLARE vTag6 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
- DECLARE vTag7 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
- DECLARE vTag8 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
+ -- Añadido temporalmente para ver si ya no sucede el cuelgue de db
+ SET vShowType = TRUE;
- DECLARE vValue1 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
- DECLARE vValue5 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
- DECLARE vValue6 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
- DECLARE vValue7 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
- DECLARE vValue8 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
-
-
- SELECT typeFk, tag5, value5, tag6, value6, tag7, value7, tag8, value8, t1.name, it1.value
- INTO vTypeFk, vTag5, vValue5, vTag6, vValue6, vTag7, vValue7, vTag8, vValue8, vTag1, vValue1
- FROM vn.item i
- LEFT JOIN vn.itemTag it1 ON it1.itemFk = i.id AND it1.priority = 1
- LEFT JOIN vn.tag t1 ON t1.id = it1.tagFk
- WHERE i.id = vItemFk;
-
- CALL cache.available_refresh(vCalcFk, FALSE, vWarehouseFk, vDate);
-
- SELECT i.id itemFk,
- i.longName,
- i.subName,
- i.tag5,
- i.value5,
- (i.value5 <=> vValue5) match5,
- i.tag6,
- i.value6,
- (i.value6 <=> vValue6) match6,
- i.tag7,
- i.value7,
- (i.value7 <=> vValue7) match7,
- i.tag8,
- i.value8,
- (i.value8 <=> vValue8) match8,
- a.available,
- IFNULL(ip.counter,0) counter,
- IF(b.groupingMode = 1, b.grouping, b.packing) as minQuantity
- FROM vn.item i
- JOIN cache.available a ON a.item_id = i.id
- LEFT JOIN vn.itemProposal ip ON ip.mateFk = i.id AND ip.itemFk = vItemFk
- LEFT JOIN vn.itemTag it1 ON it1.itemFk = i.id AND it1.priority = 1
- LEFT JOIN vn.tag t1 ON t1.id = it1.tagFk
- LEFT JOIN cache.last_buy lb ON lb.item_id = i.id AND lb.warehouse_id = vWarehouseFk
+ WITH itemTags AS (
+ SELECT i.id,
+ typeFk,
+ tag5,
+ value5,
+ tag6,
+ value6,
+ tag7,
+ value7,
+ tag8,
+ value8,
+ t.name,
+ it.value
+ FROM vn.item i
+ LEFT JOIN vn.itemTag it ON it.itemFk = i.id
+ AND it.priority = vPriority
+ LEFT JOIN vn.tag t ON t.id = it.tagFk
+ WHERE i.id = vSelf
+ )
+ SELECT i.id itemFk,
+ i.longName,
+ i.subName,
+ i.tag5,
+ i.value5,
+ (i.value5 <=> its.value5) match5,
+ i.tag6,
+ i.value6,
+ (i.value6 <=> its.value6) match6,
+ i.tag7,
+ i.value7,
+ (i.value7 <=> its.value7) match7,
+ i.tag8,
+ i.value8,
+ (i.value8 <=> its.value8) match8,
+ a.available,
+ IFNULL(ip.counter, 0) `counter`,
+ IF(b.groupingMode = 1, b.grouping, b.packing) minQuantity,
+ iss.visible located
+ FROM vn.item i
+ JOIN cache.available a ON a.item_id = i.id
+ AND a.calc_id = vCalcFk
+ LEFT JOIN vn.itemProposal ip ON ip.mateFk = i.id
+ AND ip.itemFk = vSelf
+ LEFT JOIN vn.itemTag it ON it.itemFk = i.id
+ AND it.priority = vPriority
+ LEFT JOIN vn.tag t ON t.id = it.tagFk
+ LEFT JOIN cache.last_buy lb ON lb.item_id = i.id
+ AND lb.warehouse_id = vWarehouseFk
LEFT JOIN vn.buy b ON b.id = lb.buy_id
- WHERE a.calc_id = vCalcFk
- AND available > 0
- AND IF(vIsShowedByType, i.typeFk = vTypeFk, TRUE)
- AND i.id != vItemFk
- ORDER BY counter DESC,
- (t1.name = vTag1) DESC,
- (it1.value = vValue1) DESC,
- (i.tag6 = vTag6) DESC,
- (i.value6 = vValue6) DESC,
- (i.tag5 = vTag5) DESC,
- (i.value5 = vValue5) DESC,
- (i.tag7 = vTag7) DESC,
- (i.value7 = vValue7) DESC,
- (i.tag8 = vTag8) DESC,
- (i.value8 = vValue8) DESC
- LIMIT 30;
-
-
+ LEFT JOIN vn.itemShelvingStock iss ON iss.itemFk = i.id
+ AND iss.warehouseFk = vWarehouseFk
+ JOIN itemTags its
+ WHERE a.available > 0
+ AND IF(vShowType, i.typeFk = its.typeFk, TRUE)
+ AND i.id <> vSelf
+ ORDER BY `counter` DESC,
+ (t.name = its.name) DESC,
+ (it.value = its.value) DESC,
+ (i.tag5 = its.tag5) DESC,
+ match5 DESC,
+ (i.tag6 = its.tag6) DESC,
+ match6 DESC,
+ (i.tag7 = its.tag7) DESC,
+ match7 DESC,
+ (i.tag8 = its.tag8) DESC,
+ match8 DESC
+ LIMIT 100;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -62868,6 +61861,108 @@ DELIMITER ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `item_multipleBuy` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `item_multipleBuy`(
+ vDate DATETIME,
+ vWarehouseFk INT
+)
+BEGIN
+/**
+ * Updates the tmp.itemInventory table, adding the buy id.
+ *
+ * @param tmp.itemInventory(buy_id)
+ * @param vDate -> Date of the purchase operation.
+ * @param vWarehouseFk -> Identifier of the warehouse (warehouseId).
+ */
+ ALTER TABLE tmp.itemInventory ADD IF NOT EXISTS buy_id INT;
+
+ CALL buyUltimate(vWarehouseFk, vDate);
+
+ CREATE OR REPLACE TEMPORARY TABLE tmp
+ (KEY (itemFk))
+ ENGINE = MEMORY
+ SELECT *
+ FROM (
+ SELECT itemFk, buyFk
+ FROM tmp.buyUltimate
+ ORDER BY (vWarehouseFk = warehouseFk) DESC, landing DESC
+ LIMIT 10000000000000000000
+ ) t
+ GROUP BY itemFk;
+
+ UPDATE tmp.itemInventory ai
+ JOIN tmp t ON ai.id = t.itemFk
+ SET ai.buy_id = t.buyFk;
+
+ DROP TEMPORARY TABLE tmp, tmp.buyUltimate;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `item_multipleBuyByDate` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `item_multipleBuyByDate`(
+ vDated DATETIME,
+ vWarehouseFk TINYINT(3)
+)
+BEGIN
+/**
+ * Updates the tmp.itemInventory table, adding the purchase date.
+ *
+ * @param tmp.itemInventory(buy_date)
+ * @param vDated -> end date
+ * @param vWarehouseFk -> warehouse id
+ */
+ DECLARE vLastBuyScope INT;
+ SELECT comparativeLastBuyScope INTO vLastBuyScope
+ FROM config;
+
+ ALTER TABLE tmp.itemInventory
+ ADD `buy_date` datetime NOT NULL;
+
+ CREATE OR REPLACE TEMPORARY TABLE lastBuyScope
+ SELECT i.id, MAX(t.landed) lastLanded
+ FROM item i
+ JOIN buy b ON b.itemFk = i.id
+ JOIN entry e ON e.id = b.entryFk
+ JOIN travel t ON t.id = e.travelFk
+ JOIN supplier s ON s.id = e.supplierFk
+ JOIN warehouse w ON w.id = t.warehouseInFk
+ WHERE t.landed BETWEEN (vDated + INTERVAL - vLastBuyScope DAY) AND vDated
+ AND NOT s.name = 'INVENTARIO'
+ AND (vWarehouseFk IS NULL OR t.warehouseInFk = vWarehouseFk)
+ AND w.isComparative
+ AND NOT e.isRaid
+ GROUP BY i.id;
+
+ UPDATE tmp.itemInventory y
+ JOIN lastBuyScope lbs ON lbs.id = y.id
+ SET y.buy_date = lbs.lastLanded;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `item_refreshFromTags` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
@@ -62915,7 +62010,7 @@ BEGIN
),
i.subname = JSON_VALUE(vValues, '$.4'),
i.size = JSON_VALUE(vOverwrites, '$.size'),
- i.stems = JSON_VALUE(vOverwrites, '$.stems'),
+ i.stems = IFNULL(JSON_VALUE(vOverwrites, '$.stems'),i.stems),
i.category = JSON_VALUE(vOverwrites, '$.category'),
i.tag5 = JSON_VALUE(vTags, '$.5'),
i.tag6 = JSON_VALUE(vTags, '$.6'),
@@ -63002,11 +62097,11 @@ BEGIN
* @param vBarcode del item
* @param vReference referencia a actualizar
*/
-
+
DECLARE vItemFk INT;
SELECT barcodeToItem(vBarcode) INTO vItemFk;
-
+
UPDATE item SET comment = vReference WHERE id = vItemFk;
END ;;
@@ -63029,7 +62124,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `item_setGeneric`(vSelf INT)
BEGIN
/**
* Asigna el código genérico a un item, salvo que sea un código de item genérico.
- *
+ *
* @param vSelf identificador de vn.item
*/
DECLARE vGenericFk INT;
@@ -63039,7 +62134,7 @@ BEGIN
SELECT itemFk, SUM(matches) = maxMatches `match`
FROM (
SELECT ga.id gaid, ga.itemFk,
- CASE
+ CASE
WHEN t.code = 'nflowers' THEN
it.value <=> ga.numFlores
WHEN t.code = 'origin' THEN
@@ -63070,13 +62165,13 @@ BEGIN
AND (i.`size` = ga.`size` OR ga.`size` IS NULL)
AND i.id != ga.itemFk
WHERE i.id = vSelf
- AND NOT i.isFloramondo) sub
+ AND NOT i.isFloramondo) sub
GROUP BY gaid
HAVING `match`) sub2
LIMIT 1;
- UPDATE vn.item
- SET genericFk = vGenericFk
+ UPDATE vn.item
+ SET genericFk = vGenericFk
WHERE id = vSelf;
END ;;
DELIMITER ;
@@ -63085,29 +62180,90 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `item_updatePackingShelve` */;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `item_setVisibleDiscard` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `item_updatePackingShelve`(vSelf INT, vPacking INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `item_setVisibleDiscard`(
+ vItemFk INT,
+ vWarehouseFk INT,
+ vQuantity INT,
+ vAddressFk INT)
BEGIN
+/**
+ * Procedimiento para dar dar de baja/alta un item, si vAddressFk es NULL se entiende que se da de alta y se toma el addressFk de la configuración
+ *
+ * @param vItemFk Identificador del ítem
+ * @param vWarehouseFk id del warehouse
+ * @param vQuantity a dar de alta/baja
+ * @param vAddressFk id address
+ */
+ DECLARE vTicketFk INT;
+ DECLARE vClientFk INT;
+ DECLARE vDefaultCompanyFk INT;
+ DECLARE vCalc INT;
+ DECLARE vAddressShortage INT;
- /**
- * Actualiza el valor de item.packingShelve
- *
- * @param vSelf Identificador de vn.item
- * @param vPacking Cantidad de unidades de venta que caben en una bandeja
- */
+ SELECT barcodeToItem(vItemFk) INTO vItemFk;
- UPDATE vn.item i
- SET i.packingShelve = vPacking
- WHERE i.id = vSelf;
+ SELECT DEFAULT(companyFk) INTO vDefaultCompanyFk
+ FROM vn.ticket LIMIT 1;
+
+ IF vAddressFk IS NULL THEN
+ SELECT pc.shortageAddressFk INTO vAddressShortage
+ FROM productionConfig pc ;
+ ELSE
+ SET vAddressShortage = vAddressFk;
+ END IF;
+ SELECT a.clientFk INTO vClientFk
+ FROM address a
+ WHERE a.id = vAddressFk;
+
+ SELECT t.id INTO vTicketFk
+ FROM ticket t
+ JOIN address a ON a.id = t.addressFk
+ JOIN ticketState ts ON ts.ticketFk = t.id
+ WHERE t.warehouseFk = vWarehouseFk
+ AND a.id = vAddressShortage
+ AND DATE(t.shipped) = util.VN_CURDATE()
+ AND ts.code = 'DELIVERED'
+ LIMIT 1;
+
+ CALL cache.visible_refresh(vCalc, TRUE, vWarehouseFk);
+
+ IF vTicketFk IS NULL THEN
+ CALL ticket_add(
+ vClientFk,
+ util.VN_CURDATE(),
+ vWarehouseFk,
+ vDefaultCompanyFk,
+ vAddressFk,
+ NULL,
+ NULL,
+ util.VN_CURDATE(),
+ account.myUser_getId(),
+ FALSE,
+ vTicketFk);
+ END IF;
+
+ INSERT INTO sale(ticketFk, itemFk, concept, quantity)
+ SELECT vTicketFk,
+ vItemFk,
+ CONCAT(longName,' ', worker_getCode(), ' ', LEFT(CAST(util.VN_NOW() AS TIME),5)),
+ vQuantity
+ FROM item
+ WHERE id = vItemFk;
+
+ UPDATE cache.visible
+ SET visible = visible - vQuantity
+ WHERE calc_id = vCalc
+ AND item_id = vItemFk;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -63150,195 +62306,278 @@ DELIMITER ;
/*!50003 SET character_set_results = utf8mb4 */ ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `item_ValuateInventory`(IN vDated DATE, IN vIsDetailed BOOLEAN)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `item_ValuateInventory`(vDated DATE, vIsDetailed BOOLEAN)
BEGIN
+ DECLARE vInventoried DATE;
+ DECLARE vHasNotInventory BOOLEAN DEFAULT FALSE;
+ DECLARE vInventoryClone DATE;
+ DECLARE vDateDayEnd DATETIME;
+ DECLARE vInventorySupplierFk INT;
- DECLARE vInventoried DATE;
- DECLARE vHasNotInventory BOOLEAN DEFAULT FALSE;
- DECLARE vInventoried2 DATE;
- DECLARE vDateDayEnd DATETIME;
+ SELECT inventorySupplierFk INTO vInventorySupplierFk
+ FROM entryConfig;
- SET vDateDayEnd = util.dayEnd(vDated);
+ SET vDateDayEnd = util.dayEnd(vDated);
- SELECT landed INTO vInventoried
- FROM travel tr
- JOIN entry E ON E.travelFk = tr.id
- WHERE landed <= vDateDayEnd
- AND E.supplierFk = 4
- ORDER BY landed DESC
- LIMIT 1;
+ SELECT tr.landed INTO vInventoried
+ FROM travel tr
+ JOIN `entry` e ON e.travelFk = tr.id
+ JOIN entryConfig ec
+ WHERE landed <= vDateDayEnd
+ AND e.supplierFk = vInventorySupplierFk
+ ORDER BY tr.landed DESC
+ LIMIT 1;
- SET vHasNotInventory = IF (vInventoried is null, TRUE, FALSE);
+ SET vHasNotInventory = (vInventoried IS NULL);
+
+ IF vHasNotInventory THEN
+ SELECT landed INTO vInventoryClone
+ FROM travel tr
+ JOIN `entry` e ON e.travelFk = tr.id
+ JOIN entryConfig ec
+ WHERE landed >= vDated
+ AND e.supplierFk = vInventorySupplierFk
+ ORDER BY landed ASC
+ LIMIT 1;
- IF vHasNotInventory THEN
+ SET vInventoried = vDated + INTERVAL 1 DAY;
+ SET vDateDayEnd = vInventoryClone;
+ END IF;
- SELECT landed INTO vInventoried2
- FROM travel tr
- JOIN entry E ON E.travelFk = tr.id
- WHERE landed >= vDated
- AND E.supplierFk = 4
- ORDER BY landed ASC
- LIMIT 1;
+ CREATE OR REPLACE TEMPORARY TABLE tInventory(
+ warehouseFk SMALLINT,
+ itemFk BIGINT,
+ quantity INT,
+ cost DOUBLE DEFAULT 0,
+ total DOUBLE DEFAULT 0,
+ warehouseInventory VARCHAR(20),
+ PRIMARY KEY (warehouseInventory, itemFk) USING HASH
+ )
+ ENGINE = MEMORY;
+
+ -- Inventario inicial
+ IF vHasNotInventory THEN
+ INSERT INTO tInventory(warehouseFk, itemFk, quantity, warehouseInventory)
+ SELECT tr.warehouseInFk,
+ b.itemFk,
+ SUM(b.quantity),
+ w.name
+ FROM buy b
+ JOIN item i ON i.id = b.itemFk
+ JOIN `entry` e ON e.id = b.entryFk
+ JOIN travel tr ON tr.id = e.travelFk
+ JOIN itemType t ON t.id = i.typeFk
+ JOIN warehouse w ON w.id = warehouseInFk
+ JOIN entryConfig ec
+ WHERE landed = vDateDayEnd
+ AND e.supplierFk = vInventorySupplierFk
+ AND w.valuatedInventory
+ AND t.isInventory
+ GROUP BY tr.warehouseInFk, b.itemFk;
+ ELSE
+ INSERT INTO tInventory(warehouseFk, itemFk, quantity, warehouseInventory)
+ SELECT tr.warehouseInFk,
+ b.itemFk,
+ SUM(b.quantity),
+ w.name
+ FROM buy b
+ JOIN item i ON i.id = b.itemFk
+ JOIN `entry` e ON e.id = b.entryFk
+ JOIN travel tr ON tr.id = e.travelFk
+ JOIN itemType t ON t.id = i.typeFk
+ JOIN warehouse w ON w.id = warehouseInFk
+ JOIN entryConfig ec
+ WHERE landed = vInventoried
+ AND e.supplierFk = vInventorySupplierFk
+ AND w.valuatedInventory
+ AND t.isInventory
+ GROUP BY tr.warehouseInFk, b.itemFk;
+ END IF;
- SET vInventoried = TIMESTAMPADD(DAY,1,vDated);
- SET vDateDayEnd = vInventoried2;
+ -- Añadimos las entradas
+ INSERT INTO tInventory(warehouseFk, itemFk, quantity, warehouseInventory)
+ SELECT tr.warehouseInFk,
+ b.itemFk,
+ b.quantity * IF(vHasNotInventory, -1, 1),
+ w.name
+ FROM buy b
+ JOIN item i ON i.id = b.itemFk
+ JOIN `entry` e ON e.id = b.entryFk
+ JOIN travel tr ON tr.id = e.travelFk
+ JOIN itemType t ON t.id = i.typeFk
+ JOIN warehouse w ON w.id = tr.warehouseInFk
+ JOIN entryConfig ec
+ WHERE tr.landed BETWEEN vInventoried AND vDateDayEnd
+ AND IF(tr.landed = util.VN_CURDATE(), tr.isReceived, TRUE)
+ AND NOT e.isRaid
+ AND w.valuatedInventory
+ AND t.isInventory
+ AND e.supplierFk <> vInventorySupplierFk
+ ON DUPLICATE KEY UPDATE tInventory.quantity = tInventory.quantity + (b.quantity * IF(vHasNotInventory, -1, 1));
- END IF;
+ -- Descontamos las salidas
+ INSERT INTO tInventory(warehouseFk, itemFk, quantity, warehouseInventory)
+ SELECT tr.warehouseOutFk,
+ b.itemFk,
+ b.quantity * IF(vHasNotInventory, 1, -1),
+ w.name
+ FROM buy b
+ JOIN item i ON i.id = b.itemFk
+ JOIN `entry` e ON e.id = b.entryFk
+ JOIN travel tr ON tr.id = e.travelFk
+ JOIN itemType t ON t.id = i.typeFk
+ JOIN warehouse w ON w.id = tr.warehouseOutFk
+ WHERE tr.shipped BETWEEN vInventoried AND vDateDayEnd
+ AND NOT e.isRaid
+ AND w.valuatedInventory
+ AND t.isInventory
+ ON DUPLICATE KEY UPDATE tInventory.quantity = tInventory.quantity + (b.quantity * IF(vHasNotInventory,1,-1));
- DROP TEMPORARY TABLE IF EXISTS inv;
+ -- Descontamos las lineas de venta
+ INSERT INTO tInventory(warehouseFk, itemFk, quantity, warehouseInventory)
+ SELECT w.id,
+ s.itemFk,
+ s.quantity * IF(vHasNotInventory, 1, -1),
+ w.name
+ FROM sale s
+ JOIN ticket t ON t.id = s.ticketFk
+ JOIN `client` c ON c.id = t.clientFk
+ JOIN item i ON i.id = s.itemFk
+ JOIN itemType it ON it.id = i.typeFk
+ JOIN warehouse w ON w.id = t.warehouseFk
+ WHERE t.shipped BETWEEN vInventoried AND vDateDayEnd
+ AND w.valuatedInventory
+ AND it.isInventory
+ ON DUPLICATE KEY UPDATE tInventory.quantity = tInventory.quantity + s.quantity * IF(vHasNotInventory, 1, -1);
- CREATE TEMPORARY TABLE inv
- (warehouseFk SMALLINT,
- Id_Article BIGINT,
- cantidad INT,
- coste DOUBLE DEFAULT 0,
- total DOUBLE DEFAULT 0,
- Almacen VARCHAR(20),
- PRIMARY KEY (Almacen, Id_Article) USING HASH)
- ENGINE = MEMORY;
+ -- Volver a poner lo que esta aun en las estanterias
+ IF vDated = util.VN_CURDATE() THEN
+ INSERT INTO tInventory(warehouseFk, itemFk, quantity, warehouseInventory)
+ SELECT w.id,
+ s.itemFk,
+ s.quantity * IF(vHasNotInventory, 0, 1),
+ w.name
+ FROM sale s
+ JOIN ticket t ON t.id = s.ticketFk
+ JOIN `client` c ON c.id = t.clientFk
+ JOIN item i ON i.id = s.itemFk
+ JOIN itemType it ON it.id = i.typeFk
+ JOIN warehouse w ON w.id = t.warehouseFk
+ WHERE t.shipped BETWEEN vDated AND vDateDayEnd
+ AND NOT (s.isPicked OR t.isLabeled)
+ AND w.valuatedInventory
+ AND it.isInventory
+ ON DUPLICATE KEY UPDATE tInventory.quantity = tInventory.quantity + s.quantity * IF(vHasNotInventory, 0, 1);
+ END IF;
- IF vHasNotInventory = TRUE THEN
+ -- Mercancia en transito
+ INSERT INTO tInventory(warehouseFk, itemFk, quantity, warehouseInventory)
+ SELECT tr.warehouseInFk,
+ b.itemFk,
+ b.quantity,
+ CONCAT(wOut.`name`, ' - ', wIn.`name`)
+ FROM buy b
+ JOIN item i ON i.id = b.itemFk
+ JOIN `entry` e ON e.id = b.entryFk
+ JOIN travel tr ON tr.id = e.travelFk
+ JOIN itemType t ON t.id = i.typeFk
+ JOIN warehouse wIn ON wIn.id = tr.warehouseInFk
+ JOIN warehouse wOut ON wOut.id = tr.warehouseOutFk
+ WHERE vDated >= tr.shipped AND vDated < tr.landed
+ AND NOT isRaid
+ AND wIn.valuatedInventory
+ AND t.isInventory
+ AND e.isConfirmed
+ ON DUPLICATE KEY UPDATE tInventory.quantity = tInventory.quantity + (b.quantity);
+
+ CALL vn.buyUltimate(NULL, vDateDayEnd);
- INSERT INTO inv(warehouseFk, Id_Article, cantidad, Almacen)
- SELECT tr.warehouseInFk, b.itemFk, SUM(b.quantity), w.`name`
- FROM buy b
- JOIN item i ON i.id = b.itemFk
- JOIN entry e ON e.id = b.entryFk
- JOIN travel tr ON tr.id = e.travelFk
- JOIN itemType t ON t.id = i.typeFk
- JOIN warehouse w ON w.id = warehouseInFk
- WHERE landed = vDateDayEnd
- AND e.supplierFk = 4
- AND w.valuatedInventory
- AND t.isInventory
- GROUP BY tr.warehouseInFk, b.itemFk;
+ UPDATE tInventory i
+ JOIN tmp.buyUltimate bu ON i.warehouseFk = bu.warehouseFk AND i.itemFk = bu.itemFk
+ JOIN buy b ON b.id = bu.buyFk
+ SET total = i.quantity * (IFNULL(b.buyingValue, 0) + IFNULL(b.packageValue, 0) + IFNULL(b.freightValue, 0) + IFNULL(b.comissionValue, 0)),
+ cost = IFNULL(b.buyingValue, 0) + IFNULL(b.packageValue, 0) + IFNULL(b.freightValue, 0) + IFNULL(b.comissionValue, 0)
+ WHERE i.quantity;
- END IF;
+ DELETE FROM tInventory
+ WHERE quantity IS NULL OR NOT quantity;
- INSERT INTO inv(warehouseFk, Id_Article, cantidad, Almacen)
- SELECT tr.warehouseInFk, b.itemFk, b.quantity * IF(vHasNotInventory,-1,1), w.`name`
- FROM buy b
- JOIN item i ON i.id = b.itemFk
- JOIN entry e ON e.id = b.entryFk
- JOIN travel tr ON tr.id = e.travelFk
- JOIN itemType t ON t.id = i.typeFk
- JOIN warehouse w ON w.id = tr.warehouseInFk
- WHERE tr.landed BETWEEN vInventoried AND vDateDayEnd
- AND IF(tr.landed = util.VN_CURDATE(), tr.isReceived, trUE)
- AND NOT e.isRaid
- AND w.valuatedInventory
- AND t.isInventory
- ON DUPLICATE KEY UPDATE inv.cantidad = inv.cantidad + (b.quantity * IF(vHasNotInventory,-1,1));
-
- INSERT INTO inv(warehouseFk, Id_Article, cantidad, Almacen)
- SELECT tr.warehouseOutFk, b.itemFk, b.quantity * IF(vHasNotInventory,1,-1), w.`name`
- FROM buy b
- JOIN item i ON i.id = b.itemFk
- JOIN entry e ON e.id = b.entryFk
- JOIN travel tr ON tr.id = e.travelFk
- JOIN itemType t ON t.id = i.typeFk
- JOIN warehouse w ON w.id = tr.warehouseOutFk
- WHERE tr.shipped BETWEEN vInventoried AND vDateDayEnd
- AND NOT e.isRaid
- AND w.valuatedInventory
- AND t.isInventory
- ON DUPLICATE KEY UPDATE inv.cantidad = inv.cantidad + (b.quantity * IF(vHasNotInventory,1,-1));
-
- INSERT INTO inv(warehouseFk, Id_Article, cantidad, Almacen)
- SELECT w.id, s.itemFk, s.quantity * IF(vHasNotInventory,1,-1), w.`name`
- FROM sale s
- JOIN ticket t ON t.id = s.ticketFk
- JOIN `client` c ON c.id = t.clientFk
- JOIN item i ON i.id = s.itemFk
- JOIN itemType it ON it.id = i.typeFk
- JOIN warehouse w ON w.id = t.warehouseFk
- WHERE t.shipped BETWEEN vInventoried AND vDateDayEnd
- AND w.valuatedInventory
- AND it.isInventory
- ON DUPLICATE KEY UPDATE inv.cantidad = inv.cantidad + s.quantity * IF(vHasNotInventory,1,-1);
-
- IF vDated = util.VN_CURDATE() THEN -- volver a poner lo que esta aun en las estanterias
-
- INSERT INTO inv(warehouseFk, Id_Article, cantidad, Almacen)
- SELECT w.id, s.itemFk, s.quantity * IF(vHasNotInventory,0,1), w.`name`
- FROM sale s
- JOIN ticket t ON t.id = s.ticketFk
- JOIN `client` c ON c.id = t.clientFk
- JOIN item i ON i.id = s.itemFk
- JOIN itemType it ON it.id = i.typeFk
- JOIN warehouse w ON w.id = t.warehouseFk
- WHERE t.shipped BETWEEN vDated AND vDateDayEnd
- AND (s.isPicked <> 0 or t.isLabeled <> 0 )
- AND w.valuatedInventory
- AND it.isInventory
- ON DUPLICATE KEY UPDATE inv.cantidad = inv.cantidad + s.quantity * IF(vHasNotInventory,0,1);
-
- END IF;
-
- -- Mercancia en transito
- INSERT INTO inv(warehouseFk, Id_Article, cantidad, Almacen)
- SELECT tr.warehouseInFk, b.itemFk, b.quantity, CONCAT(wOut.`name`,' - ', wIn.`name`)
- FROM buy b
- JOIN item i ON i.id = b.itemFk
- JOIN entry e ON e.id = b.entryFk
- JOIN travel tr ON tr.id = e.travelFk
- JOIN itemType t ON t.id = i.typeFk
- JOIN warehouse wIn ON wIn.id = tr.warehouseInFk
- JOIN warehouse wOut ON wOut.id = tr.warehouseOutFk
- WHERE vDated >= tr.shipped AND vDated < tr.landed
- AND NOT isRaid
- AND wIn.valuatedInventory
- AND t.isInventory
- AND e.isConfirmed
- ON DUPLICATE KEY UPDATE inv.cantidad = inv.cantidad + (b.quantity);
-
- CALL vn.buyUltimate(NULL,vDateDayEnd);
-
- UPDATE inv i
- JOIN tmp.buyUltimate bu ON i.warehouseFk = bu.warehouseFk AND i.Id_Article = bu.itemFk
- JOIN buy b ON b.id = bu.buyFk
- SET total = i.cantidad * (ifnull(b.buyingValue,0) + IFNULL(b.packageValue,0) + IFNULL(b.freightValue,0) + IFNULL(b.comissionValue,0)),
- coste = ifnull(b.buyingValue,0) + IFNULL(b.packageValue,0) + IFNULL(b.freightValue,0) + IFNULL(b.comissionValue,0)
- WHERE i.cantidad <> 0;
-
- DELETE FROM inv WHERE Cantidad IS NULL or Cantidad = 0;
-
- IF vIsDetailed THEN
-
- SELECT inv.warehouseFk,
- i.id itemFk,
- i.longName ,
- i.size,
- inv.Cantidad,
- tp.name Tipo,
- ic.name Reino,
- inv.coste,
- cast(inv.total as decimal(10,2)) total,
- almacen
- FROM inv
- JOIN warehouse w on w.id = warehouseFk
- JOIN item i ON i.id = inv.Id_Article
- JOIN itemType tp ON tp.id = i.typeFk
- JOIN itemCategory ic ON ic.id = tp.categoryFk
- WHERE w.valuatedInventory
- and inv.total > 0
- order by inv.total desc;
-
- ELSE
-
- SELECT i.Almacen, ic.name as Reino, cast(i.total as decimal(10,2)) as Euros, w.code as Comprador,it.id
- FROM inv i
- JOIN warehouse wh on wh.id = warehouseFk
- JOIN item it ON it.id = i.Id_Article
- JOIN itemType itp ON itp.id = it.typeFk
- LEFT JOIN worker w ON w.id = itp.workerFk
- JOIN itemCategory ic ON ic.id = itp.categoryFk
+ IF vIsDetailed THEN
+ SELECT ti.warehouseFk,
+ i.id itemFk,
+ i.longName,
+ i.size,
+ ti.quantity,
+ tp.name Tipo,
+ ic.name Reino,
+ ti.cost,
+ CAST(ti.total AS DECIMAL(10, 2)) total,
+ ti.warehouseInventory almacen
+ FROM tInventory ti
+ JOIN warehouse w ON w.id = warehouseFk
+ JOIN item i ON i.id = ti.itemFk
+ JOIN itemType tp ON tp.id = i.typeFk
+ JOIN itemCategory ic ON ic.id = tp.categoryFk
+ WHERE w.valuatedInventory
+ AND ti.total > 0
+ ORDER BY ti.total DESC;
+ ELSE
+ SELECT i.warehouseInventory Almacen,
+ ic.name Reino,
+ CAST(i.total AS DECIMAL(10, 2)) Euros,
+ w.code Comprador,
+ it.id
+ FROM tInventory i
+ JOIN warehouse wh ON wh.id = warehouseFk
+ JOIN item it ON it.id = i.itemFk
+ JOIN itemType itp ON itp.id = it.typeFk
+ LEFT JOIN worker w ON w.id = itp.workerFk
+ JOIN itemCategory ic ON ic.id = itp.categoryFk
WHERE wh.valuatedInventory
- AND i.total > 0;
+ AND i.total > 0;
+ END IF;
- END IF;
- DROP TEMPORARY TABLE tmp.buyUltimate;
- DROP TEMPORARY TABLE inv;
+ DROP TEMPORARY TABLE
+ tmp.buyUltimate,
+ tInventory;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `item_zoneClosure` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `item_zoneClosure`()
+BEGIN
+
+/* Devuelve una tabla temporal con la hora minima de un ticket sino tiene el de la zoneClosure y
+ * si tampoco hay el de la zona , para todos los artículos con salida hoy.
+ *
+ * @return tmp.itemZoneClosure(itemFk, timed)
+ */
+
+ CREATE OR REPLACE TEMPORARY TABLE tmp.itemZoneClosure
+ (INDEX (itemFk))
+ ENGINE = MEMORY
+ SELECT s.itemFk,
+ MIN(DATE_FORMAT(IF(HOUR(t.shipped),t.shipped,
+ IFNULL(zc.hour, z.HOUR)), '%H:%i')
+ )timed
+ FROM ticket t
+ JOIN sale s ON s.ticketFk = t.id
+ LEFT JOIN `zone` z ON z.id = t.zoneFk
+ LEFT JOIN vn.zoneClosure zc ON zc.zoneFk = t.zoneFk
+ WHERE t.shipped BETWEEN util.VN_CURDATE() AND CONCAT(util.VN_CURDATE(), ' 23:59:59')
+ GROUP BY s.itemFk;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -63366,37 +62605,37 @@ BEGIN
* @param vConcept descripcion
* @param vAmount cantidad que se compensa
* @param vCompany empresa
- * @param vOriginalAccount cuenta contable desde la cual se compensa
- *
- */
+ * @param vOriginalAccount cuenta contable desde la cual se compensa
+ *
+ */
DECLARE vNewBookEntry INT;
DECLARE vIsClientCompensation INT;
DECLARE vClientFk INT;
DECLARE vSupplierFk INT;
DECLARE vIsOriginalAClient BOOL;
DECLARE vPayMethodCompensation INT;
-
+
CALL ledger_next(vNewBookEntry);
SELECT COUNT(id) INTO vIsOriginalAClient FROM client WHERE accountingAccount LIKE vOriginalAccount COLLATE utf8_general_ci;
- SELECT id, COUNT(id) INTO vClientFk, vIsClientCompensation
- FROM client
+ SELECT id, COUNT(id) INTO vClientFk, vIsClientCompensation
+ FROM client
WHERE accountingAccount LIKE vCompensationAccount COLLATE utf8_general_ci;
-
+
SET @vAmount1:= 0.0;
SET @vAmount2:= 0.0;
- INSERT INTO XDiario (ASIEN, FECHA, SUBCTA, CONTRA, CONCEPTO, EURODEBE, EUROHABER, empresa_id)
- VALUES ( vNewBookEntry,
- vDated,
- vOriginalAccount,
- vCompensationAccount,
- vConcept,
+ INSERT INTO XDiario (ASIEN, FECHA, SUBCTA, CONTRA, CONCEPTO, EURODEBE, EUROHABER, empresa_id)
+ VALUES ( vNewBookEntry,
+ vDated,
+ vOriginalAccount,
+ vCompensationAccount,
+ vConcept,
@vAmount1:= IF(
- (vIsOriginalAClient AND vAmount > 0) OR
- (NOT vIsOriginalAClient AND vAmount < 0),
- 0,
+ (vIsOriginalAClient AND vAmount > 0) OR
+ (NOT vIsOriginalAClient AND vAmount < 0),
+ 0,
ABS(vAmount)
),
@vAmount2:= IF(@vAmount1,
@@ -63405,20 +62644,20 @@ BEGIN
),
vCompanyFk
),
- ( vNewBookEntry,
- vDated,
- vCompensationAccount,
- vOriginalAccount,
- vConcept,
+ ( vNewBookEntry,
+ vDated,
+ vCompensationAccount,
+ vOriginalAccount,
+ vConcept,
@vAmount2,
@vAmount1,
vCompanyFk);
-
+
IF vIsClientCompensation THEN
IF vIsOriginalAClient THEN
SET vAmount = -vAmount;
END IF;
- INSERT INTO receipt(invoiceFk, amountPaid, payed, bankFk, companyFk, clientFk, isConciliate)
+ INSERT INTO receipt(invoiceFk, amountPaid, payed, bankFk, companyFk, clientFk, isConciliate)
VALUES (vConcept, vAmount, vDated, vBankFk, vCompanyFk, vClientFk, TRUE);
ELSE
IF NOT vIsOriginalAClient THEN
@@ -63426,7 +62665,7 @@ BEGIN
END IF;
SELECT id INTO vSupplierFk FROM supplier WHERE `account` LIKE vCompensationAccount COLLATE utf8_general_ci;
SELECT id INTO vPayMethodCompensation FROM payMethod WHERE `code` = 'compensation';
-
+
INSERT INTO payment (received, dueDated, supplierFk, amount, bankFk, payMethodFk, concept, companyFk, isConciliated)
VALUES(vDated, vDated, vSupplierFk, vAmount, vBankFk, vPayMethodCompensation, vConcept, vCompanyFk, TRUE);
END IF;
@@ -63448,10 +62687,10 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `ledger_next`(OUT vNewBookEntry INT)
BEGIN
-
+
UPDATE vn.ledgerConfig SET lastBookEntry = LAST_INSERT_ID(lastBookEntry + 1);
SET vNewBookEntry = LAST_INSERT_ID();
-
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -63477,15 +62716,15 @@ BEGIN
* @param vEntity Nombre que hace referencia a la tabla.
*/
DECLARE vTableName VARCHAR(45);
-
+
SET vTableName = CONCAT(vEntity, 'Log');
-
+
SET @qryLog := CONCAT(
'SELECT ot.id, ot.originFk, ot.userFk, u.name, ot.action, ot.creationDate, ot.description FROM ', vTableName, ' AS ot',
' INNER JOIN account.user u ON u.id = ot.userFk',
' WHERE ot.originFk = ', vOriginFk, ' ORDER BY ot.creationDate DESC'
);
-
+
PREPARE stmt FROM @qryLog;
EXECUTE stmt;
END ;;
@@ -63510,9 +62749,9 @@ BEGIN
SET @buildingOrder := 0;
SET @route := 0;
set @cajas := 0;
-
+
UPDATE tmp.sorter
- SET buildingOrder = @buildingOrder := IF(@route = @route := routeFk, @buildingOrder, 0) + 1
+ SET buildingOrder = @buildingOrder := IF(@route = @route := routeFk, @buildingOrder, 0) + 1
where date(created) = vDate
order by routeFk, created, weight DESC;
@@ -63530,23 +62769,23 @@ set @cajas := 0;
UPDATE tmp.sorter
SET lungGrow = IF(palletOrder = 0, -13, lungGrow);
-
+
DELETE FROM tmp.lungSize WHERE dia = vDate;
-
+
INSERT INTO tmp.lungSize(dia, hora,size)
select vDate,hora, @cajas := @cajas + cajas as size
from
(
select IF(lungGrow BETWEEN -12 AND -1, ETD,time_format(created,"%H:%i")) as hora, sum(if(lungGrow <= 0, lungGrow, 1)) as cajas, @cajas := 0
- from tmp.sorter
+ from tmp.sorter
where date(created) = vDate
group by hora
) sub;
-
+
SELECT * FROM tmp.lungSize
WHERE dia = vDate;
-
-
+
+
END ;;
@@ -63567,23 +62806,23 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `machineWorker_add`(vPlate VARCHAR(10), vWorkerFk INT)
BEGIN
-
+
/**
* Inserta registro si el vWorkerFk no ha registrado nada en las últimas 12 horas
* @param vPlate número de matrícula
- * @param vWorkerFk id del worker
- *
-*/
- UPDATE vn.machineWorker mw
- JOIN vn.machine m ON m.id = mw.machineFk
+ * @param vWorkerFk id del worker
+ *
+*/
+ UPDATE vn.machineWorker mw
+ JOIN vn.machine m ON m.id = mw.machineFk
SET mw.outTimed = util.VN_NOW()
WHERE (mw.workerFk = vWorkerFk OR m.plate = vPlate)
AND ISNULL(mw.outTimed);
-
+
INSERT INTO machineWorker (machineFk, workerFk)
SELECT m.id, vWorkerFk
FROM machine m
- WHERE m.plate= vPlate;
+ WHERE m.plate= vPlate;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -63603,21 +62842,21 @@ DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `machineWorker_getHistorical`(vPlate VARCHAR(20), vWorkerFk INT)
BEGIN
/**
- * Obtiene historial de la matrícula vPlate que el trabajador vWorkerFk escanea,
+ * Obtiene historial de la matrícula vPlate que el trabajador vWorkerFk escanea,
* si es jefe de producción muestra el historial completo.
- *
+ *
* @param vPlate número de matrícula
- * @param vWorkerFk id del trabajador
- *
+ * @param vWorkerFk id del trabajador
+ *
*/
DECLARE vWorkerName VARCHAR(255) DEFAULT account.user_getNameFromId(vWorkerFk);
- SELECT mw.inTimed,account.user_getNameFromId(mw.workerFk) as workerName, mw.outTimed
+ SELECT mw.inTimed,account.user_getNameFromId(mw.workerFk) as workerName, mw.outTimed
FROM machineWorker mw
JOIN machine m ON m.plate = vPlate
WHERE mw.machineFk = m.id
AND mw.workerFk = IF(account.user_hasRole(vWorkerName, 'coolerAssist'), mw.workerFk, vWorkerFk)
- ORDER BY mw.inTimed DESC;
+ ORDER BY mw.inTimed DESC;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -63636,13 +62875,13 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `machineWorker_update`(vPlate VARCHAR(10), vWorkerFk INT)
BEGIN
-
+
/**
- * Actualiza el registro correspondiente si el vWorkerFk se ha registrado en las últimas horas (campo maxHours de machineWorkerConfig) con vPlate,
- *
+ * Actualiza el registro correspondiente si el vWorkerFk se ha registrado en las últimas horas (campo maxHours de machineWorkerConfig) con vPlate,
+ *
* @param vPlate número de matrícula
- * @param vWorkerFk id del trabajador
- *
+ * @param vWorkerFk id del trabajador
+ *
*/
DECLARE vMachineFk INT(10);
@@ -63651,24 +62890,24 @@ BEGIN
SELECT m.id INTO vMachineFk
FROM machine m
WHERE m.plate = vPlate;
-
+
SELECT maxHours INTO vMaxHours
FROM machineWorkerConfig;
- IF (SELECT COUNT(*)
+ IF (SELECT COUNT(*)
FROM machineWorker m
WHERE m.workerFk = vWorkerFk
- AND m.inTimed >= TIMESTAMPADD(HOUR , -vMaxHours, util.VN_NOW()) AND ISNULL(m.outTimed)) THEN
-
+ AND m.inTimed >= TIMESTAMPADD(HOUR , -vMaxHours, util.VN_NOW()) AND ISNULL(m.outTimed)) THEN
+
UPDATE machineWorker m
SET m.outTimed = CURRENT_TIMESTAMP()
- WHERE m.workerFk = vWorkerFk
- AND m.inTimed >= TIMESTAMPADD(HOUR , -vMaxHours, util.VN_NOW())
+ WHERE m.workerFk = vWorkerFk
+ AND m.inTimed >= TIMESTAMPADD(HOUR , -vMaxHours, util.VN_NOW())
AND ISNULL(m.outTimed)
AND m.machineFk = vMachineFk;
-
+
END IF;
-
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -63723,12 +62962,12 @@ BEGIN
/**
* Inserta en la tabla vn.mail
*
- * @param vReceiver Receptor del correo
+ * @param vReceiver Receptor del correo
* @param vReplyTo A quién contestar el correo
* @param vSubject Título del correo
* @param vBody Cuerpo del correo
*/
-
+
DECLARE vIsRepeated BOOLEAN;
SELECT COUNT(*) INTO vIsRepeated
@@ -63769,12 +63008,12 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `makeNewItem`()
BEGIN
DECLARE newItemFk INT;
-
+
SELECT getNewItemId() INTO newItemFk;
-
+
INSERT INTO item(id,name,typeFk,originFk)
SELECT newItemFk, 'Nuevo artículo', 78,39;
-
+
SELECT newItemFk;
@@ -63802,34 +63041,34 @@ BEGIN
DECLARE vMinute INT DEFAULT 0;
DECLARE vBoxes INT;
-
+
DROP TEMPORARY TABLE IF EXISTS vn.pcsDay;
CREATE TEMPORARY TABLE vn.pcsDay
SELECT 0 as hh, 0 as mm, 0 as boxes;
-
+
-- Creamos una tabla soporte para acumular las cajas a lo largo del dia
WHILE vHour < 24 DO
-
+
WHILE vMinute < 59 DO
-
+
SET vMinute = vMinute + 1;
-
+
INSERT INTO vn.pcsDay(hh,mm) VALUES(vHour, vMinute);
-
+
END WHILE;
-
+
SET vMinute = -1;
SET vHour = vHour + 1;
-
+
END WHILE;
-
+
-- Acumulamos
UPDATE vn.pcsDay pd
LEFT JOIN (SELECT * FROM vn.pcs_graf WHERE dia = vDated) pg USING(hh,mm)
SET pd.boxes = pd.boxes + pg.box;
-
+
SELECT * FROM vn.pcsDay;
-
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -63847,74 +63086,245 @@ DELIMITER ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `manaSpellersRequery`(vWorkerFk INTEGER)
+`whole_proc`:
BEGIN
/**
- * Recalcula el mana consumido por un trabajador
+ * Guarda en workerMana el mana consumido por un trabajador
*
* @param vWorkerFk Id Trabajador
*/
DECLARE vWorkerIsExcluded BOOLEAN;
- DECLARE vFromDated DATE;
- DECLARE vToDated DATE DEFAULT TIMESTAMPADD(DAY,1,util.VN_CURDATE());
- DECLARE vMana INT;
- DECLARE vAutoMana INT;
- DECLARE vClaimMana INT;
- DECLARE vManaBank INT;
- DECLARE vManaGreugeType INT;
SELECT COUNT(*) INTO vWorkerIsExcluded
FROM workerManaExcluded
WHERE workerFk = vWorkerFk;
- IF NOT vWorkerIsExcluded THEN
- SELECT id INTO vMana
- FROM `component` WHERE code = 'mana';
-
- SELECT id INTO vAutoMana
- FROM `component` WHERE code = 'autoMana';
-
- SELECT id INTO vClaimMana
- FROM `component` WHERE code = 'manaClaim';
-
- SELECT id INTO vManaBank
- FROM `bank` WHERE code = 'mana';
-
- SELECT id INTO vManaGreugeType
- FROM `greugeType` WHERE code = 'mana';
-
- SELECT max(dated) INTO vFromDated
- FROM clientManaCache;
-
- REPLACE workerMana (workerFk, amount)
- SELECT vWorkerFk, sum(mana) FROM
- (
- SELECT s.quantity * sc.value as mana
- FROM ticket t
- JOIN address a ON a.id = t.addressFk
- JOIN client c ON c.id = a.clientFk
- JOIN sale s ON s.ticketFk = t.id
- JOIN saleComponent sc ON sc.saleFk = s.id
- WHERE c.salesPersonFk = vWorkerFk AND sc.componentFk IN (vMana, vAutoMana, vClaimMana)
- AND t.shipped > vFromDated AND t.shipped < vToDated
- UNION ALL
- SELECT - r.amountPaid
- FROM receipt r
- JOIN client c ON c.id = r.clientFk
- WHERE c.salesPersonFk = vWorkerFk AND bankFk = vManaBank
- AND payed > vFromDated
- UNION ALL
- SELECT g.amount
- FROM greuge g
- JOIN client c ON c.id = g.clientFk
- WHERE c.salesPersonFk = vWorkerFk AND g.greugeTypeFk = vManaGreugeType
- AND g.shipped > vFromDated and g.shipped < util.VN_CURDATE()
- UNION ALL
- SELECT cc.mana
- FROM clientManaCache cc
- JOIN client c ON c.id = cc.clientFk
- WHERE c.salesPersonFk = vWorkerFk AND cc.dated = vFromDated
- ) sub;
+ IF vWorkerIsExcluded THEN
+ LEAVE whole_proc;
END IF;
+
+ CREATE OR REPLACE TEMPORARY TABLE tmp.client
+ SELECT id
+ FROM client
+ WHERE salesPersonFk = vWorkerFk;
+
+ CALL client_getMana();
+
+ INSERT INTO workerMana (workerFk, amount)
+ SELECT vWorkerFk, sum(mana)
+ FROM tmp.clientMana
+ ON DUPLICATE KEY UPDATE amount = VALUES(amount);
+
+ DROP TEMPORARY TABLE
+ tmp.client,
+ tmp.clientMana;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `multipleInventory` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `multipleInventory`(
+ vDate DATE,
+ vWarehouseFk TINYINT,
+ vMaxDays TINYINT
+)
+proc: BEGIN
+ DECLARE vDateTomorrow DATE DEFAULT vDate + INTERVAL 1 DAY;
+ DECLARE vDateFrom DATE DEFAULT vDate;
+ DECLARE vDateTo DATETIME;
+ DECLARE vDateToTomorrow DATETIME;
+ DECLARE vDefaultDayRange INT;
+
+ IF vDate < util.VN_CURDATE() THEN
+ LEAVE proc;
+ END IF;
+
+ IF vDate = util.VN_CURDATE() THEN
+ SELECT inventoried INTO vDateFrom
+ FROM config;
+ END IF;
+
+ SELECT defaultDayRange INTO vDefaultDayRange
+ FROM comparativeConfig;
+
+ SET vDateTo = vDate + INTERVAL IFNULL(vMaxDays, vDefaultDayRange) DAY;
+ SET vDateToTomorrow = vDateTo + INTERVAL 1 DAY;
+
+ ALTER TABLE tmp.itemInventory
+ ADD `avalaible` INT NOT NULL,
+ ADD `sd` INT NOT NULL,
+ ADD `rest` INT NOT NULL,
+ ADD `expected` INT NOT NULL,
+ ADD `inventory` INT NOT NULL,
+ ADD `visible` INT NOT NULL,
+ ADD `life` TINYINT NOT NULL DEFAULT '0';
+
+ -- Calculo del inventario
+ UPDATE tmp.itemInventory ai
+ JOIN (
+ SELECT itemFk Id_Article, SUM(quantity) Subtotal
+ FROM (
+ SELECT s.itemFk, - s.quantity quantity
+ FROM sale s
+ JOIN ticket t ON t.id = s.ticketFk
+ JOIN warehouse w ON w.id = t.warehouseFk
+ WHERE t.shipped BETWEEN vDateFrom AND util.dayEnd(vDate)
+ AND IFNULL(vWarehouseFk, t.warehouseFk) = t.warehouseFk
+ AND w.isComparative
+ UNION ALL
+ SELECT b.itemFk, b.quantity
+ FROM buy b
+ JOIN entry e ON e.id = b.entryFk
+ JOIN travel t ON t.id = e.travelFk
+ JOIN warehouse w ON w.id = t.warehouseInFk
+ WHERE t.landed BETWEEN vDateFrom AND util.dayEnd(vDate)
+ AND IFNULL(vWarehouseFk, t.warehouseInFk) = t.warehouseInFk
+ AND w.isComparative
+ AND NOT e.isExcludedFromAvailable
+ AND NOT e.isRaid
+ UNION ALL
+ SELECT b.itemFk, - b.quantity
+ FROM buy b
+ JOIN entry e ON e.id = b.entryFk
+ JOIN travel t ON t.id = e.travelFk
+ JOIN warehouse w ON w.id = t.warehouseOutFk
+ WHERE t.shipped BETWEEN vDateFrom AND util.dayEnd(vDate)
+ AND IFNULL(vWarehouseFk, t.warehouseOutFk) = t.warehouseOutFk
+ AND w.isComparative
+ AND NOT e.isExcludedFromAvailable
+ AND NOT e.isRaid
+ ) sub2
+ GROUP BY itemFk
+ ) sub ON ai.id = sub.Id_Article
+ SET ai.inventory = sub.Subtotal,
+ ai.visible = sub.Subtotal,
+ ai.avalaible = sub.Subtotal,
+ ai.sd = sub.Subtotal;
+
+ -- Cálculo del visible
+ UPDATE tmp.itemInventory ai
+ JOIN (
+ SELECT itemFk Id_Article, SUM(quantity) Subtotal
+ FROM (
+ SELECT s.itemFk, s.quantity
+ FROM sale s
+ JOIN ticket t ON t.id = s.ticketFk
+ JOIN warehouse w ON w.id = t.warehouseFk
+ WHERE t.shipped >= vDate
+ AND t.shipped < vDateTomorrow
+ AND (NOT isPicked AND NOT t.isLabeled AND t.refFk IS NULL)
+ AND IFNULL(vWarehouseFk, t.warehouseFk) = t.warehouseFk
+ AND w.isComparative
+ UNION ALL
+ SELECT b.itemFk, - b.quantity
+ FROM buy b
+ JOIN entry e ON e.id = b.entryFk
+ JOIN travel t ON t.id = e.travelFk
+ JOIN warehouse w ON w.id = t.warehouseInFk
+ WHERE t.landed = vDate
+ AND NOT t.isReceived
+ AND NOT e.isExcludedFromAvailable
+ AND NOT e.isRaid
+ AND IFNULL(vWarehouseFk, t.warehouseInFk) = t.warehouseInFk
+ AND w.isComparative
+ UNION ALL
+ SELECT b.itemFk, b.quantity
+ FROM buy b
+ JOIN entry e ON e.id = b.entryFk
+ JOIN travel t ON t.id = e.travelFk
+ JOIN warehouse w ON w.id = t.warehouseOutFk
+ WHERE t.shipped = vDate
+ AND NOT t.isReceived
+ AND NOT e.isExcludedFromAvailable
+ AND NOT e.isRaid
+ AND IFNULL(vWarehouseFk, t.warehouseOutFk) = t.warehouseOutFk
+ AND w.isComparative
+ ) sub2
+ GROUP BY itemFk
+ ) sub ON ai.id = sub.Id_Article
+ SET ai.visible = ai.visible + sub.Subtotal;
+
+ -- Calculo del disponible
+ CREATE OR REPLACE TEMPORARY TABLE tmp.itemCalc
+ (INDEX (itemFk, warehouseFk))
+ ENGINE = MEMORY
+ SELECT sub.itemFk,
+ vWarehouseFk warehouseFk,
+ sub.dated,
+ SUM(sub.quantity) quantity
+ FROM (
+ SELECT s.itemFk,
+ DATE(t.shipped) dated,
+ - s.quantity quantity
+ FROM sale s
+ JOIN ticket t ON t.id = s.ticketFk
+ JOIN warehouse w ON w.id = t.warehouseFk
+ WHERE t.shipped BETWEEN vDateTomorrow AND vDateTo
+ AND IFNULL(vWarehouseFk, t.warehouseFk) = t.warehouseFk
+ AND w.isComparative
+ UNION ALL
+ SELECT b.itemFk, t.landed, b.quantity
+ FROM buy b
+ JOIN entry e ON e.id = b.entryFk
+ JOIN travel t ON t.id = e.travelFk
+ JOIN warehouse w ON w.id = t.warehouseInFk
+ WHERE t.landed BETWEEN vDateTomorrow AND vDateTo
+ AND IFNULL(vWarehouseFk, t.warehouseInFk) = t.warehouseInFk
+ AND w.isComparative
+ AND NOT e.isExcludedFromAvailable
+ AND NOT e.isRaid
+ UNION ALL
+ SELECT b.itemFk, t.shipped, - b.quantity
+ FROM buy b
+ JOIN entry e ON e.id = b.entryFk
+ JOIN travel t ON t.id = e.travelFk
+ JOIN warehouse w ON w.id = t.warehouseOutFk
+ WHERE t.shipped BETWEEN vDateTomorrow AND vDateTo
+ AND IFNULL(vWarehouseFk, t.warehouseOutFk) = t.warehouseOutFk
+ AND w.isComparative
+ AND NOT e.isExcludedFromAvailable
+ AND NOT e.isRaid
+ ) sub
+ GROUP BY sub.itemFk, sub.dated;
+
+ CALL item_getAtp(vDate);
+ CALL travel_upcomingArrivals(vWarehouseFk, vDate);
+
+ UPDATE tmp.itemInventory ai
+ JOIN (
+ SELECT it.itemFk,
+ SUM(it.quantity) quantity,
+ im.quantity minQuantity
+ FROM tmp.itemCalc it
+ JOIN tmp.itemAtp im ON im.itemFk = it.itemFk
+ JOIN item i ON i.id = it.itemFk
+ LEFT JOIN origin o ON o.id = i.originFk
+ LEFT JOIN tmp.itemTravel t ON t.wh = o.warehouseFk
+ WHERE it.dated < IF(vMaxDays < 0 AND t.landing IS NOT NULL,
+ t.landing,
+ vDateToTomorrow)
+ GROUP BY it.itemFk
+ ) sub ON sub.itemFk = ai.id
+ SET ai.avalaible = IF(sub.minQuantity > 0,
+ ai.avalaible,
+ ai.avalaible + sub.minQuantity),
+ ai.sd = ai.inventory + sub.quantity;
+
+ DROP TEMPORARY TABLE
+ tmp.itemTravel,
+ tmp.itemCalc,
+ tmp.itemAtp;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -63935,20 +63345,20 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `mysqlConnectionsSorter_kill`()
BEGIN
/**
- * Elimina conexiones del usuario sorter con tiempo >= 30seg. Asociado al evento con el mismo nombre
- */
-
+ * Elimina conexiones del usuario sorter con tiempo >= 30seg. Asociado al evento con el mismo nombre
+ */
+
DECLARE vDone INT DEFAULT 0;
DECLARE vProcesId INT;
DECLARE vCursor CURSOR FOR
- SELECT p.id
+ SELECT p.id
FROM information_schema.processlist p
- WHERE USER = 'sorter'
+ WHERE USER = 'sorter'
AND TIME >= 30;
DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-
+
OPEN vCursor;
l: LOOP
@@ -63985,7 +63395,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `mysqlPreparedCount_check`()
BEGIN
DECLARE vPreparedCount INTEGER;
- SELECT VARIABLE_VALUE INTO vPreparedCount
+ SELECT VARIABLE_VALUE INTO vPreparedCount
FROM INFORMATION_SCHEMA.GLOBAL_STATUS
WHERE VARIABLE_NAME LIKE '%prepared_stmt_count%';
@@ -63993,7 +63403,7 @@ BEGIN
CALL `vn`.`mail_insert`('cau@verdnatura.es',
NULL,
'Problemas BBDD prepared_stmt_count',
- CONCAT('Existen problemas con el servicio de Logiflora, prepared_stmt_count con valor: ',
+ CONCAT('Existen problemas con el servicio de Logiflora, prepared_stmt_count con valor: ',
vPreparedCount,
', está próximo a exceder su límite. \r\n Hay que reiniciar el servicio LF.VMP.Service del servidor a3.')
);
@@ -64020,37 +63430,37 @@ BEGIN
DECLARE newShelving VARCHAR(3);
DECLARE vCode VARCHAR(3);
-
+
SELECT MAX(code) INTO vCode
FROM vn.shelving
WHERE isPrinted = FALSE;
-
+
SET @a1 := ASCII(MID(vCode,1,1));
SET @a2 := ASCII(MID(vCode,2,1));
SET @a3 := ASCII(MID(vCode,3,1)) + 1;
-
+
IF @a3 > 90 THEN
-
+
SET @a3 = 65;
SET @a2 = @a2 + 1;
-
+
IF @a2 > 90 THEN
-
+
SET @a2 = 65;
SET @a1 = @a1 + 1;
-
+
IF @a1 > 90 THEN
-
+
SET @a1 = 65;
-
+
END IF;
-
+
END IF;
-
+
END IF;
SET newShelving = CHAR(@a1,@a2,@a3 USING utf8);
-
+
INSERT INTO vn.shelving(code) VALUES(newShelving);
END ;;
@@ -64079,18 +63489,18 @@ BEGIN
* @param descripcion Texto de la observacion
*/
DECLARE vTableName VARCHAR(45);
-
+
SET vTableName = CONCAT(vTableCode,'Observation');
-
+
IF ISNULL(vTableName) THEN
CALL util.throw('CODE_NOT_FOUND');
END IF;
-
+
SET @qryLog := CONCAT(
'INSERT INTO ', vTableName, ' (originFk, userFk, description)',
' VALUES (', vOriginFk, ', ', account.myUser_getId(), ', "', vDescription, '")'
);
-
+
PREPARE stmt FROM @qryLog;
EXECUTE stmt;
DEALLOCATE PREPARE stmt;
@@ -64120,15 +63530,15 @@ BEGIN
DECLARE vDeliveryMethod INT;
DECLARE vClient INT;
-
+
SELECT deliveryMethodFk INTO vDeliveryMethod
- FROM vn.agencyMode
+ FROM vn.agencyMode
WHERE id = vAgencyMode;
-
+
SELECT clientFk INTO vClient
FROM vn.address
WHERE id = vAddress;
-
+
INSERT INTO hedera.order(date_send,customer_id,delivery_method_id,agency_id,address_id,source_app)
VALUES( vLanded,vClient ,vDeliveryMethod,vAgencyMode ,vAddress ,vSourceApp);
@@ -64154,7 +63564,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `orderDelete`(IN vId INT)
BEGIN
DELETE FROM hedera.`order` where id = vId;
-
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -64181,7 +63591,7 @@ BEGIN
DECLARE vOrderId INT;
CALL vn.orderCreate(vLanded,vAgencyMode,vAddress,vSourceApp,vOrderId);
SELECT vOrderId;
-
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -64201,7 +63611,7 @@ DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `orderListVolume`(IN vOrderId INT)
BEGIN
- SELECT
+ SELECT
o.id,
o.itemFk,
i.description,
@@ -64227,7 +63637,7 @@ DELIMITER ;
/*!50003 SET character_set_results = utf8mb4 */ ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `packageInvoicing`(
+CREATE DEFINER=`root`@`localhost` PROCEDURE `packageInvoicing`(
IN vClient INT,
IN vDate DATE,
IN vCompany INT,
@@ -64246,20 +63656,20 @@ BEGIN
SET vGraceDays = IF(vIsAllInvoiceable ,0, 30);
SET vGraceDate = TIMESTAMPADD(DAY, - vGraceDays, vDate);
-
- /* Clientes especiales:
+
+ /* Clientes especiales:
3240 MADEFLOR
992 JAVIER FELIU
4 TONI VENDRELL
*/
-
+
IF vClient IN (992, 3240, 4) THEN
-
+
SET vGraceDays = 365;
-
+
END IF;
/* Fin clientes especiales */
-
+
SET vDateEnd = DATE_ADD(vDate, INTERVAL 1 DAY);
DROP TEMPORARY TABLE IF EXISTS tmp.packageToInvoice;
@@ -64283,22 +63693,22 @@ BEGIN
FROM tmp.packageToInvoice
GROUP BY itemFk
HAVING totalQuantity > 0;
-
+
SELECT COUNT(*)
INTO vIsInvoiceable
FROM tmp.packageToInvoicePositives;
IF vIsInvoiceable THEN
- CALL ticket_add(vClient,
+ CALL ticket_add(vClient,
vDateEnd,
- vWarehouse,
- vCompany,
- NULL,
- NULL,
- NULL,
- vDateEnd,
- account.myUser_getId(),
+ vWarehouse,
+ vCompany,
+ NULL,
+ NULL,
+ NULL,
+ vDateEnd,
+ account.myUser_getId(),
TRUE,
vNewTicket);
@@ -64307,44 +63717,44 @@ BEGIN
packagingFk,
quantity,
pvp)
- SELECT vNewTicket,
- pti.packagingFk,
- - SUM(pti.quantity) AS totalQuantity,
+ SELECT vNewTicket,
+ pti.packagingFk,
+ - SUM(pti.quantity) AS totalQuantity,
pti.price
FROM tmp.packageToInvoice pti
- LEFT JOIN tmp.packageToInvoicePositives ptip ON pti.itemFk = ptip.itemFk
- WHERE ptip.itemFK IS NOT NULL
+ LEFT JOIN tmp.packageToInvoicePositives ptip ON pti.itemFk = ptip.itemFk
+ WHERE ptip.itemFK IS NOT NULL
OR vIsAllInvoiceable
GROUP BY packagingFk
HAVING totalQuantity;
INSERT INTO sale(
ticketFk,
- itemFk,
- concept,
- quantity,
+ itemFk,
+ concept,
+ quantity,
price
)
- SELECT vNewTicket,
- pti.itemFk,
- i.name as concept,
- sum(pti.quantity) as totalQuantity,
+ SELECT vNewTicket,
+ pti.itemFk,
+ i.name as concept,
+ sum(pti.quantity) as totalQuantity,
pti.price
FROM tmp.packageToInvoice pti
JOIN item i ON i.id = pti.itemFk
LEFT JOIN tmp.packageToInvoicePositives ptip ON pti.itemFk = ptip.itemFk
- WHERE ptip.itemFK IS NOT NULL
+ WHERE ptip.itemFK IS NOT NULL
OR vIsAllInvoiceable
GROUP BY pti.itemFk
HAVING totalQuantity;
-
+
INSERT INTO saleComponent(saleFk, componentFk, value)
SELECT id, vComponentCost, price
FROM sale
WHERE ticketFk = vNewTicket;
-
+
END IF;
-
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -64370,7 +63780,7 @@ BEGIN
WHERE mm.valor = 1 -- Listo para imprimir
AND mm.stateFk = 9 -- Encajando
AND m.Id_Ticket = ticketFk;
-
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -64392,15 +63802,15 @@ BEGIN
DECLARE valueFk INT;
DECLARE encajando INT DEFAULT 9;
-
- SELECT valor INTO valueFk
- FROM vn2008.Movimientos_mark
- WHERE Id_Movimiento = saleFk
+
+ SELECT valor INTO valueFk
+ FROM vn2008.Movimientos_mark
+ WHERE Id_Movimiento = saleFk
AND stateFk = encajando;
-
+
SET valueFk = (IFNULL(valueFk,0) + 1) MOD 3;
-
- REPLACE vn2008.Movimientos_mark(Id_Movimiento, valor, Id_Trabajador, stateFk)
+
+ REPLACE vn2008.Movimientos_mark(Id_Movimiento, valor, Id_Trabajador, stateFk)
VALUES(saleFk,valueFk,account.myUser_getId(),encajando);
@@ -64492,34 +63902,34 @@ BEGIN
DECLARE vLetters VARCHAR(26) DEFAULT 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
DECLARE vMaxId INT;
DECLARE vCode VARCHAR(8);
-
+
SET vColumn = vFromColumn;
SET vRow = vFromRow;
SET vCode = CONCAT(LPAD(vColumn,3,'0'),'-',IF(vIsLetterMode, MID(vLetters, vRow, 1), LPAD(vRow, 2,'0')));
-
+
SELECT MAX(id) INTO vMaxId
FROM vn.parking;
WHILE vColumn <= vToColumn DO
-
+
WHILE vRow <= vToRow DO
-
+
INSERT IGNORE INTO vn.parking(`column`, `row`, sectorFk, `code`, pickingOrder)
VALUES (vColumn, vRow, vSectorFk, vCode, vColumn * 100 + vRow )
ON DUPLICATE KEY UPDATE `code` = vCode;
-
+
SET vRow = vRow + 1;
SET vCode = CONCAT(LPAD(vColumn,3,'0'),'-',IF(vIsLetterMode, MID(vLetters, vRow, 1), LPAD(vRow, 2,'0')));
-
+
END WHILE;
-
+
SET vRow = vFromRow;
SET vColumn = vColumn + 1;
-
+
SET vCode = CONCAT(LPAD(vColumn,3,'0'),'-',IF(vIsLetterMode, MID(vLetters, vRow, 1), LPAD(vRow, 2,'0')));
-
+
END WHILE;
-
+
SELECT * FROM vn.parking WHERE `column` BETWEEN vFromColumn AND vToColumn;
END ;;
@@ -64544,59 +63954,59 @@ BEGIN
DECLARE vRow INT;
DECLARE vCode VARCHAR(8);
DECLARE i INT;
-
+
IF vToRow < vFromRow THEN
-
+
SET vRow = vFromRow;
-
+
WHILE vRow >= vToRow DO
-
+
SET i = 1;
-
+
WHILE i <= vTrolleysByLine DO
-
+
SET vCode = CONCAT(vLetter,'-', LPAD(vRow,2,'0'),'-', i);
-
+
INSERT IGNORE INTO vn.parking( sectorFk, `code`, pickingOrder)
VALUES (vSectorFk, vCode, vPickingOrder + (i * 10))
ON DUPLICATE KEY UPDATE `code` = vCode;
-
+
SET i = i + 1;
-
+
END WHILE;
-
+
SET vRow = vRow - 1;
-
+
END WHILE;
ELSE
-
+
SET vRow = vFromRow;
-
+
WHILE vRow <= vToRow DO
-
+
SET i = 1;
-
+
WHILE i <= vTrolleysByLine DO
-
+
SET vCode = CONCAT(vLetter,'-', LPAD(vRow,2,'0'),'-', i);
-
+
INSERT IGNORE INTO vn.parking( sectorFk, `code`, pickingOrder)
VALUES (vSectorFk, vCode, vPickingOrder + (i * 10) )
ON DUPLICATE KEY UPDATE `code` = vCode;
-
+
SET i = i + 1;
-
+
END WHILE;
-
+
SET vRow = vRow + 1;
-
+
END WHILE;
-
-
+
+
END IF;
-
-
+
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -64620,28 +64030,28 @@ BEGIN
DECLARE vColumn INT;
DECLARE vLetters VARCHAR(200);
DECLARE vLettersLength INT;
-
+
SET vColumn = vStart;
SET vRow = 1;
SET vLetters = 'ABCDEF';
SET vLettersLength = LENGTH(vLetters);
-
+
WHILE vColumn <= vEnd DO
-
+
REPLACE vn.parking(`column`, `row`, `code`, sectorFk)
VALUES(vColumn, vRow, CONCAT(vColumn,MID(vLetters,vRow,1)), vSectorFk);
-
+
SET vRow = vRow + 1;
-
+
IF vRow > vLettersLength THEN
-
+
SET vRow = 1;
SET vColumn = vColumn + 1;
-
+
END IF;
-
+
END WHILE;
-
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -64660,11 +64070,11 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `parking_setOrder`(vWarehouseFk INT)
BEGIN
-
+
/*
* Ordena el orden de preparacion de los parking de acuerdo con la tabla vn.corridor
*/
-
+
UPDATE vn.parking p
JOIN (
SELECT code,
@@ -64673,15 +64083,112 @@ BEGIN
SELECT c.prepOrder,
p.code,
@orden := 0,
- IF(c.isAscendent, 1,-1) * CAST(SUBSTRING(p.code,3,2) AS DECIMAL(2,0)) subCorridor ,
- CAST(IF(LENGTH(p.code) > 5, SUBSTRING(p.code,6,2), 0) AS DECIMAL(2,0)) ubication
+ IF(c.isAscendent, 1,-1) * CAST(SUBSTRING(p.code,3,2) AS DECIMAL(2,0)) subCorridor ,
+ CAST(IF(LENGTH(p.code) > 5, SUBSTRING(p.code,6,2), 0) AS DECIMAL(2,0)) ubication
FROM vn.parking p
- JOIN vn.sector s ON s.id = p.sectorFk
+ JOIN vn.sector s ON s.id = p.sectorFk
JOIN vn.corridor c ON c.code = LEFT(p.code,1) COLLATE utf8_general_ci
- WHERE s.warehouseFk = vWarehouseFk) sub
- ORDER BY sub.prepOrder, subCorridor, ubication) sub2 ON sub2.code = p.code
+ WHERE s.warehouseFk = vWarehouseFk) sub
+ ORDER BY sub.prepOrder, subCorridor, ubication) sub2 ON sub2.code = p.code
SET p.pickingOrder = sub2.po;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `payment_add` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `payment_add`(
+ vDated DATE,
+ vSupplierFk INT,
+ vAmount DOUBLE,
+ vCurrencyFk INT,
+ vForeignValue DOUBLE,
+ vBankFk INT,
+ vPayMethodFk INT,
+ vExpenseFk DOUBLE,
+ vConcept VARCHAR(40),
+ vCompanyFk INT)
+BEGIN
+/**
+ * Registra un pago realizado a un proveedor y
+ * su correspondiente registro en caja.
+ *
+ * @param vDated Fecha del pago
+ * @param vSupplierFk Id del proveedor
+ * @param vAmount Cantidad a pagar
+ * @param vCurrencyFk Id de la moneda
+ * @param vForeignValue Tipo de cambio utilizado
+ * @param vBankFk Id del banco
+ * @param vPayMethodFk Id del método de pago
+ * @param vExpenseFk Id de gasto
+ * @param vConcept Concepto del pago
+ * @param vCompanyFk Id de la empresa
+ * @return paymentFk Id de pago insertado
+ */
+ INSERT INTO till(
+ concept,
+ serie,
+ `number`,
+ `out`,
+ dated,
+ isAccountable,
+ bankFk,
+ workerFk,
+ companyFk,
+ isConciliate
+ )
+ SELECT CONCAT('n/pago a ', `name`),
+ 'R',
+ vSupplierFk,
+ vAmount,
+ vDated,
+ 1,
+ vBankFk,
+ account.myUser_getId(),
+ vCompanyFk,
+ 1
+ FROM supplier
+ WHERE id = vSupplierFk;
+ INSERT INTO payment(
+ received,
+ dueDated,
+ supplierFk,
+ amount,
+ currencyFk,
+ divisa,
+ bankFk,
+ payMethodFk,
+ bankingFees,
+ concept,
+ companyFk
+ )
+ VALUES(
+ vDated,
+ vDated,
+ vSupplierFk,
+ vAmount,
+ vCurrencyFk,
+ IF(NOT vForeignValue, NULL, vForeignValue),
+ vBankFk,
+ vPayMethodFk,
+ vExpenseFk,
+ vConcept,
+ vCompanyFk
+ );
+
+ SELECT LAST_INSERT_ID() paymentFk;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -64700,17 +64207,17 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `prepareClientList`()
BEGIN
-
+
/*
* Require la tabla tmp.ticket(id,clientFk)
*/
-
+
DROP TEMPORARY TABLE IF EXISTS tmp.client;
CREATE TEMPORARY TABLE tmp.client
(PRIMARY KEY (id))
ENGINE = MEMORY
SELECT DISTINCT clientFk id
- FROM tmp.ticket;
+ FROM tmp.ticket;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -64735,7 +64242,7 @@ BEGIN
ENGINE = MEMORY
SELECT t.id ticketFk, t.clientFk
FROM vn.ticket t
- LEFT JOIN vn.ticketState ts ON ts.ticket = t.id
+ LEFT JOIN vn.ticketState ts ON ts.ticketFk = t.id
JOIN vn.client c ON c.id = t.clientFk
WHERE c.typeFk IN ('normal','handMaking','internalUse')
AND (
@@ -64838,14 +64345,14 @@ BEGIN
/**
* Comprueba si la impresora pertenece al sector
*
- * @param vLabelerFk id de la impresora
+ * @param vLabelerFk id de la impresora
* @param vSector sector a comprobar
*/
DECLARE isPrinterInNewSector BOOL;
IF vLabelerFk IS NOT NULL THEN
SELECT COUNT(sectorFK) INTO isPrinterInNewSector
- FROM vn.printer p
+ FROM vn.printer p
WHERE id = vLabelerFk AND sectorFk = vSector;
IF !isPrinterInNewSector THEN
@@ -64869,7 +64376,7 @@ DELIMITER ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `productionControl`(
- vWarehouseFk INT,
+ vWarehouseFk INT,
vScopeDays INT
)
proc: BEGIN
@@ -64884,15 +64391,15 @@ proc: BEGIN
DECLARE vEndingDate DATETIME;
DECLARE vIsTodayRelative BOOLEAN;
- SELECT TIMESTAMPADD(DAY, LEAST(vScopeDays, pc.maxProductionScopeDays), util.dayEnd(util.VN_CURDATE()))
+ SELECT util.dayEnd(util.VN_CURDATE()) + INTERVAL LEAST(vScopeDays, maxProductionScopeDays) DAY
INTO vEndingDate
- FROM productionConfig pc;
+ FROM productionConfig;
SELECT isTodayRelative INTO vIsTodayRelative
FROM worker
- WHERE id = getUser();
+ WHERE id = getUser(); -- Cambiar por account.myUser_getId(), falta dar permisos
- CALL prepareTicketList( util.VN_CURDATE() - INTERVAL 1 DAY, vEndingDate);
+ CALL prepareTicketList(util.yesterday(), vEndingDate);
CREATE OR REPLACE TEMPORARY TABLE tmp.ticket
SELECT * FROM tmp.productionTicket;
@@ -64950,8 +64457,8 @@ proc: BEGIN
rm.bufferFk
FROM tmp.productionTicket tt
JOIN ticket t ON tt.ticketFk = t.id
- LEFT JOIN ticketStateToday tst ON tst.ticket = t.id
- LEFT JOIN state st ON st.id = tst.state
+ LEFT JOIN ticketStateToday tst ON tst.ticketFk = t.id
+ LEFT JOIN `state` st ON st.id = tst.state
LEFT JOIN client c ON c.id = t.clientFk
LEFT JOIN worker wk ON wk.id = c.salesPersonFk
JOIN address a ON a.id = t.addressFk
@@ -64959,9 +64466,9 @@ proc: BEGIN
JOIN agencyMode am ON am.id = t.agencyModeFk
JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
JOIN agency ag ON ag.id = am.agencyFk
- LEFT JOIN ticketState tls ON tls.ticket = tt.ticketFk
+ LEFT JOIN ticketState tls ON tls.ticketFk = tt.ticketFk
LEFT JOIN ticketLastUpdated tlu ON tlu.ticketFk = tt.ticketFk
- LEFT JOIN worker w on w.id = tls.worker
+ LEFT JOIN worker w ON w.id = tls.userFk
LEFT JOIN routesMonitor rm ON rm.routeFk = t.routeFk
LEFT JOIN `zone` z ON z.id = t.zoneFk
LEFT JOIN zoneClosure zc ON zc.zoneFk = t.zoneFk
@@ -64970,7 +64477,7 @@ proc: BEGIN
LEFT JOIN parking pk ON pk.id = tp.parkingFk
WHERE t.warehouseFk = vWarehouseFk
AND dm.code IN ('AGENCY', 'DELIVERY', 'PICKUP');
-
+
UPDATE tmp.productionBuffer pb
JOIN (
SELECT pb.ticketFk, GROUP_CONCAT(p.code) previaParking
@@ -64978,12 +64485,12 @@ proc: BEGIN
JOIN sale s ON s.ticketFk = pb.ticketFk
JOIN saleGroupDetail sgd ON sgd.saleFk = s.id
JOIN saleGroup sg ON sg.id = sgd.saleGroupFk
- JOIN parking p ON p.id = sg.parkingFk
+ JOIN parking p ON p.id = sg.parkingFk
GROUP BY pb.ticketFk
) t ON t.ticketFk = pb.ticketFk
SET pb.previaParking = t.previaParking;
- -- Problemas por ticket
+ -- Problemas por ticket
ALTER TABLE tmp.productionBuffer
CHANGE COLUMN `problem` `problem` VARCHAR(255),
ADD COLUMN `collectionH` INT,
@@ -65021,31 +64528,33 @@ proc: BEGIN
FROM tmp.productionTicket tt
JOIN saleVolume sv ON sv.ticketFk = tt.ticketFk
GROUP BY tt.ticketFk
- ) m on m.ticketFk = pb.ticketFk
+ ) m ON m.ticketFk = pb.ticketFk
SET pb.`lines` = m.`lines`,
pb.m3 = m.m3,
pb.preparationRate = m.rate;
DELETE FROM tmp.productionBuffer
- WHERE `lines`= 0;
+ WHERE NOT `lines`;
-- Lineas por linea de encajado
UPDATE tmp.productionBuffer pb
- JOIN ( SELECT ticketFk,
+ JOIN (
+ SELECT ticketFk,
SUM(sub.H) H,
SUM(sub.V) V,
SUM(sub.N) N
FROM (
- SELECT t.ticketFk,
+ SELECT t.ticketFk,
SUM(i.itemPackingTypeFk = 'H') H,
SUM(i.itemPackingTypeFk = 'V') V,
SUM(i.itemPackingTypeFk IS NULL) N
FROM tmp.productionTicket t
JOIN sale s ON s.ticketFk = t.ticketFk
JOIN item i ON i.id = s.itemFk
- GROUP BY t.ticketFk, i.itemPackingTypeFk) sub
+ GROUP BY t.ticketFk, i.itemPackingTypeFk
+ ) sub
GROUP BY ticketFk
- ) sub2 ON sub2.ticketFk = pb.ticketFk
+ ) sub2 ON sub2.ticketFk = pb.ticketFk
SET pb.H = sub2.H,
pb.V = sub2.V,
pb.N = sub2.N;
@@ -65069,15 +64578,31 @@ proc: BEGIN
-- Insertamos todos los tickets que tienen productos parkineados
-- en sectores de previa, segun el sector
+ CREATE OR REPLACE TEMPORARY TABLE tItemShelvingStock
+ (PRIMARY KEY(itemFk, sectorFk))
+ ENGINE = MEMORY
+ SELECT ish.itemFk,
+ p.sectorFk,
+ st.code = 'previousPrepared' isPreviousPrepared,
+ sc.itemPackingTypeFk
+ FROM itemShelving ish
+ JOIN shelving sh ON sh.code = ish.shelvingFk
+ JOIN parking p ON p.id = sh.parkingFk
+ JOIN sector sc ON sc.id = p.sectorFk
+ JOIN sectorType st ON st.id = sc.typeFk
+ WHERE p.sectorFk
+ AND ish.visible
+ GROUP BY ish.itemFk, p.sectorFk;
+
INSERT INTO tmp.ticketWithPrevia(ticketFk, salesCount)
SELECT pb.ticketFk, COUNT(DISTINCT s.id)
FROM tmp.productionBuffer pb
JOIN sale s ON s.ticketFk = pb.ticketFk
- JOIN itemShelvingStock iss ON iss.itemFk = s.itemFk
+ JOIN tItemShelvingStock iss ON iss.itemFk = s.itemFk
JOIN sector sc ON sc.id = iss.sectorFk
JOIN item i ON i.id = iss.itemFk
WHERE iss.isPreviousPrepared
- AND (sc.itemPackingTypeFk IS NULL
+ AND (sc.itemPackingTypeFk IS NULL
OR (i.itemPackingTypeFk IS NULL AND NOT pb.V)
OR sc.itemPackingTypeFk = i.itemPackingTypeFk)
AND s.quantity > 0
@@ -65085,14 +64610,16 @@ proc: BEGIN
-- Se calcula la cantidad de productos que estan ya preparados porque su saleGroup está aparcado
UPDATE tmp.ticketWithPrevia twp
- JOIN ( SELECT pb.ticketFk, COUNT(DISTINCT s.id) salesInParkingCount
- FROM tmp.productionBuffer pb
- JOIN sale s ON s.ticketFk = pb.ticketFk
- JOIN saleGroupDetail sgd ON sgd.saleFk = s.id
- JOIN saleGroup sg ON sg.id = sgd.saleGroupFk
- WHERE sg.parkingFk IS NOT NULL
- AND s.quantity > 0
- GROUP BY pb.ticketFk) sub ON twp.ticketFk = sub.ticketFk
+ JOIN (
+ SELECT pb.ticketFk, COUNT(DISTINCT s.id) salesInParkingCount
+ FROM tmp.productionBuffer pb
+ JOIN sale s ON s.ticketFk = pb.ticketFk
+ JOIN saleGroupDetail sgd ON sgd.saleFk = s.id
+ JOIN saleGroup sg ON sg.id = sgd.saleGroupFk
+ WHERE sg.parkingFk IS NOT NULL
+ AND s.quantity > 0
+ GROUP BY pb.ticketFk
+ ) sub ON twp.ticketFk = sub.ticketFk
SET twp.salesInParkingCount = sub.salesInParkingCount;
-- Marcamos como pendientes aquellos que no coinciden las cantidades
@@ -65101,11 +64628,244 @@ proc: BEGIN
SET pb.previousWithoutParking = TRUE
WHERE twp.salesCount > twp.salesInParkingCount;
- DROP TEMPORARY TABLE tmp.productionTicket;
- DROP TEMPORARY TABLE tmp.ticket;
- DROP TEMPORARY TABLE tmp.risk;
- DROP TEMPORARY TABLE tmp.ticket_problems;
- DROP TEMPORARY TABLE tmp.ticketWithPrevia;
+ DROP TEMPORARY TABLE
+ tmp.productionTicket,
+ tmp.ticket,
+ tmp.risk,
+ tmp.ticket_problems,
+ tmp.ticketWithPrevia,
+ tItemShelvingStock;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `productionError_add` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `productionError_add`()
+BEGIN
+ DECLARE vDatedFrom DATETIME;
+ DECLARE vDatedTo DATETIME;
+/**
+ * Rellena la tabla vn.productionError con estadisticas de encajadores, revisores y sacadores. Se ejecuta en el nightTask
+ */
+ SELECT util.VN_CURDATE() - INTERVAL 1 DAY, util.dayend(util.VN_CURDATE() - INTERVAL 1 DAY) INTO vDatedFrom, vDatedTo;
+ CALL timeControl_calculateAll(vDatedFrom, vDatedTo);
+
+ -- Rellena la tabla tmp.errorsByClaim con encajadores, revisores y sacadores
+ CREATE OR REPLACE TEMPORARY TABLE tmp.errorsByClaim
+ ENGINE = MEMORY
+ SELECT COUNT(c.ticketFk) errors,
+ cd.workerFk
+ FROM claimDevelopment cd
+ JOIN claim c ON cd.claimFk = c.id
+ JOIN ticket t ON c.ticketFk = t.id
+ JOIN claimResponsible cr ON cd.claimResponsibleFk = cr.id
+ WHERE t.shipped BETWEEN vDatedFrom AND vDatedTo
+ AND cr.code IN ('pic', 'chk', 'pck')
+ GROUP BY cd.workerFk;
+
+ -- Genera la tabla tmp.volume con encajadores, sacadores y revisores
+ CREATE OR REPLACE TEMPORARY TABLE tmp.volume
+ ENGINE = MEMORY
+ SELECT SUM(w.volume) volume,
+ w.workerFk
+ FROM bs.workerProductivity w
+ WHERE w.dated BETWEEN vDatedFrom AND vDatedTo
+ GROUP BY w.workerFk;
+
+ -- Rellena la tabla tmp.errorsByChecker con fallos de revisores
+ CREATE OR REPLACE TEMPORARY TABLE tmp.errorsByChecker
+ ENGINE = MEMORY
+ SELECT st.workerFk,
+ COUNT(t.id) errors
+ FROM saleMistake sm
+ JOIN saleTracking st ON sm.saleFk = st.saleFk
+ JOIN `state` s2 ON s2.id = st.stateFk
+ JOIN sale s ON s.id = sm.saleFk
+ JOIN ticket t on t.id = s.ticketFk
+ WHERE (t.shipped BETWEEN vDatedFrom AND vDatedTo)
+ AND s2.code IN ('OK','PREVIOUS_PREPARATION','PREPARED','CHECKED')
+ GROUP BY st.workerFk;
+
+ -- Rellena la tabla tmp.expeditionErrors con fallos de expediciones
+ CREATE OR REPLACE TEMPORARY TABLE tmp.expeditionErrors
+ ENGINE = MEMORY
+ SELECT COUNT(t.id) errors,
+ e.workerFk
+ FROM vn.expeditionMistake pm
+ JOIN vn.expedition e ON e.id = pm.expeditionFk
+ JOIN vn.ticket t ON t.id = e.ticketFk
+ WHERE t.shipped BETWEEN vDatedFrom AND vDatedTo
+ GROUP BY e.workerFk;
+
+ -- Genera la tabla tmp.total para sacadores y revisores
+ CREATE OR REPLACE TEMPORARY TABLE tmp.total
+ ENGINE = MEMORY
+ SELECT st.workerFk,
+ COUNT(DISTINCT t.id) ticketCount,
+ COUNT(s.id) lineCount
+ FROM saleTracking st
+ JOIN `state` s2 ON s2.id = st.stateFk
+ JOIN sale s ON s.id = st.saleFk
+ JOIN ticket t ON s.ticketFk = t.id
+ WHERE (t.shipped BETWEEN vDatedFrom AND vDatedTo)
+ AND s2.code IN ('OK','PREVIOUS_PREPARATION','PREPARED','CHECKED')
+ GROUP BY st.workerFk;
+
+ -- Rellena la tabla vn.productionError con sacadores
+ INSERT INTO productionError(userFk,
+ firstname,
+ lastname,
+ rol,
+ ticketNumber,
+ lineNumber,
+ error,
+ volume,
+ hourStart,
+ hourEnd,
+ hourWorked,
+ dated)
+ SELECT w.id,
+ w.firstName,
+ w.lastName,
+ "Sacadores",
+ t.ticketCount totalTickets,
+ t.lineCount,
+ IFNULL(ec.errors,0) + IFNULL(ec2.errors,0) errors,
+ v.volume volume,
+ SUBSTRING(tc.tableTimed, 1, 5) hourStart,
+ SUBSTRING(tc.tableTimed, LENGTH(tc.tableTimed)-4, 5) hourEnd,
+ IFNULL(CAST(tc.timeWorkDecimal AS DECIMAL (10,2)) , 0) hourWorked,
+ vDatedFrom dated
+ FROM tmp.total t
+ LEFT JOIN worker w ON w.id = t.workerFk
+ LEFT JOIN tmp.timeControlCalculate tc ON tc.userFk = t.workerFk
+ LEFT JOIN tmp.errorsByClaim ec ON ec.workerFk = t.workerFk
+ LEFT JOIN tmp.volume v ON v.workerFk = t.workerFk
+ LEFT JOIN tmp.errorsByChecker ec2 ON ec2.workerFk = t.workerFk
+ JOIN (SELECT DISTINCT w.id -- Verificamos que son sacadores
+ FROM vn.collection c
+ JOIN vn.state s ON s.id = c.stateFk
+ JOIN vn.train tn ON tn.id = c.trainFk
+ JOIN vn.worker w ON w.id = c.workerFk
+ WHERE c.created BETWEEN vDatedFrom AND vDatedTo) sub ON sub.id = w.id
+ GROUP BY w.id;
+
+ CREATE OR REPLACE TEMPORARY TABLE itemPickerErrors -- Errores de los sacadores, derivadores de los revisadores
+ ENGINE = MEMORY
+ SELECT COUNT(c.ticketFk) errors,
+ tt.userFk
+ FROM claimDevelopment cd
+ JOIN claim c ON cd.claimFk = c.id
+ JOIN ticket t ON c.ticketFk = t.id
+ JOIN claimResponsible cr ON cd.claimResponsibleFk = cr.id
+ JOIN ticketTracking tt ON tt.ticketFk = t.id
+ JOIN `state` s ON s.id = tt.stateFk
+ WHERE t.shipped BETWEEN vDatedFrom AND vDatedTo
+ AND cr.code = 'chk'
+ AND s.code = 'ON_PREPARATION'
+ GROUP BY tt.userFk;
+
+ UPDATE productionError ep
+ JOIN itemPickerErrors ipe ON ipe.userFk = ep.userFk
+ SET ep.error = ep.error + ipe.errors
+ WHERE vDatedFrom = ep.dated AND ep.rol = 'Sacadores';
+
+ DROP TEMPORARY TABLE itemPickerErrors;
+
+ -- Rellena la tabla vn.productionError con revisores
+ CALL productionError_addCheckerPackager(vDatedFrom, vDatedTo, "Revisadores");
+
+ -- Genera la tabla tmp.total para encajadores
+ CREATE OR REPLACE TEMPORARY TABLE tmp.total
+ ENGINE = MEMORY
+ SELECT e.workerFk,
+ COUNT(DISTINCT t.id) ticketCount,
+ COUNT(s.id) lineCount
+ FROM expedition e
+ JOIN ticket t ON e.ticketFk = t.id
+ JOIN sale s ON s.ticketFk = t.id
+ WHERE t.shipped BETWEEN vDatedFrom AND vDatedTo
+ GROUP BY e.workerFk;
+
+ -- Rellena la tabla vn.productionError con encajadores
+ CALL productionError_addCheckerPackager(vDatedFrom, vDatedTo, "Encajadores");
+
+ DROP TEMPORARY TABLE tmp.errorsByClaim,
+ tmp.volume,
+ tmp.errorsByChecker,
+ tmp.expeditionErrors,
+ tmp.total;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `productionError_addCheckerPackager` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `productionError_addCheckerPackager`(
+ vDatedFrom DATETIME,
+ vDatedTo DATETIME,
+ vRol VARCHAR(50))
+BEGIN
+/**
+ * Rellena la tabla vn.productionError con rol
+ *
+ * @param vDatedFrom Fecha desde
+ * @param vDatedTo Fecha hasta
+ * @param vRol rol a insertar
+ */
+ INSERT INTO productionError(userFk,
+ firstname,
+ lastname,
+ rol,
+ ticketNumber,
+ lineNumber,
+ error,
+ volume,
+ hourStart,
+ hourEnd,
+ hourWorked,
+ dated)
+ SELECT w.id,
+ w.firstName,
+ w.lastName,
+ vRol,
+ t.ticketCount totalTickets,
+ t.lineCount,
+ IFNULL(ec.errors,0) + IFNULL(ec2.errors,0) + IFNULL(pe.errors,0) errors,
+ NULL volume,
+ SUBSTRING(tc.tableTimed, 1, 5) hourStart,
+ SUBSTRING(tc.tableTimed, LENGTH(tc.tableTimed)-4, 5) hourEnd,
+ IFNULL(CAST(tc.timeWorkDecimal AS DECIMAL (10,2)) , 0) hourWorked,
+ vDatedFrom dated
+ FROM tmp.total t
+ LEFT JOIN worker w ON w.id = t.workerFk
+ LEFT JOIN tmp.timeControlCalculate tc ON tc.userFk = t.workerFk
+ LEFT JOIN tmp.errorsByClaim ec ON ec.workerFk = t.workerFk
+ LEFT JOIN tmp.volume v ON v.workerFk = t.workerFk
+ LEFT JOIN tmp.errorsByChecker ec2 ON ec2.workerFk = t.workerFk
+ LEFT JOIN tmp.expeditionErrors pe ON pe.workerFk = t.workerFk
+ GROUP BY w.id;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -65125,23 +64885,23 @@ DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `productionSectorList`(vSectorFk INT)
BEGIN
/**
- * Devuelve el listado de vn.sale que se puede preparar en previa para ese sector
+ * Devuelve el listado de sale que se puede preparar en previa para ese sector
*
- * @param vSectorFk Identificador de vn.sector
+ * @param vSectorFk Identificador de sector
*/
DECLARE vWarehouseFk INT;
SELECT warehouseFk INTO vWarehouseFk
- FROM vn.sector
+ FROM sector
WHERE id = vSectorFk;
DROP TEMPORARY TABLE IF EXISTS tmp.whiteTicket;
CREATE TEMPORARY TABLE tmp.whiteTicket
(ticketFk INT PRIMARY KEY)
SELECT s.ticketFk , count(*) AS saleNum, sum(ISNULL(i.itemPackingTypeFk)) iptNull
- FROM vn.sale s
- JOIN vn.item i ON i.id = s.itemFk
- JOIN vn.ticket t ON t.id = s.ticketFk
+ FROM sale s
+ JOIN item i ON i.id = s.itemFk
+ JOIN ticket t ON t.id = s.ticketFk
WHERE t.shipped BETWEEN util.VN_CURDATE() AND TIMESTAMPADD(HOUR, 23, util.VN_CURDATE())
GROUP BY s.ticketFk
HAVING saleNum = iptNull;
@@ -65150,15 +64910,15 @@ BEGIN
CREATE TEMPORARY TABLE tmp.sectorTypeTicket
(ticketFk INT PRIMARY KEY)
SELECT s.ticketFk , sum(i.itemPackingTypeFk <=> sc.itemPackingTypeFk) iptSector
- FROM vn.sale s
- JOIN vn.item i ON i.id = s.itemFk
- JOIN vn.ticket t ON t.id = s.ticketFk
- JOIN vn.sector sc ON sc.id = vSectorFk
+ FROM sale s
+ JOIN item i ON i.id = s.itemFk
+ JOIN ticket t ON t.id = s.ticketFk
+ JOIN sector sc ON sc.id = vSectorFk
WHERE t.shipped BETWEEN util.VN_CURDATE() AND TIMESTAMPADD(HOUR, 23, util.VN_CURDATE())
GROUP BY s.ticketFk
HAVING iptSector;
- CALL vn.productionControl(vWarehouseFk, 0);
+ CALL productionControl(vWarehouseFk, 0);
SELECT 0,999999,0 INTO @sameTicket, @ticket, @litrosTicket;
@@ -65197,19 +64957,19 @@ BEGIN
IF (MINUTE(isa.shipped),MINUTE(isa.shipped), MINUTE(isa.`hour`)) Minuto,
i.subName,
CAST(isa.physicalVolume * 1000 AS DECIMAL(10,0)) as Litros
- FROM vn.itemShelvingAvailable isa
- JOIN vn.item i ON i.id = isa.itemFk
- JOIN vn.sector s ON s.id = isa.sectorFk AND s.warehouseFk = isa.warehouseFk
- JOIN vn.ticket t ON t.id = isa.ticketFk
+ FROM itemShelvingAvailable isa
+ JOIN item i ON i.id = isa.itemFk
+ JOIN sector s ON s.id = isa.sectorFk AND s.warehouseFk = isa.warehouseFk
+ JOIN sectorType st ON st.id = s.typeFk
+ JOIN ticket t ON t.id = isa.ticketFk
LEFT JOIN tmp.whiteTicket wt ON wt.ticketFk = isa.ticketFk
LEFT JOIN tmp.sectorTypeTicket stt ON stt.ticketFk = isa.ticketFk
- LEFT JOIN vn.saleGroupDetail sgd ON sgd.saleFk = isa.saleFk
- JOIN vn.client c ON c.id = t.clientFk
+ LEFT JOIN saleGroupDetail sgd ON sgd.saleFk = isa.saleFk
+ JOIN client c ON c.id = t.clientFk
JOIN tmp.productionBuffer pb ON pb.ticketFk = t.id
- JOIN vn.packagingConfig pc
- WHERE IF(s.isPreviousPreparedByPacking,
+ JOIN packagingConfig pc
+ WHERE IF(st.code = 'previousByPacking',
i.`size` > pc.previousPreparationMinimumSize
- AND isa.packing > 1
AND (MOD(TRUNCATE(isa.quantity,0), isa.packing)= 0 ),
TRUE)
AND sgd.saleFk IS NULL
@@ -65264,7 +65024,7 @@ BEGIN
`yearMonth` INT
)
ENGINE = MEMORY;
-
+
WHILE vDated <= vEnded DO
INSERT INTO tmp.rangeDate
SET `dated` = vDated,
@@ -65274,7 +65034,7 @@ BEGIN
`day` = DAY(vDated),
`week` = WEEK(vDated, 1),
`yearMonth` = YEAR(vDated) * 100 + MONTH(vDated);
-
+
SET vDated = DATE_ADD(vDated, INTERVAL 1 DAY);
END WHILE;
END ;;
@@ -65363,7 +65123,7 @@ BEGIN
CALL cache.available_refresh(vCalc, FALSE, vWarehouseFk, vDate);
DROP TEMPORARY TABLE IF EXISTS tmp.recipeCook;
-
+
CREATE TEMPORARY TABLE tmp.recipeCook
SELECT *,
@counter := IF(@element = element COLLATE utf8_general_ci , @counter + 1, 1) as counter,
@@ -65381,22 +65141,22 @@ BEGIN
IFNULL((i.inkFk = r.inkFk ) ,0)
+ IFNULL((i.size = r.size) ,0)
+ IFNULL((i.name LIKE CONCAT('%',r.name,'%')) ,0)
- + IFNULL((i.longName LIKE CONCAT('%',r.longName,'%')),0)
+ + IFNULL((i.longName LIKE CONCAT('%',r.longName,'%')),0)
+ IFNULL((i.typeFk = r.typeFk),0) as matches,
i.typeFk,
rl.previousSelected
- FROM vn.recipe r
+ FROM vn.recipe r
JOIN vn.item i ON (IFNULL(i.name LIKE CONCAT('%',r.name,'%'), 0)
OR IFNULL(i.longName LIKE CONCAT('%',r.longName,'%'),0))
OR i.typeFk <=> r.typeFk
JOIN cache.available a ON a.item_id = i.id AND a.calc_id = vCalc
LEFT JOIN (SELECT recipe_ItemFk, element as log_element, selected_ItemFk, count(*) as previousSelected
FROM vn.recipe_log
- GROUP BY recipe_ItemFk, element, selected_ItemFk) rl ON rl.recipe_ItemFk = r.itemFk
+ GROUP BY recipe_ItemFk, element, selected_ItemFk) rl ON rl.recipe_ItemFk = r.itemFk
AND rl.log_element = r.element
AND rl.selected_ItemFk = i.id
WHERE r.itemFk = vItemFk
- AND a.available > vBunchesQuantity * r.quantity
+ AND a.available > vBunchesQuantity * r.quantity
UNION ALL
SELECT 100 itemFk,
CONCAT('? ',r.element,' ',IFNULL(r.size,''),' ',IFNULL(r.inkFk,'')) as longName,
@@ -65413,15 +65173,15 @@ BEGIN
WHERE r.itemFk = vItemFk
GROUP BY r.element
) sub
-
+
ORDER BY element, matches DESC, previousSelected DESC;
-
- SELECT *
+
+ SELECT *
FROM tmp.recipeCook
WHERE counter < 6
- OR itemFk = 100
+ OR itemFk = 100
;
-
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -65442,83 +65202,117 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `recipe_Plaster`(vItemFk INT, vTicke
BEGIN
DECLARE vLastCost DECIMAL(10,2);
- DECLARE vWarehouseFk INT;
- DECLARE vShipped DATE;
- DECLARE vEntryFk INT;
- DECLARE vTravelFk INT;
+ DECLARE vWarehouseFk INT;
+ DECLARE vShipped DATE;
+ DECLARE vEntryFk INT;
+ DECLARE vTravelFk INT;
- CALL cache.last_buy_refresh(FALSE);
-
- SELECT warehouseFk, shipped
+ CALL cache.last_buy_refresh(FALSE);
+
+ SELECT warehouseFk, shipped
INTO vWarehouseFk, vShipped
- FROM vn.ticket
- WHERE id = vTicketFk;
+ FROM vn.ticket
+ WHERE id = vTicketFk;
UPDATE vn.ticket t
JOIN vn.item i ON i.id = vItemFk
- SET t.nickname = CONCAT(vQuantity,' ',i.longName)
+ SET t.nickname = CONCAT(vQuantity,' ',i.longName)
WHERE t.id = vTicketFk;
SELECT b.buyingValue INTO vLastCost
FROM vn.buy b
JOIN cache.last_buy lb ON lb.buy_id = b.id
WHERE lb.item_id = vItemFk
- ORDER BY (lb.warehouse_id = vWarehouseFk) DESC
- LIMIT 1;
+ ORDER BY (lb.warehouse_id = vWarehouseFk) DESC
+ LIMIT 1;
INSERT INTO vn.sale(ticketFk, itemFk, quantity, concept, price)
SELECT vTicketFk, 98, - vQuantity, i.longName, vLastCost
FROM vn.item i
- WHERE i.id = vItemFk;
- /*
- SELECT tr.id INTO vTravelFk
- FROM vn.travel tr
- JOIN vn.warehouse w ON w.id = tr.warehouseOutFk
- WHERE tr.warehouseInFk = vWarehouseFk
- AND tr.landed = vShipped
- AND w.name = 'Confeccion';
-
- IF IFNULL(vTravelFk,0) = 0 THEN
-
- INSERT INTO vn.travel(shipped, landed, warehouseInFk, warehouseOutFk, agencyFk)
- SELECT vShipped, vShipped, vWarehouseFk, w.id, am.id
- FROM vn.warehouse w
- JOIN vn.agencyMode am
- WHERE w.name = 'Confeccion'
- AND am.name = 'DIRECTO PROVEEDOR';
-
- SET vTravelFk = LAST_INSERT_ID();
-
- END IF;
-
- SELECT e.id INTO vEntryFk
- FROM vn.entry e
- JOIN vn.supplier s ON s.id = supplierFk
- WHERE e.travelFk = vTravelFk
- AND s.name = 'Confeccion Natural'
- AND e.isRaid = FALSE;
-
- IF IFNULL(vEntryFk,0) = 0 THEN
-
- INSERT INTO vn.entry(supplierFk, evaNotes, travelFk, companyFk)
- SELECT s.id, t.nickname, vTravelFk, c.id
- FROM vn.supplier s
- JOIN vn.ticket t ON t.id = vTicketFk
- JOIN vn.company c ON c.code = 'VNL'
- WHERE s.name = 'Confeccion Natural';
-
- SET vEntryFk = LAST_INSERT_ID();
-
- END IF;
-
- INSERT INTO vn.buy(entryFk, itemFk, quantity, buyingValue, packageFk, packing, grouping)
- SELECT vEntryFk, b.itemFk, vQuantity, b.buyingValue, b.packageFk, b.packing, b.grouping
- FROM cache.last_buy lb
- JOIN vn.buy b ON b.id = lb.buy_id
- WHERE lb.item_id = vItemFk
- ORDER BY (lb.warehouse_id = vWarehouseFk) DESC
- LIMIT 1;
+ WHERE i.id = vItemFk;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `remittance_calc` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `remittance_calc`(
+ vDated DATE
+)
+BEGIN
+/**
+* Calcula los datos de remesa, incluyendo el importe,
+* el vencimiento, y otros datos relevantes.
+*
+* @param vDated Fecha a calcular
+* @return tmp.remittance
*/
+ CREATE OR REPLACE TEMPORARY TABLE tmp.remittance
+ SELECT CONCAT(s.nif, REPEAT('0', 12 - LENGTH(s.nif))) cif,
+ c.id clientFk,
+ c.name client,
+ c.fi,
+ sub.paymentDate,
+ 0 invoiceAmount,
+ CAST(sub.receipt AS DECIMAL(10,2)) receiptAmount,
+ 0 currentAmount,
+ sub.companyFk,
+ c.socialName,
+ CAST(sub.receipt AS DECIMAL(10,2)) totalAmount,
+ CAST(sub.receipt AS DECIMAL(10,2)) balance,
+ s.name company,
+ co.code companyCode,
+ c.accountingAccount,
+ c.iban,
+ c.hasSepaVnl,
+ c.hasCoreVnl,
+ c.hasLcr,
+ be.bic,
+ be.`name` entityName
+ FROM client c
+ JOIN (
+ SELECT risk.companyFk,
+ c.id,
+ SUM(risk.amount) receipt,
+ IF((c.dueDay + graceDays) MOD 30.001 <= DAY(vDated),
+ LAST_DAY(vDated - INTERVAL 1 MONTH) + INTERVAL (c.dueDay + graceDays) MOD 30.001 DAY,
+ LAST_DAY(vDated - INTERVAL 2 MONTH) + INTERVAL (c.dueDay + graceDays) MOD 30.001 DAY
+ ) paymentDate
+ FROM client c
+ JOIN payMethod pm ON pm.id = c.payMethodFk
+ JOIN (
+ SELECT cr.companyFk, cr.clientFk, cr.amount
+ FROM client c
+ JOIN clientRisk cr ON cr.clientFk = c.id
+ JOIN payMethod pm ON pm.id = c.payMethodFk
+ WHERE pm.code = 'bankDraft'
+ UNION ALL
+ SELECT io.companyFk, io.clientFk, - io.amount
+ FROM invoiceOut io
+ JOIN client c ON c.id = io.clientFk
+ JOIN payMethod pm ON pm.id = c.payMethodFk
+ WHERE io.dued > vDated
+ AND pm.code = 'bankDraft'
+ AND pm.outstandingDebt
+ AND io.amount > 0
+
+ ) risk ON risk.clientFk = c.id
+ GROUP BY risk.companyFk, c.id
+ HAVING receipt > 10
+ ) sub ON sub.id = c.id
+ JOIN supplier s ON s.id = sub.companyFk
+ JOIN company co ON co.id = sub.companyFk
+ LEFT JOIN bankEntity be ON be.id = c.bankEntityFk;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -65612,7 +65406,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `report_print`(
)
BEGIN
/**
- * Inserts in the print queue the report to be printed and the necessary parameters for this
+ * Inserts in the print queue the report to be printed and the necessary parameters for this
* one taking into account the paper size of both the printer and the report.
*
* @param vReportName the report to be printed.
@@ -65655,11 +65449,11 @@ BEGIN
END IF;
IF vReportFk IS NULL THEN
- CALL util.throw('reportNotExists');
+ CALL util.throw('reportNotExists');
END IF;
IF vReportSize <> vPrinteSize THEN
- CALL util.throw('incorrectSize');
+ CALL util.throw('incorrectSize');
END IF;
START TRANSACTION;
@@ -65668,7 +65462,7 @@ BEGIN
priorityFk = vPriorityFk,
reportFk = vReportFk,
workerFk = vUserFk;
-
+
SET vPrintQueueFk = LAST_INSERT_ID();
WHILE vI < vLength DO
@@ -65701,16 +65495,16 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `riskAllClients`(maxRiskDate DATE)
BEGIN
-
+
DROP TEMPORARY TABLE IF EXISTS tmp.client_list;
CREATE TEMPORARY TABLE tmp.client_list
(PRIMARY KEY (Id_Cliente))
ENGINE = MEMORY
SELECT id Id_Cliente, null grade FROM vn.client;
-
+
CALL vn2008.risk_vs_client_list(maxRiskDate);
-
- SELECT
+
+ SELECT
c.RazonSocial,
c.Id_Cliente,
c.Credito,
@@ -65722,7 +65516,7 @@ BEGIN
JOIN tmp.risk r ON r.Id_Cliente = c.Id_Cliente
JOIN tmp.client_list ci ON c.Id_Cliente = ci.Id_Cliente
GROUP BY c.Id_cliente;
-
+
DROP TEMPORARY TABLE IF EXISTS tmp.risk;
DROP TEMPORARY TABLE IF EXISTS tmp.client_list;
END ;;
@@ -65781,25 +65575,25 @@ BEGIN
DECLARE vM3 INT;
DECLARE vKg INT;
DECLARE vMatricula varchar(50);
-
+
SELECT sum(packages) as bultos
INTO vPackages
- FROM vn.ticket t
+ FROM vn.ticket t
WHERE routeFk = vRouteFk;
-
+
SELECT SUM(sv.physicalVolume), SUM(sv.physicalWeight)
INTO vM3, vKg
FROM vn.saleVolume sv
WHERE sv.routeFk = vRouteFk;
-
+
SELECT v.numberPlate as matricula
INTO vMatricula
- FROM vn.route r
+ FROM vn.route r
JOIN vn.vehicle v ON r.vehicleFk = v.id
WHERE r.id = vRouteFk;
-
+
SELECT vRouteFk as Ruta,
- vPackages as Bultos,
+ vPackages as Bultos,
vM3 as m3,
vKg as Kg,
vMatricula as Matricula;
@@ -65864,7 +65658,7 @@ BEGIN
) sub ON sub.routeFk = rm.routeFk
SET rm.ticketFree = sub.ticketFree;
- UPDATE routesMonitor rm
+ UPDATE routesMonitor rm
JOIN(
SELECT t.routeFk, COUNT(*) AS ticketPacked
FROM vn.ticket t
@@ -65950,11 +65744,11 @@ DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `routeSetOk`(
vRouteFk INT)
BEGIN
-
+
UPDATE vn.route r
SET r.isOk = 1
WHERE r.id = vRouteFk;
-
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -65993,15 +65787,18 @@ DELIMITER ;
/*!50003 SET character_set_results = utf8mb4 */ ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `route_calcCommission`(vSelf INT)
-proc: BEGIN
+CREATE DEFINER=`root`@`localhost` PROCEDURE `route_calcCommission`(
+ vSelf INT
+)
+BEGIN
/**
- * Calcula las comisión para una ruta y guarda los valores en la tabla routeCommission
+ * Calcula las comisión para una ruta y guarda los valores
+ * en la tabla vn.routeCommission.
*
- * @param vSelf id de ruta
+ * @param vSelf Id de ruta
*/
- DECLARE vIsUpdatable BOOL;
- DECLARE vIsFreelance BOOL;
+ DECLARE vIsUpdatable, vIsFreelance BOOL DEFAULT 0;
+ DECLARE vAgencyModePricePercentage DOUBLE;
SELECT r.created >= rc.cutoffDated INTO vIsUpdatable
FROM route r
@@ -66017,6 +65814,13 @@ proc: BEGIN
JOIN worker w ON w.id = r.workerFk
WHERE r.id = vSelf;
+ SELECT ampp.percentage INTO vAgencyModePricePercentage
+ FROM route r
+ JOIN agencyMode am ON am.id = r.agencyModeFk
+ JOIN agencyModePricePercentage ampp ON ampp.agencyModeFk = am.id
+ WHERE r.id = vSelf;
+
+ -- Falta calcular el precio, a la espera de saber el/los campo/s exacto/s al que aplicarlo/s
IF vIsFreelance THEN
INSERT INTO routeCommission (
routeFk,
@@ -66026,13 +65830,17 @@ proc: BEGIN
cat5m3
)
SELECT vSelf,
- r.commissionWorkCenterFk,
- rc.freelanceM3 * IF(
- IFNULL(r.m3, 0) >= rc.freelanceMinM3,
+ r.commissionWorkCenterFk,
+ IF(vAgencyModePricePercentage IS NOT NULL,
+ vAgencyModePricePercentage / 100,
+ rc.freelanceM3
+ ) *
+ IF(IFNULL(r.m3, 0) >= rc.freelanceMinM3,
IFNULL(r.m3, 0),
- 0),
- rc.distributionCat4M3 * IFNULL(r.m3, 0),
- rc.distributionCat5M3 * IFNULL(r.m3, 0)
+ 0
+ ),
+ rc.distributionCat4M3 * IFNULL(r.m3, 0),
+ rc.distributionCat5M3 * IFNULL(r.m3, 0)
FROM route r
JOIN vehicle v ON v.id = r.vehicleFk
JOIN routeConfig rc
@@ -66051,15 +65859,15 @@ proc: BEGIN
cat5m3
)
SELECT vSelf,
- r.commissionWorkCenterFk,
- (r.kmEnd - r.kmStart) *
- IF(v.isKmTruckRate, rc.kmHeavy, rc.kmLight),
- IFNULL(r.m3, 0) *
- IF(v.isKmTruckRate, rc.deliveryM3Cat5, rc.deliveryM3Cat4),
- (r.kmEnd - r.kmStart) * rc.kmYearly,
- IFNULL(r.m3, 0) * rc.m3Yearly,
- rc.distributionCat4M3 * IFNULL(r.m3, 0),
- rc.distributionCat5M3 * IFNULL(r.m3, 0)
+ r.commissionWorkCenterFk,
+ (r.kmEnd - r.kmStart) *
+ IF(v.isKmTruckRate, rc.kmHeavy, rc.kmLight),
+ IFNULL(r.m3, 0) *
+ IF(v.isKmTruckRate, rc.deliveryM3Cat5, rc.deliveryM3Cat4),
+ (r.kmEnd - r.kmStart) * rc.kmYearly,
+ IFNULL(r.m3, 0) * rc.m3Yearly,
+ rc.distributionCat4M3 * IFNULL(r.m3, 0),
+ rc.distributionCat5M3 * IFNULL(r.m3, 0)
FROM route r
JOIN vehicle v ON v.id = r.vehicleFk
JOIN routeConfig rc
@@ -66091,7 +65899,7 @@ proc: BEGIN
/**
* Recalculates modified route.
*/
-
+
DECLARE vDone BOOL;
DECLARE vRouteFk INT;
@@ -66100,7 +65908,7 @@ proc: BEGIN
DECLARE CONTINUE HANDLER FOR NOT FOUND
SET vDone = TRUE;
-
+
DECLARE CONTINUE HANDLER FOR SQLEXCEPTION
BEGIN
DO RELEASE_LOCK('vn.route_doRecalc');
@@ -66156,63 +65964,66 @@ BEGIN
* @param vRouteFk
* @select Información de los tickets
*/
-SELECT *
- FROM (
- SELECT t.id Id,
- t.clientFk Client,
- a.id Address,
- a.nickname ClientName,
- t.packages Packages,
- a.street AddressName,
- a.postalCode PostalCode,
- a.city City,
- sub2.itemPackingTypeFk PackingType,
- c.phone ClientPhone,
- c.mobile ClientMobile,
- a.phone AddressPhone,
- a.mobile AddressMobile,
- d.longitude Longitude,
- d.latitude Latitude,
- wm.mediaValue SalePersonPhone,
- tob.description Note,
- t.isSigned Signed,
- t.priority,
- t.cmrFk
- FROM ticket t
- JOIN client c ON t.clientFk = c.id
- JOIN address a ON t.addressFk = a.id
- LEFT JOIN delivery d ON d.ticketFk = t.id
- LEFT JOIN workerMedia wm ON wm.workerFk = c.salesPersonFk
- LEFT JOIN(
- SELECT tob.description, t.id
- FROM ticketObservation tob
- JOIN ticket t ON tob.ticketFk = t.id
- JOIN observationType ot ON ot.id = tob.observationTypeFk
- WHERE t.routeFk = vRouteFk
- AND ot.code = 'delivery'
- )tob ON tob.id = t.id
- LEFT JOIN(
- SELECT sub.ticketFk,
- CONCAT('(',
- GROUP_CONCAT(DISTINCT sub.itemPackingTypeFk
- ORDER BY sub.items DESC SEPARATOR ','),
- ') ') itemPackingTypeFk
- FROM (
- SELECT s.ticketFk, i.itemPackingTypeFk, COUNT(*) items
- FROM ticket t
- JOIN sale s ON s.ticketFk = t.id
- JOIN item i ON i.id = s.itemFk
- WHERE t.routeFk = vRouteFk
- GROUP BY t.id, i.itemPackingTypeFk
- )sub
- GROUP BY sub.ticketFk
- )sub2 ON sub2.ticketFk = t.id
- WHERE t.routeFk = vRouteFk
- ORDER BY d.id DESC
- LIMIT 10000000000000000000
- )sub3
- GROUP BY sub3.id
- ORDER BY sub3.priority;
+SELECT t.id Id,
+ t.clientFk Client,
+ a.id Address,
+ a.nickname ClientName,
+ t.packages Packages,
+ a.street AddressName,
+ a.postalCode PostalCode,
+ a.city City,
+ sub3.itemPackingTypeFk PackingType,
+ c.phone ClientPhone,
+ c.mobile ClientMobile,
+ a.phone AddressPhone,
+ a.mobile AddressMobile,
+ d.longitude Longitude,
+ d.latitude Latitude,
+ wm.mediaValue SalePersonPhone,
+ tob.description Note,
+ t.isSigned Signed,
+ t.priority,
+ t.cmrFk
+ FROM ticket t
+ JOIN client c ON t.clientFk = c.id
+ JOIN address a ON t.addressFk = a.id
+ LEFT JOIN workerMedia wm ON wm.workerFk = c.salesPersonFk
+ LEFT JOIN (
+ SELECT t.addressFk, MAX(d.ticketFk) lastTicketFk
+ FROM ticket t
+ JOIN delivery d ON t.id = d.ticketFk
+ JOIN ticket ti ON ti.routeFk = vRouteFk
+ AND ti.id = t.id
+ AND ti.clientFk = t.clientFk
+ GROUP BY addressFk
+ )sub ON sub.addressFk = a.id
+ LEFT JOIN delivery d ON d.ticketFk = sub.lastTicketFk
+ LEFT JOIN(
+ SELECT t.id ticketFk, tob.description
+ FROM ticketObservation tob
+ JOIN ticket t ON tob.ticketFk = t.id
+ JOIN observationType ot ON ot.id = tob.observationTypeFk
+ WHERE t.routeFk = vRouteFk
+ AND ot.code = 'delivery'
+ )tob ON tob.ticketFk = t.id
+ LEFT JOIN(
+ SELECT sub2.ticketFk,
+ CONCAT('(',
+ GROUP_CONCAT(DISTINCT sub2.itemPackingTypeFk
+ ORDER BY sub2.items DESC SEPARATOR ','),
+ ') ') itemPackingTypeFk
+ FROM (
+ SELECT s.ticketFk, i.itemPackingTypeFk, COUNT(*) items
+ FROM ticket t
+ JOIN sale s ON s.ticketFk = t.id
+ JOIN item i ON i.id = s.itemFk
+ WHERE t.routeFk = vRouteFk
+ GROUP BY t.id, i.itemPackingTypeFk
+ )sub2
+ GROUP BY sub2.ticketFk
+ )sub3 ON sub3.ticketFk = t.id
+ WHERE t.routeFk = vRouteFk
+ ORDER BY priority, Id;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -66258,27 +66069,27 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `saleBuy_Add`(vSaleFk INT, vBuyFk INT)
BEGIN
-
+
/* Añade un registro a la tabla saleBuy en el caso de que sea posible mantener la trazabilidad
- *
+ *
* @param vSaleFk clave primaria de vn.sale
* @param vBuyFk clave primaria de vn.buy
*/
- /*IF (SELECT COUNT(*)
+ /*IF (SELECT COUNT(*)
FROM vn.sale s
JOIN vn.item i ON i.id = s.itemFk
- JOIN vn.itemType it ON it.id = i.typeFk
- JOIN vn.itemCategory ic ON ic.id = it.categoryFk
+ JOIN vn.itemType it ON it.id = i.typeFk
+ JOIN vn.itemCategory ic ON ic.id = it.categoryFk
WHERE s.id = vSaleFk
AND ic.code = 'fruit') THEN */
-
- IF (SELECT COUNT(*) FROM vn.buy WHERE id = vBuyFk AND itemOriginalFk) THEN
-
+
+ IF (SELECT COUNT(*) FROM vn.buy WHERE id = vBuyFk AND itemOriginalFk) THEN
+
INSERT INTO vn.saleBuy (saleFk, buyFk)
VALUES(vSaleFk, vBuyFk);
-
+
END IF;
-
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -66295,15 +66106,17 @@ DELIMITER ;
/*!50003 SET character_set_results = utf8mb4 */ ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `saleGroup_add`(vSectorFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `saleGroup_add`(vSectorFk INT,vTicketFk INT)
BEGIN
/**
* Añade un nuevo registro a la tabla y devuelve su id.
*
* @param vSectorFk Identificador de vn.sector
*/
- INSERT INTO vn.saleGroup(userFk, sectorFk)
- VALUES (account.myUser_getId(), vSectorFk);
+ INSERT INTO vn.saleGroup
+ SET `userFk` = account.myUser_getId(),
+ `sectorFk` = vSectorFk,
+ `ticketFk` = vTicketFk;
SELECT LAST_INSERT_ID();
END ;;
@@ -66425,6 +66238,62 @@ DELIMITER ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `saleSplit` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `saleSplit`(vSaleFk INT, vQuantity INT)
+BEGIN
+
+
+ DECLARE vNewSaleFk INT;
+
+ INSERT INTO vn.sale(itemFk,
+ concept,
+ price,
+ discount,
+ quantity,
+ ticketFk,
+ isPriceFixed)
+ SELECT s.itemFk,
+ i.longName,
+ s.price,
+ s.discount,
+ vQuantity,
+ s.ticketFk,
+ s.isPriceFixed
+ FROM vn.sale s
+ JOIN vn.item i ON i.id = s.itemFk
+ WHERE s.id = vSaleFk;
+
+ UPDATE vn.sale s
+ JOIN vn.item i ON i.id = s.itemFk
+ SET s.quantity = s.quantity - vQuantity, s.concept = i.longName
+ WHERE s.id = vSaleFk;
+
+ SELECT LAST_INSERT_ID() INTO vNewSaleFk;
+
+ INSERT INTO vn.saleComponent( saleFk,
+ componentFk,
+ value)
+ SELECT vNewSaleFk,
+ componentFk,
+ value
+ FROM vn.saleComponent
+ WHERE saleFk = vSaleFk;
+
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `sales_merge` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
@@ -66434,41 +66303,41 @@ DELIMITER ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `sales_merge`(vTicketFk INT)
-BEGIN
- DECLARE EXIT HANDLER FOR SQLEXCEPTION
- BEGIN
- ROLLBACK;
- RESIGNAL;
- END;
-
- CREATE OR REPLACE TEMPORARY TABLE tSalesToPreserve
- SELECT s.id, s.itemFk, SUM(s.quantity) newQuantity
- FROM sale s
- JOIN item i ON i.id = s.itemFk
- JOIN itemType it ON it.id = i.typeFk
- WHERE s.ticketFk = vTicketFk
- AND it.isMergeable
- GROUP BY s.itemFk, s.price, s.discount;
-
- START TRANSACTION;
-
- UPDATE sale s
- JOIN tSalesToPreserve stp ON stp.id = s.id
- SET quantity = newQuantity
- WHERE s.ticketFk = vTicketFk;
-
- DELETE s.*
- FROM sale s
- LEFT JOIN tSalesToPreserve stp ON stp.id = s.id
- JOIN item i ON i.id = s.itemFk
- JOIN itemType it ON it.id = i.typeFk
- WHERE s.ticketFk = vTicketFk
- AND stp.id IS NULL
- AND it.isMergeable;
-
- COMMIT;
-
- DROP TEMPORARY TABLE tSalesToPreserve;
+BEGIN
+ DECLARE EXIT HANDLER FOR SQLEXCEPTION
+ BEGIN
+ ROLLBACK;
+ RESIGNAL;
+ END;
+
+ CREATE OR REPLACE TEMPORARY TABLE tSalesToPreserve
+ SELECT s.id, s.itemFk, SUM(s.quantity) newQuantity
+ FROM sale s
+ JOIN item i ON i.id = s.itemFk
+ JOIN itemType it ON it.id = i.typeFk
+ WHERE s.ticketFk = vTicketFk
+ AND it.isMergeable
+ GROUP BY s.itemFk, s.price, s.discount;
+
+ START TRANSACTION;
+
+ UPDATE sale s
+ JOIN tSalesToPreserve stp ON stp.id = s.id
+ SET quantity = newQuantity
+ WHERE s.ticketFk = vTicketFk;
+
+ DELETE s.*
+ FROM sale s
+ LEFT JOIN tSalesToPreserve stp ON stp.id = s.id
+ JOIN item i ON i.id = s.itemFk
+ JOIN itemType it ON it.id = i.typeFk
+ WHERE s.ticketFk = vTicketFk
+ AND stp.id IS NULL
+ AND it.isMergeable;
+
+ COMMIT;
+
+ DROP TEMPORARY TABLE tSalesToPreserve;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -66503,17 +66372,17 @@ BEGIN
OPEN cCur;
myLoop: LOOP
-
+
SET vDone = FALSE;
-
+
FETCH cCur INTO vTicketFk;
IF vDone THEN
LEAVE myLoop;
END IF;
-
+
CALL vn.sales_merge(vTicketFk);
-
+
END LOOP;
CLOSE cCur;
@@ -66644,9 +66513,9 @@ BEGIN
DELETE st.*
FROM vn.saleTracking st
JOIN vn.state s ON s.id = st.stateFk
- WHERE st.saleFk = vSaleFk
+ WHERE st.saleFk = vSaleFk
AND s.code = vState COLLATE utf8_unicode_ci;
-
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -66663,12 +66532,12 @@ DELIMITER ;
/*!50003 SET character_set_results = utf8mb4 */ ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `saleTracking_new`(
- vSaleFK INT,
- vIsChecked BOOLEAN,
- vOriginalQuantity INT,
- vWorkerFk INT,
- vAction VARCHAR(50),
+CREATE DEFINER=`root`@`localhost` PROCEDURE `saleTracking_new`(
+ vSaleFK INT,
+ vIsChecked BOOLEAN,
+ vOriginalQuantity INT,
+ vWorkerFk INT,
+ vAction VARCHAR(50),
vState VARCHAR(50),
vIsScanned BOOLEAN)
BEGIN
@@ -66684,12 +66553,12 @@ BEGIN
* @param vIsScanned Identificador si se ha escaneado automáticamente o manual
*/
- REPLACE vn.saleTracking(saleFk,
- isChecked,
- originalQuantity,
- workerFk,
+ REPLACE vn.saleTracking(saleFk,
+ isChecked,
+ originalQuantity,
+ workerFk,
stateFk,
- isScanned)
+ isScanned)
SELECT vSaleFK,
vIsChecked,
vOriginalQuantity,
@@ -66716,27 +66585,27 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `saleTracking_updateIsChecked`(vSaleFK INT, vIsChecked BOOL, vIsScanned BOOL)
BEGIN
-
+
/**
* Actualiza el estado del campo vn.saleTracking.isChecked y elimina las lineas de vn.itemShelving
* si procede, en el caso de las preparaciones previas, por usuario
- *
+ *
* @param vSaleFk Identificador de vn.sale
* @param vIsChecked Estado del registro
*/
-
+
UPDATE vn.saleTracking st
JOIN vn.state s ON s.id = st.stateFk AND s.code = 'PREVIOUS_PREPARATION'
SET st.isChecked = vIsChecked,
st.isScanned = vIsScanned
WHERE st.saleFk = vSaleFK
AND st.workerFk = account.myUser_getId();
-
+
IF vIsChecked = FALSE THEN
-
- DELETE FROM vn.itemShelvingSale
+
+ DELETE FROM vn.itemShelvingSale
WHERE saleFk = vSaleFK;
-
+
END IF;
END ;;
@@ -66746,16 +66615,16 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `sale_calculateComponent` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `sale_calculateComponent`(vSelf INT, vOption INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `sale_calculateComponent`(vSelf INT, vOption VARCHAR(25))
proc: BEGIN
/**
* Crea tabla temporal para vn.sale_recalcComponent() para recalcular los componentes
@@ -66763,14 +66632,14 @@ proc: BEGIN
* @param vSelf Id de la venta
* @param vOption indica en que componente pone el descuadre, NULL en casos habituales
*/
- CREATE OR REPLACE TEMPORARY TABLE tmp.recalculateSales
- SELECT s.id
- FROM sale s
- WHERE s.id = vSelf;
+ CREATE OR REPLACE TEMPORARY TABLE tmp.recalculateSales
+ SELECT s.id
+ FROM sale s
+ WHERE s.id = vSelf;
+
+ CALL sale_recalcComponent(vOption);
- CALL sale_recalcComponent(vOption);
-
- DROP TEMPORARY TABLE tmp.recalculateSales;
+ DROP TEMPORARY TABLE tmp.recalculateSales;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -66779,7 +66648,7 @@ DELIMITER ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `sale_checkNoComponents` */;
+/*!50003 DROP PROCEDURE IF EXISTS `sale_getBoxPickingList` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
@@ -66787,74 +66656,77 @@ DELIMITER ;
/*!50003 SET character_set_results = utf8mb4 */ ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `sale_checkNoComponents`(vCreatedFrom DATETIME, vCreatedTo DATETIME)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `sale_getBoxPickingList`(vSectorFk INT, vDated DATE)
BEGIN
/**
- * Comprueba que las ventas creadas entre un rango de fechas tienen componentes
- *
- * @param vCreatedFrom inicio del rango
- * @param vCreatedTo fin del rango
- */
- DECLARE v_done BOOL DEFAULT FALSE;
- DECLARE vSaleFk INTEGER;
- DECLARE vTicketFk INTEGER;
- DECLARE vConcept VARCHAR(50);
- DECLARE vCur CURSOR FOR
- SELECT s.id
- FROM sale s
- JOIN ticket t ON t.id = s.ticketFk
- JOIN item i ON i.id = s.itemFk
- JOIN itemType tp ON tp.id = i.typeFk
- JOIN itemCategory ic ON ic.id = tp.categoryFk
- LEFT JOIN tmp.coste c ON c.id = s.id
- WHERE s.created >= vCreatedFrom AND s.created <= vCreatedTo
- AND c.id IS NULL
- AND t.agencyModeFk IS NOT NULL
- AND t.isDeleted IS FALSE
- AND t.warehouseFk = 60
- AND ic.merchandise != FALSE
- GROUP BY s.id;
+* Returns a suitable boxPicking sales list
+*
+* @param vSectorFk Identifier for vn.sector table
+* @param vDated Date for vn.tickets.shipping
+*
+* @return tmp.sale
+*/
+ DECLARE vWarehouseFk INT;
- DECLARE CONTINUE HANDLER FOR NOT FOUND
- SET v_done = TRUE;
+ SELECT warehouseFk INTO vWarehouseFk
+ FROM sector
+ WHERE id = vSectorFk;
- DROP TEMPORARY TABLE IF EXISTS tmp.coste;
+ CALL productionControl(vWarehouseFk, 0);
- DROP TEMPORARY TABLE IF EXISTS tmp.coste;
- CREATE TEMPORARY TABLE tmp.coste
- (PRIMARY KEY (id)) ENGINE = MEMORY
- SELECT s.id
+ CREATE OR REPLACE TEMPORARY TABLE tmp.sale
+ (saleFk INT PRIMARY KEY)
+ SELECT
+ s.ticketFk,
+ s.id saleFk,
+ s.itemFk,
+ s.concept,
+ s.quantity,
+ MAKETIME(pb.HH,pb.mm,0) etd,
+ pb.routeFk,
+ FLOOR(s.quantity / IF(i.isBoxPickingMode, ish.packing, i.packingOut)) stickers,
+ IF(i.isBoxPickingMode, ish.packing, i.packingOut) packing,
+ b.packagingFk
FROM sale s
JOIN item i ON i.id = s.itemFk
- JOIN itemType tp ON tp.id = i.typeFk
- JOIN itemCategory ic ON ic.id = tp.categoryFk
- JOIN saleComponent sc ON sc.saleFk = s.id
- JOIN component c ON c.id = sc.componentFk
- JOIN componentType ct ON ct.id = c.typeFk AND ct.id = 6
- WHERE s.created >= vCreatedFrom
- AND ic.merchandise != FALSE;
+ JOIN itemShelving ish ON ish.itemFk = s.itemFk
+ LEFT JOIN ( SELECT iss.itemShelvingFk,
+ s.itemFk,
+ SUM(iss.quantity) reserve
+ FROM itemShelvingSale iss
+ JOIN sale s ON s.id = iss.saleFk
+ WHERE iss.isPicked = FALSE
+ AND iss.created >= vDated
+ GROUP BY iss.itemShelvingFk, s.itemFk) tISS
+ ON tISS.itemFk = ish.itemFk AND tISS.itemShelvingFk = ish.id
+ JOIN shelving sh ON sh.code = ish.shelvingFk
+ JOIN parking p ON p.id = sh.parkingFk
+ JOIN tmp.productionBuffer pb ON pb.ticketFk = s.ticketFk
+ JOIN agencyMode am ON am.id = pb.agencyModeFk
+ LEFT JOIN routesMonitor rm ON rm.routeFk = pb.routeFk
+ LEFT JOIN saleGroupDetail sgd ON sgd.saleFk = s.id
+ LEFT JOIN ticketState ts ON ts.ticketFk = s.ticketFk
+ LEFT JOIN cache.last_buy lb ON lb.item_id = i.id AND lb.warehouse_id = vWarehouseFk
+ LEFT JOIN buy b ON b.id = lb.buy_id
+ WHERE IF(i.isBoxPickingMode, ish.packing, i.packingOut)
+ <= LEAST(s.quantity, ish.visible - IFNULL(tISS.reserve,0))
+ AND NOT pb.problem
+ AND sgd.saleFk IS NULL
+ AND p.sectorFk = vSectorFk
+ AND ts.isPreviousPreparable
+ AND ((rm.bufferFk AND rm.isPickingAllowed)
+ OR am.code = 'REC_ALG')
+ AND pb.shipped = vDated
+ GROUP BY s.id
+ ORDER BY etd;
- OPEN vCur;
+ SELECT *
+ FROM tmp.sale
+ WHERE stickers;
- l: LOOP
- SET v_done = FALSE;
- FETCH vCur INTO vSaleFk;
-
- IF v_done THEN
- LEAVE l;
- END IF;
-
- SELECT ticketFk, concept
- INTO vTicketFk, vConcept
- FROM sale
- WHERE id = vSaleFk;
-
- CALL sale_calculateComponent(vSaleFk, 1);
- END LOOP;
-
- CLOSE vCur;
- DROP TEMPORARY TABLE tmp.coste;
-END ;;
+ DROP TEMPORARY TABLE tmp.productionBuffer;
+ DROP TEMPORARY TABLE tmp.sale;
+ END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
@@ -66939,7 +66811,7 @@ DECLARE vIsCollection BOOL;
TRIM(CONCAT(LPAD(s.concept,30,' '), ' ',
RPAD(IFNULL(i.size,''),5,' '))) line1,
'' cel1,
- TRIM(CONCAT(LPAD(IFNULL(ip.productor,''),30,' '), ' ',LPAD(IFNULL(o.code,''),4,' '))) line2,
+ TRIM(CONCAT(LPAD(IFNULL(ip.productor,''),30,' '), ' ',LPAD(IFNULL(o.code,''),4,' '))) line2,
IF(s.quantity MOD IFNULL(b.packing,s.quantity + 1),
CONCAT(CAST(s.quantity/IFNULL(b.`grouping`,1) AS DECIMAL(10,0)),' x ',IFNULL(b.`grouping`,1)),
CONCAT(CAST(s.quantity / IFNULL(b.packing,1) AS DECIMAL(10,0)),' pack de ',IFNULL(b.packing,1))) cel2,
@@ -66948,20 +66820,22 @@ DECLARE vIsCollection BOOL;
s.isAdded,
IF(c.workerFk IS NULL, getUser(), c.workerFk) workerFk,
IF(SUM(iss.quantity) IS NULL, 0, SUM(iss.quantity)) pickedQuantity,
- i.packingShelve,
MIN(iss.created) picked,
IF(sm.id, TRUE, FALSE) hasMistake,
- sg.sectorFk
+ sg.sectorFk,
+ b.packing,
+ b.grouping,
+ o.code
FROM tmp.ticket t
JOIN sale s ON s.ticketFk = t.id
JOIN ticket tt ON tt.id = t.id
LEFT JOIN cache.last_buy lb ON lb.item_id = s.itemFk AND lb.warehouse_id = tt.warehouseFk
- LEFT JOIN buy b ON b.id = lb.buy_id
+ LEFT JOIN buy b ON b.id = lb.buy_id
JOIN item i ON i.id = s.itemFk
LEFT JOIN ticketCollection tc ON tc.ticketFk = t.id
LEFT JOIN collection c ON c.id = tc.collectionFk
- LEFT JOIN (SELECT sub.saleFk, sub.isChecked, sub.stateFk, sub.originalQuantity
- FROM (SELECT DISTINCT st.id, st.saleFk, st.isChecked, st.stateFk, st.originalQuantity
+ LEFT JOIN (SELECT sub.saleFk, sub.isChecked, sub.stateFk, sub.originalQuantity
+ FROM (SELECT DISTINCT st.id, st.saleFk, st.isChecked, st.stateFk, st.originalQuantity
FROM tmp.ticket2 t
JOIN sale s ON s.ticketFk = t.id
JOIN saleTracking st ON st.saleFk = s.id
@@ -66973,7 +66847,7 @@ DECLARE vIsCollection BOOL;
LEFT JOIN itemColor ic ON ic.itemFk = s.itemFk
LEFT JOIN itemProductor ip ON ip.itemFk = s.itemFk
LEFT JOIN origin o ON o.id = i.originFk
- LEFT JOIN saleGroupDetail sgd ON sgd.saleFk = s.id
+ LEFT JOIN saleGroupDetail sgd ON sgd.saleFk = s.id
LEFT JOIN saleGroup sg ON sg.id = sgd.saleGroupFk
LEFT JOIN parking p ON p.id = sg.parkingFk
LEFT JOIN saleMistake sm ON sm.saleFk = s.id
@@ -67015,19 +66889,19 @@ BEGIN
DECLARE vComponentCount INT;
DECLARE vCursor CURSOR FOR
- SELECT DISTINCT tt.warehouseFk, IF(vIsTodayRelative, util.VN_CURDATE(), date(tt.shipped))
+ SELECT DISTINCT tt.warehouseFk, IF(vIsTodayRelative, util.VN_CURDATE(), DATE(tt.shipped))
FROM tmp.sale_getProblems tt
WHERE DATE(tt.shipped) BETWEEN util.VN_CURDATE()
- AND TIMESTAMPADD(DAY, IF(vIsTodayRelative, 9.9, 1.9), util.VN_CURDATE());
+ AND util.VN_CURDATE() + INTERVAL IF(vIsTodayRelative, 9.9, 1.9) DAY;
DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
DELETE tt.*
FROM tmp.sale_getProblems tt
- JOIN vn.ticketObservation tto ON tto.ticketFk = tt.ticketFk
- JOIN vn.observationType ot ON ot.id = tto.observationTypeFk
- WHERE ot.code = 'administrative'
- AND tto.description = 'Miriam';
+ JOIN ticketObservation tto ON tto.ticketFk = tt.ticketFk
+ JOIN observationType ot ON ot.id = tto.observationTypeFk
+ WHERE ot.code = 'administrative'
+ AND tto.description = 'Miriam';
CREATE OR REPLACE TEMPORARY TABLE tmp.sale_problems (
ticketFk INT(11),
@@ -67049,38 +66923,41 @@ BEGIN
CREATE OR REPLACE TEMPORARY TABLE tmp.ticket_list
(PRIMARY KEY (ticketFk))
ENGINE = MEMORY
- SELECT tp.ticketFk, tp.clientFk
- FROM tmp.sale_getProblems tp;
+ SELECT ticketFk, clientFk
+ FROM tmp.sale_getProblems;
SELECT COUNT(*) INTO vComponentCount
- FROM vn.component c
- WHERE c.isRequired;
+ FROM component
+ WHERE isRequired;
-- Too Little
INSERT INTO tmp.sale_problems(ticketFk, isTooLittle)
- SELECT tp.ticketFk, TRUE
+ SELECT tp.ticketFk, TRUE
FROM tmp.sale_getProblems tp
- JOIN vn.ticket t ON t.id = tp.ticketFk
- JOIN (SELECT t.addressFk, SUM(sv.litros) litros, t.totalWithoutVat
+ JOIN ticket t ON t.id = tp.ticketFk
+ JOIN (
+ SELECT t.addressFk, SUM(sv.litros) litros, t.totalWithoutVat
FROM tmp.ticket_list tl
- JOIN vn.saleVolume sv ON sv.ticketFk = tl.ticketFk
- JOIN vn.ticket t ON t.id = tl.ticketFk
- JOIN vn.zoneClosure zc ON zc.zoneFk = t.zoneFk AND zc.dated = util.VN_CURDATE()
- JOIN vn.agencyMode am ON am.id = t.agencyModeFk
- JOIN vn.deliveryMethod dm ON dm.id = am.deliveryMethodFk
- WHERE util.VN_NOW() < TIMESTAMPADD(MINUTE,MINUTE(zc.`hour`) ,TIMESTAMPADD(HOUR,HOUR(zc.`hour`),util.VN_CURDATE()))
- AND dm.code IN('AGENCY','DELIVERY','PICKUP')
+ JOIN saleVolume sv ON sv.ticketFk = tl.ticketFk
+ JOIN ticket t ON t.id = tl.ticketFk
+ JOIN zoneClosure zc ON zc.zoneFk = t.zoneFk
+ AND zc.dated = util.VN_CURDATE()
+ JOIN agencyMode am ON am.id = t.agencyModeFk
+ JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
+ WHERE util.VN_NOW() < (util.VN_CURDATE() + INTERVAL HOUR(zc.`hour`) HOUR) + INTERVAL MINUTE(zc.`hour`) MINUTE
+ AND dm.code IN ('AGENCY','DELIVERY','PICKUP')
AND t.shipped BETWEEN util.VN_CURDATE() AND util.midnight()
- GROUP BY t.addressFk) sub ON sub.addressFk = t.addressFk
- JOIN vn.volumeConfig vc
+ GROUP BY t.addressFk
+ ) sub ON sub.addressFk = t.addressFk
+ JOIN volumeConfig vc
WHERE sub.litros < vc.minTicketVolume
- AND sub.totalWithoutVat < vc.minTicketValue;
+ AND sub.totalWithoutVat < vc.minTicketValue;
-- Faltan componentes
INSERT INTO tmp.sale_problems(ticketFk, hasComponentLack, saleFk)
- SELECT sub.ticketFk, sub.hasComponentLack, sub.saleFk
- FROM(
- SELECT tl.ticketFk, (COUNT(DISTINCT s.id) * vComponentCount > COUNT(c.id)) hasComponentLack, s.id saleFk
+ SELECT ticketFk, (vComponentCount > nComp) hasComponentLack, saleFk
+ FROM (
+ SELECT COUNT(s.id) nComp, tl.ticketFk, s.id saleFk
FROM tmp.ticket_list tl
JOIN vn.sale s ON s.ticketFk = tl.ticketFk
LEFT JOIN vn.saleComponent sc ON sc.saleFk = s.id
@@ -67088,17 +66965,17 @@ BEGIN
JOIN vn.ticket t ON t.id = tl.ticketFk
JOIN vn.agencyMode am ON am.id = t.agencyModeFk
JOIN vn.deliveryMethod dm ON dm.id = am.deliveryMethodFk
- WHERE dm.code IN('AGENCY','DELIVERY','PICKUP')
+ WHERE dm.code IN ('AGENCY','DELIVERY','PICKUP')
AND s.quantity > 0
GROUP BY s.id
- LIMIT 10000000000000000) sub
- WHERE sub.hasComponentLack;
+ ) sub
+ HAVING hasComponentLack;
-- Cliente congelado
INSERT INTO tmp.sale_problems(ticketFk, isFreezed)
SELECT DISTINCT tl.ticketFk, TRUE
FROM tmp.ticket_list tl
- JOIN vn.client c ON c.id = tl.clientFk
+ JOIN client c ON c.id = tl.clientFk
WHERE c.isFreezed
ON DUPLICATE KEY UPDATE isFreezed = c.isFreezed;
@@ -67106,21 +66983,21 @@ BEGIN
CREATE OR REPLACE TEMPORARY TABLE tmp.clientGetDebt
(PRIMARY KEY (clientFk))
ENGINE = MEMORY
- SELECT DISTINCT clientFk
- FROM tmp.ticket_list;
+ SELECT DISTINCT clientFk
+ FROM tmp.ticket_list;
CALL client_getDebt(util.VN_CURDATE());
INSERT INTO tmp.sale_problems(ticketFk, risk, hasHighRisk)
SELECT DISTINCT tl.ticketFk, r.risk, ((r.risk - cc.riskTolerance) > c.credit + 10)
FROM tmp.ticket_list tl
- JOIN vn.ticket t ON t.id = tl.ticketFk
- JOIN vn.agencyMode a ON t.agencyModeFk = a.id
+ JOIN ticket t ON t.id = tl.ticketFk
+ JOIN agencyMode a ON t.agencyModeFk = a.id
JOIN tmp.risk r ON r.clientFk = t.clientFk
- JOIN vn.client c ON c.id = t.clientFk
- JOIN vn.clientConfig cc
+ JOIN client c ON c.id = t.clientFk
+ JOIN clientConfig cc
WHERE r.risk > c.credit + 10
- AND a.isRiskFree = FALSE
+ AND NOT a.isRiskFree
ON DUPLICATE KEY UPDATE
risk = r.risk, hasHighRisk = ((r.risk - cc.riskTolerance) > c.credit + 10);
@@ -67128,13 +67005,25 @@ BEGIN
INSERT INTO tmp.sale_problems(ticketFk, hasTicketRequest)
SELECT DISTINCT tl.ticketFk, TRUE
FROM tmp.ticket_list tl
- JOIN vn.ticketRequest tr ON tr.ticketFk = tl.ticketFk
+ JOIN ticketRequest tr ON tr.ticketFk = tl.ticketFk
WHERE tr.isOK IS NULL
ON DUPLICATE KEY UPDATE hasTicketRequest = TRUE;
+ CREATE OR REPLACE TEMPORARY TABLE tItemShelvingStock_byWarehouse
+ (INDEX (itemFk, warehouseFk))
+ ENGINE = MEMORY
+ SELECT ish.itemFk itemFk,
+ SUM(ish.visible) visible,
+ s.warehouseFk warehouseFk
+ FROM itemShelving ish
+ JOIN shelving sh ON sh.code = ish.shelvingFk
+ JOIN parking p ON p.id = sh.parkingFk
+ JOIN sector s ON s.id = p.sectorFk
+ GROUP BY ish.itemFk,
+ s.warehouseFk;
+
-- Disponible, Faltas, Inventario y Retrasos
OPEN vCursor;
-
l: LOOP
SET vDone = FALSE;
FETCH vCursor INTO vWarehouseFk, vDate;
@@ -67145,90 +67034,104 @@ BEGIN
-- Disponible: no va a haber suficiente producto para preparar todos los pedidos
CALL cache.available_refresh(vAvailableCache, FALSE, vWarehouseFk, vDate);
-
- -- Faltas: visible, disponible y ubicado son menores que la cantidad vendida
+
+ -- Faltas: visible, disponible y ubicado son menores que la cantidad vendida
CALL cache.visible_refresh(vVisibleCache, FALSE, vWarehouseFk);
INSERT INTO tmp.sale_problems(ticketFk, itemShortage, saleFk)
SELECT ticketFk, problem, saleFk
FROM (
- SELECT tl.ticketFk,
- LEFT(CONCAT('F: ',GROUP_CONCAT(i.id, ' ', i.longName, ' ')),250) problem,
+ SELECT tl.ticketFk,
+ LEFT(CONCAT('F: ',GROUP_CONCAT(i.id, ' ', i.longName, ' ')),250) problem,
s.id AS saleFk
FROM tmp.ticket_list tl
- JOIN vn.ticket t ON t.id = tl.ticketFk
- JOIN vn.sale s ON s.ticketFk = t.id
- JOIN vn.item i ON i.id = s.itemFk
- JOIN vn.itemType it on it.id = i.typeFk
- JOIN vn.itemCategory ic ON ic.id = it.categoryFk
- LEFT JOIN cache.visible v ON v.item_id = i.id AND v.calc_id = vVisibleCache
- LEFT JOIN cache.available av ON av.item_id = i.id AND av.calc_id = vAvailableCache
- LEFT JOIN vn.itemShelvingStock_byWarehouse issw ON issw.itemFk = i.id AND issw.warehouseFk = t.warehouseFk
+ JOIN ticket t ON t.id = tl.ticketFk
+ JOIN sale s ON s.ticketFk = t.id
+ JOIN item i ON i.id = s.itemFk
+ JOIN itemType it on it.id = i.typeFk
+ JOIN itemCategory ic ON ic.id = it.categoryFk
+ LEFT JOIN cache.visible v ON v.item_id = i.id
+ AND v.calc_id = vVisibleCache
+ LEFT JOIN cache.available av ON av.item_id = i.id
+ AND av.calc_id = vAvailableCache
+ LEFT JOIN tItemShelvingStock_byWarehouse issw ON issw.itemFk = i.id
+ AND issw.warehouseFk = t.warehouseFk
WHERE IFNULL(v.visible,0) < s.quantity
AND IFNULL(av.available ,0) < s.quantity
AND IFNULL(issw.visible, 0) < s.quantity
- AND s.isPicked = FALSE
- AND s.reserved = FALSE
- AND ic.merchandise = TRUE
- AND IF(vIsTodayRelative, TRUE, date(t.shipped) = vDate)
+ AND NOT s.isPicked
+ AND NOT s.reserved
+ AND ic.merchandise
+ AND IF(vIsTodayRelative, TRUE, DATE(t.shipped) = vDate)
AND NOT i.generic
AND util.VN_CURDATE() = vDate
AND t.warehouseFk = vWarehouseFk
GROUP BY tl.ticketFk) sub
ON DUPLICATE KEY UPDATE itemShortage = sub.problem, saleFk = sub.saleFk;
-
+
-- Inventario: Visible suficiente, pero ubicado menor a la cantidad vendida
INSERT INTO tmp.sale_problems(ticketFk, itemLost, saleFk)
SELECT ticketFk, problem, saleFk
FROM (
- SELECT tl.ticketFk, LEFT(GROUP_CONCAT('I: ',i.id, ' ', i.longName, ' '),250) problem, s.id AS saleFk
+ SELECT tl.ticketFk,
+ LEFT(GROUP_CONCAT('I: ', i.id, ' ', i.longName, ' '), 250) problem,
+ s.id saleFk
FROM tmp.ticket_list tl
- JOIN vn.ticket t ON t.id = tl.ticketFk
- JOIN vn.sale s ON s.ticketFk = t.id
- JOIN vn.item i ON i.id = s.itemFk
- JOIN vn.itemType it on it.id = i.typeFk
- JOIN vn.itemCategory ic ON ic.id = it.categoryFk
- LEFT JOIN cache.visible v ON v.item_id = s.itemFk AND v.calc_id = vVisibleCache
- LEFT JOIN vn.itemShelvingStock_byWarehouse issw ON issw.itemFk = i.id AND issw.warehouseFk = t.warehouseFk
+ JOIN ticket t ON t.id = tl.ticketFk
+ JOIN sale s ON s.ticketFk = t.id
+ JOIN item i ON i.id = s.itemFk
+ JOIN itemType it on it.id = i.typeFk
+ JOIN itemCategory ic ON ic.id = it.categoryFk
+ LEFT JOIN cache.visible v ON v.item_id = s.itemFk
+ AND v.calc_id = vVisibleCache
+ LEFT JOIN tItemShelvingStock_byWarehouse issw ON issw.itemFk = i.id
+ AND issw.warehouseFk = t.warehouseFk
WHERE IFNULL(v.visible,0) >= s.quantity
AND IFNULL(issw.visible, 0) < s.quantity
AND s.quantity > 0
- AND s.isPicked = FALSE
- AND s.reserved = FALSE
- AND ic.merchandise = TRUE
- AND IF(vIsTodayRelative, TRUE, date(t.shipped) = vDate)
+ AND NOT s.isPicked
+ AND NOT s.reserved
+ AND ic.merchandise
+ AND IF(vIsTodayRelative, TRUE, DATE(t.shipped) = vDate)
AND NOT i.generic
AND util.VN_CURDATE() = vDate
AND t.warehouseFk = vWarehouseFk
- GROUP BY tl.ticketFk) sub
+ GROUP BY tl.ticketFk
+ ) sub
ON DUPLICATE KEY UPDATE itemDelay = sub.problem, saleFk = sub.saleFk;
-
+
-- Retraso: Disponible suficiente, pero no visible ni ubicado
INSERT INTO tmp.sale_problems(ticketFk, itemDelay, saleFk)
SELECT ticketFk, problem, saleFk
FROM (
- SELECT tl.ticketFk, LEFT(GROUP_CONCAT('R: ',i.id, ' ', i.longName, ' '),250) problem, s.id AS saleFk
+ SELECT tl.ticketFk,
+ LEFT(GROUP_CONCAT('R: ', i.id, ' ', i.longName, ' '), 250) problem,
+ s.id saleFk
FROM tmp.ticket_list tl
- JOIN vn.ticket t ON t.id = tl.ticketFk
- JOIN vn.sale s ON s.ticketFk = t.id
- JOIN vn.item i ON i.id = s.itemFk
- JOIN vn.itemType it on it.id = i.typeFk
- JOIN vn.itemCategory ic ON ic.id = it.categoryFk
- LEFT JOIN cache.visible v ON v.item_id = s.itemFk AND v.calc_id = vVisibleCache
- LEFT JOIN cache.available av ON av.item_id = i.id AND av.calc_id = vAvailableCache
- LEFT JOIN vn.itemShelvingStock_byWarehouse issw ON issw.itemFk = i.id AND issw.warehouseFk = t.warehouseFk
- WHERE IFNULL(v.visible,0) < s.quantity
- AND IFNULL(av.available ,0) >= s.quantity
+ JOIN ticket t ON t.id = tl.ticketFk
+ JOIN sale s ON s.ticketFk = t.id
+ JOIN item i ON i.id = s.itemFk
+ JOIN itemType it on it.id = i.typeFk
+ JOIN itemCategory ic ON ic.id = it.categoryFk
+ LEFT JOIN cache.visible v ON v.item_id = s.itemFk
+ AND v.calc_id = vVisibleCache
+ LEFT JOIN cache.available av ON av.item_id = i.id
+ AND av.calc_id = vAvailableCache
+ LEFT JOIN tItemShelvingStock_byWarehouse issw ON issw.itemFk = i.id
+ AND issw.warehouseFk = t.warehouseFk
+ WHERE IFNULL(v.visible, 0) < s.quantity
+ AND IFNULL(av.available, 0) >= s.quantity
AND IFNULL(issw.visible, 0) < s.quantity
AND s.quantity > 0
- AND s.isPicked = FALSE
- AND s.reserved = FALSE
- AND ic.merchandise = TRUE
- AND IF(vIsTodayRelative, TRUE, date(t.shipped) = vDate)
+ AND NOT s.isPicked
+ AND NOT s.reserved
+ AND ic.merchandise
+ AND IF(vIsTodayRelative, TRUE, DATE(t.shipped) = vDate)
AND NOT i.generic
AND util.VN_CURDATE() = vDate
AND t.warehouseFk = vWarehouseFk
- GROUP BY tl.ticketFk) sub
+ GROUP BY tl.ticketFk
+ ) sub
ON DUPLICATE KEY UPDATE itemDelay = sub.problem, saleFk = sub.saleFk;
-- Redondeo: Cantidad pedida incorrecta en al grouping de la última compra
@@ -67236,13 +67139,12 @@ BEGIN
INSERT INTO tmp.sale_problems(ticketFk, hasRounding, saleFk)
SELECT ticketFk, problem, saleFk
FROM (
- SELECT
- tl.ticketFk,
- s.id saleFk ,
- LEFT(GROUP_CONCAT('RE: ',i.id, ' ', IFNULL(i.longName,''), ' '), 250) problem,
- MOD(s.quantity, b.`grouping`) hasRounding
+ SELECT tl.ticketFk,
+ s.id saleFk ,
+ LEFT(GROUP_CONCAT('RE: ',i.id, ' ', IFNULL(i.longName,''), ' '), 250) problem,
+ MOD(s.quantity, b.`grouping`) hasRounding
FROM tmp.ticket_list tl
- JOIN ticket t ON t.id = tl.ticketFk
+ JOIN ticket t ON t.id = tl.ticketFk
AND t.warehouseFk = vWarehouseFk
JOIN sale s ON s.ticketFk = tl.ticketFk
JOIN item i ON i.id = s.itemFk
@@ -67250,22 +67152,22 @@ BEGIN
JOIN buy b ON b.id = bu.buyFk
GROUP BY tl.ticketFk
HAVING hasRounding
- ) sub
+ ) sub
ON DUPLICATE KEY UPDATE hasRounding = sub.problem, saleFk = sub.saleFk;
END LOOP;
-
CLOSE vCursor;
-
+
INSERT INTO tmp.sale_problems(ticketFk, isTaxDataChecked)
SELECT DISTINCT tl.ticketFk, FALSE
FROM tmp.ticket_list tl
- JOIN vn.client c ON c.id = tl.clientFk
- WHERE c.isTaxDataChecked = FALSE
+ JOIN client c ON c.id = tl.clientFk
+ WHERE NOT c.isTaxDataChecked
ON DUPLICATE KEY UPDATE isTaxDataChecked = FALSE;
DROP TEMPORARY TABLE
tmp.clientGetDebt,
- tmp.ticket_list;
+ tmp.ticket_list,
+ tItemShelvingStock_byWarehouse;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -67285,16 +67187,16 @@ DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `sale_getProblemsByTicket`(IN vTicketFk INT, IN vIsTodayRelative TINYINT(1))
BEGIN
/**
- * Calcula los problemas de cada venta
+ * Calcula los problemas de cada venta
* para un conjunto de tickets.
*
* @return Problems result
*/
DROP TEMPORARY TABLE IF EXISTS tmp.sale_getProblems;
- CREATE TEMPORARY TABLE tmp.sale_getProblems
+ CREATE TEMPORARY TABLE tmp.sale_getProblems
(INDEX (ticketFk))
ENGINE = MEMORY
- SELECT t.id ticketFk, t.clientFk, t.warehouseFk, t.shipped
+ SELECT t.id ticketFk, t.clientFk, t.warehouseFk, t.shipped
FROM ticket t
WHERE t.id = vTicketFk;
@@ -67323,7 +67225,7 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `sale_PriceFix`(vTicketFk INT)
BEGIN
-
+
DELETE sc.*
FROM vn.saleComponent sc
JOIN vn.sale s ON s.id = sc.saleFk
@@ -67347,80 +67249,80 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `sale_recalcComponent` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `sale_recalcComponent`(vOption INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `sale_recalcComponent`(vOption VARCHAR(25))
proc: BEGIN
/**
- * Este procedimiento recalcula los componentes de un conjunto de sales,
+ * Este procedimiento recalcula los componentes de un conjunto de sales,
* eliminando los componentes existentes e insertandolos de nuevo
*
* @param vOption si no se quiere forzar llamar con NULL
* @table tmp.recalculateSales (id)
- */
- DECLARE vShipped DATE;
+ */
+ DECLARE vShipped DATE;
DECLARE vWarehouseFk SMALLINT;
- DECLARE vAgencyModeFk INT;
- DECLARE vAddressFk INT;
- DECLARE vTicketFk INT;
- DECLARE vLanded DATE;
- DECLARE vIsEditable BOOLEAN;
- DECLARE vZoneFk INTEGER;
- DECLARE vDone BOOL DEFAULT FALSE;
+ DECLARE vAgencyModeFk INT;
+ DECLARE vAddressFk INT;
+ DECLARE vTicketFk INT;
+ DECLARE vLanded DATE;
+ DECLARE vIsEditable BOOLEAN;
+ DECLARE vZoneFk INTEGER;
+ DECLARE vDone BOOL DEFAULT FALSE;
DECLARE vCur CURSOR FOR
SELECT DISTINCT s.ticketFk
FROM tmp.recalculateSales rs
JOIN vn.sale s ON s.id = rs.id;
- DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
+ DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
OPEN vCur;
l: LOOP
SET vDone = FALSE;
- FETCH vCur INTO vTicketFk;
-
+ FETCH vCur INTO vTicketFk;
+
IF vDone THEN
LEAVE l;
END IF;
- SELECT (hasToRecalcPrice OR ts.alertLevel IS NULL) AND t.refFk IS NULL,
- t.zoneFk,
- t.warehouseFk,
- t.shipped,
- t.addressFk,
- t.agencyModeFk,
+ SELECT (hasToRecalcPrice OR ts.alertLevel IS NULL) AND t.refFk IS NULL,
+ t.zoneFk,
+ t.warehouseFk,
+ t.shipped,
+ t.addressFk,
+ t.agencyModeFk,
t.landed
- INTO vIsEditable,
- vZoneFk,
- vWarehouseFk,
- vShipped,
- vAddressFk,
- vAgencyModeFk,
+ INTO vIsEditable,
+ vZoneFk,
+ vWarehouseFk,
+ vShipped,
+ vAddressFk,
+ vAgencyModeFk,
vLanded
FROM ticket t
- LEFT JOIN ticketState ts ON t.id = ts.ticket
+ LEFT JOIN ticketState ts ON t.id = ts.ticketFk
LEFT JOIN alertLevel al ON al.id = ts.alertLevel
WHERE t.id = vTicketFk;
CALL zone_getLanded(vShipped, vAddressFk, vAgencyModeFk, vWarehouseFk, TRUE);
-
+
IF NOT EXISTS (SELECT TRUE FROM tmp.zoneGetLanded LIMIT 1) THEN
CALL util.throw(CONCAT('There is no zone for these parameters ', vTicketFk));
END IF;
IF vLanded IS NULL OR vZoneFk IS NULL THEN
-
+
UPDATE ticket t
- SET t.landed = (SELECT landed FROM tmp.zoneGetLanded LIMIT 1)
+ SET t.landed = (SELECT landed FROM tmp.zoneGetLanded LIMIT 1)
WHERE t.id = vTicketFk AND t.landed IS NULL;
IF vZoneFk IS NULL THEN
@@ -67429,14 +67331,14 @@ proc: BEGIN
SET t.zoneFk = vZoneFk
WHERE t.id = vTicketFk AND t.zoneFk IS NULL;
END IF;
-
+
END IF;
-
+
DROP TEMPORARY TABLE tmp.zoneGetLanded;
- -- rellena la tabla buyUltimate con la ultima compra
- CALL buyUltimate (vWarehouseFk, vShipped);
-
+ -- rellena la tabla buyUltimate con la ultima compra
+ CALL buyUltimate (vWarehouseFk, vShipped);
+
CREATE OR REPLACE TEMPORARY TABLE tmp.sale
(PRIMARY KEY (saleFk)) ENGINE = MEMORY
SELECT s.id saleFk, vWarehouseFk warehouseFk
@@ -67444,7 +67346,7 @@ proc: BEGIN
JOIN tmp.recalculateSales rs ON s.id = rs.id
WHERE s.ticketFk = vTicketFk;
- CREATE OR REPLACE TEMPORARY TABLE tmp.ticketLot
+ CREATE OR REPLACE TEMPORARY TABLE tmp.ticketLot
SELECT vWarehouseFk warehouseFk, NULL available, s.itemFk, bu.buyFk, vZoneFk zoneFk
FROM sale s
JOIN tmp.recalculateSales rs ON s.id = rs.id
@@ -67456,17 +67358,17 @@ proc: BEGIN
CALL catalog_componentCalculate(vZoneFk, vAddressFk, vShipped, vWarehouseFk);
IF vOption IS NULL THEN
- SET vOption = IF(vIsEditable, 1, 6);
- END IF;
+ SET vOption = IF(vIsEditable, 'renewPrices', 'imbalance');
+ END IF;
CALL ticketComponentUpdateSale(vOption);
- CALL catalog_componentPurge();
+ CALL catalog_componentPurge();
DROP TEMPORARY TABLE tmp.buyUltimate;
- DROP TEMPORARY TABLE tmp.sale;
+ DROP TEMPORARY TABLE tmp.sale;
END LOOP;
- CLOSE vCur;
+ CLOSE vCur;
END ;;
DELIMITER ;
@@ -67475,6 +67377,149 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `sale_replaceItem` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_general_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `sale_replaceItem`(vSaleFk INT, vNewItemFk INT, vQuantity INT)
+BEGIN
+/**
+ * Añade un nuevo articulo para sustituir a otro, y actualiza la memoria de sustituciones.
+ *
+ * @param vSaleFk id de la tabla sale
+ * @param vNewItemFk articulo sustituto
+ * @param vQuantity cantidad que se va a sustituir
+ */
+ DECLARE vTicketFk INT;
+ DECLARE vItemFk INT;
+ DECLARE vWarehouseFk SMALLINT;
+ DECLARE vDate DATE;
+ DECLARE vGrouping INT;
+ DECLARE vGroupingModeFk INT;
+ DECLARE vPacking INT;
+ DECLARE vRoundQuantity INT DEFAULT 1;
+ DECLARE vLanded DATE;
+ DECLARE vAddressFk INT;
+ DECLARE vAgencyModeFk INT;
+ DECLARE vNewPrice DECIMAL(10,2);
+ DECLARE vOldPrice DECIMAL(10,2);
+ DECLARE vOption VARCHAR(255);
+ DECLARE vNewSaleFk INT;
+ DECLARE vForceToGrouping INT DEFAULT 1;
+ DECLARE vForceToPacking INT DEFAULT 2;
+ DECLARE vFinalPrice DECIMAL(10,2);
+
+ DECLARE EXIT HANDLER FOR SQLEXCEPTION
+ BEGIN
+ ROLLBACK;
+ RESIGNAL;
+ END;
+
+ SELECT s.ticketFk,
+ LEAST(s.quantity, vQuantity),
+ s.itemFk,
+ t.shipped,
+ t.warehouseFk,
+ t.landed,
+ t.addressFk,
+ t.agencyModeFk,
+ s.price
+ INTO vTicketFk,
+ vQuantity,
+ vItemFk,
+ vDate,
+ vWarehouseFk,
+ vLanded,
+ vAddressFk,
+ vAgencyModeFk,
+ vOldPrice
+ FROM sale s
+ JOIN ticket t ON t.id = s.ticketFk
+ WHERE s.id = vSaleFk;
+
+ CALL buyUltimate(vWarehouseFk, vDate);
+
+ SELECT `grouping`, groupingMode, packing
+ INTO vGrouping,vGroupingModeFk,vPacking
+ FROM buy b
+ JOIN tmp.buyUltimate tmp ON b.id = tmp.buyFk
+ WHERE tmp.itemFk = vNewItemFk AND tmp.WarehouseFk = vWarehouseFk;
+
+ IF vGroupingModeFk = vForceToPacking AND vPacking > 0 THEN
+ SET vRoundQuantity = vPacking;
+ END IF;
+ IF vGroupingModeFk = vForceToGrouping AND vGrouping > 0 THEN
+ SET vRoundQuantity = vGrouping;
+ END IF;
+
+ CALL catalog_calcFromItem(
+ vLanded,
+ vAddressFk,
+ vAgencyModeFk,
+ vNewItemFk);
+
+ SELECT price INTO vNewPrice
+ FROM tmp.ticketCalculateItem;
+
+ IF vNewPrice IS NULL THEN
+ CALL util.throw('price retrieval failed');
+ END IF;
+
+ IF vNewPrice > vOldPrice THEN
+ SET vFinalPrice = vOldPrice;
+ SET vOption = 'substitution';
+ ELSE
+ SET vFinalPrice = vNewPrice;
+ SET vOption = 'renewPrices';
+ END IF;
+
+ START TRANSACTION;
+
+ UPDATE sale
+ SET quantity = quantity - vQuantity
+ WHERE id = vSaleFk;
+
+ INSERT INTO vn.sale(ticketFk,
+ itemFk,
+ quantity,
+ concept,
+ price)
+ SELECT vTicketFk,
+ vNewItemFk,
+ CEIL(vQuantity / vRoundQuantity) * vRoundQuantity, CONCAT('+ ',i.longName),
+ vFinalPrice
+ FROM vn.item i
+ WHERE id = vNewItemFk;
+
+ SELECT LAST_INSERT_ID() INTO vNewSaleFk;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.sale;
+ CREATE TEMPORARY TABLE tmp.sale
+ (PRIMARY KEY (saleFk))
+ ENGINE = MEMORY
+ SELECT id saleFk, vWarehouseFk warehouseFk
+ FROM sale s WHERE id = vNewSaleFk;
+
+ CALL ticketComponentUpdateSale(vOption);
+ CALL catalog_componentPurge();
+
+ INSERT INTO itemProposal(itemFk, mateFk, counter)
+ VALUES(vItemFk, vNewItemFk, 1)
+ ON DUPLICATE KEY UPDATE counter = counter + 1;
+
+ COMMIT;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `sectorCollectionSaleGroup_add` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
@@ -67487,22 +67532,41 @@ DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `sectorCollectionSaleGroup_add`(vSaleGroupFk INT, vSectorCollectionFk INT)
BEGIN
/**
- * Inserta un nuevo registro en vn.sectorCollectionSaleGroup
+ * Inserta un nuevo registro en vn.sectorCollectionSaleGroup
* Actualiza el usuario en vn.saleGroup y reemplaza los registros de vn.saleTracking
- *
+ *
* @param vSaleGroupFk Identificador de vn.saleGroup
* @param vSectorCollectionFk Identificador de vn.sectorCollection
*/
- REPLACE sectorCollectionSaleGroup
- SET sectorCollectionFk = vSectorCollectionFk,
- saleGroupFk = vSaleGroupFk;
+ DECLARE vHasSaleGroup INT;
+ DECLARE vHasSectorCollection INT;
+ SELECT COUNT(id) INTO vHasSaleGroup
+ FROM saleGroup
+ WHERE id = vSaleGroupFk;
+
+ IF !vHasSaleGroup THEN
+ CALL util.throw ("invalid saleGroup");
+ END IF;
+
+ SELECT COUNT(id) INTO vHasSectorCollection
+ FROM sectorCollection
+ WHERE id = vSectorCollectionFk;
+
+ IF !vHasSectorCollection THEN
+ CALL util.throw ("invalid sectorCollection");
+ END IF;
+
+ REPLACE sectorCollectionSaleGroup
+ SET sectorCollectionFk = vSectorCollectionFk,
+ saleGroupFk = vSaleGroupFk;
+
UPDATE saleGroup sg
JOIN sectorCollectionSaleGroup scsg ON scsg.saleGroupFk = sg.id
JOIN sectorCollection sc ON sc.id = scsg.sectorCollectionFk
- SET sg.userFk = sc.userFk
+ SET sg.userFk = sc.userFk
WHERE sg.id = vSaleGroupFk;
-
+
INSERT IGNORE saleTracking(
saleFk,
isChecked,
@@ -67514,8 +67578,8 @@ BEGIN
sc.userFk,
s.id
FROM saleGroupDetail sgd
- JOIN sectorCollectionSaleGroup scsg
- ON scsg.saleGroupFk = sgd.saleGroupFk
+ JOIN sectorCollectionSaleGroup scsg
+ ON scsg.saleGroupFk = sgd.saleGroupFk
JOIN sectorCollection sc ON sc.id = scsg.sectorCollectionFk
JOIN state s ON s.code = 'PREVIOUS_PREPARATION'
WHERE sgd.saleGroupFk = vSaleGroupFk;
@@ -67616,30 +67680,30 @@ DELIMITER ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `sectorCollection_new`(vSectorFk INT)
-BEGIN
-/**
- * Inserta una nueva colección, si el usuario no tiene ninguna vacia.
- * Esto se hace para evitar que por error se generen colecciones sin sentido.
- *
- * @param vSectorFk Identificador de #vn.sector
- */
- DECLARE hasEmptyCollections BOOL;
- DECLARE vUserFk INT;
-
- SET vUserFk = account.myUser_getId();
-
- SELECT (COUNT(sc.id) > 0) INTO hasEmptyCollections
- FROM vn.sectorCollection sc
- LEFT JOIN vn.sectorCollectionSaleGroup scsg ON scsg.sectorCollectionFk = sc.id
- WHERE ISNULL(scsg.id)
- AND sc.userFk = vUserFk
- AND sc.sectorFk = vSectorFk
- AND sc.created >= util.VN_CURDATE();
-
- IF NOT hasEmptyCollections THEN
- INSERT INTO vn.sectorCollection(userFk, sectorFk)
- VALUES(vUserFk, vSectorFk);
- END IF;
+BEGIN
+/**
+ * Inserta una nueva colección, si el usuario no tiene ninguna vacia.
+ * Esto se hace para evitar que por error se generen colecciones sin sentido.
+ *
+ * @param vSectorFk Identificador de #vn.sector
+ */
+ DECLARE hasEmptyCollections BOOL;
+ DECLARE vUserFk INT;
+
+ SET vUserFk = account.myUser_getId();
+
+ SELECT (COUNT(sc.id) > 0) INTO hasEmptyCollections
+ FROM vn.sectorCollection sc
+ LEFT JOIN vn.sectorCollectionSaleGroup scsg ON scsg.sectorCollectionFk = sc.id
+ WHERE ISNULL(scsg.id)
+ AND sc.userFk = vUserFk
+ AND sc.sectorFk = vSectorFk
+ AND sc.created >= util.VN_CURDATE();
+
+ IF NOT hasEmptyCollections THEN
+ INSERT INTO vn.sectorCollection(userFk, sectorFk)
+ VALUES(vUserFk, vSectorFk);
+ END IF;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -67683,7 +67747,7 @@ BEGIN
CREATE TEMPORARY TABLE tmp.previousErrors -- Errores de previa, derivadores de los revisadores (por reclamación)
ENGINE = MEMORY
- SELECT tt.workerFk, COUNT(c.ticketFk) errorsByClaim
+ SELECT tt.userFk, COUNT(c.ticketFk) errorsByClaim
FROM claimDevelopment cd
JOIN claim c ON cd.claimFk = c.id
JOIN ticket t ON c.ticketFk = t.id
@@ -67691,7 +67755,7 @@ BEGIN
JOIN ticketTracking tt ON tt.ticketFk = t.id
JOIN `state` s ON s.id = tt.stateFk
WHERE t.shipped BETWEEN vDatedFrom AND vDatedTo AND cr.description = 'Revisadores' AND s.code = 'OK PREVIOUS'
- GROUP BY workerFk;
+ GROUP BY tt.userFk;
DELETE FROM sectorProductivity
WHERE dated = vDatedFrom
@@ -67719,7 +67783,7 @@ BEGIN
LEFT JOIN bs.workerProductivity wp ON wp.workerFk = w.id
LEFT JOIN `state` s2 ON s2.id = wp.stateFk AND s2.code = 'OK PREVIOUS'
LEFT JOIN tmp.errorsByChecker ec2 ON ec2.workerFk = w.id
- LEFT JOIN tmp.previousErrors pe ON pe.workerFk = w.id
+ LEFT JOIN tmp.previousErrors pe ON pe.userFk = w.id
WHERE DATE(sc.created) = vDatedFrom
AND wp.dated = vDatedFrom
GROUP BY w.id;
@@ -67735,32 +67799,6 @@ DELIMITER ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `sector_get` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `sector_get`()
-BEGIN
-
-/**
- * Obtiene los sectores
-*/
-
- SELECT s.id,s.description,s.warehouseFk
- FROM vn.sector s;
-
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `sector_getWarehouse` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
@@ -67775,7 +67813,7 @@ BEGIN
SELECT s.warehouseFk
FROM vn.sector s
WHERE s.id = vSectorFk;
-
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -67870,10 +67908,10 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `shelvingChange`(IN `vShelvingO` VAR
BEGIN
UPDATE vn.itemShelving
- SET shelvingFk = vShelvingD COLLATE utf8_unicode_ci
- WHERE shelvingFk = vShelvingO COLLATE utf8_unicode_ci;
-
-
+ SET shelvingFk = vShelvingD COLLATE utf8_unicode_ci
+ WHERE shelvingFk = vShelvingO COLLATE utf8_unicode_ci;
+
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -67892,16 +67930,16 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `shelvingLog_get`(shelvingFk VARCHAR(10))
BEGIN
-
+
/* Lista el log de un carro
- *
+ *
* @param shelvingFk matrícula del carro
- *
+ *
*/
-
+
SELECT originFk, name, creationDate, description
FROM shelvingLog sl
- JOIN account.user u ON u.id = sl.userFk
+ JOIN account.user u ON u.id = sl.userFk
WHERE sl.originFk = shelvingFk COLLATE utf8_general_ci
ORDER BY creationDate DESC;
@@ -67924,22 +67962,22 @@ DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `shelvingParking_get`(vShelvingFk VARCHAR(10), vWarehouseFk INT, vDayRange INT)
BEGIN
-
-SELECT s.itemFk,
+
+SELECT s.itemFk,
s.concept,
- CAST(SUM(s.quantity) AS DECIMAL(10,0)) as sinServir,
- CAST(IFNULL(ist.visible,0) AS DECIMAL(10,0)) as aparcado
+ CAST(SUM(s.quantity) AS DECIMAL(10,0)) as sinServir,
+ CAST(IFNULL(ist.visible,0) AS DECIMAL(10,0)) as aparcado
FROM vn.sale s
LEFT JOIN vn.itemShelvingSale iss ON iss.saleFk = s.id
JOIN vn.ticket t ON t.id = s.ticketFk
LEFT JOIN vn.itemShelvingStock ist ON ist.itemFk = s.itemFk AND ist.warehouseFk = vWarehouseFk
JOIN vn.itemShelving ish ON ish.itemFk = s.itemFk AND ish.shelvingFk = vShelvingFk COLLATE utf8_general_ci
- WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(TIMESTAMPADD(DAY, GREATEST(0,vDayRange), util.VN_CURDATE()))
+ WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(TIMESTAMPADD(DAY, GREATEST(0,vDayRange), util.VN_CURDATE()))
AND iss.saleFk IS NULL
AND t.warehouseFk = vWarehouseFk
GROUP BY s.itemFk
HAVING sinServir > aparcado;
-
+
END ;;
DELIMITER ;
@@ -67981,30 +68019,36 @@ DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `shelving_clean`()
BEGIN
- DELETE FROM vn.shelving
+ DELETE FROM shelving
WHERE length(code) > 3
AND parked < TIMESTAMPADD(WEEK,-1,util.VN_CURDATE());
-
- DELETE FROM vn.itemShelving
+
+ DELETE FROM itemShelving
WHERE visible <= 0
AND created < TIMESTAMPADD(MONTH,-1,util.VN_CURDATE());
- DELETE ish.*
- FROM vn.itemShelving ish
+ DELETE ish.*
+ FROM itemShelving ish
JOIN vn.shelving sh ON sh.code = ish.shelvingFk
WHERE sh.parkingFk IS NULL
AND ish.created < TIMESTAMPADD(WEEK,-1,util.VN_CURDATE());
- UPDATE vn.shelving sh
- LEFT JOIN vn.itemShelving its ON its.shelvingFk = sh.`code`
+UPDATE shelving sh
+ LEFT JOIN itemShelving its ON its.shelvingFk = sh.`code`
SET isPrinted = 0,
- parkingFk = NULL
- WHERE its.id IS NULL
- AND sh.isRecyclable
- AND ( sh.parked IS NULL
- OR
- sh.parked < TIMESTAMPADD(MONTH,-1,util.VN_CURDATE())
- );
+ parkingFk = NULL
+ WHERE its.id IS NULL
+ AND sh.isRecyclable
+ AND (
+ sh.parked IS NULL
+ OR
+ sh.parked < TIMESTAMPADD(MONTH,-1,util.VN_CURDATE())
+ )
+ AND IF(code REGEXP '^[A-Za-z]{2}[0-9]', LEFT (code, 2) NOT IN (
+ SELECT DISTINCT LEFT(its.shelvingFk, 2)
+ FROM itemShelving its
+ WHERE its.shelvingFk REGEXP '^[A-Za-z]{2}[0-9]'
+ ), TRUE);
END ;;
DELIMITER ;
@@ -68057,26 +68101,26 @@ BEGIN
) fue ON fue.itemFk = i.id
LEFT JOIN cache.stock v ON i.id = v.item_id AND v.warehouse_id = vWarehouseFk
LEFT JOIN (
- SELECT item_id, CAST(sum(amount)AS DECIMAL(10,0)) as venta
- FROM vn2008.item_out
- WHERE dat BETWEEN util.VN_CURDATE() AND util.dayend(vDated)
- AND warehouse_id = vWarehouseFk
- GROUP BY item_id
+ SELECT itemFk item_id, CAST(sum(quantity)AS DECIMAL(10,0)) as venta
+ FROM itemTicketOut
+ WHERE shipped BETWEEN util.VN_CURDATE() AND util.dayend(vDated)
+ AND warehouseFk = vWarehouseFk
+ GROUP BY itemFk
) sale ON sale.item_id = i.id
LEFT JOIN (
- SELECT item_id, CAST(sum(amount)AS DECIMAL(10,0)) as compra
- FROM vn2008.item_entry_in
- WHERE dat BETWEEN util.VN_CURDATE() AND util.dayend(vDated)
- AND warehouse_id = vWarehouseFk
+ SELECT itemFk item_id, CAST(sum(quantity)AS DECIMAL(10,0)) as compra
+ FROM itemEntryIn
+ WHERE landed BETWEEN util.VN_CURDATE() AND util.dayend(vDated)
+ AND warehouseInFk = vWarehouseFk
AND isVirtualStock = FALSE
- GROUP BY item_id
+ GROUP BY itemFk
) buy ON buy.item_id = i.id
LEFT JOIN (
- SELECT item_id, CAST(sum(amount)AS DECIMAL(10,0)) as traslado
- FROM vn2008.item_entry_out
- WHERE dat BETWEEN util.VN_CURDATE() AND util.dayend(vDated)
- AND warehouse_id = vWarehouseFk
- GROUP BY item_id
+ SELECT itemFk item_id, CAST(sum(quantity)AS DECIMAL(10,0)) as traslado
+ FROM itemEntryOut
+ WHERE shipped BETWEEN util.VN_CURDATE() AND util.dayend(vDated)
+ AND warehouseOutFk = vWarehouseFk
+ GROUP BY itemFk
) mov ON mov.item_id = i.id
WHERE v.amount;
@@ -68179,20 +68223,20 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `solunionRiskRequest`()
BEGIN
-
+
DROP TEMPORARY TABLE IF EXISTS tmp.client_list;
CREATE TEMPORARY TABLE tmp.client_list
(PRIMARY KEY (Id_Cliente))
ENGINE = MEMORY
- SELECT * FROM (SELECT cc.client Id_Cliente, ci.grade FROM vn.creditClassification cc
+ SELECT * FROM (SELECT cc.client Id_Cliente, ci.grade FROM vn.creditClassification cc
JOIN vn.creditInsurance ci ON cc.id = ci.creditClassification
WHERE dateEnd IS NULL
ORDER BY ci.creationDate DESC
LIMIT 10000000000000000000) t1 GROUP BY Id_Cliente;
-
+
CALL vn2008.risk_vs_client_list(util.VN_CURDATE());
-
- SELECT
+
+ SELECT
c.Id_Cliente, c.Cliente, c.Credito credito_vn, c.creditInsurance solunion, cast(r.risk as DECIMAL(10,0)) riesgo_vivo,
cast(c.creditInsurance - r.risk as decimal(10,0)) margen_vivo,
f.Consumo consumo_anual, c.Vencimiento, ci.grade
@@ -68202,7 +68246,7 @@ BEGIN
JOIN tmp.client_list ci ON c.Id_Cliente = ci.Id_Cliente
JOIN bi.facturacion_media_anual f ON c.Id_Cliente = f.Id_Cliente
GROUP BY Id_cliente;
-
+
DROP TEMPORARY TABLE IF EXISTS tmp.risk;
DROP TEMPORARY TABLE IF EXISTS tmp.client_list;
END ;;
@@ -68212,58 +68256,86 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `stockBuyedByWorker` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `stockBuyedByWorker`(
- vDate DATE,
- vWorker INT)
+ vDated DATE,
+ vWorker INT
+)
BEGIN
/**
- * Calculates the space reserved by buyers of the same container
+ * Inserta el volumen de compra de un comprador
+ * en stockBuyed de acuerdo con la fecha.
*
- * @param vdate date of container delivery
- * @param vWorker buyer reserving space in the container
+ * @param vDated Fecha de compra
+ * @param vWorker Id de trabajador
*/
- DECLARE vVolume DECIMAL(10, 2);
- DECLARE vWarehouseFk INT;
- DECLARE vCompressionRatio DECIMAL(1, 1);
+ CREATE OR REPLACE TEMPORARY TABLE tStockBuyed
+ (INDEX (userFk))
+ ENGINE = MEMORY
+ SELECT requested, reserved, userFk
+ FROM stockBuyed
+ WHERE dated = vDated
+ AND userFk = vWorker;
- CALL stockTraslation(vDate);
+ DELETE FROM stockBuyed
+ WHERE dated = vDated
+ AND userFk = vWorker;
- SELECT warehouseFk, conversionCoefficient INTO vWarehouseFk, vCompressionRatio
- FROM auctionConfig;
+ CALL stockTraslation(vDated);
- SELECT volume INTO vVolume
- FROM vn.packaging WHERE id = 'cc';
+ INSERT INTO stockBuyed(userFk, buyed, `dated`, reserved, requested, description)
+ SELECT it.workerFk,
+ SUM((ti.quantity / b.packing) * buy_getVolume(b.id)) / vc.palletM3 / 1000000,
+ vDated,
+ sb.reserved,
+ sb.requested,
+ u.name
+ FROM itemType it
+ JOIN item i ON i.typeFk = it.id
+ LEFT JOIN tmp.item ti ON ti.itemFk = i.id
+ JOIN itemCategory ic ON ic.id = it.categoryFk
+ JOIN warehouse wh ON wh.code = 'VNH'
+ JOIN tmp.buyUltimate bu ON bu.itemFk = i.id
+ AND bu.warehouseFk = wh.id
+ JOIN buy b ON b.id = bu.buyFk
+ JOIN volumeConfig vc
+ JOIN account.`user` u ON u.id = it.workerFk
+ LEFT JOIN tStockBuyed sb ON sb.userFk = it.workerFk
+ WHERE ic.display
+ AND it.workerFk = vWorker;
SELECT b.entryFk Id_Entrada,
i.id Id_Article,
i.name Article,
- ti.amount Cantidad,
- (vCompressionRatio * (ti.amount / b.packing) * vn.buy_getVolume(b.id))
- / vVolume buyed,
- b.packageFk id_cubo,
+ ti.quantity Cantidad,
+ (ac.conversionCoefficient * (ti.quantity / b.packing) * buy_getVolume(b.id))
+ / (vc.trolleyM3 * 1000000) buyed,
+ b.packagingFk id_cubo,
b.packing
FROM tmp.item ti
- JOIN item i ON i.id = ti.item_id
+ JOIN item i ON i.id = ti.itemFk
JOIN itemType it ON i.typeFk = it.id
JOIN itemCategory ic ON ic.id = it.categoryFk
JOIN worker w ON w.id = it.workerFk
+ JOIN auctionConfig ac
JOIN tmp.buyUltimate bu ON bu.itemFk = i.id
- AND bu.warehouseFk = vWarehouseFk
+ AND bu.warehouseFk = ac.warehouseFk
JOIN buy b ON b.id = bu.buyFk
- WHERE ic.display AND w.id = vWorker;
+ JOIN volumeConfig vc
+ WHERE ic.display
+ AND w.id = vWorker;
- DROP TEMPORARY TABLE
- tmp.buyUltimate,
- tmp.item;
+ DROP TEMPORARY TABLE tmp.buyUltimate,
+ tmp.item,
+ tStockBuyed;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -68280,51 +68352,59 @@ DELIMITER ;
/*!50003 SET character_set_results = utf8mb4 */ ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `stockBuyed_add`(vDated DATE)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `stockBuyed_add`(
+ vDated DATE
+)
BEGIN
/**
- * Inserta el volumen de compra por comprador en stockBuyed de acuerdo con la fecha
+ * Inserta el volumen de compra por comprador
+ * en stockBuyed de acuerdo con la fecha.
*
* @param vDated Fecha de compra
*/
-
- CREATE OR REPLACE TEMPORARY TABLE tStockBuyed
+ CREATE OR REPLACE TEMPORARY TABLE tStockBuyed
(INDEX (userFk))
ENGINE = MEMORY
SELECT requested, reserved, userFk
FROM stockBuyed
WHERE dated = vDated;
+ DELETE FROM stockBuyed WHERE dated = vDated;
+
CALL stockTraslation(vDated);
INSERT INTO stockBuyed(userFk, buyed, `dated`, description)
- SELECT it.workerFk,
- SUM(( ti.amount / b.packing ) * buy_getVolume(b.id)) / vc.palletM3 / 1000000 buyed,
+ SELECT it.workerFk,
+ SUM((ti.quantity / b.packing) * buy_getVolume(b.id)) / vc.palletM3 / 1000000,
vDated,
u.name
- FROM tmp.item ti
- JOIN item i ON i.id = ti.item_id
- JOIN itemType it ON it.id = i.typeFk
+ FROM itemType it
+ JOIN item i ON i.typeFk = it.id
+ LEFT JOIN tmp.item ti ON ti.itemFk = i.id
JOIN itemCategory ic ON ic.id = it.categoryFk
JOIN warehouse wh ON wh.code = 'VNH'
JOIN tmp.buyUltimate bu ON bu.itemFk = i.id AND bu.warehouseFk = wh.id
JOIN buy b ON b.id = bu.buyFk
JOIN volumeConfig vc
JOIN account.`user` u ON u.id = it.workerFk
- WHERE ic.display <> 0
+ JOIN workerDepartment wd ON wd.workerFk = u.id
+ JOIN department d ON d.id = wd.departmentFk
+ WHERE ic.display
+ AND d.code IN ('shopping', 'logistic', 'franceTeam')
GROUP BY it.workerFk;
INSERT INTO stockBuyed(buyed, dated, description)
- SELECT SUM(ic.cm3 * ito.quantity / vc.palletM3 / 1000000),
+ SELECT SUM(ic.cm3 * ito.quantity / vc.palletM3 / 1000000),
vDated,
- IF(c.country = 'España',p.name,c.country) destiny
+ IF(c.code = 'ES', p.name, c.country) destiny
FROM itemTicketOut ito
JOIN ticket t ON t.id = ito.ticketFk
JOIN `address` a ON a.id = t.addressFk
JOIN province p ON p.id = a.provinceFk
JOIN country c ON c.id = p.countryFk
JOIN warehouse wh ON wh.id = t.warehouseFk
- JOIN itemCost ic ON ic.itemFk = ito.itemFk AND ic.warehouseFk = t.warehouseFk
+ JOIN itemCost ic ON ic.itemFk = ito.itemFk
+ AND ic.warehouseFk = t.warehouseFk
JOIN volumeConfig vc
WHERE ito.shipped BETWEEN vDated AND util.dayend(vDated)
AND wh.code = 'VNH'
@@ -68336,8 +68416,7 @@ BEGIN
s.reserved = ts.reserved
WHERE s.dated = vDated;
- DROP TEMPORARY TABLE
- tmp.buyUltimate,
+ DROP TEMPORARY TABLE tmp.buyUltimate,
tmp.item,
tStockBuyed;
END ;;
@@ -68356,44 +68435,44 @@ DELIMITER ;
/*!50003 SET character_set_results = utf8mb4 */ ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `stockTraslation`(vDate DATE)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `stockTraslation`(
+ vDated DATE
+)
BEGIN
/**
- * Calcula el stock del almacén de subasta desde FechaInventario hasta vDate
- * sin tener en cuenta las salidas del mismo dia vDate
+ * Calcula el stock del almacén de subasta desde FechaInventario hasta vDated
+ * sin tener en cuenta las salidas del mismo dia vDated
* para ver el transporte a reservar
- * @param vDate Fecha hasta la cual calcula el stock
+ *
+ * @param vDated Fecha hasta la cual calcula el stock
+ * @return tmp.item
*/
DECLARE vAuctionWarehouseFk INT;
- DELETE FROM stockBuyed WHERE dated = vDate;
-
SELECT warehouseFk INTO vAuctionWarehouseFk
FROM auctionConfig;
- DROP TEMPORARY TABLE IF EXISTS tmp.item;
- CREATE TEMPORARY TABLE tmp.item
- (UNIQUE INDEX i USING HASH (item_id))
+ CREATE OR REPLACE TEMPORARY TABLE tmp.item
+ (UNIQUE INDEX i USING HASH (itemFk))
ENGINE = MEMORY
- SELECT item_id, SUM(amount) amount
- FROM vn2008.item_entry_in
- WHERE dat = vDate
- AND vDate >= util.VN_CURDATE()
- AND warehouse_id = vAuctionWarehouseFk
- AND isVirtualStock is FALSE
- GROUP BY item_id
- HAVING amount != 0;
+ SELECT itemFk, SUM(quantity) quantity
+ FROM itemEntryIn
+ WHERE landed = vDated
+ AND vDated >= util.VN_CURDATE()
+ AND warehouseInFk = vAuctionWarehouseFk
+ AND NOT isVirtualStock
+ GROUP BY itemFk
+ HAVING quantity;
- CALL `cache`.stock_refresh (FALSE);
+ CALL `cache`.stock_refresh(FALSE);
- INSERT INTO tmp.item (item_id,amount)
- SELECT item_id,s.amount
- FROM `cache`.stock s
+ INSERT INTO tmp.item (itemFk, quantity)
+ SELECT item_id, amount
+ FROM `cache`.stock
WHERE warehouse_id = vAuctionWarehouseFk
- ON DUPLICATE KEY UPDATE amount = tmp.item.amount + VALUES(amount);
-
- CALL buyUltimate(vAuctionWarehouseFk, vDate);
+ ON DUPLICATE KEY UPDATE quantity = tmp.item.quantity + VALUES(quantity);
+ CALL buyUltimate(vAuctionWarehouseFk, vDated);
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -68417,10 +68496,10 @@ BEGIN
DECLARE vBossId INT;
DECLARE vDone BOOL;
DECLARE workerCur CURSOR FOR
- SELECT workerFk
- FROM tmp.subordinate
+ SELECT workerFk
+ FROM tmp.subordinate
WHERE NOT isChecked;
-
+
DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
DECLARE EXIT HANDLER FOR 1062 BEGIN
@@ -68428,29 +68507,29 @@ BEGIN
END;
DROP TEMPORARY TABLE IF EXISTS tmp.subordinate;
-
+
CREATE TEMPORARY TABLE tmp.subordinate
(PRIMARY KEY (workerFk))
ENGINE = MEMORY
SELECT vBossFk AS workerFk, 0 AS isChecked;
-
+
WHILE (SELECT COUNT(*) FROM tmp.subordinate WHERE NOT isChecked) > 0 DO
OPEN workerCur;
workerLoop: LOOP
SET vDone = FALSE;
FETCH workerCur INTO vBossId;
-
+
IF vDone THEN
LEAVE workerLoop;
END IF;
-
- INSERT INTO tmp.subordinate
- SELECT id, 0
- FROM worker
+
+ INSERT INTO tmp.subordinate
+ SELECT id, 0
+ FROM worker
WHERE bossFk = vBossId;
-
- UPDATE tmp.subordinate
+
+ UPDATE tmp.subordinate
SET isChecked = 1
WHERE workerFk = vBossId;
END LOOP;
@@ -68490,13 +68569,13 @@ BEGIN
-- Calcula el balance inicial y final de cada proveedor
INSERT INTO openingBalance
SELECT MAX(dueDated),
- supplierFk,
- companyFk,
+ supplierFk,
+ companyFk,
sum(amount) eurAmount,
sum(divisa) foreignAmount
FROM (
SELECT p.dueDated,
- p.supplierFk,
+ p.supplierFk,
p.companyFk,
p.amount,
p.divisa
@@ -68512,7 +68591,7 @@ BEGIN
SELECT iidd.dueDated,
ii.supplierFk,
ii.companyFk,
- - iidd.amount,
+ - iidd.amount,
- iidd.foreignValue
FROM invoiceIn ii
JOIN invoiceInDueDay iidd ON ii.id = iidd.invoiceInFk
@@ -68520,14 +68599,14 @@ BEGIN
JOIN company co ON co.id = ii.companyFk
WHERE iidd.dueDated > '2014-12-31'
AND iidd.dueDated <= vEnded
- AND ii.isBooked AND co.`code` = 'VNL'
+ AND ii.isBooked AND co.`code` = 'VNL'
AND c.`code` <> 'EUR'
UNION ALL
SELECT se.dueDated,
se.supplierFk,
se.companyFk,
- - se.amount,
+ - se.amount,
0
FROM supplierExpense se
JOIN currency c ON c.id = se.currencyFk
@@ -68537,7 +68616,7 @@ BEGIN
AND co.`code` = 'VNL' AND c.`code` <> 'EUR'
) sub
GROUP BY companyFk, supplierFk;
-
+
SELECT ob.dueDated
, ob.supplierFk
, ob.companyFk
@@ -68565,7 +68644,10 @@ DELIMITER ;
/*!50003 SET character_set_results = utf8mb4 */ ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `supplierPackaging_ReportSource`(vFromDated DATE, vSupplierFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `supplierPackaging_ReportSource`(
+ vFromDated DATE,
+ vSupplierFk INT
+)
BEGIN
/**
* Selecciona los embalajes de un proveedor a partir de una fecha
@@ -68573,15 +68655,26 @@ BEGIN
* @param vFromDated Fecha de la que partir
* @param vSupplierFk Id del proveedor
*/
- DECLARE vCounter INT DEFAULT 0;
- DECLARE vMaxRow INT DEFAULT 0;
- DECLARE vItemFk INT DEFAULT 0;
SET @vBalance = 0;
+ SET @vItemFk = NULL;
- CREATE OR REPLACE TEMPORARY TABLE tSupplierPackagingList
- SELECT ROW_NUMBER() OVER(ORDER BY landed) `row`,
+ CREATE OR REPLACE TEMPORARY TABLE tSupplierPackaging
+ SELECT supplierFk,
itemFk,
- entryFk
+ longName,
+ supplier,
+ entryFk,
+ landed,
+ `in`,
+ `out`,
+ warehouse,
+ buyingValue,
+ IF (
+ NOT (@vItemFk <=> sub.itemFk),
+ @vBalance := (`in` - `out`),
+ @vBalance := (`in` - `out` + @vBalance)
+ ) balance,
+ @vItemFk := sub.itemFk previousItemFk
FROM (
SELECT supplierFk,
itemFk,
@@ -68589,8 +68682,8 @@ BEGIN
supplier,
entryFk,
landed,
- `out`,
`in`,
+ `out`,
warehouse,
buyingValue
FROM supplierPackaging
@@ -68603,103 +68696,33 @@ BEGIN
supplier,
'previous',
vFromDated,
- SUM(`out`),
SUM(`in`),
+ SUM(`out`),
NULL,
buyingValue
FROM supplierPackaging
WHERE supplierFk = vSupplierFk
AND landed < vFromDated
GROUP BY itemFk
- ) sub
- GROUP BY itemFk
- HAVING entryFk <> 'previous'
- ORDER BY landed;
+ ORDER BY itemFk, landed, entryFk
+ ) sub
+ WHERE `out` OR `in`;
- SELECT MAX(`row`) INTO vMaxRow
- FROM tSupplierPackagingList;
-
- CREATE OR REPLACE TEMPORARY TABLE tSupplierPackaging(
- supplierFk INT,
- itemFk INT,
- longName VARCHAR(50),
- supplier VARCHAR(50),
- entryFk VARCHAR(50),
- landed DATE,
- `in` VARCHAR(50),
- `out` VARCHAR(50),
- warehouse INT,
- buyingValue INT,
- balance INT
- );
-
- l1: LOOP
- SET @vBalance = 0;
- IF vCounter = vMaxRow THEN
- LEAVE l1;
- ELSE
- SET vCounter = vCounter + 1;
- END IF;
-
- SELECT itemFk INTO vItemFk
- FROM tSupplierPackagingList
- WHERE `row` = vCounter;
-
- INSERT INTO tSupplierPackaging
- SELECT supplierFk,
- itemFk,
- longName,
- supplier,
- entryFk,
- landed,
- `in`,
- `out`,
- warehouse,
- buyingValue,
- @vBalance:= (`in` - `out` + @vBalance)
- FROM (
- SELECT supplierFk,
- itemFk,
- longName,
- supplier,
- entryFk,
- landed,
- `out`,
- `in`,
- warehouse,
- buyingValue
- FROM supplierPackaging
- WHERE supplierFk = vSupplierFk
- AND landed >= vFromDated
- AND itemFk = vItemFk
- UNION ALL
- SELECT vSupplierFk,
- itemFk,
- longName,
- supplier,
- 'previous',
- vFromDated,
- SUM(`out`),
- SUM(`in`),
- NULL,
- buyingValue
- FROM supplierPackaging
- WHERE supplierFk = vSupplierFk
- AND landed < vFromDated
- AND itemFk = vItemFk
- GROUP BY itemFk
- ORDER BY landed
- ) sub
- WHERE `out` OR `in`;
- END LOOP l1;
-
- SELECT *
+ SELECT supplierFk,
+ itemFk,
+ longName,
+ supplier,
+ entryFk,
+ landed,
+ `in`,
+ `out`,
+ warehouse,
+ buyingValue,
+ balance
FROM tSupplierPackaging
- ORDER BY itemFk, landed;
+ WHERE NOT (NOT balance AND landed < CURDATE() - INTERVAL 1 YEAR);
- DROP TEMPORARY TABLE IF EXISTS
- tSupplierPackaging,
- tSupplierPackagingList;
+ DROP TEMPORARY TABLE tSupplierPackaging;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -68751,7 +68774,7 @@ BEGIN
- SUM(iid.amount) mysql,
0 sage
FROM invoiceInDueDay iid
- JOIN invoiceIn ii ON ii.id = iid.invoiceInFk
+ JOIN invoiceIn ii ON ii.id = iid.invoiceInFk
WHERE IFNULL(ii.bookEntried, ii.issued) BETWEEN vDateFrom AND vDateTo
AND ii.isBooked
GROUP BY ii.id
@@ -68777,7 +68800,7 @@ BEGIN
SELECT lc.companyFk,
s.id,
0,
- - (NZ(lc.debit) - NZ(lc.credit))
+ - (IFNULL(lc.debit, 0) - IFNULL(lc.credit, 0))
FROM tmp.ledgerComparative lc
JOIN supplier s ON s.account = lc.account
WHERE lc.`date` BETWEEN vDateFrom AND vDateTo
@@ -68844,9 +68867,11 @@ BEGIN
UPDATE vn.supplier s
JOIN ( SELECT p.supplierFk
- FROM vn.payment p
- LEFT JOIN vn.supplier s ON s.id = p.supplierFk
- LEFT JOIN vn.payMethod pm ON pm.id = s.payMethodFk
+ FROM supplier s
+ JOIN payMethod pm ON pm.id = s.payMethodFk
+ JOIN (SELECT supplierFk,MAX(created) created
+ FROM payment
+ GROUP BY supplierFk) p ON p.supplierFk = s.id
WHERE p.created < (util.VN_CURDATE() - INTERVAL pm.graceMonthsDisableChecked MONTH)
AND pm.graceMonthsDisableChecked
AND s.isPayMethodChecked
@@ -68861,7 +68886,7 @@ DELIMITER ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `test` */;
+/*!50003 DROP PROCEDURE IF EXISTS `supplier_statement` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
@@ -68869,9 +68894,142 @@ DELIMITER ;
/*!50003 SET character_set_results = utf8mb4 */ ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `test`()
+CREATE DEFINER=`root`@`localhost` PROCEDURE `supplier_statement`(
+ vSupplierFk INT,
+ vCurrencyFk INT,
+ vCompanyFk INT,
+ vOrderBy VARCHAR(15),
+ vIsConciliated BOOL
+)
BEGIN
-select 'procedimiento ejecutado con éxito';
+/**
+ * Crea un estado de cuenta de proveedores calculando
+ * los saldos en euros y en la moneda especificada.
+ *
+ * @param vSupplierFk Id del proveedor
+ * @param vCurrencyFk Id de la moneda
+ * @param vCompanyFk Id de la empresa
+ * @param vOrderBy Criterio de ordenación
+ * @param vIsConciliated Indica si está conciliado o no
+ * @return tmp.supplierStatement
+ */
+ SET @euroBalance:= 0;
+ SET @currencyBalance:= 0;
+
+ CREATE OR REPLACE TEMPORARY TABLE tmp.supplierStatement
+ ENGINE = MEMORY
+ SELECT *,
+ @euroBalance:= ROUND(
+ @euroBalance + IFNULL(paymentEuros, 0) -
+ IFNULL(invoiceEuros, 0), 2
+ ) euroBalance,
+ @currencyBalance:= ROUND(
+ @currencyBalance + IFNULL(paymentCurrency, 0) -
+ IFNULL(invoiceCurrency, 0), 2
+ ) currencyBalance
+ FROM (
+ SELECT * FROM
+ (
+ SELECT NULL bankFk,
+ ii.companyFk,
+ ii.serial,
+ ii.id,
+ CASE
+ WHEN vOrderBy = 'issued' THEN ii.issued
+ WHEN vOrderBy = 'bookEntried' THEN ii.bookEntried
+ WHEN vOrderBy = 'booked' THEN ii.booked
+ WHEN vOrderBy = 'dueDate' THEN iid.dueDated
+ END dated,
+ CONCAT('S/Fra ', ii.supplierRef) sref,
+ IF(ii.currencyFk > 1,
+ ROUND(SUM(iid.foreignValue) / SUM(iid.amount), 3),
+ NULL
+ ) changeValue,
+ CAST(SUM(iid.amount) AS DECIMAL(10,2)) invoiceEuros,
+ CAST(SUM(iid.foreignValue) AS DECIMAL(10,2)) invoiceCurrency,
+ NULL paymentEuros,
+ NULL paymentCurrency,
+ ii.currencyFk,
+ ii.isBooked,
+ c.code,
+ 'invoiceIn' statementType
+ FROM invoiceIn ii
+ JOIN invoiceInDueDay iid ON iid.invoiceInFk = ii.id
+ JOIN currency c ON c.id = ii.currencyFk
+ WHERE ii.issued > '2014-12-31'
+ AND ii.supplierFk = vSupplierFk
+ AND vCurrencyFk IN (ii.currencyFk, 0)
+ AND vCompanyFk IN (ii.companyFk, 0)
+ AND (vIsConciliated = ii.isBooked OR NOT vIsConciliated)
+ GROUP BY iid.id
+ UNION ALL
+ SELECT p.bankFk,
+ p.companyFk,
+ NULL,
+ p.id,
+ CASE
+ WHEN vOrderBy = 'issued' THEN p.received
+ WHEN vOrderBy = 'bookEntried' THEN p.received
+ WHEN vOrderBy = 'booked' THEN p.received
+ WHEN vOrderBy = 'dueDate' THEN p.dueDated
+ END,
+ CONCAT(IFNULL(pm.name, ''),
+ IF(pn.concept <> '',
+ CONCAT(' : ', pn.concept),
+ '')
+ ),
+ IF(p.currencyFk > 1, p.divisa / p.amount, NULL),
+ NULL,
+ NULL,
+ p.amount,
+ p.divisa,
+ p.currencyFk,
+ p.isConciliated,
+ c.code,
+ 'payment'
+ FROM payment p
+ LEFT JOIN currency c ON c.id = p.currencyFk
+ LEFT JOIN accounting a ON a.id = p.bankFk
+ LEFT JOIN payMethod pm ON pm.id = p.payMethodFk
+ LEFT JOIN promissoryNote pn ON pn.paymentFk = p.id
+ WHERE p.received > '2014-12-31'
+ AND p.supplierFk = vSupplierFk
+ AND vCurrencyFk IN (p.currencyFk, 0)
+ AND vCompanyFk IN (p.companyFk, 0)
+ AND (vIsConciliated = p.isConciliated OR NOT vIsConciliated)
+ UNION ALL
+ SELECT NULL,
+ companyFk,
+ NULL,
+ se.id,
+ CASE
+ WHEN vOrderBy = 'issued' THEN se.dated
+ WHEN vOrderBy = 'bookEntried' THEN se.dated
+ WHEN vOrderBy = 'booked' THEN se.dated
+ WHEN vOrderBy = 'dueDate' THEN se.dueDated
+ END,
+ se.description,
+ 1,
+ amount,
+ NULL,
+ NULL,
+ NULL,
+ currencyFk,
+ isConciliated,
+ c.`code`,
+ 'expense'
+ FROM supplierExpense se
+ JOIN currency c ON c.id = se.currencyFk
+ WHERE se.supplierFk = vSupplierFk
+ AND vCurrencyFk IN (se.currencyFk,0)
+ AND vCompanyFk IN (se.companyFk,0)
+ AND (vIsConciliated = se.isConciliated OR NOT vIsConciliated)
+ ) sub
+ ORDER BY (dated IS NULL AND NOT isBooked),
+ dated,
+ IF(vOrderBy = 'dueDate', id, NULL)
+ LIMIT 10000000000000000000
+ ) t;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -68879,37 +69037,37 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `ticketBoxesView` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketBoxesView`(IN vTicketFk INT)
BEGIN
-
- SELECT s.id,
- s.itemFk,
- s.concept,
- floor(s.quantity / b.packing) as Cajas,
- b.packing,
- s.isPicked,
+
+ SELECT s.id,
+ s.itemFk,
+ s.concept,
+ floor(s.quantity / b.packing) as Cajas,
+ b.packing,
+ s.isPicked,
i.size
- FROM ticket t
+ FROM ticket t
JOIN sale s ON s.ticketFk = t.id
JOIN item i ON i.id = s.itemFk
JOIN cache.last_buy lb on lb.warehouse_id = t.warehouseFk AND lb.item_id = s.itemFk
JOIN buy b on b.id = lb.buy_id
- JOIN packaging p on p.id = b.packageFk
+ JOIN packaging p on p.id = b.packagingFk
WHERE s.quantity >= b.packing
AND t.id = vTicketFk
AND p.isBox
GROUP BY s.itemFk;
-
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -68931,7 +69089,7 @@ BEGIN
DECLARE vDateStart DATETIME DEFAULT DATE(vDate);
DECLARE vDateEnd DATETIME DEFAULT util.dayEnd(vDate);
-
+
DROP TEMPORARY TABLE IF EXISTS tmp.ticketBuiltTime;
CREATE TEMPORARY TABLE tmp.ticketBuiltTime
@@ -68944,7 +69102,7 @@ BEGIN
SELECT ticketFk, builtTime
FROM
(
- SELECT
+ SELECT
ticketFk,
created as builtTime
FROM
@@ -68952,13 +69110,13 @@ BEGIN
WHERE created BETWEEN vDateStart AND vDateEnd
ORDER BY ticketFk, created DESC
LIMIT 10000000000000000000
- ) sub
+ ) sub
GROUP BY ticketFk
) sub2 ON sub2.ticketFk = t.id
WHERE t.shipped BETWEEN vDate AND util.dayEnd(vDate)
AND t.clientFk NOT IN (50,400,200)
AND t.companyFk = 442
-
+
;
END ;;
@@ -68968,14 +69126,14 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `ticketCalculateClon` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketCalculateClon`(IN vTicketNew INT, vTicketOld INT)
BEGIN
@@ -68987,9 +69145,9 @@ BEGIN
*/
REPLACE INTO orderTicket(orderFk,ticketFk)
- SELECT orderFk, vTicketNew
- FROM orderTicket
- WHERE ticketFk = vTicketOld;
+ SELECT orderFk, vTicketNew
+ FROM orderTicket
+ WHERE ticketFk = vTicketOld;
-- Bionizamos lineas con Preu = 0
CREATE OR REPLACE TEMPORARY TABLE tmp.recalculateSales
@@ -68998,16 +69156,16 @@ BEGIN
FROM sale
WHERE ticketFk = vTicketNew AND price = 0;
- CALL sale_recalcComponent(1);
+ CALL sale_recalcComponent('renewPrices');
-- Bionizamos lineas con Preu > 0
CREATE OR REPLACE TEMPORARY TABLE tmp.recalculateSales
(PRIMARY KEY (id)) ENGINE = MEMORY
- SELECT id
+ SELECT id
FROM sale
WHERE ticketFk = vTicketNew AND price > 0;
- CALL sale_recalcComponent(6);
+ CALL sale_recalcComponent('imbalance');
DROP TEMPORARY TABLE IF EXISTS tmp.recalculateSales;
@@ -69033,12 +69191,12 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketCalculateFromType`( vLanded D
vTypeFk INT)
BEGIN
DROP TEMPORARY TABLE IF EXISTS tmp.item;
- CREATE TEMPORARY TABLE tmp.item
- (INDEX (itemFk))
- ENGINE = MEMORY
+ CREATE TEMPORARY TABLE tmp.item
+ (INDEX (itemFk))
+ ENGINE = MEMORY
SELECT id itemFk FROM vn.item
WHERE typeFk = vTypeFk;
-
+
CALL catalog_calculate(vLanded, vAddressFk, vAgencyModeFk);
DROP TEMPORARY TABLE tmp.item;
DROP TEMPORARY TABLE tmp.ticketLot;
@@ -69060,7 +69218,7 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketCalculatePurge`()
BEGIN
- DROP TEMPORARY TABLE
+ DROP TEMPORARY TABLE
tmp.ticketCalculateItem,
tmp.ticketComponentPrice,
tmp.ticketComponent,
@@ -69084,56 +69242,56 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketClon`(vTicketFk INT, vNewShipped DATE)
BEGIN
-
+
DECLARE done INT DEFAULT FALSE;
- DECLARE vNewTicketFk INT;
+ DECLARE vNewTicketFk INT;
DECLARE vOldSaleFk INT;
DECLARE vNewSaleFk INT;
-
+
DECLARE cur1 CURSOR FOR
SELECT id
FROM vn.sale
WHERE ticketFk = vTicketFk;
-
+
DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
-
+
SET vNewShipped = IFNULL(vNewShipped, util.VN_CURDATE());
-
+
CALL vn.ticket_Clone(vTicketFk, vNewTicketFk);
-
- UPDATE vn.ticket
+
+ UPDATE vn.ticket
SET landed = TIMESTAMPADD(DAY, DATEDIFF(vNewShipped, shipped), landed),
shipped = vNewShipped
WHERE id = vNewTicketFk;
-
+
OPEN cur1;
-
+
read_loop: LOOP
-
+
FETCH cur1 INTO vOldSaleFk;
-
+
IF done THEN
LEAVE read_loop;
END IF;
-
+
INSERT INTO vn.sale(ticketFk, itemFk, quantity, concept, price, discount, priceFixed, isPriceFixed)
SELECT vNewTicketFk, itemFk, quantity, concept, price, discount, priceFixed, isPriceFixed
FROM vn.sale
WHERE id = vOldSaleFk;
-
+
SELECT max(id) INTO vNewSaleFk
FROM vn.sale
WHERE ticketFk = vNewTicketFk;
-
+
INSERT INTO vn.saleComponent(saleFk, componentFk, value, isGreuge)
SELECT vNewSaleFk, componentFk, value, isGreuge
FROM vn.saleComponent
WHERE saleFk = vOldSaleFk;
-
+
END LOOP;
CLOSE cur1;
-
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -69155,18 +69313,18 @@ BEGIN
DECLARE vShipped DATE;
DECLARE vMaxDated DATE;
-
- SELECT shipped, TIMESTAMPADD(YEAR,1,shipped)
+
+ SELECT shipped, TIMESTAMPADD(YEAR,1,shipped)
INTO vShipped, vMaxDated
FROM vn.ticket
WHERE id = vTicketFk;
-
+
WHILE vShipped <= vMaxDated DO
-
+
SET vShipped = TIMESTAMPADD(WEEK, 1, vShipped);
-
+
CALL vn.ticketClon(vTicketFk, vShipped);
-
+
END WHILE;
END ;;
@@ -69188,10 +69346,10 @@ DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketCollection_get`(vTicketFk INT)
BEGIN
- SELECT tc.collectionFk
+ SELECT tc.collectionFk
FROM vn.ticketCollection tc
WHERE ticketFk = vTicketFk;
-
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -69210,18 +69368,18 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketCollection_setUsedShelves`(vTicketFk INT, vUsedShelves INT)
BEGIN
-
+
/*
* Inserta número de baldas que ocupa un ticket
- *
+ *
* @param vTicketFk Identificador de ticket
* @param vUsedShelves Número de baldas
*/
-
+
UPDATE ticketCollection tc
SET tc.usedShelves = vUsedShelves
WHERE tc.ticketFk = vTicketFk;
-
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -69229,76 +69387,73 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `ticketComponentUpdate` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketComponentUpdate`(
vTicketFk INT,
- vClientFk INT,
- vAgencyModeFk INT,
- vAddressFk INT,
- vWarehouseFk TINYINT,
- vCompanyFk SMALLINT,
- vShipped DATETIME,
- vLanded DATE,
- vIsDeleted BOOLEAN,
- vHasToBeUnrouted BOOLEAN,
- vOption INT)
+ vClientFk INT,
+ vAgencyModeFk INT,
+ vAddressFk INT,
+ vWarehouseFk TINYINT,
+ vCompanyFk SMALLINT,
+ vShipped DATETIME,
+ vLanded DATE,
+ vIsDeleted BOOLEAN,
+ vHasToBeUnrouted BOOLEAN,
+ vOption VARCHAR(25))
BEGIN
- DECLARE EXIT HANDLER FOR SQLEXCEPTION
- BEGIN
+ DECLARE EXIT HANDLER FOR SQLEXCEPTION
+ BEGIN
ROLLBACK;
- RESIGNAL;
+ RESIGNAL;
END;
START TRANSACTION;
- IF (SELECT addressFk FROM ticket WHERE id = vTicketFk) <> vAddressFk THEN
-
- UPDATE ticket t
+ IF (SELECT addressFk FROM ticket WHERE id = vTicketFk) <> vAddressFk THEN
+
+ UPDATE ticket t
JOIN address a ON a.id = vAddressFk
SET t.nickname = a.nickname
WHERE t.id = vTicketFk;
-
- END IF;
+ END IF;
UPDATE ticket t
- SET
+ SET
t.clientFk = vClientFk,
t.agencyModeFk = vAgencyModeFk,
t.addressFk = vAddressFk,
t.warehouseFk = vWarehouseFk,
- t.companyFk = vCompanyFk,
+ t.companyFk = vCompanyFk,
t.landed = vLanded,
t.shipped = vShipped,
- t.isDeleted = vIsDeleted
+ t.isDeleted = vIsDeleted
WHERE
t.id = vTicketFk;
IF vHasToBeUnrouted THEN
UPDATE ticket t SET t.routeFk = NULL
WHERE t.id = vTicketFk;
- END IF;
-
- IF vOption <> 8 THEN
- DROP TEMPORARY TABLE IF EXISTS tmp.sale;
- CREATE TEMPORARY TABLE tmp.sale
- (PRIMARY KEY (saleFk))
- ENGINE = MEMORY
- SELECT id AS saleFk, vWarehouseFk warehouseFk
- FROM sale s WHERE s.ticketFk = vTicketFk;
-
- CALL ticketComponentUpdateSale (vOption);
-
- DROP TEMPORARY TABLE tmp.sale;
END IF;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.sale;
+ CREATE TEMPORARY TABLE tmp.sale
+ (PRIMARY KEY (saleFk))
+ ENGINE = MEMORY
+ SELECT id AS saleFk, vWarehouseFk warehouseFk
+ FROM sale s WHERE s.ticketFk = vTicketFk;
+
+ CALL ticketComponentUpdateSale (vOption);
+
+ DROP TEMPORARY TABLE tmp.sale;
COMMIT;
END ;;
DELIMITER ;
@@ -69307,16 +69462,16 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `ticketComponentUpdateSale` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketComponentUpdateSale`(vOption INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketComponentUpdateSale`(vCode VARCHAR(25))
BEGIN
/**
* A partir de la tabla tmp.sale, crea los Movimientos_componentes
@@ -69326,132 +69481,59 @@ BEGIN
* @param table tmp.sale tabla memory con el campo saleFk, warehouseFk
**/
DECLARE vComponentFk INT;
- DECLARE vRenewComponents BOOLEAN;
- DECLARE vKeepPrices BOOLEAN;
- CASE vOption
- WHEN 1 THEN
- SET vRenewComponents = TRUE;
- SET vKeepPrices = FALSE;
- WHEN 2 THEN
- SELECT id INTO vComponentFk FROM component WHERE `code` = 'debtCollection';
- SET vRenewComponents = TRUE;
- SET vKeepPrices = TRUE;
- WHEN 3 THEN
- SELECT id INTO vComponentFk FROM component WHERE `code` = 'mana';
- SET vRenewComponents = TRUE;
- SET vKeepPrices = TRUE;
- WHEN 4 THEN
- SELECT id INTO vComponentFk FROM component WHERE `code` = 'buyerDiscount';
- SET vRenewComponents = TRUE;
- SET vKeepPrices = TRUE;
- /* WHEN 5 THEN
- SET vComponentFk = 35;
- SET vRenewComponents = TRUE;
- SET vKeepPrices = TRUE;*/
- WHEN 6 THEN
- SELECT id INTO vComponentFk FROM component WHERE `code` = 'imbalance';
- SET vRenewComponents = TRUE;
- SET vKeepPrices = TRUE;
- WHEN 7 THEN
- REPLACE INTO saleComponent(saleFk, componentFk, value)
- SELECT s.id, 28, ROUND(((s.price * (100 - s.discount) / 100) - SUM(IFNULL(sc.value, 0))) * 0.8, 3)
- FROM sale s
- JOIN tmp.sale tmps ON tmps.saleFk = s.id
- LEFT JOIN saleComponent sc ON sc.saleFk = s.id
- AND sc.componentFk NOT IN (28, 29)
- GROUP BY s.id;
+ IF vCode <> 'renewPrices' THEN
+ SELECT id INTO vComponentFk FROM component WHERE `code` = vCode;
+ END IF;
- REPLACE INTO saleComponent(saleFk, componentFk, value)
- SELECT s.id, 29, ROUND(((s.price * (100 - s.discount) / 100) - SUM(IFNULL(sc.value, 0))) * 0.2, 3)
- FROM sale s
- JOIN tmp.sale tmps ON tmps.saleFk = s.id
- LEFT JOIN saleComponent sc ON sc.saleFk = s.id
- AND sc.componentFk NOT IN (28, 29)
- GROUP BY s.id;
+ DELETE sc.*
+ FROM tmp.sale tmps
+ JOIN saleComponent sc ON sc.saleFk = tmps.saleFk
+ JOIN `component` c ON c.id = sc.componentFk
+ WHERE c.isRenewable;
- SET vRenewComponents = FALSE;
- SET vKeepPrices = FALSE;
- WHEN 8 THEN
- DELETE sc.*
- FROM tmp.sale tmps JOIN saleComponent sc ON sc.saleFk = tmps.saleFk;
+ REPLACE INTO saleComponent(saleFk, componentFk, value)
+ SELECT s.id, tc.componentFk, tc.cost
+ FROM sale s
+ JOIN tmp.sale tmps ON tmps.saleFk = s.id
+ JOIN tmp.ticketComponent tc ON tc.itemFk = s.itemFk AND tc.warehouseFk = tmps.warehouseFk
+ LEFT JOIN saleComponent sc ON sc.saleFk = s.id
+ AND sc.componentFk = tc.componentFk
+ LEFT JOIN `component` c ON c.id = tc.componentFk
+ WHERE IF(sc.componentFk IS NULL AND NOT c.isRenewable, FALSE, TRUE);
- REPLACE INTO saleComponent(saleFk, componentFk, value)
- SELECT s.id, 28, ROUND(((s.price * (100 - s.discount) / 100)), 3)
- FROM sale s
- JOIN tmp.sale tmps ON tmps.saleFk = s.id;
-
- SET vRenewComponents = FALSE;
- SET vKeepPrices = FALSE;
- WHEN 9 THEN
- SET vRenewComponents = TRUE;
- SET vKeepPrices = TRUE;
- END CASE;
-
- IF vRenewComponents THEN
- DELETE sc.*
- FROM tmp.sale tmps
- JOIN saleComponent sc ON sc.saleFk = tmps.saleFk
- JOIN `component` c ON c.id = sc.componentFk
- WHERE c.isRenewable;
-
- REPLACE INTO saleComponent(saleFk, componentFk, value)
- SELECT s.id, tc.componentFk, tc.cost
- FROM sale s
- JOIN tmp.sale tmps ON tmps.saleFk = s.id
- JOIN tmp.ticketComponent tc ON tc.itemFk = s.itemFk AND tc.warehouseFk = tmps.warehouseFk
- LEFT JOIN saleComponent sc ON sc.saleFk = s.id
- AND sc.componentFk = tc.componentFk
- LEFT JOIN `component` c ON c.id = tc.componentFk
- WHERE IF(sc.componentFk IS NULL AND NOT c.isRenewable, FALSE, TRUE);
-
- -- Añadir componente venta por paquete
- DROP TEMPORARY TABLE IF EXISTS tmp.sale2;
- CREATE TEMPORARY TABLE tmp.sale2
- (PRIMARY KEY (saleFk))
- ENGINE = MEMORY
- SELECT * FROM tmp.sale;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponent2;
- CREATE TEMPORARY TABLE tmp.ticketComponent2
- SELECT * FROM tmp.ticketComponent;
+ -- Añadir componente venta por paquete
+ REPLACE INTO saleComponent(saleFk, componentFk, value)
+ SELECT t.id, t.componentFk, t.cost
+ FROM (
+ SELECT s.id, tc.componentFk, tc.cost, MOD(s.quantity, b.packing) as resto
+ FROM vn.sale s
+ JOIN tmp.sale tmps ON tmps.saleFk = s.id
+ JOIN cache.last_buy lb ON lb.item_id = s.itemFk AND tmps.warehouseFk = lb.warehouse_id
+ JOIN vn.buy b ON b.id = buy_id
+ JOIN tmp.ticketComponent tc ON tc.itemFk = s.itemFk AND tc.warehouseFk = tmps.warehouseFk
+ JOIN `component` c ON c.id = tc.componentFk AND c.code = 'salePerPackage'
+ LEFT JOIN (
+ SELECT s.id
+ FROM vn.sale s
+ JOIN tmp.sale tmps ON tmps.saleFk = s.id
+ JOIN tmp.ticketComponent tc ON tc.itemFk = s.itemFk AND tc.warehouseFk = tmps.warehouseFk
+ JOIN saleComponent sc ON sc.saleFk = s.id AND sc.componentFk = tc.componentFk
+ JOIN `component` c ON c.id = sc.componentFk AND c.code = 'lastUnitsDiscount'
+ ) tp ON tp.id = s.id
+ WHERE tp.id IS NULL
+ HAVING resto <> 0) t;
+ IF vCode <> 'renewPrices' THEN
REPLACE INTO saleComponent(saleFk, componentFk, value)
- SELECT t.id, t.componentFk, t.cost
- FROM (
- SELECT s.id, tc.componentFk, tc.cost, MOD(s.quantity, b.packing) as resto
- FROM vn.sale s
- JOIN tmp.sale tmps ON tmps.saleFk = s.id
- JOIN cache.last_buy lb ON lb.item_id = s.itemFk AND tmps.warehouseFk = lb.warehouse_id
- JOIN vn.buy b ON b.id = buy_id
- JOIN tmp.ticketComponent tc ON tc.itemFk = s.itemFk AND tc.warehouseFk = tmps.warehouseFk
- JOIN `component` c ON c.id = tc.componentFk AND c.code = 'salePerPackage'
- LEFT JOIN (
- SELECT s.id
- FROM vn.sale s
- JOIN tmp.sale2 tmps ON tmps.saleFk = s.id
- JOIN tmp.ticketComponent2 tc ON tc.itemFk = s.itemFk AND tc.warehouseFk = tmps.warehouseFk
- JOIN saleComponent sc ON sc.saleFk = s.id AND sc.componentFk = tc.componentFk
- JOIN `component` c ON c.id = sc.componentFk AND c.code = 'lastUnitsDiscount'
- ) tp ON tp.id = s.id
- WHERE tp.id IS NULL
- HAVING resto <> 0) t;
-
- DROP TEMPORARY TABLE IF EXISTS
- tmp.sale2,
- tmp.ticketComponent2;
- END IF;
-
- IF vKeepPrices THEN
- REPLACE INTO saleComponent(saleFk, componentFk, value)
- SELECT s.id, vComponentFk, ROUND((s.price * (100 - s.discount) / 100) - SUM(sc.value), 3) dif
- FROM sale s
- JOIN tmp.sale tmps ON tmps.saleFk = s.id
- LEFT JOIN saleComponent sc ON sc.saleFk = s.id
- WHERE sc.saleFk <> vComponentFk
- GROUP BY s.id
- HAVING dif <> 0;
- ELSE
+ SELECT s.id, vComponentFk, ROUND((s.price * (100 - s.discount) / 100) - SUM(sc.value), 3) dif
+ FROM sale s
+ JOIN tmp.sale tmps ON tmps.saleFk = s.id
+ LEFT JOIN saleComponent sc ON sc.saleFk = s.id
+ WHERE sc.saleFk <> vComponentFk
+ GROUP BY s.id
+ HAVING dif <> 0;
+ ELSE
UPDATE sale s
JOIN item i on i.id = s.itemFk
JOIN itemType it on it.id = i.typeFk
@@ -69470,11 +69552,11 @@ BEGIN
WHERE sc.componentFk != 21
GROUP BY s.id
HAVING ROUND(saleValue, 4) <> 0;
- END IF;
+ END IF;
- UPDATE sale s
+ UPDATE sale s
JOIN (
- SELECT SUM(sc.value) sumValue, sc.saleFk
+ SELECT SUM(sc.value) sumValue, sc.saleFk
FROM saleComponent sc
JOIN tmp.sale tmps ON tmps.saleFk = sc.saleFk
JOIN `component` c ON c.id = sc.componentFk
@@ -69482,14 +69564,14 @@ BEGIN
GROUP BY sc.saleFk) sc ON sc.saleFk = s.id
SET s.priceFixed = sumValue, s.isPriceFixed = 1;
- DELETE sc.*
+ DELETE sc.*
FROM saleComponent sc
JOIN tmp.sale tmps ON tmps.saleFk = sc.saleFk
JOIN sale s on s.id = sc.saleFk
JOIN item i ON i.id = s.itemFk
JOIN itemType it ON it.id = i.typeFk
WHERE it.code = 'PRT';
-
+
INSERT INTO saleComponent(saleFk, componentFk, value)
SELECT s.id, 15, s.price
FROM sale s
@@ -69558,24 +69640,24 @@ BEGIN
CREATE TEMPORARY TABLE tmp.ticket
ENGINE = MEMORY
SELECT vTicketFk ticketFk;
-
+
CALL vn.ticket_getTax(NULL);
- SELECT
+ SELECT
tt.ticketFk,
CAST(tt.taxableBase AS DECIMAL(10, 2)) AS taxableBase,
CAST(tt.rate * tt.taxableBase / 100 AS DECIMAL(10, 2)) AS tax,
- pgc.*,
+ pgc.*,
CAST(IF(pe.equFk IS NULL, taxableBase, 0) AS DECIMAL(10, 2)) AS Base,
pgc.rate / 100 as vatPercent
FROM tmp.ticketTax tt
JOIN vn.pgc ON pgc.code = tt.pgcFk
LEFT JOIN vn.pgcEqu pe ON pe.equFk = pgc.code;
-
+
DROP TEMPORARY TABLE tmp.ticket;
DROP TEMPORARY TABLE tmp.ticketTax;
DROP TEMPORARY TABLE tmp.ticketAmount;
-
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -69613,29 +69695,29 @@ BEGIN
JOIN ticket t ON t.id = tmpTicket.ticketFk;
CALL addressTaxArea ();
-
+
DROP TEMPORARY TABLE IF EXISTS tmp.ticketTax;
CREATE TEMPORARY TABLE tmp.ticketTax
(INDEX (ticketFk))
ENGINE = MEMORY
SELECT tmpTicket.ticketFk,
bp.pgcFk,
- SUM(ROUND(s.quantity * s.price * (100 - s.discount)/100,2)
+ SUM(ROUND(s.quantity * s.price * (100 - s.discount)/100,2)
) AS taxableBase,
SUM(ROUND(s.quantity * s.price * (100 - s.discount)/100,2)
) * pgc.rate / 100 AS tax,
tc.code
-
+
FROM tmp.ticket tmpTicket
JOIN sale s ON s.ticketFk = tmpTicket.ticketFk
JOIN item i ON i.id = s.itemFk
JOIN ticket t ON t.id = tmpTicket.ticketFk
JOIN supplier su ON su.id = t.companyFk
- JOIN tmp.addressTaxArea ata
+ JOIN tmp.addressTaxArea ata
ON ata.addressFk = t.addressFk AND ata.companyFk = t.companyFk
- JOIN itemTaxCountry itc
+ JOIN itemTaxCountry itc
ON itc.itemFk = i.id AND itc.countryFk = su.countryFk
- JOIN bookingPlanner bp
+ JOIN bookingPlanner bp
ON bp.countryFk = su.countryFk
AND bp.taxAreaFk = ata.areaFk
AND bp.taxClassFk = itc.taxClassFk
@@ -69643,7 +69725,7 @@ BEGIN
JOIN taxClass tc ON tc.id = bp.taxClassFk
GROUP BY tmpTicket.ticketFk, pgc.code
HAVING taxableBase != 0;
-
+
DROP TEMPORARY TABLE IF EXISTS tmp.ticketAmount;
CREATE TEMPORARY TABLE tmp.ticketAmount
(INDEX (ticketFk))
@@ -69654,7 +69736,7 @@ BEGIN
DROP TEMPORARY TABLE IF EXISTS tmp.addressCompany;
DROP TEMPORARY TABLE IF EXISTS tmp.addressTaxArea;
-
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -69675,7 +69757,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketGetTotal`(vTaxArea VARCHAR(25
BEGIN
/**
* Calcula el total con IVA para un conjunto de tickets.
- *
+ *
* @param vTaxArea
* @table tmp.ticket(ticketFk) Identificadores de los tickets a calcular
* @return tmp.ticketTotal Total para cada ticket
@@ -69692,7 +69774,7 @@ BEGIN
FROM tmp.ticket t
LEFT JOIN tmp.ticketAmount ta ON t.ticketFk = ta.ticketFk
GROUP BY ticketFk;
-
+
DROP TEMPORARY TABLE IF EXISTS tmp.ticketAmount;
DROP TEMPORARY TABLE IF EXISTS tmp.ticketTax;
END ;;
@@ -69764,24 +69846,24 @@ BEGIN
DECLARE vParked DATETIME;
DECLARE vLevel INT;
DECLARE vCollectionFk INT;
-
- SELECT IFNULL(`level`,0), IFNULL(collectionFk,0)
+
+ SELECT IFNULL(`level`,0), IFNULL(collectionFk,0)
INTO vLevel, vCollectionFk
FROM vn.ticketCollection
WHERE ticketFk = vTicketFk
LIMIT 1;
-
- SELECT created, parkingFk
+
+ SELECT created, parkingFk
INTO vParked, vParkingFk
FROM vn.ticketParking
WHERE ticketFk = vTicketFk;
-
+
SELECT tp.ticketFk, CONCAT(tc.collectionFk, ' - ', tc.level) coleccion, tp.created, p.code, am.name as Agencia
FROM vn.ticketParking tp
JOIN vn.parking p ON p.id = tp.parkingFk
JOIN vn.sector sc ON sc.id = p.sectorFk
LEFT JOIN vn.ticketCollection tc ON tc.ticketFk = tp.ticketFk
- JOIN vn.ticketStateToday tst ON tst.ticket = tp.ticketFk
+ JOIN vn.ticketStateToday tst ON tst.ticketFk = tp.ticketFk
JOIN vn.ticket t ON t.id = tp.ticketFk
JOIN vn.zone z ON z.id = t.zoneFk
JOIN vn.agencyMode am ON am.id = z.agencyModeFk
@@ -69802,7 +69884,7 @@ BEGIN
AND sc.isPackagingArea
AND tp.created < vParked
AND t.packages <=> 0);
-
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -69823,7 +69905,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketNotInvoicedByClient`(vClientF
BEGIN
DROP TEMPORARY TABLE IF EXISTS tmp.ticket;
-
+
CREATE TEMPORARY TABLE tmp.ticket
SELECT id ticketFk
FROM ticket
@@ -69833,7 +69915,7 @@ BEGIN
CALL vn.ticketGetTotal(NULL);
- SELECT c.id,
+ SELECT c.id,
c.name as Cliente,
t.shipped as Fecha,
t.id as Id_Ticket,
@@ -69844,7 +69926,7 @@ BEGIN
DROP TEMPORARY TABLE
tmp.ticket,
- tmp.ticketTotal;
+ tmp.ticketTotal;
END ;;
DELIMITER ;
@@ -69864,21 +69946,21 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketObservation_addNewBorn`(vTicketFk INT)
BEGIN
-
+
/**
* Inserta observaciones para los tickets con clientes nuevos o recuperados
- *
+ *
* @param vTicketFk Identificador de vn.ticket
*/
-
+
DECLARE vDescription VARCHAR(20) DEFAULT '¡Cliente NUEVO! ';
INSERT INTO vn.ticketObservation(ticketFk, observationTypeFk, description)
SELECT vTicketFk, ot.id, vDescription
FROM vn.observationType ot
WHERE ot.hasNewBornMessage
- ON DUPLICATE KEY UPDATE description = CONCAT(vDescription, ticketObservation.description);
-
+ ON DUPLICATE KEY UPDATE description = CONCAT(vDescription, ticketObservation.description);
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -69918,7 +70000,7 @@ BEGIN
DECLARE vComponentCost INT;
DECLARE vDone INT DEFAULT FALSE;
DECLARE vClientId INT;
-
+
DECLARE vCursor CURSOR FOR
SELECT DISTINCT clientFk
FROM (
@@ -69935,31 +70017,31 @@ BEGIN
RESIGNAL;
END;
- SELECT id INTO vWarehouseInventory
- FROM warehouse
+ SELECT id INTO vWarehouseInventory
+ FROM warehouse
WHERE `code`= 'inv';
-
- SELECT id INTO vComponentCost
- FROM component
+
+ SELECT id INTO vComponentCost
+ FROM component
WHERE `code`= 'purchaseValue';
-
- SELECT packagingInvoicingDated INTO vDateStart
- FROM ticketConfig;
-
+
+ SELECT packagingInvoicingDated INTO vDateStart
+ FROM ticketConfig;
+
IF vWarehouseInventory IS NULL THEN
CALL util.throw('Warehouse inventory not set');
END IF;
IF vComponentCost IS NULL THEN
CALL util.throw('Component cost not set');
- END IF;
+ END IF;
SET vDateEnd = vDated + INTERVAL 1 DAY;
-
+
IF NOT vWithoutPeriodGrace THEN
SET vGraceDate = vGraceDate -INTERVAL 1 MONTH;
END IF;
-
+
DROP TEMPORARY TABLE IF EXISTS tmp.packagingToInvoice;
CREATE TEMPORARY TABLE tmp.packagingToInvoice
(INDEX (clientFk))
@@ -69972,7 +70054,7 @@ BEGIN
t.clientFk
FROM ticketPackaging tp
JOIN packaging p ON p.id = tp.packagingFk
- JOIN ticket t ON t.id = tp.ticketFk
+ JOIN ticket t ON t.id = tp.ticketFk
JOIN client c ON c.id = t.clientFk
WHERE c.isActive
AND (vClientFk IS NULL OR t.clientFk = vClientFk)
@@ -69980,7 +70062,7 @@ BEGIN
AND (tp.quantity < 0 OR (tp.quantity > 0 AND t.shipped < vGraceDate))
AND tp.quantity
AND p.itemFk;
-
+
OPEN vCursor;
l: LOOP
@@ -69993,25 +70075,25 @@ BEGIN
START TRANSACTION;
CALL ticket_add(
- vClientId,
+ vClientId,
vDateEnd,
- vWarehouseInventory,
- vCompanyFk,
- NULL,
- NULL,
- NULL,
- vDateEnd,
- account.myUser_getId(),
+ vWarehouseInventory,
+ vCompanyFk,
+ NULL,
+ NULL,
+ NULL,
+ vDateEnd,
+ account.myUser_getId(),
TRUE,
vNewTicket);
-
+
INSERT INTO ticketPackaging(ticketFk, packagingFk, quantity, pvp)
SELECT vNewTicket, packagingFk, - SUM(quantity) totalQuantity, price
- FROM tmp.packagingToInvoice
+ FROM tmp.packagingToInvoice
WHERE clientFk = vClientId
GROUP BY packagingFk
HAVING IF(vWithoutPeriodGrace, totalQuantity <> 0, totalQuantity < 0);
-
+
INSERT INTO sale(ticketFk, itemFk, concept, quantity, price)
SELECT vNewTicket, pti.itemFk, i.name, SUM(pti.quantity) totalQuantity, pti.price
FROM tmp.packagingToInvoice pti
@@ -70019,12 +70101,12 @@ BEGIN
WHERE pti.clientFk = vClientId
GROUP BY pti.itemFk
HAVING IF(vWithoutPeriodGrace, totalQuantity <> 0, totalQuantity > 0);
-
+
INSERT INTO saleComponent(saleFk, componentFk, value)
SELECT id, vComponentCost, price
FROM sale
WHERE ticketFk = vNewTicket;
-
+
COMMIT;
END LOOP;
CLOSE vCursor;
@@ -70048,43 +70130,43 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketParking_findSkipped`(vTicketFk INT, vItemPackingTypeFk VARCHAR(1))
BEGIN
-
+
/**
* Averigua los tickets que se han saltado por un error en el proceso encajado
* @param vTicketFk Ticket
* @param vItemPackingTypeFk Modo de encajado
* @return un select con los tickets afectados
- */
+ */
DECLARE vParkingFk INT;
DECLARE vParked DATETIME;
DECLARE vLevel INT;
DECLARE vWagon INT;
DECLARE vCollectionFk INT;
-
- SELECT IFNULL(`level`,0), IFNULL(`wagon`,0),IFNULL(collectionFk,0)
+
+ SELECT IFNULL(`level`,0), IFNULL(`wagon`,0),IFNULL(collectionFk,0)
INTO vLevel, vWagon, vCollectionFk
FROM vn.ticketCollection tc
JOIN vn.collection c ON c.id = tc.collectionFk AND c.itemPackingTypeFk = vItemPackingTypeFk
WHERE ticketFk = vTicketFk
ORDER BY c.id DESC
LIMIT 1;
-
- SELECT created, parkingFk
+
+ SELECT created, parkingFk
INTO vParked, vParkingFk
FROM vn.ticketParking tp
- JOIN vn.parking p ON p.id = tp.parkingFk
- JOIN vn.sector s ON s.id = p.sectorFk
+ JOIN vn.parking p ON p.id = tp.parkingFk
+ JOIN vn.sector s ON s.id = p.sectorFk
WHERE ticketFk = vTicketFk
AND s.itemPackingTypeFk = vItemPackingTypeFk
AND s.isPackagingArea ;
-
+
SELECT tp.ticketFk, CONCAT(tc.collectionFk, ' ', tc.wagon, ' - ', tc.level) coleccion, tp.created, p.code, am.name as Agencia
FROM vn.ticketParking tp
JOIN vn.parking p ON p.id = tp.parkingFk
JOIN vn.sector sc ON sc.id = p.sectorFk
LEFT JOIN vn.ticketCollection tc ON tc.ticketFk = tp.ticketFk
- JOIN vn.ticketStateToday tst ON tst.ticket = tp.ticketFk
+ JOIN vn.ticketStateToday tst ON tst.ticketFk = tp.ticketFk
JOIN vn.ticket t ON t.id = tp.ticketFk
JOIN vn.zone z ON z.id = t.zoneFk
JOIN vn.agencyMode am ON am.id = z.agencyModeFk
@@ -70095,9 +70177,9 @@ BEGIN
AND (
( IFNULL(tc.collectionFk,-1) != IFNULL(@vCollectionFk,0) AND tp.created < vParked )
OR
- ( tc.collectionFk = vCollectionFk
+ ( tc.collectionFk = vCollectionFk
AND (LEFT(tc.wagon,1) < LEFT(vWagon,1)
- OR (LEFT(tc.wagon,1) = LEFT(vWagon,1) AND LEFT(tc.level,1) < LEFT(vLevel,1)))
+ OR (LEFT(tc.wagon,1) = LEFT(vWagon,1) AND LEFT(tc.level,1) < LEFT(vLevel,1)))
)
)
) -- Etiquetas que no se han escaneado y ya estamos con una posterior
@@ -70105,7 +70187,7 @@ BEGIN
(s.alertLevel > 1
AND tp.parkingFk = vParkingFk
AND sc.isPackagingArea
- AND tp.created < vParked
+ AND tp.created < vParked
AND t.packages <=> 0);
END ;;
DELIMITER ;
@@ -70157,11 +70239,11 @@ DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketRequest_Add`(vDescription VARCHAR(255), vQuantity INT, vPrice DOUBLE, vTicketFk INT, vBuyerCode VARCHAR(3))
BEGIN
- INSERT INTO vn.ticketRequest(description,
- quantity,
- price,
- ticketFk,
- buyerCode,
+ INSERT INTO vn.ticketRequest(description,
+ quantity,
+ price,
+ ticketFk,
+ buyerCode,
requesterFk)
VALUES(vDescription,
vQuantity,
@@ -70169,7 +70251,7 @@ BEGIN
vTicketFk,
vBuyerCode,
vn.getUser());
-
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -70188,26 +70270,26 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketStateToday_setState`(vTicketFk INT, vStateCode VARCHAR(45))
BEGIN
-
+
/* Modifica el estado de un ticket de hoy
- *
+ *
* @param vTicketFk el id del ticket
* @param vStateCode estado a modificar del ticket
- *
+ *
*/
-
+
DECLARE vAlertLevel INT;
-
- SELECT s.alertLevel INTO vAlertLevel
- FROM state s
- JOIN ticketStateToday tst ON tst.state = s.id
- WHERE tst.ticket = vTicketFk
+
+ SELECT s.alertLevel INTO vAlertLevel
+ FROM state s
+ JOIN ticketStateToday tst ON tst.state = s.id
+ WHERE tst.ticketFk = vTicketFk
LIMIT 1;
-
+
IF vAlertLevel < 2 THEN
-
+
CALL vn.ticket_setState(vTicketFk, vStateCode);
-
+
END IF;
END ;;
@@ -70217,34 +70299,34 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `ticketStateUpdate` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketStateUpdate`(vTicketFk INT, vStateCode VARCHAR(45))
BEGIN
-
+
/*
* @deprecated:utilizar ticket_setState
*/
-
+
DECLARE vAlertLevel INT;
- SELECT s.alertLevel INTO vAlertLevel
+ SELECT s.alertLevel INTO vAlertLevel
FROM vn.state s
JOIN vn.ticketState ts ON ts.stateFk = s.id
WHERE ts.ticketFk = vTicketFk;
-
- IF !(vStateCode = 'ON_CHECKING' AND vAlertLevel > 1) THEN
-
- INSERT INTO ticketTracking(stateFk, ticketFk, workerFk)
+
+ IF !(vStateCode = 'ON_CHECKING' AND vAlertLevel > 1) THEN
+
+ INSERT INTO ticketTracking(stateFk, ticketFk, userFk)
SELECT id, vTicketFk, account.myUser_getId()
- FROM vn.state
+ FROM vn.state
WHERE `code` = vStateCode collate utf8_unicode_ci;
END IF;
@@ -70388,14 +70470,14 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `ticket_add` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_add`(
vClientId INT
@@ -70410,11 +70492,26 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_add`(
,vIsRequiredZone INT
,OUT vNewTicket INT)
BEGIN
+/**
+* Crea un ticket,
+* ¡¡NO se debe llamar directamente, llamar a salix que hace comprobaciones previas!!
+*
+* @param vClientId id del cliente
+* @param vShipped dia preparacion
+* @param vWarehouseFk id del warehouse
+* @param vCompanyFk id la empresa
+* @param vAddressFk id del consignatario
+* @param vAgencyModeFk id de la agencia
+* @param vRouteFk id de la ruta | NULL
+* @param vlanded dia llegada
+* @param vUserId que crea el ticket
+* @param vIsRequiredZone Indica si tiene que tener zona valida para ser creado
+* @return vNewTicket id del ticket creado
+*/
DECLARE vZoneFk INT;
DECLARE vPrice DECIMAL(10,2);
DECLARE vBonus DECIMAL(10,2);
DECLARE vIsActive BOOL;
- DECLARE vNickname VARCHAR(100);
IF vClientId IS NULL THEN
CALL util.throw ('CLIENT_NOT_ESPECIFIED');
@@ -70480,10 +70577,6 @@ BEGIN
JOIN agencyMode am ON am.id = a.agencyModeFk
WHERE a.id = vAddressFk;
- SELECT a.nickname INTO vNickname
- FROM address a
- WHERE a.id = vAddressFk;
-
SET vNewTicket = LAST_INSERT_ID();
INSERT INTO ticketObservation(ticketFk, observationTypeFk, description)
@@ -70501,7 +70594,7 @@ BEGIN
END IF;
IF (SELECT ct.isCreatedAsServed FROM vn.clientType ct JOIN vn.client c ON c.typeFk = ct.code WHERE c.id = vClientId ) <> FALSE THEN
- INSERT INTO ticketTracking(stateFk, ticketFk, workerFk)
+ INSERT INTO ticketTracking(stateFk, ticketFk, userFk)
SELECT id, vNewTicket, account.myUser_getId()
FROM state
WHERE `code` = 'DELIVERED';
@@ -70524,20 +70617,20 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_administrativeCopy`(vOriginalTicket INT, OUT vNewTicket INT)
BEGIN
-
+
INSERT INTO vn.ticket(clientFk, addressFk, shipped, warehouseFk, companyFk, landed)
- SELECT t.clientFk , t.addressFk , t.shipped ,w.id, t.companyFk , t.landed
+ SELECT t.clientFk , t.addressFk , t.shipped ,w.id, t.companyFk , t.landed
FROM vn.ticket t
JOIN vn.warehouse w ON w.name = 'INVENTARIO'
WHERE t.id = vOriginalTicket;
-
+
SELECT LAST_INSERT_ID() INTO vNewTicket;
INSERT INTO vn.sale(ticketFk, itemFk, concept, quantity, price, discount)
- SELECT vNewTicket, s.itemFk , s.concept , s.quantity , s.price , s.discount
+ SELECT vNewTicket, s.itemFk , s.concept , s.quantity , s.price , s.discount
FROM vn.sale s
WHERE s.ticketFk = vOriginalTicket;
-
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -70545,14 +70638,14 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `ticket_canAdvance` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_canAdvance`(vDateFuture DATE, vDateToAdvance DATE, vWarehouseFk INT)
BEGIN
@@ -70567,8 +70660,7 @@ BEGIN
SELECT inventoried INTO vDateInventory FROM config;
- DROP TEMPORARY TABLE IF EXISTS tmp.stock;
- CREATE TEMPORARY TABLE tmp.stock
+ CREATE OR REPLACE TEMPORARY TABLE tmp.stock
(itemFk INT PRIMARY KEY,
amount INT)
ENGINE = MEMORY;
@@ -70585,7 +70677,7 @@ BEGIN
SELECT itemFk, quantity
FROM itemEntryIn
WHERE landed >= vDateInventory
- AND landed < vDateFuture
+ AND landed <= vDateToAdvance
AND isVirtualStock = FALSE
AND warehouseInFk = vWarehouseFk
UNION ALL
@@ -70614,44 +70706,63 @@ BEGIN
dest.totalWithVat,
origin.totalWithVat futureTotalWithVat,
dest.agency,
+ dest.agencyModeFk,
origin.futureAgency,
+ origin.agencyModeFk futureAgencyModeFk,
dest.lines,
dest.liters,
origin.futureLines - origin.hasStock AS notMovableLines,
(origin.futureLines = origin.hasStock) AS isFullMovable,
+ dest.zoneFk,
+ origin.futureZoneFk,
+ origin.futureZoneName,
origin.classColor futureClassColor,
- dest.classColor
+ dest.classColor,
+ origin.clientFk futureClientFk,
+ origin.addressFk futureAddressFk,
+ origin.warehouseFk futureWarehouseFk,
+ origin.companyFk futureCompanyFk,
+ IFNULL(dest.nickname, origin.nickname) nickname,
+ dest.landed
FROM (
SELECT
s.ticketFk,
- t.workerFk,
+ c.salesPersonFk workerFk,
t.shipped,
t.totalWithVat,
st.name futureState,
- t.addressFk,
am.name futureAgency,
count(s.id) futureLines,
GROUP_CONCAT(DISTINCT ipt.code ORDER BY ipt.code) futureIpt,
CAST(SUM(litros) AS DECIMAL(10,0)) futureLiters,
SUM((s.quantity <= IFNULL(st.amount,0))) hasStock,
- st.classColor
+ z.id futureZoneFk,
+ z.name futureZoneName,
+ st.classColor,
+ t.clientFk,
+ t.nickname,
+ t.addressFk,
+ t.warehouseFk,
+ t.companyFk,
+ t.agencyModeFk
FROM ticket t
+ JOIN client c ON c.id = t.clientFk
JOIN sale s ON s.ticketFk = t.id
JOIN saleVolume sv ON sv.saleFk = s.id
JOIN item i ON i.id = s.itemFk
JOIN ticketState ts ON ts.ticketFk = t.id
JOIN state st ON st.id = ts.stateFk
JOIN agencyMode am ON t.agencyModeFk = am.id
+ JOIN zone z ON t.zoneFk = z.id
LEFT JOIN itemPackingType ipt ON ipt.code = i.itemPackingTypeFk
LEFT JOIN tmp.stock st ON st.itemFk = i.id
WHERE t.shipped BETWEEN vDateFuture AND util.dayend(vDateFuture)
AND t.warehouseFk = vWarehouseFk
GROUP BY t.id
) origin
- JOIN (
+ LEFT JOIN (
SELECT
t.id ticketFk,
- t.addressFk,
st.name state,
GROUP_CONCAT(DISTINCT ipt.code ORDER BY ipt.code) ipt,
t.shipped,
@@ -70659,7 +70770,15 @@ BEGIN
am.name agency,
CAST(SUM(litros) AS DECIMAL(10,0)) liters,
CAST(COUNT(*) AS DECIMAL(10,0)) `lines`,
- st.classColor
+ st.classColor,
+ t.clientFk,
+ t.nickname,
+ t.addressFk,
+ t.zoneFk,
+ t.warehouseFk,
+ t.companyFk,
+ t.landed,
+ t.agencyModeFk
FROM ticket t
JOIN sale s ON s.ticketFk = t.id
JOIN saleVolume sv ON sv.saleFk = s.id
@@ -70673,7 +70792,7 @@ BEGIN
AND st.order <= 5
GROUP BY t.id
) dest ON dest.addressFk = origin.addressFk
- WHERE origin.hasStock != 0;
+ WHERE origin.hasStock;
DROP TEMPORARY TABLE tmp.stock;
END ;;
@@ -70715,6 +70834,7 @@ BEGIN
t.warehouseFk,
ts.alertLevel,
t.shipped,
+ t.totalWithVat,
sub2.shipped futureShipped,
t.workerFk,
st.code stateCode,
@@ -70781,7 +70901,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_canMerge`(vDated DATE, vScop
BEGIN
/**
* Devuelve un listado de tickets susceptibles de fusionarse con otros tickets en el futuro
- *
+ *
* @param vDated Fecha en cuestión
* @param vScopeDays Dias en el futuro a sondear
* @param vLitersMax Volumen máximo de los tickets a catapultar
@@ -70846,14 +70966,14 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `ticket_checkNoComponents` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_checkNoComponents`(vShippedFrom DATETIME, vShippedTo DATETIME)
BEGIN
@@ -70862,10 +70982,10 @@ BEGIN
* Comprueba que los tickets entre un rango de fechas tienen componentes
* y recalcula sus componentes
*
- * @param vShippedFrom rango inicial de fecha
+ * @param vShippedFrom rango inicial de fecha
* @param vShippedTo rango final de fecha
*/
-
+
CREATE OR REPLACE TEMPORARY TABLE tmp.coste
(primary key (id)) ENGINE = MEMORY
SELECT s.id
@@ -70880,9 +71000,9 @@ BEGIN
WHERE t.shipped BETWEEN vShippedFrom AND vShippedTo
AND ic.merchandise;
- CREATE OR REPLACE TEMPORARY TABLE tmp.recalculateSales
+ CREATE OR REPLACE TEMPORARY TABLE tmp.recalculateSales
(primary key (id)) ENGINE = MEMORY
- SELECT DISTINCT s.id
+ SELECT DISTINCT s.id
FROM ticket t
JOIN sale s ON s.ticketFk = t.id
JOIN item i ON i.id = s.itemFk
@@ -70893,10 +71013,10 @@ BEGIN
AND c.id IS NULL
AND ic.merchandise;
- CALL vn.sale_recalcComponent(1);
+ CALL sale_recalcComponent('renewPrices');
- DROP TEMPORARY TABLE tmp.recalculateSales;
- DROP TEMPORARY TABLE tmp.coste;
+ DROP TEMPORARY TABLE tmp.recalculateSales;
+ DROP TEMPORARY TABLE tmp.coste;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -70904,14 +71024,14 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `ticket_Clone` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_Clone`(vOriginalTicket INT, OUT vNewTicket INT)
BEGIN
@@ -70924,22 +71044,22 @@ BEGIN
DECLARE vStateFk INT;
INSERT INTO ticket (
- clientFk,
- shipped,
- addressFk,
- agencyModeFk,
- nickname,
- warehouseFk,
- companyFk,
- landed,
- zoneFk,
- zonePrice,
- zoneBonus,
- routeFk,
- priority,
- hasPriority,
- clonedFrom
- )
+ clientFk,
+ shipped,
+ addressFk,
+ agencyModeFk,
+ nickname,
+ warehouseFk,
+ companyFk,
+ landed,
+ zoneFk,
+ zonePrice,
+ zoneBonus,
+ routeFk,
+ priority,
+ hasPriority,
+ clonedFrom
+ )
SELECT
clientFk,
shipped,
@@ -70956,18 +71076,18 @@ BEGIN
priority,
hasPriority,
vOriginalTicket
- FROM ticket
- WHERE id = vOriginalTicket;
+ FROM ticket
+ WHERE id = vOriginalTicket;
SET vNewTicket = LAST_INSERT_ID();
INSERT INTO ticketObservation(ticketFk, observationTypeFk, description)
- SELECT vNewTicket, o.observationTypeFk, o.description
- FROM ticketObservation o
- WHERE o.ticketFk = vOriginalTicket;
+ SELECT vNewTicket, observationTypeFk, description
+ FROM ticketObservation
+ WHERE ticketFk = vOriginalTicket;
- INSERT INTO ticketTracking(ticketFk, stateFk, workerFk, created)
- SELECT vNewTicket, stateFk, workerFk , created
+ INSERT INTO ticketTracking(ticketFk, stateFk, userFk, created)
+ SELECT vNewTicket, stateFk, userFk, created
FROM ticketTracking
WHERE ticketFk = vOriginalTicket
ORDER BY created;
@@ -70987,14 +71107,13 @@ DELIMITER ;
/*!50003 SET character_set_results = utf8mb4 */ ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_cloneWeekly`(vWeek INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_cloneWeekly`(vDateFrom DATE, vDateTo DATE)
BEGIN
DECLARE vIsDone BOOL;
DECLARE vLanding DATE;
DECLARE vShipment DATE;
DECLARE vWarehouseFk INT;
DECLARE vTicketFk INT;
- DECLARE vWeekDay INT;
DECLARE vClientFk INT;
DECLARE vCompanyFk INT;
DECLARE vAddressFk INT;
@@ -71006,19 +71125,21 @@ BEGIN
DECLARE rsTicket CURSOR FOR
SELECT tt.ticketFk,
- tt.weekDay,
- t.clientFk,
- t.warehouseFk,
- t.companyFk,
- t.addressFk,
- tt.agencyModeFk
- FROM ticketWeekly tt
- JOIN ticket t ON tt.ticketFk = t.id;
+ t.clientFk,
+ t.warehouseFk,
+ t.companyFk,
+ t.addressFk,
+ tt.agencyModeFk,
+ ti.dated
+ FROM ticketWeekly tt
+ JOIN ticket t ON tt.ticketFk = t.id
+ JOIN tmp.time ti
+ WHERE WEEKDAY(ti.dated) = tt.weekDay;
DECLARE CONTINUE HANDLER FOR NOT FOUND SET vIsDone = TRUE;
-
- SET vYear = YEAR(util.VN_CURDATE()) + IF(vWeek < WEEK(util.VN_CURDATE()),1, 0);
-
+
+ CALL `util`.`time_generate`(vDateFrom,vDateTo);
+
OPEN rsTicket;
myLoop: LOOP
BEGIN
@@ -71026,36 +71147,31 @@ BEGIN
DECLARE vIsDuplicateMail BOOL;
DECLARE vSubject VARCHAR(150);
DECLARE vMessage TEXT;
-
+
SET vIsDone = FALSE;
- FETCH rsTicket INTO vTicketFk, vWeekDay, vClientFk, vWarehouseFk, vCompanyFk, vAddressFk, vAgencyModeFk;
+ FETCH rsTicket INTO vTicketFk,vClientFk, vWarehouseFk, vCompanyFk, vAddressFk, vAgencyModeFk,vShipment;
IF vIsDone THEN
LEAVE myLoop;
END IF;
- SELECT dated INTO vShipment
- FROM `time`
- WHERE `year` = vYear AND `week` = vWeek
- AND WEEKDAY(dated) = vWeekDay;
-
-- busca si el ticket ya ha sido clonado
IF EXISTS (SELECT TRUE FROM ticket tOrig
JOIN sale saleOrig ON tOrig.id = saleOrig.ticketFk
JOIN saleCloned sc ON sc.saleOriginalFk = saleOrig.id
JOIN sale saleClon ON saleClon.id = sc.saleClonedFk
JOIN ticket tClon ON tClon.id = saleClon.ticketFk
- WHERE tOrig.id = vTicketFk
- AND tClon.isDeleted = FALSE
+ WHERE tOrig.id = vTicketFk
+ AND tClon.isDeleted = FALSE
AND DATE(tClon.shipped) = vShipment)
THEN
ITERATE myLoop;
END IF;
IF vAgencyModeFk IS NULL THEN
- SELECT agencyModeFk INTO vAgencyModeFk
+ SELECT agencyModeFk INTO vAgencyModeFk
FROM address
- WHERE clientFk = vClientFk
+ WHERE clientFk = vClientFk
AND isDefaultAddress;
END IF;
@@ -71076,8 +71192,8 @@ BEGIN
FALSE,
vNewTicket);
- UPDATE ticket
- SET clonedFrom = vTicketFk
+ UPDATE ticket
+ SET clonedFrom = vTicketFk
WHERE id = vNewTicket;
INSERT INTO sale (ticketFk, itemFk, concept, quantity, price,
@@ -71096,7 +71212,7 @@ BEGIN
INSERT IGNORE INTO saleCloned(saleOriginalFk, saleClonedFk)
SELECT saleOriginal.id, saleClon.id
FROM sale saleOriginal
- JOIN sale saleClon ON saleOriginal.itemFk = saleClon.itemFk
+ JOIN sale saleClon ON saleOriginal.itemFk = saleClon.itemFk
AND saleOriginal.quantity = saleClon.quantity
WHERE saleOriginal.ticketFk = vTicketFk
AND saleClon.ticketFk = vNewTicket;
@@ -71126,7 +71242,7 @@ BEGIN
buyed,
requesterFk,
attenderFk,
- vNewTicket
+ vNewTicket
FROM ticketRequest
WHERE ticketFk =vTicketFk;
@@ -71141,26 +71257,26 @@ BEGIN
INSERT INTO ticketObservation(
ticketFk,
observationTypeFk,
- description)
+ description)
VALUES(
vNewTicket,
vSalesPersonFK,
CONCAT('turno desde ticket: ',vTicketFk))
- ON DUPLICATE KEY UPDATE description =
+ ON DUPLICATE KEY UPDATE description =
CONCAT(ticketObservation.description,VALUES(description),' ');
INSERT INTO ticketObservation(ticketFk,
observationTypeFk,
- description)
+ description)
VALUES(
vNewTicket,
vItemPicker,
'ATENCION: Contiene lineas de TURNO')
- ON DUPLICATE KEY UPDATE description =
+ ON DUPLICATE KEY UPDATE description =
CONCAT(ticketObservation.description,VALUES(description),' ');
IF (vLanding IS NULL) THEN
-
+
SELECT e.email INTO vSalesPersonEmail
FROM client c
JOIN account.emailUser e ON e.userFk = c.salesPersonFk
@@ -71168,8 +71284,8 @@ BEGIN
SET vSubject = CONCAT('Turnos - No se ha podido clonar correctamente el ticket ',
vTicketFk,' para el dia: ', vShipment);
- SET vMessage = CONCAT('No se ha podido clonar el ticket ', vTicketFk,
- ' para el dia: ', vShipment,
+ SET vMessage = CONCAT('No se ha podido clonar el ticket ', vTicketFk,
+ ' para el dia: ', vShipment,
' porque no hay una zona de envío disponible. Se ha creado el ticket: ',
vNewTicket, ' pero ha que revisar las fechas y la agencia');
@@ -71189,6 +71305,7 @@ BEGIN
END;
END LOOP;
CLOSE rsTicket;
+ DROP TEMPORARY TABLE IF EXISTS tmp.time;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -71208,7 +71325,7 @@ DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_close`()
BEGIN
/**
- * Realiza el cierre de todos los
+ * Realiza el cierre de todos los
* tickets de la tabla tmp.ticket_close.
*
* @table tmp.ticket_close(ticketFk) Identificadores de los tickets a cerrar
@@ -71226,7 +71343,7 @@ BEGIN
DECLARE cur CURSOR FOR
SELECT ticketFk FROM tmp.ticket_close;
-
+
DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
DECLARE EXIT HANDLER FOR SQLEXCEPTION BEGIN
RESIGNAL;
@@ -71236,7 +71353,7 @@ BEGIN
proc: LOOP
SET vDone = FALSE;
-
+
FETCH cur INTO vCurTicketFk;
IF vDone THEN
@@ -71253,12 +71370,12 @@ BEGIN
c.hasToInvoice
INTO vClientFk,
vIsTaxDataChecked,
- vCompanyFk,
+ vCompanyFk,
vShipped,
vHasDailyInvoice,
vWithPackage,
vHasToInvoice
- FROM ticket t
+ FROM ticket t
JOIN `client` c ON c.id = t.clientFk
JOIN province p ON p.id = c.provinceFk
LEFT JOIN autonomy a ON a.id = p.autonomyFk
@@ -71268,22 +71385,22 @@ BEGIN
INSERT INTO ticketPackaging (ticketFk, packagingFk, quantity)
(SELECT vCurTicketFk, p.id, COUNT(*)
- FROM expedition e
+ FROM expedition e
JOIN packaging p ON p.itemFk = e.freightItemFk
WHERE e.ticketFk = vCurTicketFk AND p.isPackageReturnable
AND vWithPackage
GROUP BY p.itemFk);
-- No retornables o no catalogados
- INSERT INTO sale (itemFk, ticketFk, concept, quantity, price, isPriceFixed)
+ INSERT INTO sale (itemFk, ticketFk, concept, quantity, price, isPriceFixed)
(SELECT e.freightItemFk, vCurTicketFk, i.name, COUNT(*) AS amount, getSpecialPrice(e.freightItemFk, vClientFk), 1
- FROM expedition e
+ FROM expedition e
JOIN item i ON i.id = e.freightItemFk
LEFT JOIN packaging p ON p.itemFk = i.id
WHERE e.ticketFk = vCurTicketFk AND IFNULL(p.isPackageReturnable, 0) = 0
AND getSpecialPrice(e.freightItemFk, vClientFk) > 0
GROUP BY e.freightItemFk);
-
+
IF(vHasDailyInvoice) AND vHasToInvoice THEN
-- Facturacion rapida
@@ -71291,10 +71408,10 @@ BEGIN
-- Facturar si está contabilizado
IF vIsTaxDataChecked THEN
CALL invoiceOut_newFromClient(
- vClientFk,
- (SELECT invoiceSerial(vClientFk, vCompanyFk, 'M')),
- vShipped,
- vCompanyFk,
+ vClientFk,
+ (SELECT invoiceSerial(vClientFk, vCompanyFk, 'M')),
+ vShipped,
+ vCompanyFk,
NULL,
NULL,
vNewInvoiceId);
@@ -71337,10 +71454,11 @@ BEGIN
JOIN agencyMode am ON am.id = t.agencyModeFk
LEFT JOIN ticketState ts ON ts.ticketFk = t.id
JOIN alertLevel al ON al.id = ts.alertLevel
- WHERE al.code = 'PACKED' OR (am.code = 'refund' AND al.code != 'delivered')
+ WHERE (al.code = 'PACKED' OR (am.code = 'refund' AND al.code != 'delivered'))
AND t.id = vTicketFk
AND t.refFk IS NULL
- GROUP BY t.id);
+ GROUP BY t.id
+ );
CALL ticket_close();
@@ -71352,35 +71470,35 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `ticket_componentMakeUpdate` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_componentMakeUpdate`(
vTicketFk INT,
vClientFk INT,
vNickname VARCHAR(50),
vAgencyModeFk INT,
- vAddressFk INT,
+ vAddressFk INT,
vZoneFk INT,
vWarehouseFk INT,
- vCompanyFk INT,
+ vCompanyFk INT,
vShipped DATETIME,
- vLanded DATE,
+ vLanded DATE,
vIsDeleted BOOLEAN,
- vHasToBeUnrouted BOOLEAN,
- vOption INT)
+ vHasToBeUnrouted BOOLEAN,
+ vOption VARCHAR(25))
BEGIN
-
+
/**
* Modifica en el ticket los campos que se le pasan por parámetro
* y cambia sus componentes
- *
+ *
* @param vTicketFk Id del ticket a modificar
* @param vClientFk nuevo cliente
* @param vNickname nuevo alias
@@ -71395,29 +71513,29 @@ BEGIN
* @param vHasToBeUnrouted si se le elimina la ruta al ticket
* @param vOption opcion para el case del proc ticketComponentUpdateSale
*/
-
+
DECLARE vPrice DECIMAL(10,2);
DECLARE vBonus DECIMAL(10,2);
CALL ticket_componentPreview (vTicketFk, vLanded, vAddressFk, vZoneFk, vWarehouseFk);
IF (SELECT addressFk FROM ticket WHERE id = vTicketFk) <> vAddressFk THEN
-
- UPDATE ticket t
+
+ UPDATE ticket t
JOIN address a ON a.id = vAddressFk
SET t.nickname = a.nickname
WHERE t.id = vTicketFk;
-
+
END IF;
CALL zone_getShipped(vLanded, vAddressFk, vAgencyModeFk, TRUE);
- SELECT zoneFk, price, bonus INTO vZoneFk, vPrice, vBonus
+ SELECT zoneFk, price, bonus INTO vZoneFk, vPrice, vBonus
FROM tmp.zoneGetShipped
WHERE shipped BETWEEN DATE(vShipped) AND util.dayEnd(vShipped) AND warehouseFk = vWarehouseFk LIMIT 1;
UPDATE ticket t
- SET
+ SET
t.clientFk = vClientFk,
t.nickname = vNickname,
t.agencyModeFk = vAgencyModeFk,
@@ -71438,23 +71556,21 @@ BEGIN
WHERE t.id = vTicketFk;
END IF;
- IF vOption <> 8 THEN
- DROP TEMPORARY TABLE IF EXISTS tmp.sale;
- CREATE TEMPORARY TABLE tmp.sale
- (PRIMARY KEY (saleFk))
- ENGINE = MEMORY
- SELECT id AS saleFk, vWarehouseFk warehouseFk
- FROM sale s WHERE s.ticketFk = vTicketFk;
+ DROP TEMPORARY TABLE IF EXISTS tmp.sale;
+ CREATE TEMPORARY TABLE tmp.sale
+ (PRIMARY KEY (saleFk))
+ ENGINE = MEMORY
+ SELECT id AS saleFk, vWarehouseFk warehouseFk
+ FROM sale s WHERE s.ticketFk = vTicketFk;
- DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponent;
- CREATE TEMPORARY TABLE tmp.ticketComponent
- SELECT * FROM tmp.ticketComponentPreview;
+ DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponent;
+ CREATE TEMPORARY TABLE tmp.ticketComponent
+ SELECT * FROM tmp.ticketComponentPreview;
- CALL ticketComponentUpdateSale (vOption);
+ CALL ticketComponentUpdateSale (vOption);
- DROP TEMPORARY TABLE tmp.sale;
- DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponent;
- END IF;
+ DROP TEMPORARY TABLE tmp.sale;
+ DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponent;
DROP TEMPORARY TABLE tmp.zoneGetShipped, tmp.ticketComponentPreview;
END ;;
@@ -71475,7 +71591,7 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_componentPreview`(
vTicketFk INT,
- vLanded DATE,
+ vLanded DATE,
vAddressFk INT,
vZoneFk INT,
vWarehouseFk SMALLINT)
@@ -71491,7 +71607,7 @@ BEGIN
*
* @return tmp.ticketComponentPreview (warehouseFk, itemFk, componentFk, cost)
*/
- DECLARE vHasDataChanged BOOL DEFAULT FALSE;
+ DECLARE vHasDataChanged BOOL DEFAULT FALSE;
DECLARE vHasAddressChanged BOOL;
DECLARE vHasZoneChanged BOOL DEFAULT FALSE;
DECLARE vHasWarehouseChanged BOOL DEFAULT FALSE;
@@ -71502,8 +71618,8 @@ BEGIN
DECLARE vHasChangeAll BOOL DEFAULT FALSE;
- SELECT DATE(landed) <> vLanded,
- addressFk <> vAddressFk,
+ SELECT DATE(landed) <> vLanded,
+ addressFk <> vAddressFk,
zoneFk <> vZoneFk,
warehouseFk <> vWarehouseFk
INTO
@@ -71526,15 +71642,15 @@ BEGIN
SET vAgencyModeTypeRateFk = 6;
END IF;
- SELECT TIMESTAMPADD(DAY, -travelingDays, vLanded) INTO vShipped
+ SELECT TIMESTAMPADD(DAY, -travelingDays, vLanded) INTO vShipped
FROM zone
WHERE id = vZoneFk;
-
+
CALL buyUltimate(vWarehouseFk, vShipped);
-
+
DROP TEMPORARY TABLE IF EXISTS tmp.ticketLot;
- CREATE TEMPORARY TABLE tmp.ticketLot ENGINE = MEMORY (
- SELECT
+ CREATE TEMPORARY TABLE tmp.ticketLot ENGINE = MEMORY (
+ SELECT
vWarehouseFk AS warehouseFk,
NULL AS available,
s.itemFk,
@@ -71554,9 +71670,9 @@ BEGIN
JOIN sale s ON s.id = sc.saleFk
JOIN ticket t ON t.id = s.ticketFk
JOIN `component` c ON c.id = sc.componentFk
- WHERE s.ticketFk = vTicketFk
- AND (c.isRenewable = FALSE
- OR
+ WHERE s.ticketFk = vTicketFk
+ AND (c.isRenewable = FALSE
+ OR
(NOT vHasChangeAll
AND (NOT (c.typeFk <=> vAddressTypeRateFk
OR c.typeFk <=> vAgencyModeTypeRateFk))));
@@ -71635,55 +71751,59 @@ DELIMITER ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_DelayTruckSplit`(vTicketFk INT)
-BEGIN
-
- /*
- * Splita las lineas de ticket que no estan ubicadas
- *
- */
-
- DECLARE vNewTicketFk INT;
- DECLARE vTotalLines INT;
- DECLARE vLinesToSplit INT;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.SalesToSplit;
-
- SELECT COUNT(*) INTO vTotalLines
- FROM vn.sale
- WHERE ticketFk = vTicketFk;
-
- CREATE TEMPORARY TABLE tmp.SalesToSplit
- SELECT s.id saleFk
- FROM vn.ticket t
- JOIN vn.sale s ON t.id = s.ticketFk
- LEFT JOIN vn.itemShelvingStock_byWarehouse issw ON issw.itemFk = s.itemFk AND issw.warehouseFk = t.warehouseFk
- WHERE s.quantity > IFNULL(issw.visible, 0)
- AND s.quantity > 0
- AND s.isPicked = FALSE
- AND s.reserved = FALSE
- AND t.id = vTicketFk;
-
- SELECT COUNT(*) INTO vLinesToSplit
- FROM tmp.SalesToSplit;
-
- IF vLinesToSplit = vTotalLines AND vLinesToSplit > 0 THEN
-
- SET vNewTicketFk = vTicketFk;
-
- ELSE
-
- CALL vn.ticket_Clone(vTicketFk, vNewTicketFk);
-
- UPDATE vn.sale s
- JOIN tmp.SalesToSplit sts ON sts.saleFk = s.id
- SET s.ticketFk = vNewTicketFk;
-
- END IF;
-
- CALL vn.ticketStateUpdate(vNewTicketFk, 'FIXING');
-
- DROP TEMPORARY TABLE tmp.SalesToSplit;
-
+BEGIN
+/**
+ * Splita las lineas de ticket que no estan ubicadas
+ *
+ * @param vTicketFk Id ticket
+ */
+ DECLARE vNewTicketFk INT;
+ DECLARE vTotalLines INT;
+ DECLARE vLinesToSplit INT;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.SalesToSplit;
+
+ SELECT COUNT(*) INTO vTotalLines
+ FROM sale
+ WHERE ticketFk = vTicketFk;
+
+ CREATE TEMPORARY TABLE tmp.SalesToSplit
+ SELECT s.id saleFk
+ FROM ticket t
+ JOIN sale s ON t.id = s.ticketFk
+ LEFT JOIN (
+ SELECT ish.itemFk itemFk,
+ SUM(ish.visible) visible,
+ s.warehouseFk warehouseFk
+ FROM itemShelving ish
+ JOIN shelving sh ON sh.code = ish.shelvingFk
+ JOIN parking p ON p.id = sh.parkingFk
+ JOIN sector s ON s.id = p.sectorFk
+ GROUP BY ish.itemFk,
+ s.warehouseFk
+ ) issw ON issw.itemFk = s.itemFk
+ AND issw.warehouseFk = t.warehouseFk
+ WHERE s.quantity > IFNULL(issw.visible, 0)
+ AND s.quantity > 0
+ AND NOT s.isPicked
+ AND NOT s.reserved
+ AND t.id = vTicketFk;
+
+ SELECT COUNT(*) INTO vLinesToSplit
+ FROM tmp.SalesToSplit;
+
+ IF vLinesToSplit = vTotalLines AND vLinesToSplit > 0 THEN
+ SET vNewTicketFk = vTicketFk;
+ ELSE
+ CALL ticket_Clone(vTicketFk, vNewTicketFk);
+ UPDATE sale s
+ JOIN tmp.SalesToSplit sts ON sts.saleFk = s.id
+ SET s.ticketFk = vNewTicketFk;
+ END IF;
+
+ CALL ticketStateUpdate(vNewTicketFk, 'FIXING');
+
+ DROP TEMPORARY TABLE tmp.SalesToSplit;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -71701,91 +71821,91 @@ DELIMITER ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_doCmr`(vSelf INT)
-BEGIN
-/**
-* Crea u actualiza la información del CMR asociado con
-* un ticket específico en caso de que sea necesario.
-*
-* @param vSelf El id del ticket
-*/
- DECLARE vCmrFk, vPreviousCmrFk, vCurrentCmrFk INT;
- SELECT cmrFk INTO vCmrFk
- FROM ticket
- WHERE id = vSelf;
-
- CREATE OR REPLACE TEMPORARY TABLE tTicket
- SELECT wo.firstName,
- v.numberPlate,
- com.id companyFk,
- a.id addressFk,
- c2.defaultAddressFk,
- su.id supplierFk,
- t.landed
- FROM ticket t
- JOIN ticketState ts ON ts.ticketFk = t.id
- JOIN `state` s ON s.id = ts.stateFk
- JOIN alertLevel al ON al.id = s.alertLevel
- JOIN client c ON c.id = t.clientFk
- JOIN `address` a ON a.id = t.addressFk
- JOIN province p ON p.id = a.provinceFk
- JOIN country co ON co.id = p.countryFk
- JOIN agencyMode am ON am.id = t.agencyModeFk
- JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
- JOIN warehouse w ON w.id = t.warehouseFk
- JOIN company com ON com.id = t.companyFk
- JOIN client c2 ON c2.id = com.clientFk
- JOIN supplierAccount sa ON sa.id = com.supplierAccountFk
- JOIN supplier su ON su.id = sa.supplierFk
- LEFT JOIN route r ON r.id = t.routeFk
- LEFT JOIN worker wo ON wo.id = r.workerFk
- LEFT JOIN vehicle v ON v.id = r.vehicleFk
- WHERE t.shipped BETWEEN util.yesterday() AND util.dayEnd(util.VN_CURDATE())
- AND al.code IN ('PACKED', 'DELIVERED')
- AND co.code <> 'ES'
- AND am.name <> 'ABONO'
- AND w.code = 'ALG'
- AND dm.code = 'DELIVERY'
- AND t.id = vSelf
- GROUP BY t.id;
-
- START TRANSACTION;
-
- IF vCmrFk THEN
- UPDATE cmr c
- JOIN tTicket t
- SET c.senderInstruccions = t.firstName,
- c.truckPlate = t.numberPlate,
- c.companyFk = t.companyFk,
- c.addressToFk = t.addressFk,
- c.addressFromFk = t.defaultAddressFk,
- c.supplierFk = t.supplierFk,
- c.ead = t.landed
- WHERE id = vCmrFk;
- ELSE
- SELECT MAX(id) INTO vPreviousCmrFk FROM cmr;
-
- INSERT INTO cmr (
- senderInstruccions,
- truckPlate,
- companyFk,
- addressToFk,
- addressFromFk,
- supplierFk,
- ead
- )
- SELECT * FROM tTicket;
-
- SELECT MAX(id) INTO vCurrentCmrFk FROM cmr;
-
- IF vPreviousCmrFk <> vCurrentCmrFk THEN
- UPDATE ticket
- SET cmrFk = vCurrentCmrFk
- WHERE id = vSelf;
- END IF;
- END IF;
-
- COMMIT;
- DROP TEMPORARY TABLE tTicket;
+BEGIN
+/**
+* Crea u actualiza la información del CMR asociado con
+* un ticket específico en caso de que sea necesario.
+*
+* @param vSelf El id del ticket
+*/
+ DECLARE vCmrFk, vPreviousCmrFk, vCurrentCmrFk INT;
+ SELECT cmrFk INTO vCmrFk
+ FROM ticket
+ WHERE id = vSelf;
+
+ CREATE OR REPLACE TEMPORARY TABLE tTicket
+ SELECT wo.firstName,
+ v.numberPlate,
+ com.id companyFk,
+ a.id addressFk,
+ c2.defaultAddressFk,
+ su.id supplierFk,
+ t.landed
+ FROM ticket t
+ JOIN ticketState ts ON ts.ticketFk = t.id
+ JOIN `state` s ON s.id = ts.stateFk
+ JOIN alertLevel al ON al.id = s.alertLevel
+ JOIN client c ON c.id = t.clientFk
+ JOIN `address` a ON a.id = t.addressFk
+ JOIN province p ON p.id = a.provinceFk
+ JOIN country co ON co.id = p.countryFk
+ JOIN agencyMode am ON am.id = t.agencyModeFk
+ JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
+ JOIN warehouse w ON w.id = t.warehouseFk
+ JOIN company com ON com.id = t.companyFk
+ JOIN client c2 ON c2.id = com.clientFk
+ JOIN supplierAccount sa ON sa.id = com.supplierAccountFk
+ JOIN supplier su ON su.id = sa.supplierFk
+ LEFT JOIN route r ON r.id = t.routeFk
+ LEFT JOIN worker wo ON wo.id = r.workerFk
+ LEFT JOIN vehicle v ON v.id = r.vehicleFk
+ WHERE t.shipped BETWEEN util.yesterday() AND util.dayEnd(util.VN_CURDATE())
+ AND al.code IN ('PACKED', 'DELIVERED')
+ AND co.code <> 'ES'
+ AND am.name <> 'ABONO'
+ AND w.code = 'ALG'
+ AND dm.code = 'DELIVERY'
+ AND t.id = vSelf
+ GROUP BY t.id;
+
+ START TRANSACTION;
+
+ IF vCmrFk THEN
+ UPDATE cmr c
+ JOIN tTicket t
+ SET c.senderInstruccions = t.firstName,
+ c.truckPlate = t.numberPlate,
+ c.companyFk = t.companyFk,
+ c.addressToFk = t.addressFk,
+ c.addressFromFk = t.defaultAddressFk,
+ c.supplierFk = t.supplierFk,
+ c.ead = t.landed
+ WHERE id = vCmrFk;
+ ELSE
+ SELECT MAX(id) INTO vPreviousCmrFk FROM cmr;
+
+ INSERT INTO cmr (
+ senderInstruccions,
+ truckPlate,
+ companyFk,
+ addressToFk,
+ addressFromFk,
+ supplierFk,
+ ead
+ )
+ SELECT * FROM tTicket;
+
+ SELECT MAX(id) INTO vCurrentCmrFk FROM cmr;
+
+ IF vPreviousCmrFk <> vCurrentCmrFk THEN
+ UPDATE ticket
+ SET cmrFk = vCurrentCmrFk
+ WHERE id = vSelf;
+ END IF;
+ END IF;
+
+ COMMIT;
+ DROP TEMPORARY TABLE tTicket;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -72008,26 +72128,35 @@ DELIMITER ;
/*!50003 SET character_set_results = utf8mb4 */ ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_getMovable`(vTicketFk INT, vDatedNew DATETIME, vWarehouseFk INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_getMovable`(
+ vTicketFk INT,
+ vNewShipped DATETIME,
+ vWarehouseFk INT
+)
BEGIN
/**
* Cálcula el stock movible para los artículos de un ticket
- * vDatedNew debe ser menor que vDatedOld, en los otros casos se
+ * vNewShipped debe ser menor que vOldShipped, en los otros casos se
* asume que siempre es posible
*
* @param vTicketFk -> Ticket
- * @param vDatedNew -> Nueva fecha
+ * @param vNewShipped -> Nueva fecha
* @return Sales con Movible
*/
- DECLARE vDatedOld DATETIME;
- SET vDatedNew = DATE_ADD(vDatedNew, INTERVAL 1 DAY);
+ DECLARE vOldShipped DATETIME;
- SELECT t.shipped INTO vDatedOld
+ SELECT t.shipped INTO vOldShipped
FROM ticket t
WHERE t.id = vTicketFk;
- CALL item_getStock(vWarehouseFk, vDatedNew, NULL);
- CALL item_getMinacum(vWarehouseFk, vDatedNew, DATEDIFF(DATE_SUB(vDatedOld, INTERVAL 1 DAY), vDatedNew), NULL);
+ -- Añadimos un dia más para calcular el stock hasta vNewShipped inclusive
+ CALL item_getStock(vWarehouseFk, DATE_ADD(vNewShipped, INTERVAL 1 DAY), NULL);
+ CALL item_getMinacum(
+ vWarehouseFk,
+ vNewShipped,
+ DATEDIFF(DATE_SUB(vOldShipped, INTERVAL 1 DAY), vNewShipped),
+ NULL
+ );
SELECT s.id,
s.itemFk,
@@ -72042,12 +72171,14 @@ BEGIN
FROM ticket t
JOIN sale s ON s.ticketFk = t.id
JOIN item i ON i.id = s.itemFk
- LEFT JOIN tmp.itemMinacum im ON im.itemFk = s.itemFk AND im.warehouseFk = vWarehouseFk
+ LEFT JOIN tmp.itemMinacum im ON im.itemFk = s.itemFk
+ AND im.warehouseFk = vWarehouseFk
LEFT JOIN tmp.itemList il ON il.itemFk = s.itemFk
WHERE t.id = vTicketFk;
- DROP TEMPORARY TABLE IF EXISTS tmp.itemList;
- DROP TEMPORARY TABLE IF EXISTS tmp.itemMinacum;
+ DROP TEMPORARY TABLE IF EXISTS
+ tmp.itemList,
+ tmp.itemMinacum;
END ;;
DELIMITER ;
@@ -72076,32 +72207,29 @@ BEGIN
*/
CALL sale_getProblems(vIsTodayRelative);
- DROP TEMPORARY TABLE IF EXISTS tmp.ticket_problems;
- CREATE TEMPORARY TABLE tmp.ticket_problems
- (PRIMARY KEY (ticketFk))
- ENGINE = MEMORY
- SELECT
- ticketFk,
- MAX(p.isFreezed) isFreezed,
- MAX(p.risk) risk,
- MAX(p.hasHighRisk) hasHighRisk,
- MAX(p.hasTicketRequest) hasTicketRequest,
- MAX(p.itemShortage) itemShortage,
- MIN(p.isTaxDataChecked) isTaxDataChecked,
- MAX(p.hasComponentLack) hasComponentLack,
- MAX(p.isTooLittle) isTooLittle,
- MAX(p.itemDelay) itemDelay,
- MAX(p.hasRounding) hasRounding,
- MAX(p.itemLost) itemLost,
- 0 totalProblems
- FROM tmp.sale_problems p
- GROUP BY ticketFk;
+ CREATE OR REPLACE TEMPORARY TABLE tmp.ticket_problems
+ (PRIMARY KEY (ticketFk))
+ ENGINE = MEMORY
+ SELECT ticketFk,
+ MAX(isFreezed) isFreezed,
+ MAX(risk) risk,
+ MAX(hasHighRisk) hasHighRisk,
+ MAX(hasTicketRequest) hasTicketRequest,
+ MAX(itemShortage) itemShortage,
+ MIN(isTaxDataChecked) isTaxDataChecked,
+ MAX(hasComponentLack) hasComponentLack,
+ MAX(isTooLittle) isTooLittle,
+ MAX(itemDelay) itemDelay,
+ MAX(hasRounding) hasRounding,
+ MAX(itemLost) itemLost,
+ 0 totalProblems
+ FROM tmp.sale_problems
+ GROUP BY ticketFk;
UPDATE tmp.ticket_problems tp
- SET tp.totalProblems =
- (
+ SET tp.totalProblems = (
(tp.isFreezed) +
- IF(tp.risk, TRUE, FALSE) +
+ IF(tp.risk,TRUE, FALSE) +
(tp.hasTicketRequest) +
(tp.isTaxDataChecked = 0) +
(tp.hasComponentLack) +
@@ -72112,8 +72240,7 @@ BEGIN
(tp.itemShortage)
);
- DROP TEMPORARY TABLE
- tmp.sale_problems;
+ DROP TEMPORARY TABLE tmp.sale_problems;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -72146,124 +72273,147 @@ BEGIN
CALL cache.visible_refresh(vVisibleCache, FALSE, vWarehouseFk);
CALL `vn`.`zoneClosure_recalc`();
- DROP TEMPORARY TABLE IF EXISTS tmp.salesToSplit;
-
- CREATE TEMPORARY TABLE tmp.salesToSplit
+ CREATE OR REPLACE TEMPORARY TABLE tmp.salesToSplit
(saleFk INT PRIMARY KEY,
ticketFk INT,
- problem VARCHAR(1)) ENGINE = MEMORY;
+ problem VARCHAR(1),
+ INDEX(ticketFk)) ENGINE = MEMORY;
+
+ CREATE OR REPLACE TEMPORARY TABLE tItemShelvingStock_byWarehouse
+ (INDEX (itemFk, warehouseFk))
+ ENGINE = MEMORY
+ SELECT ish.itemFk itemFk,
+ SUM(ish.visible) visible,
+ s.warehouseFk warehouseFk
+ FROM itemShelving ish
+ JOIN shelving sh ON sh.code = ish.shelvingFk
+ JOIN parking p ON p.id = sh.parkingFk
+ JOIN sector s ON s.id = p.sectorFk
+ GROUP BY ish.itemFk,
+ s.warehouseFk;
INSERT INTO tmp.salesToSplit(saleFk, ticketFk, problem)
- SELECT s.id, s.ticketFk, 'F'
- FROM vn.ticket t
- JOIN vn.sale s ON s.ticketFk = t.id
- JOIN vn.item i ON i.id = s.itemFk
- JOIN vn.itemType it on it.id = i.typeFk
- JOIN vn.itemCategory ic ON ic.id = it.categoryFk
- LEFT JOIN cache.visible v ON v.item_id = i.id AND v.calc_id = vVisibleCache
- LEFT JOIN cache.available av ON av.item_id = i.id AND av.calc_id = vAvailableCache
- LEFT JOIN vn.itemShelvingStock_byWarehouse issw ON issw.itemFk = i.id AND issw.warehouseFk = t.warehouseFk
- WHERE IFNULL(v.visible,0) < s.quantity
- AND IFNULL(av.available ,0) < s.quantity
- AND IFNULL(issw.visible, 0) < s.quantity
- AND s.isPicked = FALSE
- AND s.reserved = FALSE
- AND ic.merchandise = TRUE
- AND t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
- AND NOT i.generic
- AND t.warehouseFk = vWarehouseFk;
-
+ SELECT s.id, s.ticketFk, 'F'
+ FROM ticket t
+ JOIN sale s ON s.ticketFk = t.id
+ JOIN item i ON i.id = s.itemFk
+ JOIN itemType it on it.id = i.typeFk
+ JOIN itemCategory ic ON ic.id = it.categoryFk
+ LEFT JOIN cache.visible v ON v.item_id = i.id
+ AND v.calc_id = vVisibleCache
+ LEFT JOIN cache.available av ON av.item_id = i.id
+ AND av.calc_id = vAvailableCache
+ LEFT JOIN tItemShelvingStock_byWarehouse issw ON issw.itemFk = i.id
+ AND issw.warehouseFk = t.warehouseFk
+ WHERE IFNULL(v.visible,0) < s.quantity
+ AND IFNULL(av.available ,0) < s.quantity
+ AND IFNULL(issw.visible, 0) < s.quantity
+ AND s.isPicked = FALSE
+ AND s.reserved = FALSE
+ AND ic.merchandise = TRUE
+ AND t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
+ AND NOT i.generic
+ AND t.warehouseFk = vWarehouseFk;
+
INSERT IGNORE INTO tmp.salesToSplit(saleFk, ticketFk, problem)
- SELECT s.id, s.ticketFk, 'I'
- FROM vn.ticket t
- JOIN vn.sale s ON s.ticketFk = t.id
- JOIN vn.item i ON i.id = s.itemFk
- JOIN vn.itemType it on it.id = i.typeFk
- JOIN vn.itemCategory ic ON ic.id = it.categoryFk
- LEFT JOIN cache.visible v ON v.item_id = s.itemFk AND v.calc_id = vVisibleCache
- LEFT JOIN vn.itemShelvingStock_byWarehouse issw ON issw.itemFk = i.id AND issw.warehouseFk = t.warehouseFk
- WHERE IFNULL(v.visible,0) >= s.quantity
- AND IFNULL(issw.visible, 0) < s.quantity
- AND s.quantity > 0
- AND s.isPicked = FALSE
- AND s.reserved = FALSE
- AND ic.merchandise = TRUE
- AND t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
- AND NOT i.generic
- AND t.warehouseFk = vWarehouseFk;
-
+ SELECT s.id, s.ticketFk, 'I'
+ FROM ticket t
+ JOIN sale s ON s.ticketFk = t.id
+ JOIN item i ON i.id = s.itemFk
+ JOIN itemType it on it.id = i.typeFk
+ JOIN itemCategory ic ON ic.id = it.categoryFk
+ LEFT JOIN cache.visible v ON v.item_id = s.itemFk
+ AND v.calc_id = vVisibleCache
+ LEFT JOIN tItemShelvingStock_byWarehouse issw ON issw.itemFk = i.id
+ AND issw.warehouseFk = t.warehouseFk
+ WHERE IFNULL(v.visible,0) >= s.quantity
+ AND IFNULL(issw.visible, 0) < s.quantity
+ AND s.quantity > 0
+ AND NOT s.isPicked
+ AND NOT s.reserved
+ AND ic.merchandise
+ AND t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
+ AND NOT i.generic
+ AND t.warehouseFk = vWarehouseFk;
+
INSERT IGNORE INTO tmp.salesToSplit(saleFk, ticketFk, problem)
- SELECT s.id, s.ticketFk, 'R'
- FROM vn.ticket t
- JOIN vn.sale s ON s.ticketFk = t.id
- JOIN vn.item i ON i.id = s.itemFk
- JOIN vn.itemType it on it.id = i.typeFk
- JOIN vn.itemCategory ic ON ic.id = it.categoryFk
- LEFT JOIN cache.visible v ON v.item_id = s.itemFk AND v.calc_id = vVisibleCache
- LEFT JOIN cache.available av ON av.item_id = i.id AND av.calc_id = vAvailableCache
- LEFT JOIN vn.itemShelvingStock_byWarehouse issw ON issw.itemFk = i.id AND issw.warehouseFk = t.warehouseFk
- WHERE IFNULL(v.visible,0) < s.quantity
- AND IFNULL(av.available ,0) >= s.quantity
- AND IFNULL(issw.visible, 0) < s.quantity
- AND s.quantity > 0
- AND s.isPicked = FALSE
- AND s.reserved = FALSE
- AND ic.merchandise = TRUE
- AND t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
- AND NOT i.generic
- AND t.warehouseFk = vWarehouseFk;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.ticketsToSplit;
-
- CREATE TEMPORARY TABLE tmp.ticketsToSplit
- (ticketFk INT PRIMARY KEY,
+ SELECT s.id, s.ticketFk, 'R'
+ FROM ticket t
+ JOIN sale s ON s.ticketFk = t.id
+ JOIN item i ON i.id = s.itemFk
+ JOIN itemType it on it.id = i.typeFk
+ JOIN itemCategory ic ON ic.id = it.categoryFk
+ LEFT JOIN cache.visible v ON v.item_id = s.itemFk
+ AND v.calc_id = vVisibleCache
+ LEFT JOIN cache.available av ON av.item_id = i.id
+ AND av.calc_id = vAvailableCache
+ LEFT JOIN tItemShelvingStock_byWarehouse issw ON issw.itemFk = i.id
+ AND issw.warehouseFk = t.warehouseFk
+ WHERE IFNULL(v.visible,0) < s.quantity
+ AND IFNULL(av.available ,0) >= s.quantity
+ AND IFNULL(issw.visible, 0) < s.quantity
+ AND s.quantity > 0
+ AND NOT s.isPicked
+ AND NOT s.reserved
+ AND ic.merchandise
+ AND t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
+ AND NOT i.generic
+ AND t.warehouseFk = vWarehouseFk;
+
+ CREATE OR REPLACE TEMPORARY TABLE tTicketsToSplit(
+ ticketFk INT PRIMARY KEY,
problems VARCHAR(100),
addressFk INT,
ipt VARCHAR(10),
- etd TIME) ENGINE = MEMORY;
+ etd TIME,
+ INDEX(addressFk)
+ ) ENGINE = MEMORY;
- INSERT INTO tmp.ticketsToSplit
- SELECT
- ss.ticketFk,
- GROUP_CONCAT(DISTINCT ss.problem ORDER BY ss.problem) problems,
- t.addressFk,
- GROUP_CONCAT(DISTINCT i.itemPackingTypeFk ORDER BY i.itemPackingTypeFk) ipt,
- zc.`hour` etd
- FROM tmp.salesToSplit ss
- JOIN vn.ticket t ON t.id = ss.ticketFk
- JOIN vn.sale s ON s.id = ss.saleFk
- JOIN vn.item i ON i.id = s.itemFk
- LEFT JOIN vn.zoneClosure zc ON zc.zoneFk = t.zoneFk
- GROUP BY ss.ticketFk;
+ INSERT INTO tTicketsToSplit
+ SELECT ss.ticketFk,
+ GROUP_CONCAT(DISTINCT ss.problem ORDER BY ss.problem) problems,
+ t.addressFk,
+ GROUP_CONCAT(DISTINCT i.itemPackingTypeFk ORDER BY i.itemPackingTypeFk) ipt,
+ DATE_FORMAT(IF(HOUR(t.shipped),
+ t.shipped,
+ IFNULL(zc.hour, z.HOUR)),'%H:%i') etd
+ FROM tmp.salesToSplit ss
+ JOIN ticket t ON t.id = ss.ticketFk
+ JOIN sale s ON s.id = ss.saleFk
+ JOIN item i ON i.id = s.itemFk
+ LEFT JOIN zoneClosure zc ON zc.zoneFk = t.zoneFk
+ LEFT JOIN zone z ON z.id = t.zoneFk
+ GROUP BY ss.ticketFk;
- SELECT
- ts.*,
- t.id ticketFuture,
- st.name state,
- zc.`hour` tfEtd,
- GROUP_CONCAT(DISTINCT i.itemPackingTypeFk ORDER BY i.itemPackingTypeFk) tfIpt,
- st2.name tfState
- FROM tmp.ticketsToSplit ts
- LEFT JOIN vn.ticketState ts2 ON ts2.ticketFk = ts.ticketFk
- LEFT JOIN vn.state st ON st.id = ts2.stateFk
- LEFT JOIN vn.ticket t
- ON t.id != ts.ticketFk
- AND t.addressFk = ts.addressFk
- AND t.shipped BETWEEN vDated AND util.dayend(vDated)
- LEFT JOIN vn.zoneClosure zc ON zc.zoneFk = t.zoneFk AND zc.dated = vDated
- LEFT JOIN vn.sale s ON s.ticketFk = t.id
- LEFT JOIN vn.item i ON i.id = s.itemFk
- LEFT JOIN vn.ticketState tst ON tst.ticketFk = t.id
- LEFT JOIN vn.state st2 ON st2.id = tst.stateFk
- WHERE (t.id IS NULL
- OR (vDated > util.VN_CURDATE())
- OR (vDated = util.VN_CURDATE() AND vHour >= zc.`hour`))
+ SELECT ts.*,
+ t.id ticketFuture,
+ st.name state,
+ zc.`hour` tfEtd,
+ GROUP_CONCAT(
+ DISTINCT i.itemPackingTypeFk ORDER BY i.itemPackingTypeFk
+ ) tfIpt,
+ st2.name tfState
+ FROM tTicketsToSplit ts
+ LEFT JOIN ticketState ts2 ON ts2.ticketFk = ts.ticketFk
+ LEFT JOIN `state` st ON st.id = ts2.stateFk
+ LEFT JOIN ticket t ON t.id != ts.ticketFk
+ AND t.addressFk = ts.addressFk
+ AND t.shipped BETWEEN vDated AND util.dayend(vDated)
+ LEFT JOIN zoneClosure zc ON zc.zoneFk = t.zoneFk AND zc.dated = vDated
+ LEFT JOIN sale s ON s.ticketFk = t.id
+ LEFT JOIN item i ON i.id = s.itemFk
+ LEFT JOIN ticketState tst ON tst.ticketFk = t.id
+ LEFT JOIN state st2 ON st2.id = tst.stateFk
+ WHERE (t.id IS NULL
+ OR (vDated > util.VN_CURDATE())
+ OR (vDated = util.VN_CURDATE() AND vHour >= zc.`hour`))
AND ts.etd <= vHour
GROUP BY ts.ticketFk, t.id
ORDER BY ts.etd, ts.ticketFk;
-
+
DROP TEMPORARY TABLE
- tmp.ticketsToSplit;
+ tTicketsToSplit,
+ tItemShelvingStock_byWarehouse;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -72290,6 +72440,8 @@ BEGIN
* @return tmp.ticketAmount (ticketFk, taxableBase, tax, code)
* @return tmp.ticketTax (ticketFk, pgcFk, taxableBase, rate, code) Impuesto desglosado para cada ticket.
*/
+ -- Mantengo el drop porque si no da error en los tests de back de salix
+ -- Table 'addressCompany' was locked with a READ lock and can't be updated'
DROP TEMPORARY TABLE IF EXISTS tmp.addressCompany;
CREATE TEMPORARY TABLE tmp.addressCompany
(INDEX (addressFk, companyFk))
@@ -72298,24 +72450,24 @@ BEGIN
FROM tmp.ticket tmpTicket
JOIN ticket t ON t.id = tmpTicket.ticketFk;
- CALL addressTaxArea ();
-
+ CALL addressTaxArea();
+
IF vTaxArea IS NOT NULL THEN
UPDATE tmp.addressTaxArea
SET areaFk = vTaxArea;
END IF;
- /* Solo se calcula la base imponible (taxableBase) y el impuesto se calculará posteriormente
- * No se debería cambiar el sistema por problemas con los decimales
- */
- DROP TEMPORARY TABLE IF EXISTS tmp.ticketTax;
- CREATE TEMPORARY TABLE tmp.ticketTax
+ -- Solo se calcula la base imponible (taxableBase) y
+ -- el impuesto se calculará posteriormente
+ -- No se debería cambiar el sistema por problemas con los decimales
+
+ CREATE OR REPLACE TEMPORARY TABLE tmp.ticketTax
(PRIMARY KEY (ticketFk, code, rate))
ENGINE = MEMORY
SELECT * FROM (
SELECT tmpTicket.ticketFk,
bp.pgcFk,
- SUM(s.quantity * s.price * (100 - s.discount)/100 ) taxableBase,
+ SUM(s.quantity * s.price * (100 - s.discount) / 100 ) taxableBase,
pgc.rate,
tc.code,
bp.priority
@@ -72324,22 +72476,21 @@ BEGIN
JOIN item i ON i.id = s.itemFk
JOIN ticket t ON t.id = tmpTicket.ticketFk
JOIN supplier su ON su.id = t.companyFk
- JOIN tmp.addressTaxArea ata
- ON ata.addressFk = t.addressFk AND ata.companyFk = t.companyFk
- JOIN itemTaxCountry itc
- ON itc.itemFk = i.id AND itc.countryFk = su.countryFk
- JOIN bookingPlanner bp
- ON bp.countryFk = su.countryFk
- AND bp.taxAreaFk = ata.areaFk
- AND bp.taxClassFk = itc.taxClassFk
+ JOIN tmp.addressTaxArea ata ON ata.addressFk = t.addressFk
+ AND ata.companyFk = t.companyFk
+ JOIN itemTaxCountry itc ON itc.itemFk = i.id
+ AND itc.countryFk = su.countryFk
+ JOIN bookingPlanner bp ON bp.countryFk = su.countryFk
+ AND bp.taxAreaFk = ata.areaFk
+ AND bp.taxClassFk = itc.taxClassFk
JOIN pgc ON pgc.code = bp.pgcFk
JOIN taxClass tc ON tc.id = bp.taxClassFk
GROUP BY tmpTicket.ticketFk, pgc.code, pgc.rate
- HAVING taxableBase <> 0) t3
+ HAVING taxableBase
+ ) t3
ORDER BY priority;
- DROP TEMPORARY TABLE IF EXISTS tmp.ticketServiceTax;
- CREATE TEMPORARY TABLE tmp.ticketServiceTax
+ CREATE OR REPLACE TEMPORARY TABLE tmp.ticketServiceTax
(PRIMARY KEY (ticketFk, code, rate))
ENGINE = MEMORY
SELECT tt.ticketFk,
@@ -72351,35 +72502,34 @@ BEGIN
JOIN ticketService ts ON ts.ticketFk = tt.ticketFk
JOIN ticket t ON t.id = tt.ticketFk
JOIN supplier su ON su.id = t.companyFk
- JOIN tmp.addressTaxArea ata
- ON ata.addressFk = t.addressFk AND ata.companyFk = t.companyFk
- JOIN bookingPlanner bp
- ON bp.countryFk = su.countryFk
- AND bp.taxAreaFk = ata.areaFk
- AND bp.taxClassFk = ts.taxClassFk
+ JOIN tmp.addressTaxArea ata ON ata.addressFk = t.addressFk
+ AND ata.companyFk = t.companyFk
+ JOIN bookingPlanner bp ON bp.countryFk = su.countryFk
+ AND bp.taxAreaFk = ata.areaFk
+ AND bp.taxClassFk = ts.taxClassFk
JOIN pgc ON pgc.code = bp.pgcFk
JOIN taxClass tc ON tc.id = bp.taxClassFk
GROUP BY tt.ticketFk, pgc.code
- HAVING taxableBase <> 0;
+ HAVING taxableBase;
INSERT INTO tmp.ticketTax (ticketFk, pgcFk, taxableBase, rate, code)
SELECT ts.ticketFk, ts.pgcFk, ts.taxableBase, ts.rate, ts.code
FROM tmp.ticketServiceTax ts
ON DUPLICATE KEY UPDATE ticketTax.taxableBase = VALUES (taxableBase) + ticketTax.taxableBase ;
- DROP TEMPORARY TABLE IF EXISTS tmp.ticketAmount;
- CREATE TEMPORARY TABLE tmp.ticketAmount
+ CREATE OR REPLACE TEMPORARY TABLE tmp.ticketAmount
(INDEX (ticketFk))
ENGINE = MEMORY
- SELECT ticketFk,
- taxableBase,
+ SELECT ticketFk,
+ taxableBase,
SUM(CAST(taxableBase * rate / 100 AS DECIMAL(10, 2))) tax,
code
FROM tmp.ticketTax
GROUP BY ticketFk, code;
- DROP TEMPORARY TABLE tmp.addressCompany;
- DROP TEMPORARY TABLE tmp.addressTaxArea;
+ DROP TEMPORARY TABLE
+ tmp.addressCompany,
+ tmp.addressTaxArea;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -72452,11 +72602,11 @@ DELIMITER ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_getWithParameters`(
- vClientFk INT,
+ vClientFk INT,
vWarehouseFk INT,
- vShipped DATE,
- vAddressFk INT,
- vCompanyFk INT,
+ vShipped DATE,
+ vAddressFk INT,
+ vCompanyFk INT,
vAgencyModeFk INT,
OUT vTicketFk INT
)
@@ -72470,8 +72620,8 @@ BEGIN
* @param vAddressFk Consignatario
* @param vCompanyFk Empresa
* @param vAgencyModeFk agencia
- */
-
+ */
+
SELECT t.id INTO vTicketFk
FROM vn.ticket t
WHERE t.clientFk <=> vClientFk
@@ -72481,7 +72631,7 @@ BEGIN
AND (t.companyFk <=> vCompanyFk OR vCompanyFk IS NULL)
AND (t.agencyModeFk <=> vAgencyModeFk OR vAgencyModeFk IS NULL)
LIMIT 1;
-
+
IF vTicketFk IS NULL THEN
CALL vn.ticket_add(
vClientFk,
@@ -72521,24 +72671,24 @@ BEGIN
DECLARE vAddressFk INT;
DECLARE vAgencyModeFk INT;
DECLARE vWarehouseFk INT;
- DECLARE vCursor CURSOR FOR
+ DECLARE vCursor CURSOR FOR
SELECT id, landed, addressFk, agencyModeFk, warehouseFk
FROM vn.ticket WHERE shipped > '2020-01-01' AND zoneFk is null;
DECLARE CONTINUE HANDLER FOR SQLSTATE '02000' SET vDone = 1;
-
+
OPEN vCursor;
REPEAT
FETCH vCursor INTO vFechedTicket, vLanded, vAddressFk, vAgencyModeFk, vWarehouseFk;
CALL vn.zone_getShipped (vlanded, vAddressFk, vAgencyModeFk, TRUE);
-
+
UPDATE vn.ticket t
JOIN tmp.zoneGetShipped zgs ON zgs.warehouseFk = vWarehouseFk
SET t.zoneFk = zgs.zoneFk
WHERE t.id = vFechedTicket;
-
+
UNTIL vDone END REPEAT;
DROP TEMPORARY TABLE tmp.zoneGetShipped;
-
+
CLOSE vCursor;
END ;;
DELIMITER ;
@@ -72558,14 +72708,14 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_priceDifference`(
vTicketFk INT,
- vLanded DATE,
+ vLanded DATE,
vAddressFk INT,
vZoneFk INT,
vWarehouseFk INT)
BEGIN
/**
* Devuelve las diferencias de precio de los movimientos de un ticket.
- *
+ *
* @param vTicketFk Id del ticket
* @param vLanded Fecha de recepcion
* @param vAddressFk Id del consignatario
@@ -72574,26 +72724,26 @@ BEGIN
*/
CALL vn.ticket_componentPreview(vTicketFk, vLanded, vAddressFk, vZoneFk, vWarehouseFk);
- SELECT s.itemFk,
- i.name,
- i.size,
- i.category,
- IFNULL(s.quantity, 0) AS quantity,
- IFNULL(s.price, 0) AS price,
+ SELECT s.itemFk,
+ i.name,
+ i.size,
+ i.category,
+ IFNULL(s.quantity, 0) AS quantity,
+ IFNULL(s.price, 0) AS price,
ROUND(SUM(tc.cost), 2) AS newPrice,
s.quantity * (s.price - ROUND(SUM(tc.cost), 2)) difference,
s.id AS saleFk
FROM sale s
- JOIN item i ON i.id = s.itemFk
- JOIN ticket t ON t.id = s.ticketFk
- LEFT JOIN tmp.ticketComponentPreview tc ON tc.itemFk = s.itemFk
+ JOIN item i ON i.id = s.itemFk
+ JOIN ticket t ON t.id = s.ticketFk
+ LEFT JOIN tmp.ticketComponentPreview tc ON tc.itemFk = s.itemFk
AND tc.warehouseFk = vWarehouseFk
- LEFT JOIN saleComponent sc ON sc.saleFk = s.id
+ LEFT JOIN saleComponent sc ON sc.saleFk = s.id
AND sc.componentFk = tc.componentFk
- LEFT JOIN `component` c ON c.id = tc.componentFk
- WHERE t.id = vTicketFk
- AND IF(sc.componentFk IS NULL
- AND c.classRate IS NOT NULL, FALSE, TRUE)
+ LEFT JOIN `component` c ON c.id = tc.componentFk
+ WHERE t.id = vTicketFk
+ AND IF(sc.componentFk IS NULL
+ AND c.classRate IS NOT NULL, FALSE, TRUE)
GROUP BY s.id ORDER BY s.id;
DROP TEMPORARY TABLE tmp.ticketComponentPreview;
@@ -72616,7 +72766,7 @@ DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_printLabelPrevious`(vTicketFk INT)
BEGIN
/**
- * Calls the report_print procedure and passes it
+ * Calls the report_print procedure and passes it
* the necessary parameters for printing.
*
* @param vTicketFk id ticket to print.
@@ -72624,18 +72774,18 @@ BEGIN
DECLARE vPrinterFk INT;
DECLARE vSaleGroup INT;
DECLARE vUserFk INT DEFAULT account.myUser_getId();
-
+
SELECT sg.id, o.labelerFk INTO vSaleGroup, vPrinterFk
FROM saleGroup sg
JOIN sector sc ON sc.id = sg.sectorFk
- JOIN saleGroupDetail sgd ON sg.id = sgd.saleGroupFk
+ JOIN saleGroupDetail sgd ON sg.id = sgd.saleGroupFk
JOIN sale s ON sgd.saleFk = s.id
JOIN ticket t ON s.ticketFk = t.id
JOIN operator o ON o.workerFk = vUserFk
- WHERE sc.id = o.sectorFk
+ WHERE sc.id = o.sectorFk
AND t.id = vTicketFk
LIMIT 1;
-
+
CALL report_print(
'LabelPrevia',
vPrinterFk,
@@ -72669,12 +72819,12 @@ proc:BEGIN
*/
DECLARE hasInvoice BOOL;
- SELECT COUNT(*) INTO hasInvoice
- FROM ticket
+ SELECT COUNT(*) INTO hasInvoice
+ FROM ticket
WHERE id = vSelf
AND refFk IS NOT NULL;
-
- IF hasInvoice THEN
+
+ IF hasInvoice THEN
LEAVE proc;
END IF;
@@ -72700,16 +72850,16 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `ticket_recalcComponents` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_recalcComponents`(vSelf INT, vOption INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_recalcComponents`(vSelf INT, vOption VARCHAR(25))
proc: BEGIN
/**
@@ -72762,14 +72912,14 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `ticket_setNextState` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_setNextState`(vSelf INT)
BEGIN
@@ -72789,7 +72939,7 @@ BEGIN
FROM state
WHERE id = vStateFk;
- INSERT INTO ticketTracking(stateFk, ticketFk, workerFk)
+ INSERT INTO ticketTracking(stateFk, ticketFk, userFk)
VALUES (vNewStateFk, vSelf, account.myUser_getId());
END ;;
DELIMITER ;
@@ -72853,14 +73003,14 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `ticket_setPreviousState` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_setPreviousState`(vTicketFk INT)
BEGIN
@@ -72885,7 +73035,7 @@ BEGIN
ORDER BY id DESC
LIMIT 1;
- INSERT INTO ticketTracking(stateFk, ticketFk, workerFk)
+ INSERT INTO ticketTracking(stateFk, ticketFk, userFk)
SELECT s.nextStateFk, tt.ticketFk, account.myUser_getId()
FROM ticketTracking tt
JOIN vn.state s ON tt.stateFk = s.id
@@ -72907,7 +73057,10 @@ DELIMITER ;
/*!50003 SET character_set_results = utf8mb4 */ ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_setState`(vSelf INT, vStateCode VARCHAR(255) COLLATE utf8_general_ci)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_setState`(
+ vSelf INT,
+ vStateCode VARCHAR(255) COLLATE utf8_general_ci
+)
BEGIN
/**
* Modifica el estado de un ticket si se cumplen las condiciones necesarias.
@@ -72919,51 +73072,44 @@ BEGIN
DECLARE vTicketStateCode VARCHAR(255);
DECLARE vCanChangeState BOOL;
DECLARE vPackedAlertLevel INT;
- DECLARE vOnPreparationAlertLevel INT;
- DECLARE vNextAlertLevel INT;
DECLARE vZoneFk INT;
- SELECT s.alertLevel, s.`code`, s2.alertLevel, t.zoneFk
- INTO vticketAlertLevel, vTicketStateCode, vNextAlertLevel , vZoneFk
+ SELECT s.alertLevel, s.`code`, t.zoneFk
+ INTO vticketAlertLevel, vTicketStateCode, vZoneFk
FROM state s
JOIN ticketTracking tt ON tt.stateFk = s.id
- JOIN state s2 ON s2.code = vStateCode
JOIN ticket t ON t.id = tt.ticketFk
WHERE tt.ticketFk = vSelf
ORDER BY tt.created DESC
LIMIT 1;
- SELECT id INTO vPackedAlertLevel FROM alertLevel WHERE code = 'PACKED';
- SELECT id INTO vOnPreparationAlertLevel FROM alertLevel WHERE code = 'ON_PREPARATION';
+ SELECT id INTO vPackedAlertLevel FROM alertLevel WHERE code = 'PACKED';
IF vStateCode = 'OK' AND vZoneFk IS NULL THEN
CALL util.throw('ASSIGN_ZONE_FIRST');
END IF;
- IF vNextAlertLevel > vticketAlertLevel && vticketAlertLevel < vOnPreparationAlertLevel THEN
- UPDATE sale
- SET originalQuantity = quantity
- WHERE ticketFk = vSelf;
- END IF;
-
- SET vCanChangeState = (vStateCode <> 'ON_CHECKING' OR vticketAlertLevel < vPackedAlertLevel)
- AND NOT (
+ SET vCanChangeState = ((
+ vStateCode <> 'ON_CHECKING' AND vStateCode <> 'CHECKED') OR
+ vticketAlertLevel < vPackedAlertLevel
+ )AND NOT (
vTicketStateCode IN ('CHECKED', 'CHECKING')
AND vStateCode IN ('PREPARED', 'ON_PREPARATION')
);
IF vCanChangeState THEN
- INSERT INTO ticketTracking (stateFk, ticketFk, workerFk)
+ INSERT INTO ticketTracking (stateFk, ticketFk, userFk)
SELECT id, vSelf, account.myUser_getId()
FROM state
WHERE `code` = vStateCode COLLATE utf8_unicode_ci;
-
+
IF vStateCode = 'PACKED' THEN
CALL ticket_doCmr(vSelf);
END IF;
ELSE
CALL util.throw('INCORRECT_TICKET_STATE');
END IF;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -72997,40 +73143,39 @@ proc:BEGIN
SELECT COUNT(*) INTO vProblemLines
FROM tmp.salesToSplit
WHERE ticketFk = vTicketFk;
-
+
SELECT count(*) INTO vTotalLines
- FROM vn.sale s
+ FROM vn.sale s
WHERE s.ticketFk = vTicketFk;
-
+
SET vHasFullProblem = (vTotalLines = vProblemLines);
-- Ticket completo
IF vHasFullProblem THEN
-
+
UPDATE vn.ticket
SET landed = vDated + INTERVAL 1 DAY,
shipped = vDated,
nickname = CONCAT('(',DAY(util.VN_CURDATE()),') ', nickname )
WHERE id = vTicketFk;
-
- SELECT CONCAT("Se ha cambiado el ticket ", vTicketFk, " al dia ", vDated);
+
+ SELECT "moved" message, NULL ticketFuture;
LEAVE proc;
-
+
END IF;
-- Ticket a futuro existe
IF vTicketFutureFk THEN
-
- UPDATE vn.sale s
+
+ UPDATE vn.sale s
JOIN tmp.salesToSplit ss ON s.id = ss.saleFk
SET s.ticketFk = vTicketFutureFk,
s.concept = CONCAT('(s) ', s.concept)
WHERE ss.ticketFk = vTicketFk;
-
- SELECT CONCAT("Se han movido lineas del ticket ", vTicketFk,
- " al ticket existente ", vTicketFutureFk,"(", vDated,")");
+
+ SELECT "future" message, NULL ticketFuture;
LEAVE proc;
-
+
END IF;
-- Ticket nuevo
@@ -73042,19 +73187,18 @@ proc:BEGIN
t.landed = vDated + INTERVAL 1 DAY,
t.shipped = vDated,
t.agencyModeFk = pc.defautlAgencyMode,
- t.zoneFk = pc.defaultZone
+ t.zoneFk = pc.defaultZone
WHERE t.id = vTicketFutureFk;
-
- UPDATE vn.sale s
- JOIN tmp.salesToSplit sts ON sts.saleFk = s.id
+
+ UPDATE vn.sale s
+ JOIN tmp.salesToSplit sts ON sts.saleFk = s.id
SET s.ticketFk = vTicketFutureFk,
s.concept = CONCAT('(s) ', s.concept)
WHERE sts.ticketFk = vTicketFk;
CALL vn.ticketStateUpdate(vTicketFutureFk, 'FIXING');
- SELECT CONCAT("Se han movido lineas del ticket ", vTicketFk,
- " al nuevo ticket ", vTicketFutureFk,"(", vDated,")");
+ SELECT "new" message,vTicketFutureFk ticketFuture;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -73162,7 +73306,7 @@ proc:BEGIN
SELECT itemPackingTypeFk INTO vItemPackingTypeFk
FROM tmp.saleGroup sg
WHERE NOT ISNULL(sg.itemPackingTypeFk)
- ORDER BY sg.totalLitros
+ ORDER BY sg.itemPackingTypeFk
LIMIT 1;
UPDATE vn.sale s
@@ -73192,43 +73336,43 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_splitPackingComplete`(vTicketFk INT, vSectorFk INT)
BEGIN
-
+
DECLARE vNeedToSplit BOOLEAN;
DECLARE vNewTicketFk INT;
-
+
DROP TEMPORARY TABLE IF EXISTS tmpSale;
-
+
CREATE TEMPORARY TABLE tmpSale
SELECT DISTINCT s.id
- FROM vn.ticket t
+ FROM vn.ticket t
JOIN vn.sale s ON s.ticketFk = t.id
- JOIN vn.item i ON i.id = s.itemFk
+ JOIN vn.item i ON i.id = s.itemFk
LEFT JOIN vn.itemShelvingStock iss ON iss.itemFk = s.itemFk AND iss.sectorFk = vSectorFk
- JOIN vn.packagingConfig pc
+ JOIN vn.packagingConfig pc
WHERE t.id = vTicketFk
AND ( s.quantity MOD IFNULL(iss.packing,1) != 0
- OR
+ OR
IFNULL(iss.packing,1) = 1
- OR
+ OR
i.`size` <= pc.previousPreparationMinimumSize
);
-
- SELECT COUNT(*)
+
+ SELECT COUNT(*)
INTO vNeedToSplit
- FROM tmpSale;
-
+ FROM tmpSale;
+
IF vNeedToSplit THEN
-
+
CALL vn.ticket_Clone(vTicketFk, vNewTicketFk);
-
+
UPDATE vn.sale s
- JOIN vn.tmpSale ts ON ts.id = s.id
+ JOIN vn.tmpSale ts ON ts.id = s.id
SET s.ticketFk = vNewTicketFk;
-
+
END IF;
-
+
DROP TEMPORARY TABLE tmpSale;
-
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -73259,7 +73403,7 @@ BEGIN
WHERE ot.description = 'Peso Aduana'
AND t.clientFk = vClientFk
AND t.shipped BETWEEN vDated AND util.dayend(vDated);
-
+
SELECT sum(IF(sv.physicalWeight = 0, sv.weight, sv.physicalWeight)) INTO vTheorycalWeight
FROM vn.ticket t
JOIN vn.sale s ON s.ticketFk = t.id
@@ -73268,9 +73412,9 @@ BEGIN
JOIN vn.itemCost ic ON ic.itemFk = i.id AND ic.warehouseFk = t.warehouseFk
WHERE t.clientFk = vClientFk
AND t.shipped BETWEEN vDated AND util.dayend(vDated);
-
+
SET vRatio = vRealWeight / vTheorycalWeight;
-
+
DROP TEMPORARY TABLE IF EXISTS tmp.ticketWeight;
CREATE TEMPORARY TABLE tmp.ticketWeight
@@ -73291,7 +73435,7 @@ BEGIN
AND t.shipped BETWEEN vDated AND util.dayend(vDated)
GROUP BY ib.ediBotanic, o.code;
-
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -73322,7 +73466,7 @@ BEGIN
(INDEX (departmentFk))
SELECT dated,
businessFk,
- userFk,
+ sub.id userFk,
departmentFk,
hourStart,
hourEnd,
@@ -73350,8 +73494,7 @@ BEGIN
at2.permissionRate,
at2.discountRate,
ct.hoursWeek hoursWeek,
- at2.isAllowedToWork,
- u.userFk
+ at2.isAllowedToWork
FROM time t
LEFT JOIN business b ON t.dated BETWEEN b.started AND IFNULL(b.ended, vDatedTo)
LEFT JOIN worker w ON w.id = b.workerFk
@@ -73411,18 +73554,18 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `timeBusiness_calculateAll`(vDatedFr
BEGIN
/**
- * @param vDatedFrom Fecha desde
+ * @param vDatedFrom Fecha desde
* @param vDatedTo Fecha hasta
*/
- CREATE OR REPLACE TEMPORARY TABLE tmp.`user`
+ CREATE OR REPLACE TEMPORARY TABLE tmp.`user`
SELECT w.id userFk
FROM vn.worker w;
-
+
CALL vn.timeBusiness_calculate(vDatedFrom, vDatedTo);
DROP TEMPORARY TABLE tmp.`user`;
-
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -73442,21 +73585,21 @@ DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `timeBusiness_calculateByDepartment`(vDepartmentFk INT, vDatedFrom DATETIME, vDatedTo DATETIME)
BEGIN
/**
- * @param vDepartmentFk
+ * @param vDepartmentFk
* @param vDatedFrom workerTimeControl
* @param vDatedTo workerTimeControl
*/
DROP TEMPORARY TABLE IF EXISTS tmp.`user`;
-
+
CREATE TEMPORARY TABLE tmp.`user`
SELECT DISTINCT b.workerFk userFk
- FROM business AS b
- WHERE (b.started BETWEEN vDatedFrom AND vDatedTo
+ FROM business AS b
+ WHERE (b.started BETWEEN vDatedFrom AND vDatedTo
OR IFNULL(b.ended, vDatedTo) BETWEEN vDatedFrom AND vDatedTo
OR (b.started <= vDatedFrom AND b.ended >= vDatedTo)
) AND b.departmentFk = vDepartmentFk
ORDER BY b.ended DESC;
-
+
CALL timeBusiness_calculate(vDatedFrom, vDatedTo);
DROP TEMPORARY TABLE tmp.`user`;
@@ -73481,19 +73624,19 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `timeBusiness_calculateByUser`(vUser
BEGIN
/**
- * @param vUserFk
+ * @param vUserFk
* @param vDatedFrom workerTimeControl
* @param vDatedTo workerTimeControl
*/
-
+
DROP TEMPORARY TABLE IF EXISTS tmp.`user`;
-
+
CREATE TEMPORARY TABLE tmp.`user`
SELECT id userFk
- FROM account.user
- WHERE id = vUserFk;
+ FROM account.user
+ WHERE id = vUserFk;
CALL vn.timeBusiness_calculate(vDatedFrom, vDatedTo);
-
+
DROP TEMPORARY TABLE tmp.`user`;
END ;;
@@ -73520,14 +73663,14 @@ BEGIN
* @param vDatedFrom Fecha desde
* @param vDatedTo Fecha hasta
*/
-
- CREATE OR REPLACE TEMPORARY TABLE tmp.`user`
+
+ CREATE OR REPLACE TEMPORARY TABLE tmp.`user`
SELECT w.id userFk
FROM worker w
WHERE w.id = vWorkerFk;
-
+
CALL timeBusiness_calculate(vDatedFrom, vDatedTo);
-
+
DROP TEMPORARY TABLE tmp.`user`;
END ;;
@@ -73547,202 +73690,195 @@ DELIMITER ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `timeControl_calculate`(
- vDatedFrom DATETIME,
+ vDatedFrom DATETIME,
vDatedTo DATETIME)
BEGIN
/*
+ * Agrupa por trabajador y día, el tiempo de trabajo y descanso retribuido(si tiene).
+ * Los registros horarios incorrectos (tmp.timeControlError) no se considerarán.
+ * Si un trabajador ha trabajado más de un cierto umbral de tiempo (vTimeToBreakTime)
+ * y no ha tenido descansos que superen un parámetro determinado(vMaxTimeToBreak),
+ * se le añadirá un tiempo de descanso (vBreakTime) a sus horas trabajadas.
+ * El tiempo de descanso solo se añade si el trabajador realmente disfrutó del descanso.
+ * Si disfrutó de menos tiempo de descanso, solo se añade el tiempo que disfrutó.
+ *
* @param vDatedFrom
- * @param vDatedTo
- * Cálculo de horas trabajadas por empleado y día,
- * sin tener en cuenta los días con fichadas incorrectas (tabla tmp.timeControlError)
- * En el caso de haber hecho descanso y trabajado un mínimo de tiempo (vTimeToBreakTime),
- * se añade al tiempo de trabajo efectivo el descanso (vBreakTime)
- * @return tmp.timeControlCalculate
+ * @param vDatedTo
+ *
+ * @return tmp.timeControlCalculate
* (workerFk, dated, timeWorkSeconds, timeWorkSexagesimal, timeWorkDecimal, timed)
*/
- DECLARE vHourToSeconds INTEGER;
+ DECLARE vHourSeconds INTEGER;
DECLARE vDatedFromYesterday DATETIME;
DECLARE vDatedToTomorrow DATETIME;
DECLARE vTimeToBreakTime INT;
DECLARE vBreakTime INT;
+ DECLARE vMaxTimeToBreak INT;
SELECT DATE_SUB(vDatedFrom, INTERVAL 1 DAY), DATE_ADD(vDatedTo, INTERVAL 1 DAY)
INTO vDatedFromYesterday, vDatedToTomorrow;
- SELECT timeToBreakTime, breakTime INTO vTimeToBreakTime, vBreakTime
+ SELECT timeToBreakTime, breakTime, maxTimeToBreak, TIME_TO_SEC('01:00:00')
+ INTO vTimeToBreakTime, vBreakTime, vMaxTimeToBreak, vHourSeconds
FROM workerTimeControlConfig
LIMIT 1;
- CALL timeControl_getError(vDatedFrom, vDatedTo);
+ CALL timeControl_getError(vDatedFromYesterday, vDatedToTomorrow);
- DROP TEMPORARY TABLE IF EXISTS tmp.workerTimeControl;
- CREATE TEMPORARY TABLE tmp.workerTimeControl
- (INDEX (userFk), INDEX (timed))
- ENGINE = MEMORY
- SELECT DISTINCT(wtc.id),
- wtc.userFk,
+ CREATE OR REPLACE TEMPORARY TABLE tmp.workerTimeControl
+ (INDEX(userFk, timed), INDEX(timed), INDEX(direction))
+ ENGINE = MEMORY
+ SELECT wtc.userFk,
wtc.timed,
+ DATE(wtc.timed) dated,
wtc.direction,
TRUE isReal
FROM workerTimeControl wtc
- JOIN tmp.`user` w ON w.userFk = wtc.userFk
+ JOIN tmp.`user` u ON u.userFk = wtc.userFk
+ LEFT JOIN (
+ SELECT wtc.userFk, MIN(wtc.timed) firstIn
+ FROM workerTimeControl wtc
+ JOIN tmp.`user` u ON u.userFk = wtc.userFk
+ LEFT JOIN tmp.timeControlError tce ON tce.id = wtc.id
+ WHERE wtc.timed BETWEEN vDatedFromYesterday AND vDatedToTomorrow
+ AND wtc.direction = 'in'
+ AND tce.id IS NULL
+ GROUP BY userFk
+ ) fi ON wtc.userFk = fi.userFk
+ LEFT JOIN (
+ SELECT wtc.userFk, MAX(wtc.timed) lastOut
+ FROM workerTimeControl wtc
+ JOIN tmp.`user` u ON u.userFk = wtc.userFk
+ LEFT JOIN tmp.timeControlError tce ON tce.id = wtc.id
+ WHERE wtc.timed BETWEEN vDatedFromYesterday AND vDatedToTomorrow
+ AND wtc.direction = 'out'
+ AND tce.id IS NULL
+ GROUP BY userFk
+ ) lo ON wtc.userFk = lo.userFk
LEFT JOIN tmp.timeControlError tce ON tce.id = wtc.id
- WHERE wtc.timed BETWEEN vDatedFromYesterday AND vDatedToTomorrow
+ WHERE wtc.timed BETWEEN fi.firstIn AND lo.lastOut
AND tce.id IS NULL
- ORDER BY wtc.userFk, wtc.timed ASC;
+ ORDER BY wtc.userFk, wtc.timed;
- SELECT MAX(id) INTO @vCont
- FROM tmp.workerTimeControl;
+ CREATE OR REPLACE TEMPORARY TABLE tmp.wtcToinsert
+ (INDEX(timed))
+ ENGINE = MEMORY
+ WITH wtc AS(
+ SELECT timed,
+ userFk,
+ dated,
+ direction,
+ LEAD(dated) OVER
+ (PARTITION BY userFk, dated ORDER BY timed) nextDay,
+ LEAD(userFk) OVER
+ (PARTITION BY userFk ORDER BY timed) nextUserFk,
+ ROW_NUMBER() OVER (ORDER BY userFk, timed) MOD 2 isOdd
+ FROM tmp.workerTimeControl
+ WHERE timed BETWEEN vDatedFromYesterday AND vDatedToTomorrow
+ ORDER BY userFk, timed
+ ), wtcToinsert AS(
+ SELECT userFk,
+ dated,
+ IF(userFk = nextUserFk
+ AND nextDay IS NULL
+ AND isOdd
+ AND direction <> 'out', TRUE, FALSE) outNextDay,
+ IF(userFk = nextUserFk
+ AND nextDay IS NULL
+ AND NOT isOdd
+ AND direction <> 'out', TRUE, FALSE) outNextDayWhitBreak
+ FROM wtc
+ HAVING outNextDay OR outNextDayWhitBreak
+ )SELECT userFk, util.dayEnd(dated) timed, 'out' direction
+ FROM wtcToinsert
+ WHERE outNextDay
+ UNION ALL
+ SELECT userFk, dated + INTERVAL 1 DAY, 'in'
+ FROM wtcToinsert
+ WHERE outNextDay
+ UNION ALL
+ SELECT userFk, util.dayEnd(dated) - INTERVAL 1 SECOND, 'middle'
+ FROM wtcToinsert
+ WHERE outNextDayWhitBreak
+ UNION ALL
+ SELECT userFk, util.dayEnd(dated), 'out'
+ FROM wtcToinsert
+ WHERE outNextDayWhitBreak
+ UNION ALL
+ SELECT userFk, dated + INTERVAL 1 DAY, 'in'
+ FROM wtcToinsert
+ WHERE outNextDayWhitBreak
+ UNION ALL
+ SELECT userFk, dated + INTERVAL 1 DAY + INTERVAL 1 SECOND, 'middle'
+ FROM wtcToinsert
+ WHERE outNextDayWhitBreak;
- DROP TEMPORARY TABLE IF EXISTS tmp.workerTimeControlAux;
- CREATE TEMPORARY TABLE tmp.workerTimeControlAux (
- `id` int(11) ,
- `userFk` int(10) unsigned ,
- `timed` datetime,
- `direction` enum('in', 'out','middle')
- ) ENGINE=MEMORY;
+ INSERT INTO tmp.workerTimeControl (userFk, timed, dated, direction, isReal)
+ SELECT userFk, timed, DATE(timed), direction, FALSE
+ FROM tmp.wtcToinsert;
- SET @counter := 0;
- SET @vIsOdd := FALSE;
-
- -- Cambio de dia en medio de un descanso
- INSERT INTO tmp.workerTimeControlAux (id, userFk, timed, direction)
- SELECT @vCont:= @vCont + 1 id,
- userFk,
- util.dayEnd(dated) timed,
- 'middle' direction
- FROM(SELECT wtc.userFk,
- DATE(@lastTimed) dated,
- (@vIsOdd := NOT @vIsOdd) isOdd,
- IF(@vIsOdd AND wtc.direction = 'middle'
- AND DATE(timed) <> DATE(@lastTimed), TRUE, FALSE) hasBreak,
- @lastTimed := wtc.timed
- FROM tmp.workerTimeControl wtc
- ORDER BY wtc.userFk, wtc.timed
- LIMIT 10000000000000000000
- )sub
- WHERE hasBreak;
-
- SET @counter := 0;
- SET @vIsOdd := FALSE;
-
- INSERT INTO tmp.workerTimeControlAux (id, userFk, timed, direction)
- SELECT @vCont:= @vCont + 1,
- userFk,
- DATE_ADD(sub.dated, INTERVAL 1 DAY),
- 'middle'
- FROM(SELECT wtc.userFk,
- DATE(@lastTimed) dated,
- (@vIsOdd := NOT @vIsOdd) isOdd,
- IF(@vIsOdd AND wtc.direction = 'middle'
- AND DATE(timed) <> DATE(@lastTimed), TRUE, FALSE) hasBreak,
- @lastTimed := wtc.timed
- FROM tmp.workerTimeControl wtc
- ORDER BY wtc.userFk, wtc.timed
- LIMIT 10000000000000000000
- )sub
- WHERE hasBreak;
-
- -- Cambio de dia
- INSERT INTO tmp.workerTimeControlAux (id, userFk, timed, direction)
- SELECT @vCont:= @vCont + 1 id,
- sub.userFk,
- util.dayEnd(sub.dated) timed,
- 'out' direction
- FROM (SELECT MAX(wtc.timed) timed, wtc.userFk, date(wtc.timed) dated
- FROM workerTimeControl wtc
- JOIN tmp.`user` w ON w.userFk = wtc.userFk
- LEFT JOIN tmp.timeControlError tce ON tce.id = wtc.id
- WHERE wtc.timed BETWEEN vDatedFromYesterday AND vDatedToTomorrow
- AND tce.id IS NULL
- GROUP BY wtc.userFk, DATE(wtc.timed)
- ) sub
- JOIN tmp.workerTimeControl wtc ON wtc.timed = sub.timed
- AND wtc.userFk = sub.userFk
- WHERE wtc.direction <> 'out';
-
- INSERT INTO tmp.workerTimeControlAux (id, userFk, timed, direction)
- SELECT @vCont:= @vCont + 1, sub.userFk, DATE_ADD(sub.dated, INTERVAL 1 DAY), 'in'
- FROM (SELECT MAX(wtc.timed) timed, wtc.userFk, date(wtc.timed) dated
- FROM workerTimeControl wtc
- JOIN tmp.`user` w ON w.userFk = wtc.userFk
- LEFT JOIN tmp.timeControlError tce ON tce.id = wtc.id
- WHERE wtc.timed BETWEEN vDatedFromYesterday AND vDatedToTomorrow
- AND tce.id IS NULL
- GROUP BY wtc.userFk, DATE(wtc.timed)
- ) sub
- JOIN tmp.workerTimeControl wtc ON wtc.timed = sub.timed
- AND wtc.userFk = sub.userFk
- WHERE wtc.direction <> 'out';
-
- INSERT INTO tmp.workerTimeControl (id, userFk, timed, direction, isReal)
- SELECT id, userFk, timed, direction, FALSE FROM tmp.workerTimeControlAux;
-
- SET vHourToSeconds = 3600;
- SET @vIsOdd := TRUE;
- SET @vDated := 0;
- SET @vLastTimed := 0;
- SET @vPreviousTimed := 0;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.workerBreakDays;
- CREATE TEMPORARY TABLE tmp.workerBreakDays
- (INDEX (userFk), INDEX (dated))
- ENGINE = MEMORY
- SELECT sub.userFk,
- sub.dated
- FROM (SELECT (@vIsOdd := NOT @vIsOdd),
- IF(wtc.direction = 'in', @vIsOdd := TRUE, NULL),
- IF(@vIsOdd, @vLastTimed := UNIX_TIMESTAMP(wtc.timed), NULL),
- IF(@vIsOdd, 0, UNIX_TIMESTAMP(wtc.timed) - @vLastTimed) timeWork,
- IF(direction='in', @vDated := DATE(wtc.timed), @vDated) dated,
- wtc.userFk
- FROM tmp.workerTimeControl wtc
- ORDER BY wtc.userFk, wtc.timed, wtc.id
- LIMIT 10000000000000000000
- )sub
- GROUP BY sub.userFk, sub.dated
- HAVING SUM(sub.timeWork) >= vTimeToBreakTime;
-
- SET @vIsOdd := TRUE;
- SET @vDated := 0;
- SET @vLastTimed := 0;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.workerTimeControlAux2;
- CREATE TEMPORARY TABLE tmp.workerTimeControlAux2
- SELECT *
- FROM tmp.workerTimeControl
- WHERE timed BETWEEN vDatedFromYesterday AND vDatedTo
- ORDER BY userFk, timed, id;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.timeControlCalculate;
+ SET @accumulatedForBreakTime = 0;
+ SET @oldrealDay = NULL;
CREATE OR REPLACE TEMPORARY TABLE tmp.timeControlCalculate
- (INDEX (userFk, dated))
- ENGINE = MEMORY
- SELECT sub.userFk,
- sub.dated,
- IF(wb.userFk, vBreakTime, 0) + SUM(sub.timeWork) timeWorkSeconds,
- SEC_TO_TIME(IF(wb.userFk, vBreakTime, 0) + SUM(sub.timeWork)) timeWorkSexagesimal,
- (IF(wb.userFk, vBreakTime, 0) + SUM(sub.timeWork)) / vHourToSeconds timeWorkDecimal,
- CAST(GROUP_CONCAT(DATE_FORMAT(sub.realTimed, "%H:%i")
- ORDER BY sub.timed ASC SEPARATOR ' - ') AS CHAR(256)) timed
- FROM (SELECT (@vIsOdd := NOT @vIsOdd),
- IF(direction='in', @vIsOdd := TRUE, 0),
- IF(@vIsOdd, @vLastTimed := UNIX_TIMESTAMP(timed), 0),
- IF(@vIsOdd, 0, UNIX_TIMESTAMP(timed) - @vLastTimed) timeWork,
- timed,
- userFk,
- DATE(timed) dated,
- IF(isReal, timed, NULL) realTimed
- FROM tmp.workerTimeControlAux2
- )sub
- LEFT JOIN tmp.workerBreakDays wb ON wb.userFk = sub.userFk AND wb.dated = sub.dated
- WHERE sub.timed BETWEEN vDatedFrom AND vDatedTo
- GROUP BY sub.userFk, sub.dated;
+ WITH workerTimed AS (
+ SELECT
+ userFk,
+ dated,
+ timed,
+ (direction ='in' AND isReal) breakPoint,
+ SUM(CASE WHEN (direction ='in' AND isReal) THEN TRUE ELSE FALSE END)
+ OVER (ORDER BY userFk, timed) AS realDay,
+ TIMESTAMPDIFF(SECOND, LAG(timed)
+ OVER (PARTITION BY userFk, dated ORDER BY timed), timed) gapTime,
+ ROW_NUMBER()
+ OVER (PARTITION BY userFk, dated ORDER BY timed) MOD 2 isOdd
+ FROM tmp.workerTimeControl
+ WHERE timed BETWEEN vDatedFromYesterday AND vDatedToTomorrow
+ ), accumulated AS (
+ SELECT SUM(IF(isOdd, 0, gapTime))
+ OVER (PARTITION BY userFk,dated ORDER BY userFk,timed) accumulatedWorkTime,
+ SUM(IF(NOT isOdd OR breakPoint OR gapTime >= vMaxTimeToBreak OR gapTime IS NULL, 0, gapTime))
+ OVER (PARTITION BY realDay ORDER BY realDay,timed) accumulatedBreakTime,
+ IF(realDay <> @oldrealDay OR (isOdd AND gapTime >= vMaxTimeToBreak),
+ @accumulatedForBreakTime := 0,
+ @accumulatedForBreakTime := @accumulatedForBreakTime +
+ IF(isOdd, 0, gapTime )) accumulatedForBreakTime,
+ @oldrealDay := realDay,
+ userFk,
+ dated,
+ realDay
+ FROM workerTimed
+ ), totalWorked AS (
+ SELECT userFk,
+ dated,
+ MAX(accumulatedWorkTime) +
+ IF(MAX(accumulatedForBreakTime) + LEAST(vBreakTime, MAX(accumulatedBreakTime)) >= vTimeToBreakTime,
+ LEAST(vBreakTime, MAX(accumulatedBreakTime)),
+ 0) timeWorkSeconds
+ FROM accumulated
+ GROUP BY userFk, dated
+ )SELECT tw.userFk,
+ tw.dated,
+ timeWorkSeconds,
+ SEC_TO_TIME(timeWorkSeconds) timeWorkSexagesimal,
+ timeWorkSeconds / vHourSeconds timeWorkDecimal,
+ sub.tableTimed
+ FROM totalWorked tw
+ JOIN (
+ SELECT userFk,
+ dated,
+ GROUP_CONCAT(DATE_FORMAT(timed, "%H:%i") ORDER BY timed ASC
+ SEPARATOR ' - ')tableTimed
+ FROM tmp.workerTimeControl
+ WHERE timed BETWEEN vDatedFromYesterday AND vDatedToTomorrow
+ AND isReal
+ GROUP BY userFk, dated
+ )sub ON sub.dated = tw.dated
+ AND sub.userFk = tw.userFk
+ WHERE tw.dated BETWEEN vDatedFrom AND vDatedTo;
- DROP TEMPORARY TABLE tmp.workerBreakDays;
DROP TEMPORARY TABLE tmp.timeControlError;
- DROP TEMPORARY TABLE tmp.workerTimeControlAux;
- DROP TEMPORARY TABLE tmp.workerTimeControlAux2;
+ DROP TEMPORARY TABLE tmp.wtcToinsert;
DROP TEMPORARY TABLE tmp.workerTimeControl;
END ;;
DELIMITER ;
@@ -73768,14 +73904,14 @@ BEGIN
* @param vDatedTo Fecha hasta
*/
- CREATE OR REPLACE TEMPORARY TABLE tmp.`user`
+ CREATE OR REPLACE TEMPORARY TABLE tmp.`user`
SELECT w.id userFk
FROM vn.worker w;
-
+
CALL vn.timeControl_calculate(vDatedFrom, vDatedTo);
DROP TEMPORARY TABLE tmp.`user`;
-
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -73795,21 +73931,21 @@ DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `timeControl_calculateByDepartment`(vDepartmentFk INT, vDatedFrom DATETIME, vDatedTo DATETIME)
BEGIN
/**
- * @param vDepartmentFk
+ * @param vDepartmentFk
* @param vDatedFrom workerTimeControl
* @param vDatedTo workerTimeControl
*/
DROP TEMPORARY TABLE IF EXISTS tmp.`user`;
-
+
CREATE TEMPORARY TABLE tmp.`user`
SELECT DISTINCT b.workerFk userFk
- FROM business AS b
- WHERE (b.started BETWEEN vDatedFrom AND vDatedTo
+ FROM business AS b
+ WHERE (b.started BETWEEN vDatedFrom AND vDatedTo
OR IFNULL(b.ended, vDatedTo) BETWEEN vDatedFrom AND vDatedTo
OR (b.started <= vDatedFrom AND b.ended >= vDatedTo)
) AND b.departmentFk = vDepartmentFk
ORDER BY b.ended DESC;
-
+
CALL timeControl_calculate(vDatedFrom, vDatedTo);
DROP TEMPORARY TABLE tmp.`user`;
@@ -73834,19 +73970,19 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `timeControl_calculateByUser`(vUserF
BEGIN
/**
- * @param vUserFk
+ * @param vUserFk
* @param vDatedFrom workerTimeControl
* @param vDatedTo workerTimeControl
*/
-
+
DROP TEMPORARY TABLE IF EXISTS tmp.`user`;
-
+
CREATE TEMPORARY TABLE tmp.`user`
SELECT id userFk
- FROM account.user
- WHERE id = vUserFk;
+ FROM account.user
+ WHERE id = vUserFk;
CALL vn.timeControl_calculate(vDatedFrom, vDatedTo);
-
+
DROP TEMPORARY TABLE tmp.`user`;
END ;;
@@ -73873,19 +74009,17 @@ BEGIN
* @param vDatedFrom workerTimeControl
* @param vDatedTo workerTimeControl
*/
+ DROP TEMPORARY TABLE IF EXISTS tmp.`user`;
- DROP TEMPORARY TABLE IF EXISTS tmp.`user`;
-
- CREATE TEMPORARY TABLE tmp.`user`
+ CREATE TEMPORARY TABLE tmp.`user`
SELECT u.id userFk
FROM account.user u
- JOIN vn.worker w ON w.userFk = u.id
- WHERE w.id = vWorkerFk;
+ JOIN vn.worker w ON w.id = u.id
+ WHERE w.id = vWorkerFk;
- CALL vn.timeControl_calculate(vDatedFrom, vDatedTo);
-
- DROP TEMPORARY TABLE tmp.`user`;
+ CALL vn.timeControl_calculate(vDatedFrom, vDatedTo);
+ DROP TEMPORARY TABLE tmp.`user`;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -73906,12 +74040,12 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `timeControl_getError`(vDatedFrom DA
BEGIN
/*
* @param vDatedFrom
- * @param vDatedTo
+ * @param vDatedTo
* @table tmp.`user`(userFk)
* Fichadas incorrectas de las cuales no se puede calcular horas trabajadas
* @return tmp.timeControlError (id)
*/
- DECLARE vDayMaxTime INTEGER;
+ DECLARE vDayMaxTime INTEGER;
SET @journeyCounter := 0;
SET @lastUserFk := NULL;
@@ -73919,16 +74053,16 @@ BEGIN
SELECT dayMaxTime INTO vDayMaxTime
FROM workerTimeControlConfig LIMIT 1;
- DROP TEMPORARY TABLE IF EXISTS tmp.timeControl;
- CREATE TEMPORARY TABLE tmp.timeControl
+ DROP TEMPORARY TABLE IF EXISTS tmp.timeControl;
+ CREATE TEMPORARY TABLE tmp.timeControl
(INDEX(id), INDEX(journeyCounter))
ENGINE = MEMORY
SELECT sub.id,
- sub.direction,
+ sub.direction,
sub.timed,
IF(sub.direction = 'in' OR @hasOut OR sub.userFk <> @lastUserFk, @journeyCounter := @journeyCounter + 1, @journeyCounter) journeyCounter,
- @lastUserFk := sub.userFk workerFk,
- IF(sub.direction = 'out', @hasOut:= TRUE, @hasOut:= FALSE)
+ @lastUserFk := sub.userFk workerFk,
+ IF(sub.direction = 'out', @hasOut:= TRUE, @hasOut:= FALSE)
FROM (
SELECT DISTINCT wtc.id,
wtc.direction,
@@ -73939,59 +74073,36 @@ BEGIN
WHERE wtc.timed BETWEEN DATE_SUB(vDatedFrom, INTERVAL 1 DAY) AND DATE_ADD(vDatedTo, INTERVAL 1 DAY)
ORDER BY wtc.userFk, wtc.timed
) sub;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.timeControlAux;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.timeControlAux;
CREATE TEMPORARY TABLE tmp.timeControlAux
(INDEX(id), INDEX(journeyCounter))
ENGINE = MEMORY
SELECT * FROM tmp.timeControl;
- DROP TEMPORARY TABLE IF EXISTS tmp.timeControlError;
- CREATE TEMPORARY TABLE tmp.timeControlError
+ DROP TEMPORARY TABLE IF EXISTS tmp.timeControlError;
+ CREATE TEMPORARY TABLE tmp.timeControlError
(INDEX(id))
ENGINE = MEMORY
- SELECT id
+ SELECT id
FROM tmp.timeControlAux tca
JOIN (
- SELECT journeyCounter,
+ SELECT journeyCounter,
UNIX_TIMESTAMP(MAX(timed)) - UNIX_TIMESTAMP(MIN(timed)) timeWork,
- SUM(direction = 'in') totalIn,
+ SUM(direction = 'in') totalIn,
SUM(direction = 'out') totalOut,
timed
FROM tmp.timeControl
GROUP BY journeyCounter
- HAVING COUNT(*) MOD 2 = 1
- OR totalIn <> 1
- OR totalOut <> 1
+ HAVING COUNT(*) MOD 2 = 1
+ OR totalIn <> 1
+ OR totalOut <> 1
OR timeWork >= vDayMaxTime
)sub ON sub.journeyCounter = tca.journeyCounter
WHERE sub.timed BETWEEN vDatedFrom AND vDatedTo;
- DROP TEMPORARY TABLE IF EXISTS tmp.timeControl;
- DROP TEMPORARY TABLE IF EXISTS tmp.timeControlAux;
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `timeWorkerControl_check` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `timeWorkerControl_check`(vUserFk INT, vDated DATE,vTabletFk VARCHAR(100))
-proc: BEGIN
-/**
- * deprecated call workerTimeControl_check
- */
-CALL vn.workerTimeControl_check(vUserFk,vDated,vTabletFk);
-
+ DROP TEMPORARY TABLE IF EXISTS tmp.timeControl;
+ DROP TEMPORARY TABLE IF EXISTS tmp.timeControlAux;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -74036,42 +74147,42 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `travelVolume` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `travelVolume`(vTravelFk INT)
BEGIN
-
- SELECT w1.name AS ORI,
- w2.name AS DES,
+
+ SELECT w1.name AS ORI,
+ w2.name AS DES,
tr.shipped shipment,
tr.landed landing,
- a.name Agencia,
+ a.name Agencia,
s.name Proveedor,
e.id Id_Entrada,
e.invoiceNumber Referencia,
CAST(ROUND(SUM(GREATEST(b.stickers ,b.quantity /b.packing ) *
- vn.item_getVolume(b.itemFk ,b.packageFk)) / vc.trolleyM3 / 1000000 ,1) AS DECIMAL(10,2)) AS CC,
+ vn.item_getVolume(b.itemFk ,b.packagingFk)) / vc.trolleyM3 / 1000000 ,1) AS DECIMAL(10,2)) AS CC,
CAST(ROUND(SUM(GREATEST(b.stickers ,b.quantity /b.packing ) *
- vn.item_getVolume(b.itemFk ,b.packageFk)) / vc.palletM3 / 1000000,1) AS DECIMAL(10,2)) AS espais
- FROM vn.buy b
- JOIN vn.entry e ON e.id = b.entryFk
- JOIN vn.supplier s ON s.id = e.supplierFk
- JOIN vn.travel tr ON tr.id = e.travelFk
+ vn.item_getVolume(b.itemFk ,b.packagingFk)) / vc.palletM3 / 1000000,1) AS DECIMAL(10,2)) AS espais
+ FROM vn.buy b
+ JOIN vn.entry e ON e.id = b.entryFk
+ JOIN vn.supplier s ON s.id = e.supplierFk
+ JOIN vn.travel tr ON tr.id = e.travelFk
JOIN vn.agencyMode a ON a.id = tr.agencyModeFk
- JOIN vn.warehouse w1 ON w1.id = tr.warehouseInFk
- JOIN vn.warehouse w2 ON w2.id = tr.warehouseOutFk
- JOIN vn.volumeConfig vc
- JOIN vn.item i ON i.id = b.itemFk
+ JOIN vn.warehouse w1 ON w1.id = tr.warehouseInFk
+ JOIN vn.warehouse w2 ON w2.id = tr.warehouseOutFk
+ JOIN vn.volumeConfig vc
+ JOIN vn.item i ON i.id = b.itemFk
JOIN vn.itemType it ON it.id = i.typeFk
WHERE tr.id = vTravelFk;
-
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -74079,21 +74190,21 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `travelVolume_get` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `travelVolume_get`(vFromDated DATE, vToDated DATE, vWarehouseFk INT)
BEGIN
SELECT tr.landed Fecha,
a.name Agencia,
count(DISTINCT e.id) numEntradas,
- FLOOR(sum(item_getVolume(b.itemFk, b.packageFk) * b.stickers / 1000000 )) AS m3
+ FLOOR(sum(item_getVolume(b.itemFk, b.packagingFk) * b.stickers / 1000000 )) AS m3
FROM vn.travel tr
JOIN vn.agencyMode a ON a.id = tr.agencyModeFk
JOIN vn.entry e ON e.travelFk = tr.id
@@ -74127,11 +74238,11 @@ BEGIN
* @param vShipped The shipment date
* @param vLanded The landing date
*/
-
+
IF vLanded < vShipped THEN
SIGNAL SQLSTATE '45000'
SET MESSAGE_TEXT = 'Landing cannot be lesser than shipment';
- END IF;
+ END IF;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -74195,7 +74306,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `travel_checkWarehouseIsFeedStock`(v
proc: BEGIN
/*
* Check that the warehouse is not Feed Stock
- *
+ *
* @vWarehouseFk param warehouse id
*/
IF vWarehouseFk IS NULL THEN
@@ -74294,11 +74405,10 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `travel_cloneWithEntries`(
BEGIN
/**
* Clona un travel junto con sus entradas y compras
- *
* @param vTravelFk travel plantilla a clonar
* @param vDateStart fecha del shipment del nuevo travel
* @param vDateEnd fecha del landing del nuevo travel
- * @param vWarehouseOutFk fecha del salida del nuevo travel
+ * @param vWarehouseOutFk warehouse del salida del nuevo travel
* @param vWarehouseInFk warehouse de landing del nuevo travel
* @param vRef referencia del nuevo travel
* @param vAgencyModeFk del nuevo travel
@@ -74308,6 +74418,7 @@ BEGIN
DECLARE vEvaNotes VARCHAR(255);
DECLARE vDone BOOL;
DECLARE vAuxEntryFk INT;
+ DECLARE vTx BOOLEAN DEFAULT @@in_transaction;
DECLARE vRsEntry CURSOR FOR
SELECT e.id
FROM entry e
@@ -74318,11 +74429,11 @@ BEGIN
DECLARE EXIT HANDLER FOR SQLEXCEPTION
BEGIN
- ROLLBACK;
+ CALL util.tx_rollback(vTx);
RESIGNAL;
END;
- START TRANSACTION;
+ CALL util.tx_start(vTx);
INSERT INTO travel (shipped, landed, warehouseInFk, warehouseOutFk, agencyModeFk, `ref`, isDelivered, isReceived, m3, cargoSupplierFk, kg,clonedFrom)
SELECT vDateStart, vDateEnd, vWarehouseInFk, vWarehouseOutFk, vAgencyModeFk, vRef, isDelivered, isReceived, m3,cargoSupplierFk, kg,vTravelFk
@@ -74345,7 +74456,7 @@ BEGIN
END IF;
CALL entry_cloneHeader(vAuxEntryFk, vNewEntryFk, vNewTravelFk);
- CALL entry_copyBuys(vAuxEntryFk, vNewEntryFk);
+ CALL entry_copyBuys(vAuxEntryFk, vNewEntryFk);
SELECT evaNotes INTO vEvaNotes
FROM entry
@@ -74359,60 +74470,7 @@ BEGIN
SET @isModeInventory = FALSE;
CLOSE vRsEntry;
- COMMIT;
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `travel_doRecalc` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb3 */ ;
-/*!50003 SET character_set_results = utf8mb3 */ ;
-/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `travel_doRecalc`()
-BEGIN
-/**
- * Recounts the number of entries of changed travels.
- */
- DECLARE vDone BOOL;
- DECLARE vTravelFk INT;
- DECLARE vTotalEntries INT;
-
- DECLARE cCur CURSOR FOR
- SELECT travelFk FROM travelRecalc;
-
- DECLARE CONTINUE HANDLER FOR NOT FOUND
- SET vDone = TRUE;
-
- OPEN cCur;
-
- myLoop: LOOP
- SET vDone = FALSE;
- FETCH cCur INTO vTravelFk;
-
- IF vDone THEN
- LEAVE myLoop;
- END IF;
-
- SELECT COUNT(*) INTO vTotalEntries
- FROM entry
- WHERE travelFk = vTravelFk;
-
- UPDATE travel
- SET totalEntries = vTotalEntries
- WHERE id = vTravelFk;
-
- DELETE FROM travelRecalc WHERE travelFk = vTravelFk;
- END LOOP;
-
- CLOSE cCur;
+ CALL util.tx_commit(vTx);
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -74421,7 +74479,7 @@ DELIMITER ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `travel_getEntriesMissingPackage` */;
+/*!50003 DROP PROCEDURE IF EXISTS `travel_doRecalc` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
@@ -74429,6 +74487,175 @@ DELIMITER ;
/*!50003 SET character_set_results = utf8mb4 */ ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `travel_doRecalc`()
+proc: BEGIN
+/**
+* Recounts the number of entries of changed travels.
+*/
+ DECLARE vTravelFk INT;
+
+ DECLARE EXIT HANDLER FOR SQLEXCEPTION
+ BEGIN
+ DO RELEASE_LOCK('vn.ticket_doRecalc');
+ END;
+
+ IF !GET_LOCK('vn.travel_doRecalc', 0) THEN
+ LEAVE proc;
+ END IF;
+
+ CREATE OR REPLACE TEMPORARY TABLE tTravel
+ ENGINE = MEMORY
+ SELECT travelFk FROM travelRecalc;
+
+ UPDATE travel t
+ JOIN tTravel tt ON tt.travelFk = t.id
+ SET t.totalEntries = (
+ SELECT COUNT(e.id)
+ FROM entry e
+ WHERE e.travelFk = t.id
+ );
+
+ DELETE tr FROM travelRecalc tr JOIN tTravel t ON tr.travelFk = t.travelFk;
+ DROP TEMPORARY TABLE tTravel;
+ DO RELEASE_LOCK('vn.travel_doRecalc');
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `travel_getDetailFromContinent` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `travel_getDetailFromContinent`(
+ vContinentFk INT
+)
+BEGIN
+/**
+ * Devuelve los detalles de los vuelos que tienen
+ * un almacén de salida de un continente.
+ *
+ * @param vContinentFk Id de continente
+ */
+ DECLARE vDateFrom DATE DEFAULT util.VN_CURDATE() - INTERVAL 12 WEEK;
+ SELECT IFNULL(CONCAT(" ", entryFk), travelFk) travelAndEntry,
+ sub.*
+ FROM (
+ SELECT tr.id travelFk,
+ NULL entryFk,
+ TRUE isTravel,
+ am.name agency,
+ tr.ref,
+ tr.shipped,
+ wOut.name originBoxes,
+ tr.landed,
+ wIn.name destination,
+ SUM(b.stickers) stickers,
+ NULL evaNotes,
+ tr.kg,
+ CAST(SUM(b.weight * b.stickers) AS INT) loadedkg,
+ CAST(
+ SUM(vc.aerealVolumetricDensity *
+ b.stickers *
+ IF(p.volume,
+ p.volume,
+ p.width * p.depth * p.height
+ ) / 1000000
+ ) AS INT
+ ) volumeKg,
+ NULL loadPriority,
+ NULL invoiceAmount,
+ s.nickname freighter,
+ NULL reference
+ FROM travel tr
+ LEFT JOIN supplier s ON s.id = tr.cargoSupplierFk
+ LEFT JOIN entry e ON e.travelFk = tr.id
+ LEFT JOIN buy b ON b.entryFk = e.id
+ LEFT JOIN packaging p ON p.id = b.packagingFk
+ LEFT JOIN item i ON i.id = b.itemFk
+ LEFT JOIN itemType it ON it.id = i.typeFk
+ JOIN warehouse wIn ON wIn.id = tr.warehouseInFk
+ JOIN warehouse wOut ON wOut.id = tr.warehouseOutFk
+ JOIN country co ON co.id = wOut.countryFk
+ JOIN agencyMode am ON am.id = tr.agencyModeFk
+ JOIN volumeConfig vc
+ WHERE tr.landed >= vDateFrom
+ AND co.continentFk = vContinentFk
+ GROUP BY tr.id
+ UNION ALL
+ SELECT e.travelFk,
+ e.id,
+ FALSE,
+ s.name,
+ e.invoiceNumber,
+ tr.shipped,
+ wOut.name,
+ tr.landed,
+ wIn.name,
+ SUM(b.stickers),
+ e.evaNotes,
+ NULL,
+ CAST(SUM(b.weight * b.stickers) AS INT),
+ CAST(
+ SUM(vc.aerealVolumetricDensity *
+ b.stickers *
+ IF(p.volume,
+ p.volume,
+ p.width * p.depth * p.height
+ ) / 1000000
+ ) AS INT
+ ),
+ loadPriority,
+ e.invoiceAmount,
+ s2.nickname,
+ e.reference
+ FROM entry e
+ JOIN buy b ON b.entryFk = e.id
+ JOIN packaging p ON p.id = b.packagingFk
+ JOIN item i ON i.id = b.itemFk
+ JOIN itemType it ON it.id = i.typeFk
+ JOIN supplier s ON s.id = e.supplierFk
+ JOIN travel tr ON tr.id = e.travelFk
+ LEFT JOIN supplier s2 ON s2.id = tr.cargoSupplierFk
+ JOIN warehouse wIn ON wIn.id = tr.warehouseInFk
+ JOIN warehouse wOut ON wOut.id = tr.warehouseOutFk
+ JOIN country co ON co.id = wOut.countryFk
+ JOIN volumeConfig vc
+ WHERE tr.landed >= vDateFrom
+ AND co.continentFk = vContinentFk
+ GROUP BY e.id
+ ) sub
+ ORDER BY landed ASC,
+ shipped ASC,
+ travelFk,
+ isTravel DESC,
+ (loadPriority > 0) DESC,
+ loadPriority,
+ agency,
+ evaNotes;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `travel_getEntriesMissingPackage` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb3 */ ;
+/*!50003 SET character_set_results = utf8mb3 */ ;
+/*!50003 SET collation_connection = utf8mb3_general_ci */ ;
+DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `travel_getEntriesMissingPackage`(vSelf INT)
BEGIN
DECLARE vpackageOrPackingNull INT;
@@ -74439,11 +74666,11 @@ BEGIN
WHERE id = vSelf;
SELECT e.id entryFk
- FROM travel t
- JOIN entry e ON e.travelFk = t.id
- JOIN buy b ON b.entryFk = e.id
- WHERE t.id = vTravelFk
- AND (b.packing IS NULL OR b.packageFk IS NULL);
+ FROM travel t
+ JOIN entry e ON e.travelFk = t.id
+ JOIN buy b ON b.entryFk = e.id
+ WHERE t.id = vTravelFk
+ AND (b.packing IS NULL OR b.packagingFk IS NULL);
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -74465,7 +74692,7 @@ BEGIN
/*
* Desplaza al dia siguiente los travels que contengan redadas y avisa a los compradores
- *
+ *
*/
DECLARE vDone BOOL DEFAULT FALSE;
DECLARE vWorkerName VARCHAR(50);
@@ -74477,7 +74704,7 @@ BEGIN
SELECT GROUP_CONCAT( DISTINCT CONCAT('https://salix.verdnatura.es/#!/travel/', ttr.id, '/summary ') ORDER BY ttr.id SEPARATOR '\n\r'),
u.name
FROM tmp.travel ttr
- JOIN entry e ON e.travelFk = ttr.id
+ JOIN entry e ON e.travelFk = ttr.id
JOIN buy b ON b.entryFk = e.id
JOIN item i ON i.id = b.itemFk
JOIN itemType it ON it.id = i.typeFk
@@ -74485,19 +74712,19 @@ BEGIN
GROUP BY u.name;
DECLARE CONTINUE HANDLER FOR NOT FOUND
- SET vDone = TRUE;
+ SET vDone = TRUE;
DECLARE EXIT HANDLER FOR SQLEXCEPTION
BEGIN
ROLLBACK;
RESIGNAL;
END;
-
+
DROP TEMPORARY TABLE IF EXISTS tmp.travel;
CREATE TEMPORARY TABLE tmp.travel
SELECT tr.id,tr.landed
FROM travel tr
- JOIN entry e ON e.travelFk = tr.id
+ JOIN entry e ON e.travelFk = tr.id
WHERE tr.landed = util.tomorrow()
AND e.isRaid
GROUP BY tr.id;
@@ -74555,7 +74782,7 @@ proc: BEGIN
IF vSelf IS NULL THEN
LEAVE proc;
END IF;
-
+
INSERT IGNORE INTO travelRecalc SET travelFk = vSelf;
END ;;
DELIMITER ;
@@ -74565,6 +74792,100 @@ DELIMITER ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `travel_upcomingArrivals` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `travel_upcomingArrivals`(
+ vWarehouseFk INT,
+ vDate DATETIME
+)
+BEGIN
+/**
+ * Procedure to track and organize the movement of items between warehouses,
+ * where 'warehouseINFk' is @vWarehouseFk.
+ * Uses temporary tables to process and store the travel data of the items.
+ *
+ * @params vWarehouseFk warehouse id
+ * @params vDate selected landed date
+ * @return tmp.itemTravel
+ */
+ DECLARE vTravelFk INT;
+ DECLARE vWarehouseOutFk INT;
+ DECLARE vShipment DATETIME;
+ DECLARE vDateStart DATETIME;
+
+ CREATE OR REPLACE TEMPORARY TABLE tTravelTop
+ (PRIMARY KEY (wh_in,wh_out,landing,shipment))
+ ENGINE = MEMORY
+ SELECT 0 id,
+ vWarehouseFk wh_in,
+ vWarehouseFk wh_out,
+ FALSE ok,
+ vDate landing,
+ vDate shipment;
+
+ REPEAT
+ SET vTravelFk = NULL;
+
+ SELECT id,
+ wh_out,
+ shipment,
+ landing
+ INTO vTravelFk,
+ vWarehouseOutFk,
+ vShipment,
+ vDateStart
+ FROM tTravelTop
+ WHERE ok = FALSE LIMIT 1;
+
+ UPDATE tTravelTop
+ SET ok = TRUE
+ WHERE id = vTravelFk;
+
+ INSERT IGNORE INTO tTravelTop
+ SELECT id,
+ vWarehouseFk,
+ warehouseOutFk,
+ FALSE,
+ IF(vTravelFk, vDateStart, landed),
+ shipped shipment
+ FROM travel
+ WHERE warehouseOutFk = vWarehouseOutFk
+ AND IF(vTravelFk, landed <= vShipment, landed >= vShipment)
+ AND shipped >= util.VN_CURDATE()
+ AND NOT isDelivered;
+ UNTIL vTravelFk IS NULL END REPEAT;
+
+ DELETE FROM tTravelTop WHERE id = 0;
+
+ CREATE OR REPLACE TEMPORARY TABLE tmp.itemTravel
+ (KEY (wh))
+ ENGINE = MEMORY
+ SELECT *
+ FROM (
+ SELECT wh_out wh,
+ landing
+ FROM tTravelTop
+ WHERE wh_out <> vWarehouseFk
+ ORDER BY landing
+ LIMIT 10000000000000000000
+ ) t
+ GROUP BY wh;
+
+ DROP TEMPORARY TABLE tTravelTop;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `travel_updatePacking` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
@@ -74581,10 +74902,10 @@ BEGIN
* @param vItemFk id del item
* @param vPacking nuevo packing
*/
-
+
DECLARE vAuctionWarehouseFk INT;
DECLARE vMainWarehouseFk INT;
-
+
SELECT warehouseFk INTO vAuctionWarehouseFk
FROM auctionConfig;
@@ -74644,7 +74965,7 @@ BEGIN
FROM travelClonedWeekly
WHERE travelFk;
- DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
+ DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
SET vCounter = vSinceWeek;
@@ -74706,12 +75027,12 @@ BEGIN
/*
* Plantilla para modificar reemplazar todos los tags
* por los valores que tienen los articulos
- *
+ *
* @param vTypeFk tipo a modificar
- *
+ *
*/
- DELETE it.*
- FROM itemTag it
+ DELETE it.*
+ FROM itemTag it
JOIN item i ON i.id = it.itemFk
WHERE i.typeFk = vTypeFk;
@@ -74720,40 +75041,40 @@ BEGIN
FROM item i
JOIN tag t ON t.name = 'Longitud' COLLATE utf8_general_ci
WHERE i.typeFk = vTypeFk;
-
+
INSERT INTO itemTag(itemFk, tagFk, value, priority)
SELECT i.id, t.id, i.category, 5
FROM item i
JOIN tag t ON t.name = 'Categoria' COLLATE utf8_general_ci
WHERE i.typeFk = vTypeFk;
-
+
INSERT INTO itemTag(itemFk, tagFk, value, priority)
SELECT i.id, t.id, ink.name, 2
FROM item i
JOIN tag t ON t.name = 'Color' COLLATE utf8_general_ci
JOIN ink ON ink.id = i.inkFk
WHERE i.typeFk = vTypeFk;
-
+
INSERT INTO itemTag(itemFk, tagFk, value, priority)
SELECT i.id, t.id, p.name, 3
FROM item i
JOIN tag t ON t.name = 'Productor' COLLATE utf8_general_ci
JOIN producer p ON p.id = i.producerFk
- WHERE i.typeFk = vTypeFk;
-
+ WHERE i.typeFk = vTypeFk;
+
INSERT INTO itemTag(itemFk, tagFk, value, priority)
SELECT i.id, t.id, o.name, 4
FROM item i
JOIN tag t ON t.name = 'Origen' COLLATE utf8_general_ci
JOIN origin o ON o.id = i.originFk
WHERE i.typeFk = vTypeFk;
- /*
+ /*
INSERT INTO itemTag(itemFk, tagFk, value, priority)
SELECT i.id, t.id, i.stems, 6
FROM item i
JOIN tag t ON t.name = 'Tallos' COLLATE utf8_general_ci
- WHERE i.typeFk = vTypeFk;
- */
+ WHERE i.typeFk = vTypeFk;
+ */
-- CALL itemTagArrangedUpdate(NULL);
END ;;
@@ -74776,7 +75097,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `updatePedidosInternos`(vItemFk INT)
BEGIN
UPDATE vn.item SET upToDown = 0 WHERE item.id = vItemFk;
-
+
END ;;
DELIMITER ;
@@ -74804,7 +75125,7 @@ BEGIN
SELECT vp.regex INTO vRegex
FROM vehiclePlateRegex vp
WHERE vp.countryCodeFk = vCountryCodeFk;
-
+
IF NOT vNumberPlate REGEXP BINARY (vRegex)THEN
CALL util.throw(CONCAT('Error: la matricula ', vNumberPlate, ' no es valida para ',vCountryCodeFk));
END IF;
@@ -74837,7 +75158,7 @@ proc:BEGIN
ROLLBACK;
RESIGNAL;
END;
-
+
SELECT eventEarlyDays INTO vEventEarlyDays
FROM vehicleConfig;
@@ -74855,7 +75176,7 @@ proc:BEGIN
IF NOT vHasEvents THEN
LEAVE proc;
END IF;
-
+
START TRANSACTION;
SELECT util.notification_send('vehicle-event-expired',
@@ -74890,21 +75211,21 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `visible_getMisfit`(vSectorFk INT)
BEGIN
-
+
/* Devuelve una tabla temporal con los descuadres entre el visible teórico y lo ubicado en la práctica
- *
+ *
* @param vSectorFk Identificador de vn.sector
- *
+ *
* @return tmp.stockMisfit(itemFk, visible, parked)
*/
-
+
DECLARE vCalcVisibleFk INT;
DECLARE vWarehouseFk INT;
SELECT warehouseFk INTO vWarehouseFk
- FROM vn.sector s
+ FROM vn.sector s
WHERE s.id = vSectorFk;
-
+
CALL cache.visible_refresh(vCalcVisibleFk, FALSE, vWarehouseFk);
DROP TEMPORARY TABLE IF EXISTS tmp.stockMisfit;
@@ -74917,17 +75238,17 @@ BEGIN
INSERT INTO tmp.stockMisfit(itemFk, parked)
SELECT iss.itemFk , sum(iss.visible )
- FROM vn.itemShelvingStock iss
- JOIN vn.sector s ON s.id = iss.sectorFk
+ FROM vn.itemShelvingStock iss
+ JOIN vn.sector s ON s.id = iss.sectorFk
WHERE vSectorFk IN (s.id, s.sonFk)
GROUP BY iss.itemFk;
-
+
INSERT INTO tmp.stockMisfit(itemFk, visible)
- SELECT v.item_id , v.visible
- FROM cache.visible v
- WHERE v.calc_id = vCalcVisibleFk
+ SELECT v.item_id , v.visible
+ FROM cache.visible v
+ WHERE v.calc_id = vCalcVisibleFk
ON DUPLICATE KEY UPDATE visible = v.visible;
-
+
DELETE FROM tmp.stockMisfit
WHERE visible = parked;
@@ -74951,17 +75272,17 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `warehouseFitting`(IN vWhOrigin INT
BEGIN
DECLARE vCacheVisibleOriginFk INT;
DECLARE vCacheVisibleDestinyFk INT;
-
+
CALL cache.visible_refresh(vCacheVisibleOriginFk, FALSE, vWhOrigin);
CALL cache.visible_refresh(vCacheVisibleDestinyFk, FALSE, vWhDestiny);
-
+
SELECT i.id itemFk,
i.longName,
i.size,
i.subName,
vOrigin.visible AS Origen,
vDestiny.visible Destino
-
+
FROM vn.item i
JOIN vn.itemType it ON it.id = i.typeFk
LEFT JOIN cache.visible vOrigin ON vOrigin.calc_id = vCacheVisibleOriginFk AND vOrigin.item_id = i.id
@@ -74990,13 +75311,13 @@ BEGIN
DECLARE vWhOrigin INT;
DECLARE vWhDestiny INT;
-
+
SELECT warehouseInFk, warehouseOutFk INTO vWhDestiny, vWhOrigin
FROM vn.travel
WHERE id = vTravelFk;
-
+
CALL vn.warehouseFitting(vWhOrigin, vWhDestiny);
-
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -75060,7 +75381,7 @@ BEGIN
* Calcula los días y horas de vacaciones en función de un contrato y año
*
* @param vYear
- * @param vBusinessFk
+ * @param vBusinessFk
* @return tmp.workerCalendarCalculateBusiness (days, hours, daysEnjoyed, hoursEnjoyed)
*/
DECLARE vStarted DATE;
@@ -75072,17 +75393,17 @@ BEGIN
DECLARE vPayedHolidays DECIMAL(5,2);
DECLARE vDifDays INT;
- SELECT IF(b.started < CONCAT(vYear,"-01-01"), CONCAT(vYear,"-01-01"),b.started),
- IF(b.ended IS NULL OR YEAR(b.ended)>vYear , CONCAT(vYear,"-12-31"), b.ended),
+ SELECT IF(b.started < CONCAT(vYear,"-01-01"), CONCAT(vYear,"-01-01"),b.started),
+ IF(b.ended IS NULL OR YEAR(b.ended)>vYear , CONCAT(vYear,"-12-31"), b.ended),
IF(wbt.hasHolidayEntitlement, w.days, 0),
c.hoursWeek,
IF(YEAR(b.ended) = vYear, b.payedHolidays, 0) payedHolidays
- INTO vStarted,
- vEnded,
- vDaysHoliday,
+ INTO vStarted,
+ vEnded,
+ vDaysHoliday,
vHoursWeek,
vPayedHolidays
- FROM business b
+ FROM business b
JOIN workerBusinessType wbt ON wbt.id = b.workerBusinessTypeFk
JOIN workCenterHoliday w ON w.workcenterFk = b.workcenterFk
LEFT JOIN calendarType c ON c.id = b.calendarTypeFk
@@ -75090,23 +75411,23 @@ BEGIN
AND w.year = vYear;
DROP TEMPORARY TABLE IF EXISTS tmp.workerCalendarCalculateBusiness;
-
+
IF vStarted < vEnded THEN
SET vDifDays = DAYOFYEAR(vEnded) - DAYOFYEAR(vStarted) + 1;
- SELECT IFNULL(SUM(a.holidayEntitlementRate), 0),
+ SELECT IFNULL(SUM(a.holidayEntitlementRate), 0),
SUM(-(a.discountRate - 1)) + vPayedHolidays
- INTO vDaysToSubtract,
- vDaysHolidayEnjoyed
+ INTO vDaysToSubtract,
+ vDaysHolidayEnjoyed
FROM calendar c
JOIN absenceType a ON a.id = c.dayOffTypeFk
JOIN business b ON b.id = c.businessFk
- WHERE b.id = vBusinessFk
+ WHERE b.id = vBusinessFk
AND YEAR(c.dated) = vYear;
END IF;
- CREATE TEMPORARY TABLE tmp.workerCalendarCalculateBusiness
+ CREATE TEMPORARY TABLE tmp.workerCalendarCalculateBusiness
ENGINE = MEMORY
SELECT @days := IFNULL(ROUND((vDaysHoliday * (vDifDays - vDaysToSubtract) / IF(util.isLeapYear(vYear) , 366, 365)), 1), 0) days,
@days * (vHoursWeek / 5) hours,
@@ -75134,32 +75455,32 @@ BEGIN
/**
* Calcula los días y horas de vacaciones en función de un trabajador y año
*
- * @param vYear
- * @param vWorkerFk
+ * @param vYear
+ * @param vWorkerFk
* @return tmp.workerCalendarCalculateYear (days, hours, daysEnjoyed, hoursEnjoyed)
- */
+ */
DECLARE vDone BOOL;
DECLARE vBusinessFk INT;
DECLARE cur CURSOR FOR
- SELECT b.id
+ SELECT b.id
FROM business b
- WHERE vYear BETWEEN YEAR(b.started) AND IFNULL(YEAR(b.ended), vYear)
+ WHERE vYear BETWEEN YEAR(b.started) AND IFNULL(YEAR(b.ended), vYear)
AND b.workerFk = vWorkerFk;
DECLARE CONTINUE HANDLER FOR NOT FOUND
- SET vDone = TRUE;
-
+ SET vDone = TRUE;
+
DROP TEMPORARY TABLE IF EXISTS tmp.workerCalendarCalculateYear;
CREATE TEMPORARY TABLE tmp.workerCalendarCalculateYear
- (days DEC(5,2),
+ (days DEC(5,2),
hours DEC(5,2),
- daysEnjoyed DEC(5,2),
- hoursEnjoyed DEC(5,2))
+ daysEnjoyed DEC(5,2),
+ hoursEnjoyed DEC(5,2))
ENGINE = MEMORY;
INSERT INTO tmp.workerCalendarCalculateYear VALUES(0, 0, 0, 0);
-
+
OPEN cur;
l: LOOP
@@ -75172,12 +75493,12 @@ BEGIN
CALL workerCalendar_calculateBusiness(vYear, vBusinessFk);
UPDATE tmp.workerCalendarCalculateYear w
- JOIN tmp.workerCalendarCalculateBusiness wc
+ JOIN tmp.workerCalendarCalculateBusiness wc
SET w.days = w.days + wc.days,
w.hours = w.hours + wc.hours,
w.daysEnjoyed = w.daysEnjoyed + wc.daysEnjoyed,
w.hoursEnjoyed = w.hoursEnjoyed + wc.hoursEnjoyed;
-
+
DROP TEMPORARY TABLE tmp.workerCalendarCalculateBusiness;
END LOOP;
@@ -75192,38 +75513,6 @@ DELIMITER ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `workerCreate` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `workerCreate`(
- vFirstname VARCHAR(50),
- vLastName VARCHAR(50),
- vCode CHAR(3),
- vBossFk INT,
- vUserFk INT,
- vFi VARCHAR(15) ,
- vBirth DATE
-)
-BEGIN
-/**
- * Create new worker
- *
- */
- INSERT INTO worker(id, code, firstName, lastName, bossFk, fi, birth,userFk)
- VALUES (vUserFk, vCode, vFirstname, vLastName, vBossFk, vFi, vBirth,vUserFk);
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `workerCreateExternal` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
@@ -75280,20 +75569,20 @@ BEGIN
DROP TEMPORARY TABLE IF EXISTS tmp.workerDepartmentByDate;
CREATE TEMPORARY TABLE tmp.workerDepartmentByDate
ENGINE = MEMORY
- SELECT w.id userFk,
- w.lastName name,
- w.firstName firstname,
- d.name department,
+ SELECT w.id userFk,
+ w.lastName name,
+ w.firstName firstname,
+ d.name department,
d.id departmentFk,
- b.started,
- d.isProduction,
+ b.started,
+ d.isProduction,
CAST(12 * b.amount / ct.hoursWeek / 52 AS DECIMAL(10,2)) costeHora,
w.fi nif
FROM business b
JOIN calendarType ct ON ct.id = b.calendarTypeFk
JOIN department d ON d.id = b.departmentFk
JOIN worker w ON w.id = b.workerFk
- WHERE b.started <= vDate
+ WHERE b.started <= vDate
AND (b.ended > vDate OR b.ended IS NULL);
END ;;
DELIMITER ;
@@ -75317,21 +75606,26 @@ mainLabel:BEGIN
IF (SELECT COUNT(*) FROM workerDisableExcluded WHERE workerFk = vUserId AND (dated > util.VN_CURDATE() OR dated IS NULL)) > 0 THEN
LEAVE mainLabel;
END IF;
+
+ DELETE cp FROM clientProtected cp
+ JOIN client c ON c.id = cp.clientFk
+ WHERE c.salesPersonFk = vUserId;
+
DELETE FROM account.account
WHERE id = vUserId;
- UPDATE account.user
+ UPDATE account.user
SET role = 2
- WHERE id = vUserId;
+ WHERE id = vUserId;
- DELETE FROM pbx.sip
- WHERE user_id = vUserId;
+ DELETE FROM pbx.sip
+ WHERE user_id = vUserId;
UPDATE `client` c
JOIN payMethod p ON p.name = 'CONTADO'
SET c.credit = 0, c.payMethodFk = p.id, hasCoreVnl = FALSE
WHERE c.id = vUserId;
-
+
UPDATE `client` c
SET c.salesPersonFk = null
WHERE c.salesPersonFk = vUserId;
@@ -75360,12 +75654,12 @@ BEGIN
SELECT b.workerFk
FROM business b
JOIN vn.worker w ON w.id = b.workerFk
- JOIN account.account a ON a.id = b.workerFk
- LEFT JOIN (SELECT b.workerFk
+ JOIN account.account a ON a.id = b.workerFk
+ LEFT JOIN (SELECT b.workerFk
FROM business b
WHERE (ended IS NULL OR ended >=util.VN_CURDATE())
)sub ON sub.workerFk = a.id
- LEFT JOIN vn.workerDisableExcluded wd ON wd.workerFk = b.workerFk
+ LEFT JOIN vn.workerDisableExcluded wd ON wd.workerFk = b.workerFk
WHERE sub.workerFk IS NULL
AND wd.workerFk IS NULL
GROUP BY w.id;
@@ -75383,7 +75677,7 @@ BEGIN
END WHILE;
CLOSE rs;
-
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -75447,19 +75741,19 @@ DELIMITER ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `workerJourney_replace`(
- vDatedFrom DATE,
- vDatedTo DATE,
+ vDatedFrom DATE,
+ vDatedTo DATE,
vWorkerFk INT)
BEGIN
/**
- * Actualiza la tabla workerJourney para que actue como caché permanente revisable
+ * Actualiza la tabla workerJourney para que actue como caché permanente revisable
* de las jornadas laborales.
* @param vDatedFrom workerTimeControl
* @param vDatedTo workerTimeControl
* @param vWorkerFk, en caso de pasar 0 ó NULL se aplica a todos
- */
+ */
DECLARE vDatedTimeTo DATETIME;
- DECLARE vMaxTimePerDay INT;
+ DECLARE vMaxTimePerDay INT;
DECLARE vMinHoursToBreak DECIMAL(10,2);
DECLARE vBreakHours DECIMAL(10,2);
DECLARE vMonthByYear INT;
@@ -75467,57 +75761,57 @@ BEGIN
DECLARE vMonthsByYear INT DEFAULT 12;
DECLARE vDaysByWeek INT DEFAULT 5;
DECLARE vDatedFromYesterday DATETIME;
- DECLARE vDatedToTomorrow DATETIME;
-
- SELECT DATE_SUB(vDatedFrom, INTERVAL 1 DAY), DATE_ADD(vDatedTo, INTERVAL 1 DAY)
+ DECLARE vDatedToTomorrow DATETIME;
+
+ SELECT DATE_SUB(vDatedFrom, INTERVAL 1 DAY), DATE_ADD(vDatedTo, INTERVAL 1 DAY)
INTO vDatedFromYesterday, vDatedToTomorrow;
SET vDatedTimeTo = util.dayEnd(vDatedTo);
-
- SELECT minHoursToBreak, breakHours, maxTimePerDay
+
+ SELECT minHoursToBreak, breakHours, maxTimePerDay
INTO vMinHoursToBreak, vBreakHours, vMaxTimePerDay
FROM workerTimeControlConfig;
DELETE FROM workerJourney
- WHERE dated BETWEEN vDatedFrom AND vDatedTo
+ WHERE dated BETWEEN vDatedFrom AND vDatedTo
AND NOT isPaid
AND NOT isUpdated
- AND (vWorkerFk IS NULL OR userFK = vWorkerFk);
+ AND (vWorkerFk IS NULL OR userFK = vWorkerFk);
- -- Se inserta todos los días del periodo por worker y business en el rango de fechas.
+ -- Se inserta todos los días del periodo por worker y business en el rango de fechas.
INSERT IGNORE INTO workerJourney(userFk, dated, businessFk)
SELECT b.workerFk, t.dated, b.id
- FROM business b
+ FROM business b
JOIN time t ON t.dated BETWEEN b.started AND IFNULL(b.ended,util.VN_CURDATE())
WHERE t.dated BETWEEN vDatedFrom AND vDatedTo
AND (vWorkerFk IS NULL OR b.workerFk = vWorkerFk)
ORDER BY b.workerFk, t.dated, b.id;
-
+
DROP TEMPORARY TABLE IF EXISTS tmp.`user`;
IF vWorkerFk THEN
CALL timeControl_calculateByUser(vWorkerFk, vDatedFrom , vDatedTimeTo);
- CREATE TEMPORARY TABLE IF NOT EXISTS tmp.`user`
- SELECT vWorkerFk userFk;
+ CREATE TEMPORARY TABLE IF NOT EXISTS tmp.`user`
+ SELECT vWorkerFk userFk;
ELSE
CALL timeControl_calculateAll(vDatedFrom, vDatedTimeTo);
- CREATE TEMPORARY TABLE IF NOT EXISTS tmp.`user`
+ CREATE TEMPORARY TABLE IF NOT EXISTS tmp.`user`
SELECT id userFk
FROM worker w;
- END IF;
+ END IF;
UPDATE workerJourney wj
JOIN tmp.timeControlCalculate t ON wj.dated = t.dated AND wj.userFk = t.userFk
- SET wj.total = CAST(IF(t.timeWorkDecimal >= vMinHoursToBreak,
- t.timeWorkDecimal - vBreakHours,
+ SET wj.total = CAST(IF(t.timeWorkDecimal >= vMinHoursToBreak,
+ t.timeWorkDecimal - vBreakHours,
t.timeWorkDecimal) AS DECIMAL (10,2)),
wj.lunch = IF(t.timeWorkDecimal >= vMinHoursToBreak , vBreakHours , 0)
WHERE wj.dated BETWEEN vDatedFrom AND vDatedTo
AND NOT wj.isPaid
AND NOT wj.isUpdated
AND (vWorkerFk IS NULL OR wj.userFk = vWorkerFk);
-
- -- NOCTURNIDAD
+
+ -- NOCTURNIDAD
CALL timeControl_getError(vDatedFrom, vDatedTimeTo);
SET @vIsOdd := TRUE;
@@ -75527,9 +75821,9 @@ BEGIN
CREATE TEMPORARY TABLE tmp.workerTimeControl
(INDEX (userFk), INDEX (timed))
ENGINE = MEMORY
- SELECT DISTINCT(wtc.id),
- wtc.userFk,
- wtc.timed,
+ SELECT DISTINCT(wtc.id),
+ wtc.userFk,
+ wtc.timed,
wtc.direction
FROM workerTimeControl wtc
JOIN tmp.`user` w ON w.userFk = wtc.userFk
@@ -75539,10 +75833,10 @@ BEGIN
AND (vWorkerFk IS NULL OR wtc.userFk = vWorkerFk)
ORDER BY wtc.userFk, wtc.timed ASC;
- SELECT MAX(id) INTO @vCont
+ SELECT MAX(id) INTO @vCont
FROM tmp.workerTimeControl;
- DROP TEMPORARY TABLE IF EXISTS tmp.workerTimeControlAux;
+ DROP TEMPORARY TABLE IF EXISTS tmp.workerTimeControlAux;
CREATE TEMPORARY TABLE tmp.workerTimeControlAux (
`id` int(11) ,
`userFk` int(10) unsigned ,
@@ -75564,9 +75858,9 @@ BEGIN
DATE(@lastTimed) dated,
@lastUserFk lastUserFk,
IF(direction ='middle', @vIsOdd := NOT @vIsOdd, FALSE) isOdd,
- IF(@vIsOdd
- AND @lastDirection = 'middle'
- AND (DATE(@lastTimed) <> date(timed)
+ IF(@vIsOdd
+ AND @lastDirection = 'middle'
+ AND (DATE(@lastTimed) <> date(timed)
OR @lastUserFk <> userFk), TRUE, FALSE) hasBreak,
@lastTimed := wtc.timed,
@lastUserFk := userFk,
@@ -75580,16 +75874,16 @@ BEGIN
SET @lastDirection := NULL;
INSERT INTO tmp.workerTimeControlAux (id, userFk, timed, direction)
- SELECT @vCont:= @vCont + 1,
- lastUserFk,
- DATE_ADD(sub.dated, INTERVAL 1 DAY),
+ SELECT @vCont:= @vCont + 1,
+ lastUserFk,
+ DATE_ADD(sub.dated, INTERVAL 1 DAY),
'middle'
FROM (SELECT IF(@lastUserFk <> userFk, @vIsOdd := TRUE, NULL),
DATE(@lastTimed) dated,
@lastUserFk lastUserFk,
IF(direction ='middle', @vIsOdd := NOT @vIsOdd, FALSE) isOdd,
- IF(@vIsOdd
- AND @lastDirection = 'middle'
+ IF(@vIsOdd
+ AND @lastDirection = 'middle'
AND (DATE(@lastTimed)<>date(timed)
OR @lastUserFk<>userFk), TRUE, FALSE) hasBreak,
@lastTimed := wtc.timed,
@@ -75602,7 +75896,7 @@ BEGIN
-- Cambio de dia
INSERT INTO tmp.workerTimeControlAux (id, userFk, timed, direction)
SELECT @vCont:= @vCont + 1,
- wtc.userFk,
+ wtc.userFk,
util.dayEnd(date(wtc.timed)),
'out'
FROM workerTimeControl wtc
@@ -75613,8 +75907,8 @@ BEGIN
GROUP BY wtc.userFk, DATE(wtc.timed);
INSERT INTO tmp.workerTimeControlAux (id, userFk, timed, direction)
- SELECT @vCont:= @vCont + 1,
- wtc.userFk,
+ SELECT @vCont:= @vCont + 1,
+ wtc.userFk,
DATE_ADD(date(wtc.timed), INTERVAL 1 DAY),
'in'
FROM workerTimeControl wtc
@@ -75640,8 +75934,8 @@ BEGIN
IF(@vIsOdd, @vLastTimed:=UNIX_TIMESTAMP(timed),@vLastTimed),
IF(direction='in', @vDated := DATE(wtc.timed), @vDated ) dated,
wtc.userFk,
- IF(UNIX_TIMESTAMP(timed)- @vLastTimed < vMaxTimePerDay,
- workerNigthlyHours_calculate(FROM_UNIXTIME(@vLastTimed), wtc.timed),
+ IF(UNIX_TIMESTAMP(timed)- @vLastTimed < vMaxTimePerDay,
+ workerNigthlyHours_calculate(FROM_UNIXTIME(@vLastTimed), wtc.timed),
0) NigthlyHours,
@lastUserFk := userFk
FROM (SELECT DISTINCT(wtc.id), wtc.userFk, wtc.timed, wtc.direction
@@ -75654,7 +75948,7 @@ BEGIN
) wtc
ORDER BY wtc.userFk, wtc.timed
)sub
- WHERE sub.dated BETWEEN vDatedFrom AND vDatedTo
+ WHERE sub.dated BETWEEN vDatedFrom AND vDatedTo
GROUP BY userFk, sub.dated
)night ON night.userFk = wj.userFk AND night.dated = wj.dated
SET wj.nocturn = night.NigthlyHours
@@ -75666,8 +75960,8 @@ BEGIN
UPDATE workerJourney wj
JOIN business b ON b.id = wj.businessFk
JOIN calendarType ct ON ct.id = b.calendarTypeFk
- SET wj.priceOrdinaryHour =
- (vMonthsByYear * b.amount) /
+ SET wj.priceOrdinaryHour =
+ (vMonthsByYear * b.amount) /
(vWeeksByYear * ct.hoursWeek),
wj.contractJourney = ct.hoursWeek / vDaysByWeek
WHERE wj.dated BETWEEN vDatedFrom AND vDatedTo
@@ -75675,7 +75969,7 @@ BEGIN
AND NOT wj.isPaid
AND NOT isUpdated;
- -- Precio Extras, Vacaciones y Nocturnas
+ -- Precio Extras, Vacaciones y Nocturnas
UPDATE workerJourney wj
JOIN(SELECT MAX(w.dated), t.dated, w.holidayInc, w.nightInc, w.extraInc
FROM time t
@@ -75699,12 +75993,12 @@ BEGIN
WHERE ct.isPartial
AND wj.dated BETWEEN vDatedFrom AND vDatedTo
AND (vWorkerFk IS NULL OR wj.userFk = vWorkerFk)
- AND NOT wj.isPaid
+ AND NOT wj.isPaid
AND NOT wj.isUpdated;
-- Ausencias
UPDATE workerJourney wj
- JOIN businessCalendar bc ON bc.businessFk = wj.businessFk
+ JOIN businessCalendar bc ON bc.businessFk = wj.businessFk
AND bc.dated = wj.dated
JOIN absenceType ab ON ab.id = bc.absenceTypeFk
SET wj.permission = ab.permissionRate * wj.contractJourney,
@@ -75719,7 +76013,7 @@ BEGIN
UPDATE workerJourney
SET holiday = IF(DAYNAME(dated)='sábado', 0, total),
contractJourney = 0
- WHERE DAYNAME(dated) IN ('sábado', 'domingo')
+ WHERE DAYNAME(dated) IN ('sábado', 'domingo')
AND dated BETWEEN vDatedFrom AND vDatedTo
AND (vWorkerFk IS NULL OR userFk = vWorkerFk)
AND NOT isPaid
@@ -75728,8 +76022,8 @@ BEGIN
-- Festivos por centro de trabajo
UPDATE workerJourney wj
JOIN calendarHolidays ch ON ch.dated = wj.dated
- JOIN business b ON b.id = wj.businessFk
- AND b.workcenterFk = ch.workcenterFk
+ JOIN business b ON b.id = wj.businessFk
+ AND b.workcenterFk = ch.workcenterFk
SET wj.holiday = wj.total,
wj.permission = wj.contractJourney,
wj.contractJourney = 0
@@ -75739,7 +76033,7 @@ BEGIN
AND NOT wj.isUpdated;
-- Horas extras
- UPDATE workerJourney
+ UPDATE workerJourney
SET extra = lunch + total - contractJourney
WHERE dated BETWEEN vDatedFrom AND vDatedTo
AND (vWorkerFk IS NULL OR userFk = vWorkerFk)
@@ -75769,15 +76063,15 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `workerMistakeType_get`()
BEGIN
-
+
/**
* Obtiene los tipos de error para los trabajadores
*/
-
- SELECT code, description
- FROM workerMistakeType
+
+ SELECT code, description
+ FROM workerMistakeType
ORDER BY description;
-
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -75804,89 +76098,7 @@ BEGIN
*
*/
INSERT INTO vn.workerMistake(userFk, workerMistakeTypeFk)
- VALUES(vWorkerFk, vWorkerMistakeTypeFk);
-
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `workerTimeControlAdd` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `workerTimeControlAdd`(IN vUserFk INT, IN vWarehouseFk INT, IN vDated DATETIME)
-BEGIN
-
- /*INSERT INTO workerTimeControl(userFk, timed, manual, warehouseFk)
- VALUES(vUserFk, vDated, FALSE, vWarehouseFk);
-
- CALL vn.workerTimeControlSOWP(vUserFk , vDated);*/
-
- CALL vn.workerTimeControl_add(vUserFk,vWarehouseFk,util.VN_NOW(),FALSE);
-
-
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `workerTimeControlPinGenerate` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `workerTimeControlPinGenerate`(
- vWorkerFk INT)
-BEGIN
-/**
- * Create new pin for workerFk or new pin for all workers if vWorkerFk is null
- *
- */
-
-
-
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `workerTimeControlSetOrder` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `workerTimeControlSetOrder`()
-BEGIN
-
- SET @order := 1;
- SET @userFk := 0;
- SET @day := 0;
-
- UPDATE tmp.workerTimeControl
- SET `order` = IF(userFk = @userFk AND day(timed) = @day, @order := @order + 1, @order := 1),
- userFk = @userFk := userFk,
- manual = manual + (0 * @day := day(timed))
- ORDER BY userFk, timed;
+ VALUES(vWorkerFk, vWorkerMistakeTypeFk);
END ;;
DELIMITER ;
@@ -75907,34 +76119,13 @@ DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `workerTimeControlSOWP`(IN vUserFk INT, IN vDated DATE)
BEGIN
SET @order := 0;
-
- UPDATE workerTimeControl
- SET `order` = @order := @order + 1
- WHERE vUserFk =userFk
+
+ UPDATE workerTimeControl
+ SET `order` = @order := @order + 1
+ WHERE vUserFk =userFk
AND vDated = DATE(timed)
ORDER BY timed;
-
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `workerTimeControl_add` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `workerTimeControl_add`(IN vUserFk INT, IN vWarehouseFk INT, IN vTimed DATETIME, IN vIsManual BOOL)
-BEGIN
-
-
- SELECT workerTimeControl_add(vUserFk,vWarehouseFk,vTimed,vIsManual);
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -76021,73 +76212,73 @@ proc: BEGIN
DECLARE vTo VARCHAR(50) DEFAULT NULL;
DECLARE vUserName VARCHAR(50) DEFAULT NULL;
DECLARE vBody VARCHAR(255) DEFAULT NULL;
-
- SELECT dayBreak, weekBreak, weekScope, dayWorkMax, dayStayMax
+
+ SELECT dayBreak, weekBreak, weekScope, dayWorkMax, dayStayMax
INTO vDayBreak, vWeekBreak, vWeekScope, vDayWorkMax, vDayStayMax
FROM workerTimeControlParams;
SELECT MAX(timed) INTO vLastIn
- FROM workerTimeControl
- WHERE userFk = vUserFk
+ FROM workerTimeControl
+ WHERE userFk = vUserFk
AND direction = 'in';
-
+
SELECT MAX(timed) INTO vLastOut
- FROM workerTimeControl
- WHERE userFk = vUserFk
- AND direction = 'out';
+ FROM workerTimeControl
+ WHERE userFk = vUserFk
+ AND direction = 'out';
SELECT CONCAT(u.name,'@verdnatura.es') INTO vTo
FROM account.user u
- WHERE u.id = (SELECT bossFk FROM worker WHERE id = vUserFk);
-
+ WHERE u.id = (SELECT bossFk FROM worker WHERE id = vUserFk);
+
SELECT CONCAT(firstName,' ',lastName) INTO vUserName
FROM worker w
WHERE w.id = vUserFk;
IF UNIX_TIMESTAMP(util.VN_NOW()) - UNIX_TIMESTAMP(vLastIn) > vDayStayMax THEN -- NUEVA JORNADA
-
- -- VERIFICAR DESCANSO DIARIO
- IF UNIX_TIMESTAMP(util.VN_NOW()) - UNIX_TIMESTAMP(vLastOut) < vDayBreak THEN
+
+ -- VERIFICAR DESCANSO DIARIO
+ IF UNIX_TIMESTAMP(util.VN_NOW()) - UNIX_TIMESTAMP(vLastOut) < vDayBreak THEN
SELECT "Descansos 12 h" AS problem;
-- ENVIAMOS CORREO AL BOSSFK
SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"Descansos 12 h") INTO vBody;
CALL mail_insert(vTo,vTo,'error al fichar',vBody);
LEAVE proc;
- END IF;
-
+ END IF;
+
-- VERIFICAR FICHADAS IMPARES DEL ÚLTIMO DÍA QUE SE FICHÓ
- IF (SELECT MOD(COUNT(*),2) -- <>0
- FROM workerTimeControl
+ IF (SELECT MOD(COUNT(*),2) -- <>0
+ FROM workerTimeControl
WHERE userFk = vUserFk
AND timed >= vLastIn
- ) THEN
+ ) THEN
SELECT "Dias con fichadas impares" AS problem;
-- ENVIAMOS CORREO AL BOSSFK
SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"Dias con fichadas impares") INTO vBody;
CALL mail_insert(vTo,vTo,'error al fichar',vBody);
- LEAVE proc;
+ LEAVE proc;
END IF;
-
+
-- VERIFICAR VACACIONES
SELECT at2.name INTO vCalendarStateType
- FROM calendar c
+ FROM calendar c
JOIN business b ON b.id = c.businessFk
JOIN absenceType at2 ON at2.id = c.dayOffTypeFk
WHERE c.dated = util.VN_CURDATE()
AND at2.isAllowedToWork = FALSE
AND b.workerFk = vUserFk
LIMIT 1;
-
+
IF(LENGTH(vCalendarStateType)) THEN
SELECT vCalendarStateType AS problem;
-- ENVIAMOS CORREO AL BOSSFK
SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"Vacaciones") INTO vBody;
CALL mail_insert(vTo,vTo,'error al fichar',vBody);
- LEAVE proc;
-
+ LEAVE proc;
+
END IF;
-
+
-- VERIFICAR CONTRATO EN VIGOR
IF (SELECT COUNT(*)
FROM business b
@@ -76099,44 +76290,44 @@ proc: BEGIN
-- ENVIAMOS CORREO AL BOSSFK
SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"No hay un contrato en vigor") INTO vBody;
CALL mail_insert(vTo,vTo,'error al fichar',vBody);
- LEAVE proc;
-
+ LEAVE proc;
+
END IF;
-- VERIFICAR DESCANSO SEMANAL
SET @vHasBreakWeek:= FALSE;
- SET @vLastTimed:= UNIX_TIMESTAMP((util.VN_NOW() - INTERVAL vWeekScope SECOND));
-
+ SET @vLastTimed:= UNIX_TIMESTAMP((util.VN_NOW() - INTERVAL vWeekScope SECOND));
+
DROP TEMPORARY TABLE IF EXISTS tmp.trash;
CREATE TEMPORARY TABLE tmp.trash
SELECT IF(vWeekBreak-(UNIX_TIMESTAMP(timed)-@vLastTimed) <= 0, @vHasBreakWeek:=TRUE, TRUE) alias,
@vLastTimed:= UNIX_TIMESTAMP(timed)
- FROM workerTimeControl
+ FROM workerTimeControl
WHERE timed>= (util.VN_NOW() - INTERVAL vWeekScope SECOND)
AND userFk= vUserFk
AND direction IN ('in','out')
- ORDER BY timed ASC;
-
- IF UNIX_TIMESTAMP(util.VN_NOW()) - UNIX_TIMESTAMP(vLastOut) < vWeekBreak AND @vHasBreakWeek = FALSE THEN -- REVISA SI EL DESCANSO SE HA REALIZADO DESPUÉS DE LA ÚLTIMA FICHADA
+ ORDER BY timed ASC;
+
+ IF UNIX_TIMESTAMP(util.VN_NOW()) - UNIX_TIMESTAMP(vLastOut) < vWeekBreak AND @vHasBreakWeek = FALSE THEN -- REVISA SI EL DESCANSO SE HA REALIZADO DESPUÉS DE LA ÚLTIMA FICHADA
SELECT "Descansos 36 h" AS problem;
-- ENVIAMOS CORREO AL BOSSFK
SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"Descansos 36 h") INTO vBody;
CALL mail_insert(vTo,vTo,'error al fichar',vBody);
LEAVE proc;
END IF;
+
+ DROP TEMPORARY TABLE tmp.trash;
- DROP TEMPORARY TABLE tmp.trash;
-
- ELSE -- DIA ACTUAL
-
+ ELSE -- DIA ACTUAL
+
-- VERIFICA QUE EL TIEMPO EFECTIVO NO SUPERE EL MÁXIMO
- SELECT IFNULL(SUM(if( mod(wtc.order,2)=1, -UNIX_TIMESTAMP(timed), UNIX_TIMESTAMP(timed))),0) - IF( MOD(COUNT(*),2), UNIX_TIMESTAMP(util.VN_NOW()), 0) INTO vTimedWorked
+ SELECT IFNULL(SUM(if( mod(wtc.order,2)=1, -UNIX_TIMESTAMP(timed), UNIX_TIMESTAMP(timed))),0) - IF( MOD(COUNT(*),2), UNIX_TIMESTAMP(util.VN_NOW()), 0) INTO vTimedWorked
FROM workerTimeControl wtc
- WHERE userFk = vUserFk
+ WHERE userFk = vUserFk
AND timed >= vLastIn
ORDER BY timed;
- IF vTimedWorked > vDayWorkMax THEN
+ IF vTimedWorked > vDayWorkMax THEN
SELECT "Jornadas" AS problem;
-- ENVIAMOS CORREO AL BOSSFK
SELECT CONCAT(vUserName,' No ha podido fichar por el siguiente problema: ',"Jornadas") INTO vBody;
@@ -76159,10 +76350,10 @@ proc: BEGIN
-- ENVIAMOS CORREO AL BOSSFK
SELECT CONCAT(vUserName,' No a podido fichar por el siguiente problema: ',"No perteneces a este departamento.") INTO vBody;
CALL mail_insert(vTo,vTo,'error al fichar',vBody);
- LEAVE proc;
+ LEAVE proc;
END IF;
END IF;*/
-
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -76182,7 +76373,7 @@ DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `workerTimeControl_checkBreak`(vStarted DATE)
BEGIN
/**
- * Retorna los trabajadores que no han respetado el descanso semanal de 36/72 horas
+ * Retorna los trabajadores que no han respetado el descanso semanal de 36/72 horas
* El sistema verificará el descanso corto en la siguiente semana
* o el largo en las 2 siguientes semanas a partir de la fecha dada
* @param vStarted día inicio de la semana en el que se quiere verificar
@@ -76193,27 +76384,27 @@ BEGIN
DECLARE vShortWeekBreak INT;
DECLARE vLongWeekBreak INT;
- SELECT util.dayEnd(DATE_ADD(vStarted, INTERVAL shortWeekDays DAY)),
+ SELECT util.dayEnd(DATE_ADD(vStarted, INTERVAL shortWeekDays DAY)),
util.dayEnd(DATE_ADD(vStarted, INTERVAL longWeekDays DAY)),
- shortWeekBreak,
+ shortWeekBreak,
longWeekBreak
INTO vShortEnded, vLongEnded, vShortWeekBreak, vLongWeekBreak
FROM workerTimeControlConfig;
-
+
SET @previousTimed:= UNIX_TIMESTAMP(vStarted);
SET @lastUserFk := NULL;
-
+
-- Descanso corto en la semana
-
+
DROP TEMPORARY TABLE IF EXISTS tmp.worker;
CREATE TEMPORARY TABLE tmp.worker
(PRIMARY KEY(workerFk))
ENGINE = MEMORY
SELECT DISTINCT userFk workerFk
- FROM workerTimeControl
+ FROM workerTimeControl
WHERE timed BETWEEN vStarted AND vShortEnded
AND direction IN ('in', 'out');
-
+
DROP TEMPORARY TABLE IF EXISTS tmp.worker2;
CREATE TEMPORARY TABLE tmp.worker2
(PRIMARY KEY(workerFk))
@@ -76226,28 +76417,28 @@ BEGIN
SELECT sub2.userFk workerFk
FROM(SELECT sub.userFk,
IF(sub.userFk <> @lastUserFk,
- @previousTimed:= sub.timed,
+ @previousTimed:= sub.timed,
FALSE),
- IF(sub.timed - @previousTimed >= vShortWeekBreak,
- TRUE,
+ IF(sub.timed - @previousTimed >= vShortWeekBreak,
+ TRUE,
FALSE) hasShortWeekBreak,
@previousTimed:= sub.timed,
@lastUserFk:= sub.userFk
FROM (
SELECT userFk, UNIX_TIMESTAMP(timed) timed
- FROM workerTimeControl
+ FROM workerTimeControl
WHERE timed BETWEEN vStarted AND vShortEnded
AND direction IN ('in', 'out')
- UNION
+ UNION
SELECT w.workerFk,
UNIX_TIMESTAMP(IFNULL(
- MIN(wtc.timed),
+ MIN(wtc.timed),
DATE_ADD(vShortEnded, INTERVAL vShortWeekBreak SECOND)))
FROM tmp.worker w
- LEFT JOIN workerTimeControl wtc
- ON wtc.userFk = w.workerFk
- AND wtc.timed BETWEEN vShortEnded
- AND DATE_ADD(vShortEnded, INTERVAL vShortWeekBreak SECOND)
+ LEFT JOIN workerTimeControl wtc
+ ON wtc.userFk = w.workerFk
+ AND wtc.timed BETWEEN vShortEnded
+ AND DATE_ADD(vShortEnded, INTERVAL vShortWeekBreak SECOND)
GROUP BY w.workerFk
UNION
SELECT w.workerFk,
@@ -76255,10 +76446,10 @@ BEGIN
MAX(wtc.timed),
DATE_SUB(vStarted, INTERVAL vShortWeekBreak SECOND)))
FROM tmp.worker2 w
- LEFT JOIN workerTimeControl wtc
- ON wtc.userFk = w.workerFk
- AND wtc.timed BETWEEN
- DATE_SUB(vStarted, INTERVAL vShortWeekBreak SECOND)
+ LEFT JOIN workerTimeControl wtc
+ ON wtc.userFk = w.workerFk
+ AND wtc.timed BETWEEN
+ DATE_SUB(vStarted, INTERVAL vShortWeekBreak SECOND)
AND vStarted
GROUP BY w.workerFk
ORDER BY userFk, timed
@@ -76268,7 +76459,7 @@ BEGIN
GROUP BY sub2.userFk
HAVING NOT SUM(hasShortWeekBreak);
- -- Descanso largo en las 2 siguientes semanas
+ -- Descanso largo en las 2 siguientes semanas
DROP TEMPORARY TABLE tmp.worker;
CREATE TEMPORARY TABLE tmp.worker
(PRIMARY KEY(workerFk))
@@ -76288,12 +76479,12 @@ BEGIN
(PRIMARY KEY(workerFk))
ENGINE = MEMORY
SELECT sub2.userFk workerFk
- FROM(SELECT userFk,
+ FROM(SELECT userFk,
IF(userFk <> @lastUserFk,
- @previousTimed:= timed,
+ @previousTimed:= timed,
TRUE),
- IF(timed - @previousTimed >= vLongWeekBreak,
- TRUE,
+ IF(timed - @previousTimed >= vLongWeekBreak,
+ TRUE,
FALSE) hasLongWeekBreak,
@previousTimed:= timed,
@lastUserFk:= userFk
@@ -76302,24 +76493,24 @@ BEGIN
JOIN tmp.workerWithoutShortWeekBreak wws ON wws.workerFk = wtc.userFk
WHERE timed BETWEEN vStarted AND vLongEnded
AND direction IN ('in', 'out')
- UNION
+ UNION
SELECT w.workerFk,
- UNIX_TIMESTAMP(IFNULL(MIN(wtc.timed),
+ UNIX_TIMESTAMP(IFNULL(MIN(wtc.timed),
DATE_ADD(vLongEnded, INTERVAL vLongWeekBreak SECOND)))
FROM tmp.worker w
- LEFT JOIN workerTimeControl wtc
- ON wtc.userFk = w.workerFk
- AND timed BETWEEN vLongEnded
- AND DATE_ADD(vLongEnded, INTERVAL vLongWeekBreak SECOND)
+ LEFT JOIN workerTimeControl wtc
+ ON wtc.userFk = w.workerFk
+ AND timed BETWEEN vLongEnded
+ AND DATE_ADD(vLongEnded, INTERVAL vLongWeekBreak SECOND)
GROUP BY w.workerFk
UNION
- SELECT w.workerFk,
- UNIX_TIMESTAMP(IFNULL(MAX(wtc.timed),
+ SELECT w.workerFk,
+ UNIX_TIMESTAMP(IFNULL(MAX(wtc.timed),
DATE_SUB(vStarted, INTERVAL vLongWeekBreak SECOND)))
FROM tmp.worker2 w
- LEFT JOIN workerTimeControl wtc
- ON wtc.userFk = w.workerFk
- AND timed BETWEEN DATE_SUB(vStarted, INTERVAL vLongWeekBreak SECOND)
+ LEFT JOIN workerTimeControl wtc
+ ON wtc.userFk = w.workerFk
+ AND timed BETWEEN DATE_SUB(vStarted, INTERVAL vLongWeekBreak SECOND)
AND vStarted
GROUP BY w.workerFk
ORDER BY userFk, timed
@@ -76347,31 +76538,36 @@ DELIMITER ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `workerTimeControl_clockIn`(
- vWorker INT,
+ vWorkerFk INT,
vTimed DATETIME,
- vDirection VARCHAR(10))
+ vDirection VARCHAR(10),
+ vDevice VARCHAR(255)
+)
BEGIN
/**
- * Verifica si el empleado puede fichar
- * @param vWorker Identificador del trabajador
- * @param vTimed valor de la fichada, IF vTimed IS NULL vTimed = NOW
- * @param vDirection solo se pueden pasa los valores del campo
- * workerTimeControl.direction ENUM('in', 'out', 'middle')
- * @return Si todo es correcto, retorna el número de id la tabla workerTimeControl.
- * Si hay algún problema, devuelve el mesaje a que se debe mostrar al usuario
- * Solo retorna el primer problema, en caso de no ocurrir ningún error se añadirá
- * fichada a la tabla vn.workerTimeControl
- */
+* Verifica si el empleado puede fichar
+* @param vWorkerFk Identificador del trabajador
+* @param vTimed Balor de la fichada, IF vTimed IS NULL vTimed = NOW
+* @param vDirection Solo se pueden pasa los valores del campo
+* workerTimeControl.direction ENUM('in', 'out', 'middle')
+* @param vDevice Dispositivo en el que se ha fichado
+* @return Si todo es correcto, retorna el número de id la tabla workerTimeControl.
+* Si hay algún problema, devuelve el mesaje que se debe mostrar al usuario
+* Solo retorna el primer problema, en caso de no ocurrir ningún error se añadirá
+* fichada a la tabla vn.workerTimeControl
+*/
+
DECLARE vLastIn DATETIME;
DECLARE vLastOut DATETIME;
DECLARE vNextIn DATETIME;
- DECLARE vLastDirection VARCHAR(6);
- DECLARE vNextDirection VARCHAR(6);
+ DECLARE vNextOut DATETIME;
+ DECLARE vNextDirection ENUM('in', 'out');
+ DECLARE vLastDirection ENUM('in', 'out');
+ DECLARE vDayMaxTime INTEGER;
DECLARE vDayBreak INT;
DECLARE vShortWeekBreak INT;
DECLARE vLongWeekBreak INT;
DECLARE vWeekScope INT;
- DECLARE vGap INT;
DECLARE vMailTo VARCHAR(50) DEFAULT NULL;
DECLARE vUserName VARCHAR(50) DEFAULT NULL;
DECLARE vIsError BOOLEAN DEFAULT FALSE;
@@ -76379,152 +76575,81 @@ BEGIN
DECLARE vErrorCode VARCHAR(50);
DECLARE vDated DATE;
DECLARE vIsAllowedToWork VARCHAR(50);
- DECLARE vDepartmentFk INT;
- DECLARE vTimedLoop BIGINT;
- DECLARE vTimedLoopPrevious BIGINT;
- DECLARE vHasBreakWeek BOOLEAN DEFAULT FALSE;
- DECLARE vManual BOOLEAN DEFAULT TRUE;
- DECLARE vDone INT DEFAULT FALSE;
-
- DECLARE vCursor CURSOR FOR
- SELECT UNIX_TIMESTAMP(vTimed) timed
- UNION
- SELECT UNIX_TIMESTAMP(timed)
- FROM workerTimeControl
- WHERE timed BETWEEN (vTimed - INTERVAL vGap SECOND) AND vTimed
- AND userFk = vWorker
- AND direction IN ('in', 'out')
- ORDER BY timed ASC;
-
- DECLARE vCursor2 CURSOR FOR
- SELECT UNIX_TIMESTAMP(vTimed) timed
- UNION
- SELECT UNIX_TIMESTAMP(timed)
- FROM workerTimeControl
- WHERE timed BETWEEN vTimed AND (vTimed + INTERVAL vGap SECOND)
- AND userFk = vWorker
- AND direction IN ('in', 'out')
- ORDER BY timed ASC;
-
- DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
+ DECLARE vIsManual BOOLEAN DEFAULT TRUE;
+ DECLARE vMaxWorkShortCycle INT;
+ DECLARE vMaxWorkLongCycle INT;
DECLARE EXIT HANDLER FOR SQLSTATE '45000'
BEGIN
- SELECT CONCAT(u.name, '@verdnatura.es'),
+ SELECT CONCAT(u.name, '@verdnatura.es'),
CONCAT(w.firstName, ' ', w.lastName)
INTO vMailTo, vUserName
FROM account.user u
JOIN worker w ON w.bossFk = u.id
- WHERE w.id = vWorker;
+ WHERE w.id = vWorkerFk;
- CASE vErrorCode
- WHEN 'IS_NOT_ALLOWED_FUTURE' THEN
- SELECT 'No se permite fichar a futuro' INTO vErrorMessage;
- WHEN 'INACTIVE_BUSINESS' THEN
- SELECT 'No hay un contrato en vigor' INTO vErrorMessage;
- WHEN 'IS_NOT_ALLOWED_WORK' THEN
- SELECT 'No está permitido trabajar' INTO vErrorMessage;
- WHEN 'ODD_WORKERTIMECONTROL' THEN
- SELECT 'Fichadas impares' INTO vErrorMessage;
- WHEN 'BREAK_DAY' THEN
- SELECT CONCAT('Descanso diario ', FORMAT(vDayBreak/3600, 0), 'h.')
- INTO vErrorMessage;
- WHEN 'BREAK_WEEK' THEN
- SELECT CONCAT('Descanso semanal ',
- FORMAT(vShortWeekBreak / 3600,0) ,'h. / ',
- FORMAT(vLongWeekBreak / 3600, 0) ,'h.') INTO vErrorMessage;
- WHEN 'WRONG_DIRECTION' THEN
- SELECT 'Dirección incorrecta' INTO vErrorMessage;
- ELSE
- SELECT 'Error sin definir'INTO vErrorMessage;
- END CASE;
+ SELECT `description` INTO vErrorMessage
+ FROM workerTimeControlError
+ WHERE `code` = vErrorCode;
+
+ IF vErrorMessage IS NULL THEN
+ SET vErrorMessage = 'Error sin definir';
+ END IF;
SELECT vErrorMessage `error`;
SELECT CONCAT(vUserName,
' no ha podido fichar por el siguiente problema: ',
vErrorMessage)
INTO vErrorMessage;
+
CALL mail_insert( vMailTo, vMailTo, 'Error al fichar', vErrorMessage);
-
END;
IF (vTimed IS NULL) THEN
SET vTimed = util.VN_NOW();
- SET vManual = FALSE;
+ SET vIsManual = FALSE;
END IF;
SET vDated = DATE(vTimed);
- SELECT IF(pc.name = 'Conductor +3500kg',
+ SELECT IF(pc.code = 'driverCE',
wc.dayBreakDriver,
wc.dayBreak),
wc.shortWeekBreak,
wc.longWeekBreak,
- wc.weekScope
+ wc.weekScope,
+ wc.dayMaxTime,
+ wc.maxWorkShortCycle,
+ wc.maxWorkLongCycle
INTO vDayBreak,
vShortWeekBreak,
vLongWeekBreak,
- vWeekScope
+ vWeekScope,
+ vDayMaxTime,
+ vMaxWorkShortCycle,
+ vMaxWorkLongCycle
FROM business b
JOIN professionalCategory pc
ON pc.id = b.workerBusinessProfessionalCategoryFk
- JOIN workerTimeControlConfig wc ON TRUE
- WHERE b.workerFk = vWorker
+ JOIN workerTimeControlConfig wc
+ WHERE b.workerFk = vWorkerFk
AND vDated BETWEEN b.started AND IFNULL(b.ended, vDated);
-
- SELECT timed INTO vLastIn
- FROM workerTimeControl
- WHERE userFk = vWorker
- AND direction = 'in'
- AND timed < vTimed
- ORDER BY timed DESC
- LIMIT 1;
-
- SELECT timed INTO vLastOut
- FROM workerTimeControl
- WHERE userFk = vWorker
- AND direction = 'out'
- AND timed < vTimed
- ORDER BY timed DESC
- LIMIT 1;
-
- SELECT timed INTO vNextIn
- FROM workerTimeControl
- WHERE userFk = vWorker
- AND direction = 'in'
- AND timed > vTimed
- ORDER BY timed ASC
- LIMIT 1;
-
- SELECT direction INTO vNextDirection
- FROM workerTimeControl
- WHERE userFk = vWorker
- AND timed > vTimed
- ORDER BY timed ASC
- LIMIT 1;
-
- SELECT direction INTO vLastDirection
- FROM workerTimeControl
- WHERE userFk = vWorker
- AND timed < vTimed
- ORDER BY timed DESC
- LIMIT 1;
-
- -- FICHADAS A FUTURO
- IF vTimed > DATE_ADD(util.VN_NOW(), INTERVAL 60 SECOND) THEN
- SET vErrorCode = 'IS_NOT_ALLOWED_FUTURE';
- CALL util.throw(vErrorCode);
- END IF;
-
+
-- CONTRATO EN VIGOR
IF vDayBreak IS NULL THEN
SET vErrorCode = 'INACTIVE_BUSINESS';
CALL util.throw(vErrorCode);
END IF;
-
+
+ -- FICHADAS A FUTURO
+ IF vTimed > util.VN_NOW() + INTERVAL 1 MINUTE THEN
+ SET vErrorCode = 'IS_NOT_ALLOWED_FUTURE';
+ CALL util.throw(vErrorCode);
+ END IF;
+
-- VERIFICAR SI ESTÁ PERMITIDO TRABAJAR
- CALL timeBusiness_calculateByWorker(vWorker, vDated, vDated);
+ CALL timeBusiness_calculateByWorker(vWorkerFk, vDated, vDated);
SELECT isAllowedToWork INTO vIsAllowedToWork
FROM tmp.timeBusinessCalculate;
DROP TEMPORARY TABLE tmp.timeBusinessCalculate;
@@ -76535,7 +76660,7 @@ BEGIN
END IF;
-- DIRECCION CORRECTA
- CALL workerTimeControl_direction(vWorker, vTimed);
+ CALL workerTimeControl_direction(vWorkerFk, vTimed);
IF (SELECT
IF(IF(option1 IN ('inMiddle', 'outMiddle'),
'middle',
@@ -76549,26 +76674,50 @@ BEGIN
) THEN
SET vIsError = TRUE;
END IF;
-
+
DROP TEMPORARY TABLE tmp.workerTimeControlDirection;
- IF vIsError = TRUE THEN
+ IF vIsError THEN
SET vErrorCode = 'WRONG_DIRECTION';
CALL util.throw(vErrorCode);
END IF;
-- FICHADAS IMPARES
+ SELECT timed INTO vLastIn
+ FROM workerTimeControl
+ WHERE userFk = vWorkerFk
+ AND direction = 'in'
+ AND timed < vTimed
+ ORDER BY timed DESC
+ LIMIT 1;
+
IF (SELECT IF(vDirection = 'in',
MOD(COUNT(*), 2) ,
IF (vDirection = 'out', NOT MOD(COUNT(*), 2), FALSE))
FROM workerTimeControl
- WHERE userFk = vWorker
+ WHERE userFk = vWorkerFk
AND timed BETWEEN vLastIn AND vTimed
) THEN
SET vErrorCode = 'ODD_WORKERTIMECONTROL';
CALL util.throw(vErrorCode);
END IF;
-
+
-- DESCANSO DIARIO
+ SELECT timed INTO vLastOut
+ FROM workerTimeControl
+ WHERE userFk = vWorkerFk
+ AND direction = 'out'
+ AND timed < vTimed
+ ORDER BY timed DESC
+ LIMIT 1;
+
+ SELECT timed INTO vNextIn
+ FROM workerTimeControl
+ WHERE userFk = vWorkerFk
+ AND direction = 'in'
+ AND timed > vTimed
+ ORDER BY timed ASC
+ LIMIT 1;
+
CASE vDirection
WHEN 'in' THEN
IF UNIX_TIMESTAMP(vTimed) - UNIX_TIMESTAMP(vLastOut) <= vDayBreak THEN
@@ -76586,94 +76735,93 @@ BEGIN
CALL util.throw(vErrorCode);
END IF;
- -- VERIFICAR DESCANSO SEMANAL
- IF (vDirection IN('in', 'out')) THEN
- -- VERIFICA DESCANSO CORTO EN LA ÚLTIMA SEMANA
- SET vGap = vWeekScope;
- SET vTimedLoopPrevious = UNIX_TIMESTAMP((vTimed - INTERVAL vGap SECOND));
- SET vDone = FALSE;
- OPEN vCursor;
- l:LOOP
- FETCH vCursor INTO vTimedLoop;
- IF vDone THEN
- LEAVE l;
- END IF;
- IF vShortWeekBreak - (vTimedLoop - vTimedLoopPrevious) <= 0 THEN
- SET vHasBreakWeek = TRUE;
- LEAVE l;
- END IF;
- SET vTimedLoopPrevious = vTimedLoop;
- END LOOP l;
- CLOSE vCursor;
- -- VERIFICA DESCANSO LARGO EN LA ÚLTIMAS 2 SEMANAS
- IF NOT vHasBreakWeek THEN
- SET vGap = vWeekScope * 2;
- SET vTimedLoopPrevious = UNIX_TIMESTAMP(vTimed - INTERVAL vGap SECOND);
- SET vDone = FALSE;
- OPEN vCursor;
- l:LOOP
- FETCH vCursor INTO vTimedLoop;
- IF vDone THEN
- LEAVE l;
- END IF;
- IF vLongWeekBreak - (vTimedLoop - vTimedLoopPrevious) <= 0 THEN
- SET vHasBreakWeek = TRUE;
- LEAVE l;
- END IF;
- SET vTimedLoopPrevious = vTimedLoop;
- END LOOP l;
- CLOSE vCursor;
- END IF;
- IF vManual THEN
- -- VERIFICA DESCANSO CORTO EN LA PRÓXIMA SEMANA
- SET vGap = vWeekScope;
- SET vTimedLoopPrevious = vTimed;
- SET vDone = FALSE;
- OPEN vCursor2;
- l:LOOP
- FETCH vCursor2 INTO vTimedLoop;
- IF vDone THEN
- LEAVE l;
- END IF;
- IF vShortWeekBreak - (vTimedLoop - vTimedLoopPrevious) <= 0 THEN
- SET vHasBreakWeek = TRUE;
- LEAVE l;
- END IF;
- SET vTimedLoopPrevious = vTimedLoop;
- END LOOP l;
- CLOSE vCursor2;
- -- VERIFICA DESCANSO LARGO EN LAS PRÓXIMAS 2 SEMANAS
- IF NOT vHasBreakWeek THEN
- SET vGap = vWeekScope * 2;
- SET vTimedLoopPrevious = vTimed;
- SET vDone = FALSE;
- OPEN vCursor2;
- l:LOOP
- FETCH vCursor2 INTO vTimedLoop;
- IF vDone THEN
- LEAVE l;
- END IF;
- IF vShortWeekBreak - (vTimedLoop - vTimedLoopPrevious) <= 0 THEN
- SET vHasBreakWeek = TRUE;
- LEAVE l;
- END IF;
- SET vTimedLoopPrevious = vTimedLoop;
- END LOOP l;
- CLOSE vCursor2;
- END IF;
+
+ IF (vDirection IN('in', 'out')) THEN
+ -- VERIFICA MAXIMO TIEMPO DESDE ENTRADA HASTA LA SALIDA
+
+ SELECT timed INTO vNextOut
+ FROM workerTimeControl
+ WHERE userFk = vWorkerFk
+ AND direction = 'out'
+ AND timed > vTimed
+ ORDER BY timed ASC
+ LIMIT 1;
+
+ SELECT direction INTO vNextDirection
+ FROM workerTimeControl
+ WHERE userFk = vWorkerFk
+ AND direction IN('in','out')
+ AND timed > vTimed
+ ORDER BY timed ASC
+ LIMIT 1;
+
+ SELECT direction INTO vLastDirection
+ FROM workerTimeControl
+ WHERE userFk = vWorkerFk
+ AND direction IN('in', 'out')
+ AND timed < vTimed
+ ORDER BY timed ASC
+ LIMIT 1;
+
+ IF (vDirection ='in'
+ AND vNextDirection = 'out'
+ AND UNIX_TIMESTAMP(vNextOut) - UNIX_TIMESTAMP(vTimed) > vDayMaxTime) OR
+ (vDirection ='out'
+ AND vLastDirection = 'in'
+ AND UNIX_TIMESTAMP(vTimed) -UNIX_TIMESTAMP(vLastIn) > vDayMaxTime) THEN
+ SET vErrorCode = 'DAY_MAX_TIME';
+ CALL util.throw(vErrorCode);
END IF;
- IF NOT vHasBreakWeek THEN
+
+ -- VERIFICA DESCANSO SEMANAL
+
+ WITH wtc AS(
+ (SELECT timed
+ FROM vn.workerTimeControl
+ WHERE userFk = vWorkerFk
+ AND direction IN ('in', 'out')
+ AND timed BETWEEN vTimed - INTERVAL (vWeekScope * 2) SECOND
+ AND vTimed + INTERVAL (vWeekScope * 2) SECOND )
+ UNION
+ (SELECT vTimed)
+ ), wtcGap AS(
+ SELECT timed,
+ TIMESTAMPDIFF(SECOND, LAG(timed) OVER (ORDER BY timed), timed) gap
+ FROM wtc
+ ORDER BY timed
+ ), wtcBreak AS(
+ SELECT timed,
+ IF(IFNULL(gap, 0) > vShortWeekBreak, TRUE, FALSE) hasShortBreak,
+ IF(IFNULL(gap, 0) > vLongWeekBreak, TRUE, FALSE) hasLongBreak
+ FROM wtcGap
+ ORDER BY timed
+ ), wtcBreakCounter AS(
+ SELECT timed,
+ SUM(hasShortBreak) OVER (ORDER BY timed) breakCounter ,
+ LEAD(hasLongBreak) OVER (ORDER BY timed) nextHasLongBreak
+ FROM wtcBreak
+ )SELECT TIMESTAMPDIFF(SECOND, MIN(timed), MAX(timed)) > vMaxWorkLongCycle OR
+ (TIMESTAMPDIFF(SECOND, MIN(timed), MAX(timed))> vMaxWorkShortCycle
+ AND NOT SUM(IFNULL(nextHasLongBreak, 1)))
+ hasError INTO vIsError
+ FROM wtcBreakCounter
+ GROUP BY breakCounter
+ HAVING hasError
+ LIMIT 1;
+
+ IF vIsError THEN
SET vErrorCode = 'BREAK_WEEK';
CALL util.throw(vErrorCode);
END IF;
END IF;
- -- SE PERMITE FICHAR
- INSERT INTO workerTimeControl(userFk, timed, direction, manual)
- VALUES(vWorker, vTimed, vDirection, vManual);
+ -- Se permite fichar
+ INSERT INTO workerTimeControl(userFk, timed, direction, device, `manual`)
+ VALUES(vWorkerFk, vTimed, vDirection, vDevice, vIsManual);
SELECT LAST_INSERT_ID() id;
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -76696,27 +76844,27 @@ BEGIN
* Devuelve que direcciones de fichadas son lógicas a partir de la anterior fichada
* @param vWorkerFk Identificador del trabajador
* @return (option1, option2)
- * Los valores posibles de retorno son ('in', 'inMiddle', 'outMiddle', 'out')
+ * Los valores posibles de retorno son ('in', 'inMiddle', 'outMiddle', 'out')
*/
DECLARE vLastIn DATETIME ;
DECLARE vIsMiddleOdd BOOLEAN ;
- IF (vTimed IS NULL) THEN
+ IF (vTimed IS NULL) THEN
SET vTimed = util.VN_NOW();
END IF;
-
+
SELECT timed INTO vLastIn
- FROM workerTimeControl
+ FROM workerTimeControl
WHERE userFk = vWorkerFk
- AND direction = 'in'
+ AND direction = 'in'
AND timed < vTimed
ORDER BY timed DESC
LIMIT 1;
-
+
SELECT (COUNT(*)mod 2 = 1) INTO vIsMiddleOdd
- FROM workerTimeControl
+ FROM workerTimeControl
WHERE userFk = vWorkerFk
- AND direction = 'middle'
+ AND direction = 'middle'
AND timed BETWEEN vLastIn AND util.VN_NOW();
DROP TEMPORARY TABLE IF EXISTS tmp.workerTimeControlDirection;
@@ -76765,7 +76913,7 @@ DELIMITER ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `workerTimeControl_getClockIn`(
- vUserFk INT,
+ vUserFk INT,
vDated DATE)
BEGIN
/**
@@ -76775,9 +76923,9 @@ BEGIN
* @param vDated Fecha proporcionada
*/
CALL timeControl_calculateByWorker(
- vUserFk,
+ vUserFk,
DATE_SUB(vDated, INTERVAL 6 DAY), util.dayEnd(vDated));
-
+
SET @position := 0;
SET @lastDated := NULL;
@@ -76794,7 +76942,7 @@ BEGIN
MAX(2daysAgoDirection) 2daysAgoDirection,
MAX(1daysAgo) 1daysAgo,
MAX(1daysAgoDirection) 1daysAgoDirection,
- MAX(0daysAgo) 0daysAgo,
+ MAX(0daysAgo) 0daysAgo,
MAX(0daysAgoDirection) 0daysAgoDirection
FROM(SELECT IF(daysAgo = 6, timed, '') 6daysAgo,
IF(daysAgo = 5, timed, '') 5daysAgo,
@@ -76814,7 +76962,7 @@ BEGIN
direction,
position
FROM(SELECT DATEDIFF(vDated, timed) daysAgo,
- TIME_FORMAT(timed,'%H:%i') timed,
+ TIME_FORMAT(timed,'%H:%i') timed,
IF(DATE(timed) <> @lastDated, @position := 0, NULL),
@position := @position+1 position,
@lastDated := DATE(timed),
@@ -76826,18 +76974,18 @@ BEGIN
LIMIT 10000000000000000000
)sub
)sub2
- GROUP BY position) sub3
+ GROUP BY position) sub3
JOIN (SELECT MAX(IF(daysAgo = 6, timeWorkSeconds, 0)) 6daysAgoTotal,
MAX(IF(daysAgo = 5, timeWorkSeconds, 0)) 5daysAgoTotal,
MAX(IF(daysAgo = 4, timeWorkSeconds, 0)) 4daysAgoTotal,
MAX(IF(daysAgo = 3, timeWorkSeconds, 0)) 3daysAgoTotal,
MAX(IF(daysAgo = 2, timeWorkSeconds, 0)) 2daysAgoTotal,
MAX(IF(daysAgo = 1, timeWorkSeconds, 0)) 1daysAgoTotal,
- MAX(IF(daysAgo = 0, timeWorkSeconds, 0)) 0daysAgoTotal
+ MAX(IF(daysAgo = 0, timeWorkSeconds, 0)) 0daysAgoTotal
FROM (SELECT DATEDIFF(vDated, dated) daysAgo,
timeWorkSeconds
FROM tmp.timeControlCalculate) sub4)sub5 ON TRUE;
-
+
DROP TEMPORARY TABLE tmp.timeControlCalculate;
END ;;
DELIMITER ;
@@ -76901,97 +77049,45 @@ BEGIN
DECLARE vDirectionPrevious VARCHAR(6);
DECLARE vTimedPrevious DATETIME;
- SELECT direction INTO vDirectionRemove
- FROM vn.workerTimeControl
- WHERE userFk = vUserFk
+ SELECT direction INTO vDirectionRemove
+ FROM vn.workerTimeControl
+ WHERE userFk = vUserFk
AND timed = vTimed ;
IF vDirectionRemove = 'out' THEN
-
+
SELECT timed, direction INTO vTimedPrevious, vDirectionPrevious
- FROM vn.workerTimeControl
- WHERE userFk = vUserFk
+ FROM vn.workerTimeControl
+ WHERE userFk = vUserFk
AND timed < vTimed
ORDER BY timed DESC
- LIMIT 1;
-
+ LIMIT 1;
+
IF vDirectionPrevious = "middle" THEN
- UPDATE vn.workerTimeControl
+ UPDATE vn.workerTimeControl
SET direction = "out"
WHERE userFk = vUserFk
AND timed = vTimedPrevious;
END IF;
-
+
ELSE IF vDirectionRemove = 'in' THEN
- UPDATE vn.workerTimeControl
+ UPDATE vn.workerTimeControl
SET direction = "in"
WHERE userFk = vUserFk
AND timed > vTimed
ORDER BY timed ASC
- LIMIT 1;
+ LIMIT 1;
END IF;
-
+
END IF;
-
+
DELETE FROM vn.workerTimeControl
- WHERE userFk = vUserFk
+ WHERE userFk = vUserFk
AND timed = vTimed;
-
+
CALL vn.workerTimeControlSOWP(vUserFk, vTimed);
-
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `workerTimeControl_repair` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `workerTimeControl_repair`()
-proc: BEGIN
-/**
- * Corrige las fichadas
- *
- */
-
-/*1- poner todos a middle*/
-UPDATE vn.workerTimeControl SET direction = 'middle';
-
-/*2- poner los out*/
-UPDATE vn.workerTimeControl wtc
- JOIN
- (SELECT userFk,MAX(timed) maxTimed FROM
- (SELECT id, userFk, timed, date(timed) dated
- FROM vn.workerTimeControl
- ) sub
- GROUP BY userFk,dated
- )sub
- SET direction = "out"
- WHERE wtc.userFk = sub.userFk
- AND wtc.timed = sub.maxTimed;
-
- /*3- poner los in*/
-UPDATE vn.workerTimeControl wtc
- JOIN
- (SELECT userFk,MIN(timed) maxTimed FROM
- (SELECT id, userFk, timed, date(timed) dated
- FROM vn.workerTimeControl
- ) sub
- GROUP BY userFk,dated
- )sub
- SET direction = "in"
- WHERE wtc.userFk = sub.userFk
- AND wtc.timed = sub.maxTimed ;
-
+
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -77064,7 +77160,7 @@ BEGIN
AND w.businessFk
GROUP BY tm.userFk,t.dated
ORDER BY tm.userFk,t.dated;
-
+
INSERT INTO vn.mail (receiver, replyTo, subject, body)
SELECT eu.email, 'laboral@verdnatura.es', CONCAT('Registro de horas semana ', WEEK(vDatedFrom), ' año ', YEAR(vDatedFrom)) ,
CONCAT('
@@ -77156,7 +77252,7 @@ BEGIN
IF (DAYNAME(util.VN_CURDATE()) = 'miércoles') THEN
SELECT DATE_SUB(util.VN_CURDATE(), INTERVAL 9 DAY), CONCAT(DATE_SUB(util.VN_CURDATE(), INTERVAL 3 DAY), ' 23:59:59') INTO vDatedFrom, vDatedTo;
-
+
CALL vn.workerTimeControl_sendMailByDepartment(vDatedFrom, vDatedTo, NULL);
END IF;
END ;;
@@ -77167,34 +77263,6 @@ DELIMITER ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `workerTimeControl_setOrder` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8mb4 */ ;
-/*!50003 SET character_set_results = utf8mb4 */ ;
-/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
-DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `workerTimeControl_setOrder`(vUserFk INT, vStarted DATE, vFinished DATE)
-BEGIN
-
- SET @order := 0;
- SET @day := '2000-01-01';
-
- UPDATE vn.workerTimeControl w
- SET w.`order` = @order := IF(@day = @day := date(timed), @order, 0) + 1
- WHERE w.userFk = vUserFk
- AND w.timed BETWEEN vStarted AND util.dayend(vFinished)
- ORDER BY w.timed;
-
-END ;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `workerTimeControl_weekCheckBreak` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
@@ -77206,9 +77274,9 @@ DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `workerTimeControl_weekCheckBreak`(vStarted DATE, vEnded DATE)
BEGIN
/**
- * Retorna los trabajadores que no han respetado el descanso semanal de 36/72 horas
- * El sistema verificará el descanso corto en la siguiente semana
- * o el largo en las 2 siguientes semanas a partir de las fechas dadas
+ * Retorna los trabajadores que no han respetado el descanso semanal de 36/72 horas
+ * El sistema verificará el descanso corto en la siguiente semana
+ * o el largo en las 2 siguientes semanas a partir de las fechas dadas
* @param vStarted día inicio para verificar
* @param vEnded día final para verificar
* @return tmp.workerWithoutWeekBreak (workerFk)
@@ -77230,10 +77298,10 @@ BEGIN
CALL workerTimeControl_checkBreak(vStarted);
INSERT IGNORE INTO tmp.workerWithoutWeekBreakInWeek
- SELECT workerFk
+ SELECT workerFk
FROM tmp.workerWithoutWeekBreak;
DROP TEMPORARY TABLE IF EXISTS tmp.workerWithoutWeekBreak;
- SET vStarted = DATE_ADD(vStarted, INTERVAL 1 DAY);
+ SET vStarted = DATE_ADD(vStarted, INTERVAL 1 DAY);
END WHILE;
END ;;
@@ -77271,7 +77339,7 @@ BEGIN
DECLARE vDepartmentFk INT;
DECLARE isEnabled BOOLEAN DEFAULT TRUE;
- SELECT COUNT(*) INTO vHasSignedToday
+ SELECT COUNT(*) INTO vHasSignedToday
FROM workerTimeControl WHERE timed >= vDated AND userFk = vUserFk;
SET @day := 0;
@@ -77284,16 +77352,16 @@ BEGIN
SELECT fichada_anterior, fichada_actual, interval_in_minutes, jornadas
FROM
(
- SELECT @lastTimed fichada_anterior,
+ SELECT @lastTimed fichada_anterior,
timed,
CAST(time_to_sec(timediff(timed,@lastTimed )) / 60 AS UNSIGNED) as interval_in_minutes,
IF(day(timed) != @day, 1, 0) as jornadas,
@day := day(timed) dia_del_mes,
- @lastTimed := timed fichada_actual
+ @lastTimed := timed fichada_actual
FROM
(
SELECT day(timed) as dayNumber, dayname(timed) as dayName, timed
- FROM
+ FROM
(SELECT TIMESTAMPADD(DAY, -11, util.VN_NOW()) as timed, vUserFk as userFk -- Fichada virtual para los en los que no se ha trabajado la semana anterior
UNION ALL
SELECT timed, userFk
@@ -77301,18 +77369,18 @@ BEGIN
WHERE userFk = vUserFk
AND timed >= TIMESTAMPADD(DAY, -10,vDated)
UNION ALL
- SELECT IF(vHasSignedToday, '2000-01-01 00:00', util.VN_NOW()) as timed, vUserFk
+ SELECT IF(vHasSignedToday, '2000-01-01 00:00', util.VN_NOW()) as timed, vUserFk
) sub4
ORDER BY timed
) sub
-
+
) sub2
WHERE fichada_actual >= TIMESTAMPADD(WEEK, -1, vDated)
) sub3 ;
SELECT IFNULL(SUM(impar),0) into vImpares
FROM (
- SELECT day(timed) as dayNumber,
+ SELECT day(timed) as dayNumber,
count(*) mod 2 as impar
FROM vn.workerTimeControl wtc
WHERE userFk = vUserFk
@@ -77329,29 +77397,29 @@ BEGIN
AND at2.isAllowedToWork = FALSE
AND b.workerFk = vUserFk
LIMIT 1;
-
+
-- Contrato en vigor
SELECT IF(COUNT(*),vCantWork,'Sin contrato') INTO vCantWork
FROM business b
WHERE b.workerFk = vUserFk
AND b.started <= vDated
AND IFNULL(b.ended, vDated) >= vDated;
-
+
-- Departamento si vTabletFk es 0 no hacemos comprobacion (Madrid y Vilassar)
IF vTabletFk <> '0' THEN
-- 1 Obtener el departamento del usuario
SELECT wtcu.departmentFk INTO vDepartmentFk
FROM workerTimeControlUserInfo wtcu
WHERE wtcu.userFk = vUserFk;
- -- 2 Comprobar si la tablet pertenece al departamento
+ -- 2 Comprobar si la tablet pertenece al departamento
SELECT COUNT(td.tabletFk) INTO isEnabled
FROM tabletDepartment td
WHERE td.tabletFk = vTabletFk AND td.departmentFk = vDepartmentFk;
-
+
END IF;
-
+
IF vJornadas IS NOT NULL THEN
-
+
SELECT 'Jornadas' as Item, vJornadas as Cantidad, 'Correcto' AS Análisis
UNION ALL
SELECT 'Descansos 12 h' as Item, vDescansos12h as Cantidad, IF(vDescansos12h >= vJornadas, 'Correcto','Error: 1 por jornada') as Análisis
@@ -77360,9 +77428,9 @@ BEGIN
UNION ALL
SELECT 'Dias con fichadas impares' as Item, vImpares as Cantidad, IF(vImpares = 0, 'Correcto','Error') as Análisis
UNION ALL
- SELECT IF (LENGTH(vCantWork),CONCAT('Dia no laborable: ', vCantWork),'Dia laborable') as Item,
- '' as Cantidad,
- IF(LENGTH(vCantWork),'Error', 'Correcto') as Análisis
+ SELECT IF (LENGTH(vCantWork),CONCAT('Dia no laborable: ', vCantWork),'Dia laborable') as Item,
+ '' as Cantidad,
+ IF(LENGTH(vCantWork),'Error', 'Correcto') as Análisis
UNION ALL
SELECT 'El fichador no pertenece a tu departamento.' as Item, '' as Cantidad, IF(isEnabled, 'Correcto','Error') as Análisis;
@@ -77376,7 +77444,7 @@ BEGIN
UNION ALL
SELECT 'Dias con fichadas impares' as Item, vImpares as Cantidad, 'Correcto' as Análisis
UNION ALL
- SELECT IF (LENGTH(vCantWork),CONCAT('Dia no laborable: ', vCantWork),'Dia laborable') as Item,
+ SELECT IF (LENGTH(vCantWork),CONCAT('Dia no laborable: ', vCantWork),'Dia laborable') as Item,
'' as Cantidad, IF(LENGTH(vCantWork),'Error', 'Correcto') as Análisis
UNION ALL
SELECT 'El fichador no pertenece a tu departamento.' as Item, '' as Cantidad, IF(isEnabled, 'Correcto','Error') as Análisis;
@@ -77406,11 +77474,11 @@ BEGIN
* @param vDepartmentFk id del departamento
*
*/
-
- SELECT w.id,w.firstName, w.lastName,d.name
- FROM worker w
- JOIN workerDepartment wd ON wd.workerFk = w.id
- JOIN department d ON d.id = wd.departmentFk
+
+ SELECT w.id,w.firstName, w.lastName,d.name
+ FROM worker w
+ JOIN workerDepartment wd ON wd.workerFk = w.id
+ JOIN department d ON d.id = wd.departmentFk
WHERE d.id = vDepartmentFk
ORDER BY firstName;
@@ -77430,46 +77498,30 @@ DELIMITER ;
/*!50003 SET character_set_results = utf8mb4 */ ;
/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `worker_getHierarchy`(vBoss INT)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `worker_getHierarchy`(vUserFk INT)
BEGIN
- DECLARE EXIT HANDLER FOR 1062 BEGIN
- CALL util.throw('INFINITE_LOOP');
- END;
-
- DROP TEMPORARY TABLE IF EXISTS workerHierarchy;
- CREATE TEMPORARY TABLE workerHierarchy
+/**
+ * Retorna una tabla temporal con los trabajadores que tiene
+ * el usuario por debajo en la jerarquía de la empresa.
+ *
+ * @param vUserFk Id de usuario.
+ * @return tmp.workerHierarchyList
+ */
+ CREATE OR REPLACE TEMPORARY TABLE tmp.workerHierarchyList
(PRIMARY KEY (workerFk))
ENGINE = MEMORY
- SELECT vBoss AS workerFk;
-
- DROP TEMPORARY TABLE IF EXISTS tmp.workerHierarchyList;
- CREATE TEMPORARY TABLE tmp.workerHierarchyList
- (PRIMARY KEY (workerFk))
- ENGINE = MEMORY
- SELECT vBoss AS workerFk, 0 AS isChecked;
-
-
- WHILE (SELECT COUNT(*) FROM tmp.workerHierarchyList WHERE NOT isChecked) > 0 DO
-
- INSERT INTO tmp.workerHierarchyList
- SELECT w.id, 0
- FROM worker w
- JOIN workerHierarchy wh ON wh.workerFk = w.bossFk;
-
- UPDATE tmp.workerHierarchyList whl
- JOIN workerHierarchy wh ON wh.workerFk = whl.workerFk
- SET whl.isChecked = 1;
-
- TRUNCATE workerHierarchy;
-
- INSERT INTO workerHierarchy
- SELECT workerFk
- FROM tmp.workerHierarchyList
- WHERE NOT isChecked;
-
- END WHILE;
-
- DROP TEMPORARY TABLE IF EXISTS workerHierarchy;
+ WITH RECURSIVE workerHierarchy AS (
+ SELECT id workerFk, bossFk, 0 depth
+ FROM vn.worker
+ WHERE id = vUserFk
+ UNION ALL
+ SELECT w.id, w.bossFk, wh.depth + 1
+ FROM vn.worker w
+ JOIN workerHierarchy wh ON w.bossFk = wh.workerFk
+ )
+ SELECT *
+ FROM workerHierarchy
+ ORDER BY depth, workerFk;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -77495,7 +77547,7 @@ BEGIN
SELECT s.id,s.description,s.warehouseFk
FROM sector s
- JOIN operator o ON o.sectorFk = s.id
+ JOIN operator o ON o.sectorFk = s.id
WHERE o.workerFk = account.myUser_getId();
END ;;
@@ -77543,15 +77595,34 @@ DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `worker_updateBusiness`(vSelf INT)
BEGIN
/**
- * Actualiza en la tabla @worker el contrato actual del trabajador.
+ * Activates an account and configures its email settings.
*
- * @param vSelf Id del trabajador
+ * @param vSelf account id.
*/
- UPDATE worker w
- LEFT JOIN business b ON b.workerFk = w.id
- AND util.VN_CURDATE() BETWEEN b.started AND IFNULL(b.ended, util.VN_CURDATE())
- SET w.businessFk = b.id
- WHERE w.id = vSelf;
+ DECLARE vOldBusinessFk INT;
+ DECLARE vNewBusinessFk INT;
+
+ SELECT businessFk INTO vOldBusinessFk FROM worker WHERE id = vSelf;
+
+ SELECT id INTO vNewBusinessFk
+ FROM business
+ WHERE workerFk = vSelf
+ AND util.VN_CURDATE() BETWEEN started AND IFNULL(ended, util.VN_CURDATE())
+ LIMIT 1;
+
+ UPDATE worker
+ SET businessFk = vNewBusinessFk
+ WHERE id = vSelf;
+
+ IF vOldBusinessFk IS NULL THEN
+ CALL account.account_enable(vSelf);
+
+ UPDATE client c
+ JOIN payMethod pm ON pm.code = 'bankDraft'
+ SET c.payMethodFk = pm.id
+ WHERE c.id = vSelf
+ AND c.iban;
+ END IF;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -77580,8 +77651,8 @@ BEGIN
DECLARE vDone BOOL;
DECLARE vCursor CURSOR FOR
- SELECT DISTINCT b.workerFk
- FROM business b
+ SELECT DISTINCT b.workerFk
+ FROM business b
WHERE b.started > vBusinessUpdated AND b.started <= vCurdate
OR b.ended >= vBusinessUpdated AND b.ended < vCurdate;
@@ -77624,10 +77695,10 @@ DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `workingHours`(username varchar(255), logon boolean)
BEGIN
DECLARE userid int(11);
-
+
SELECT vn.getUserId(username) INTO userid;
SELECT username, userid;
- IF userid IS NOT NULL THEN
+ IF userid IS NOT NULL THEN
IF (logon) THEN
CALL vn.workingHoursTimeIn(userid);
ELSE
@@ -77696,17 +77767,17 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `wrongEqualizatedClient`()
BEGIN
SELECT clientFk, c.name, c.isActive, c.isTaxDataChecked, count(ie) as num
FROM vn.client c
- JOIN
+ JOIN
(
- SELECT DISTINCT
+ SELECT DISTINCT
`a`.`clientFk` ,
a.isEqualizated = 0 as ie
-
+
FROM
`vn`.`address` `a`
) sub ON sub.clientFk = c.id
WHERE c.hasToInvoiceByAddress = FALSE
-
+
GROUP BY clientFk
HAVING num > 1
UNION ALL
@@ -77724,6 +77795,60 @@ DELIMITER ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `XDiario_check` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `XDiario_check`()
+BEGIN
+/**
+ * Realiza la revisión diaria de los asientos contables,
+ * identificando y notificando los asientos descuadrados
+ * y ajustando los saldos en caso necesario.
+ */
+ INSERT INTO mail (receiver, subject, body)
+ SELECT 'cau@verdnatura.es',
+ 'Asientos descuadrados',
+ GROUP_CONCAT(CONCAT(' Asiento: ', ASIEN, ' - Importe:', recon) SEPARATOR ' | \n')
+ FROM (
+ SELECT ASIEN,
+ SUM(IFNULL(ROUND(Eurodebe, 2), 0)) - SUM(IFNULL(ROUND(EUROHABER, 2), 0)) recon
+ FROM XDiario
+ WHERE NOT enlazado
+ GROUP BY ASIEN
+ HAVING ABS(SUM(IFNULL(ROUND(Eurodebe, 2), 0)) - SUM(IFNULL(ROUND(EUROHABER, 2), 0))) > 0.01
+ ) sub
+ HAVING COUNT(*);
+
+ UPDATE XDiario xd
+ JOIN (
+ SELECT xd.id, SUBCTA, recon
+ FROM XDiario xd
+ JOIN (
+ SELECT ASIEN,
+ SUM(IFNULL(ROUND(Eurodebe, 2), 0)) - SUM(IFNULL(ROUND(EUROHABER, 2), 0)) recon
+ FROM XDiario
+ WHERE NOT enlazado
+ GROUP BY ASIEN
+ HAVING recon
+ ) sub ON sub.ASIEN = xd.ASIEN
+ WHERE xd.SUBCTA > '5999999999'
+ GROUP BY xd.ASIEN
+ ) sub ON sub.id = xd.id
+ SET xd.Eurohaber = IF(IFNULL(xd.Eurohaber, 0) = 0, xd.Eurohaber, xd.Eurohaber + sub.recon),
+ xd.Eurodebe = IF(IFNULL(xd.Eurodebe, 0) = 0, xd.Eurodebe, xd.Eurodebe - sub.recon);
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `XDiario_checkDate` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
@@ -77790,27 +77915,27 @@ proc: BEGIN
SELECT scope INTO vScope
FROM zoneConfig;
-
+
DROP TEMPORARY TABLE IF EXISTS tmp.zone;
CREATE TEMPORARY TABLE tmp.zone
(INDEX (id))
ENGINE = MEMORY
SELECT id FROM zone;
-
+
TRUNCATE TABLE zoneClosure;
-
+
WHILE vCounter <= vScope DO
-
+
CALL zone_getOptionsForShipment(vShipped, TRUE);
-
+
REPLACE zoneClosure(zoneFk, dated, `hour`)
- SELECT zoneFk, vShipped, `hour`
+ SELECT zoneFk, vShipped, `hour`
FROM tmp.zoneOption;
-
+
SET vCounter = vCounter + 1;
SET vShipped = TIMESTAMPADD(DAY, 1, vShipped);
END WHILE;
-
+
-- DROP TEMPORARY TABLE tmp.zone;
DO RELEASE_LOCK('vn.zoneClosure_recalc');
END ;;
@@ -77904,7 +78029,7 @@ BEGIN
OR (vSelf IS NOT NULL AND parentFk = vSelf);
DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-
+
SET vSons = 0;
OPEN vChildren;
@@ -77915,11 +78040,11 @@ BEGIN
IF vDone THEN
LEAVE myLoop;
END IF;
-
+
SET vIndex = vIndex + 1;
SET vLft = vIndex;
SET vSons = vSons + 1;
-
+
CALL zoneGeo_calcTreeRec(
vChildFk,
CONCAT(vPath, vChildFk, '/'),
@@ -78022,7 +78147,7 @@ proc: BEGIN
SELECT isChanged INTO vIsChanged
FROM zoneGeoRecalc;
-
+
IF vIsChanged THEN
UPDATE zoneGeoRecalc SET isChanged = FALSE;
CALL vn.zoneGeo_calcTree;
@@ -78119,6 +78244,74 @@ DELIMITER ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `zone_getAddresses` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8mb4 */ ;
+/*!50003 SET character_set_results = utf8mb4 */ ;
+/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ;
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` PROCEDURE `zone_getAddresses`(
+ vSelf INT,
+ vLanded DATE
+)
+BEGIN
+/**
+ * Devuelve un listado de todos los clientes activos
+ * con consignatarios a los que se les puede
+ * vender producto para esa zona y no tiene un ticket
+ * para ese día.
+ *
+ * @param vSelf Id de zona
+ * @param vDated Fecha de entrega
+ * @return Un select
+ */
+ CALL zone_getPostalCode(vSelf);
+
+ WITH notHasTicket AS (
+ SELECT id
+ FROM vn.client
+ WHERE id NOT IN (
+ SELECT clientFk
+ FROM vn.ticket
+ WHERE landed BETWEEN vLanded AND util.dayEnd(vLanded)
+ )
+ )
+ SELECT c.id clientFk,
+ c.name,
+ c.phone,
+ c.mobile,
+ c.salesPersonFk,
+ u.name username,
+ aai.invoiced,
+ cnb.lastShipped
+ FROM vn.client c
+ JOIN notHasTicket ON notHasTicket.id = c.id
+ LEFT JOIN account.`user` u ON u.id = c.salesPersonFk
+ JOIN vn.`address` a ON a.clientFk = c.id
+ JOIN vn.postCode pc ON pc.code = a.postalCode
+ JOIN vn.town t ON t.id = pc.townFk AND t.provinceFk = a.provinceFk
+ JOIN vn.zoneGeo zg ON zg.name = a.postalCode
+ JOIN tmp.zoneNodes zn ON zn.geoFk = pc.geoFk
+ LEFT JOIN bs.clientNewBorn cnb ON cnb.clientFk = c.id
+ LEFT JOIN vn.annualAverageInvoiced aai ON aai.clientFk = c.id
+ JOIN vn.clientType ct ON ct.code = c.typeFk
+ WHERE a.isActive
+ AND c.isActive
+ AND ct.code = 'normal'
+ AND c.businessTypeFk <> 'worker'
+ GROUP BY c.id;
+
+ DROP TEMPORARY TABLE tmp.zoneNodes;
+END ;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `zone_getAgency` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
@@ -78210,7 +78403,7 @@ proc:BEGIN
* @table tmp.closedZones(zoneFk, warehouseFk);
*/
DROP TEMPORARY TABLE IF EXISTS tmp.closedZones;
-
+
CREATE TEMPORARY TABLE tmp.closedZones (
`zoneFk` int(11) NOT NULL,
`warehouseFk` smallint(6) unsigned NOT NULL,
@@ -78252,7 +78445,7 @@ DELIMITER ;;
CREATE DEFINER=`root`@`localhost` PROCEDURE `zone_getCollisions`()
BEGIN
/**
- * Calcula si para un mismo codigo postal y dia
+ * Calcula si para un mismo codigo postal y dia
* hay mas de una zona configurada y manda correo
*
*/
@@ -78261,16 +78454,16 @@ BEGIN
DECLARE vIsDone INT DEFAULT FALSE;
DECLARE vTableCollisions TEXT;
DECLARE cur1 CURSOR FOR SELECT zoneFk from tmp.zoneOption;
-
+
DECLARE CONTINUE HANDLER FOR NOT FOUND SET vIsDone = TRUE;
DROP TEMPORARY TABLE IF EXISTS tmp.zone;
CREATE TEMPORARY TABLE tmp.zone
- SELECT z.id
+ SELECT z.id
FROM zone z
JOIN agencyMode am ON am.id = z.agencyModeFk
JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
- WHERE dm.code IN ('AGENCY','DELIVERY');
+ WHERE dm.code IN ('AGENCY','DELIVERY');
CALL zone_getOptionsForShipment(util.VN_CURDATE(),FALSE);
@@ -78285,7 +78478,7 @@ BEGIN
PRIMARY KEY zoneFkk (zoneFk, geoFk),
INDEX(geoFk))
ENGINE = MyISAM;
-
+
OPEN cur1;
cur1Loop: LOOP
SET vIsDone = FALSE;
@@ -78293,40 +78486,40 @@ BEGIN
IF vIsDone THEN
LEAVE cur1Loop;
END IF;
-
+
CALL zone_getLeaves(vZoneFk, NULL, NULL, TRUE);
- myLoop: LOOP
+ myLoop: LOOP
SET vGeoFk = NULL;
- SELECT geoFk INTO vGeoFk
+ SELECT geoFk INTO vGeoFk
FROM tmp.zoneNodes zn
WHERE NOT isChecked
LIMIT 1;
-
+
IF vGeoFk IS NULL THEN
LEAVE myLoop;
END IF;
-
+
CALL zone_getLeaves(vZoneFk, vGeoFk, NULL, TRUE);
UPDATE tmp.zoneNodes
- SET isChecked = TRUE
+ SET isChecked = TRUE
WHERE geoFk = vGeoFk;
END LOOP;
END LOOP;
CLOSE cur1;
- DELETE FROM tmp.zoneNodes
+ DELETE FROM tmp.zoneNodes
WHERE sons > 0;
-
+
DROP TEMPORARY TABLE IF EXISTS geoCollision;
CREATE TEMPORARY TABLE geoCollision
SELECT z.agencyModeFk, zn.geoFk, zw.warehouseFk
FROM tmp.zoneNodes zn
JOIN zone z ON z.id = zn.zoneFk
- JOIN zoneWarehouse zw ON z.id = zw.zoneFk
+ JOIN zoneWarehouse zw ON z.id = zw.zoneFk
GROUP BY z.agencyModeFk, zn.geoFk, zw.warehouseFk
HAVING count(*) > 1;
-
+
SELECT 'Se ha eliminado el asiento ', vAsien, ' que estaba enlazado en SAGE/CONTAPLUS, vinculado a la factura ', vRef ,'
- ', vBody, '| C.Postal | @@ -78336,39 +78529,39 @@ BEGINAlmacén | Salix |
|---|
', + 'Modificada la catidad de ', OLD.quantity, ' a ' , NEW.quantity, + ' del artículo ', OLD.itemFk, ' tras estado encajado del ticket.
', + 'Este email se ha generado automáticamente' ) + ); + END IF; + IF (OLD.quantity > NEW.quantity) THEN + INSERT INTO saleComponent(saleFk, componentFk, value) + SELECT NEW.id, cm.id, sc.value + FROM saleComponent sc + JOIN component cd ON cd.id = sc.componentFk + JOIN component cm ON cm.code = 'mana' + WHERE saleFk = NEW.id AND cd.code = 'lastUnitsDiscount' + ON DUPLICATE KEY UPDATE value = sc.value + VALUES(value); + + DELETE sc.* + FROM vn.saleComponent sc + JOIN component c ON c.id = sc.componentFk + WHERE saleFk = NEW.id AND c.code = 'lastUnitsDiscount'; + END IF; + INSERT IGNORE INTO `vn`.`routeRecalc` (`routeFk`) + SELECT r.id + FROM vn.sale s + JOIN vn.ticket t ON t.id = s.ticketFk + JOIN vn.route r ON r.id = t.routeFk + WHERE r.isOk = FALSE + AND s.id = NEW.id + AND r.created >= util.VN_CURDATE() + GROUP BY r.id; + END IF; + + IF !(ABS(NEW.isPicked) <=> ABS(OLD.isPicked)) AND NEW.quantity > 0 THEN + UPDATE vn.collection c + JOIN vn.ticketCollection tc ON tc.collectionFk = c.id AND tc.ticketFk = NEW.ticketFk + SET c.salePickedCount = c.salePickedCount + IF(NEW.isPicked != 0, 1, -1); + END IF; + + IF !(NEW.quantity <=> OLD.quantity) AND (NEW.quantity = 0 OR OLD.quantity = 0) THEN + UPDATE vn.collection c + JOIN vn.ticketCollection tc ON tc.collectionFk = c.id AND tc.ticketFk = NEW.ticketFk + SET c.saleTotalCount = c.saleTotalCount + IF(OLD.quantity = 0, 1, -1); + END IF; +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`sale_beforeDelete` + BEFORE DELETE ON `sale` + FOR EACH ROW +BEGIN + IF OLD.quantity > 0 THEN + INSERT IGNORE INTO `vn`.`routeRecalc` (`routeFk`) + SELECT r.id + FROM vn.sale s + JOIN vn.ticket t ON t.id = s.ticketFk + JOIN vn.route r ON r.id = t.routeFk + WHERE r.isOk = FALSE + AND s.id = OLD.id + AND r.created >= util.VN_CURDATE() + GROUP BY r.id; + END IF; +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`sale_afterDelete` + AFTER DELETE ON `sale` + FOR EACH ROW +BEGIN + DECLARE vIsToSendMail BOOL; + DECLARE vUserRole VARCHAR(255); + + INSERT INTO ticketLog + SET `action` = 'delete', + `changedModel` = 'Sale', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); + + CALL stock.log_add('sale', NULL, OLD.id); + CALL ticket_requestRecalc(OLD.ticketFk); + + SELECT account.myUser_getName() INTO vUserRole; + SELECT account.user_getMysqlRole(vUserRole) INTO vUserRole; + + SELECT COUNT(*) INTO vIsToSendMail + FROM ticketTracking tt + JOIN vn.state s ON s.id = tt.stateFk + WHERE s.code='PACKED' + AND tt.ticketFk = OLD.ticketFk + AND vUserRole IN ('salesPerson', 'salesBoss') + LIMIT 1; + + IF vIsToSendMail THEN + CALL vn.mail_insert('jefesventas@verdnatura.es', + 'noreply@verdnatura.es', + CONCAT('Ticket ', OLD.ticketFk ,' eliminado artículo tras encajado' ), + CONCAT('Ticket ', OLD.ticketFk ,'.
', + 'Eliminado artículo ', OLD.itemFk, ' tras estado encajado del ticket.
Este email se ha generado automáticamente' ) + ); + END IF; + + IF OLD.quantity > 0 THEN + UPDATE vn.collection c + JOIN vn.ticketCollection tc ON tc.collectionFk = c.id AND tc.ticketFk = OLD.ticketFk + JOIN vn.item i ON i.id = OLD.itemFk + AND (c.itemPackingTypeFk = i.itemPackingTypeFk + OR ISNULL(c.itemPackingTypeFk)) + SET c.saleTotalCount = c.saleTotalCount - 1, + c.salePickedCount = c.salePickedCount - ABS(OLD.isPicked); + END IF; +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`saleBuy_beforeInsert` + BEFORE INSERT ON `saleBuy` + FOR EACH ROW +BEGIN + + SET NEW.workerFk = vn.getUser(); + + END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`saleGroup_beforeInsert` + BEFORE INSERT ON `saleGroup` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`saleGroup_beforeUpdate` + BEFORE UPDATE ON `saleGroup` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`saleGroup_afterDelete` + AFTER DELETE ON `saleGroup` + FOR EACH ROW +BEGIN + INSERT INTO ticketLog + SET `action` = 'delete', + `changedModel` = 'SaleGroup', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`saleLabel_afterUpdate` + AFTER UPDATE ON `vn`.`saleLabel` + FOR EACH ROW +IF NEW.stem >= (SELECT s.quantity FROM sale s WHERE s.id = NEW.saleFk) THEN + UPDATE sale s SET s.isPicked = TRUE WHERE s.id = NEW.saleFk; +END IF */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`saleTracking_afterInsert` + AFTER INSERT ON `saleTracking` + FOR EACH ROW +BEGIN + + IF NEW.isChecked THEN + + UPDATE vn.sale s + SET s.isPicked = TRUE + WHERE s.id = NEW.saleFk + AND s.isPicked = 0; + + END IF; + +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`sharingCart_beforeInsert` + BEFORE INSERT ON `sharingCart` + FOR EACH ROW +BEGIN + IF NEW.workerFk = NEW.workerSubstitute THEN + CALL util.throw ('worker and workerSubstitute must be different'); + ELSE + INSERT IGNORE INTO sharingCartDaily (ownerFk, substituteFk, dated) + SELECT NEW.workerFk, NEW.workerSubstitute, dated + FROM time + WHERE dated BETWEEN NEW.started AND NEW.ended; + END IF; +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`sharingCart_beforeUpdate` + BEFORE UPDATE ON `sharingCart` + FOR EACH ROW +BEGIN + IF NEW.workerFk = NEW.workerSubstitute THEN + CALL util.throw ('worker and workerSubstitute must be different'); + ELSE + DELETE sc FROM sharingCartDaily sc + WHERE sc.dated BETWEEN OLD.started AND OLD.ended AND + sc.ownerFk = OLD.workerFk AND + sc.substituteFk = OLD.workerSubstitute; + + INSERT IGNORE INTO sharingCartDaily (ownerFk, substituteFk, dated) + SELECT NEW.workerFk, NEW.workerSubstitute, dated + FROM time + WHERE dated BETWEEN NEW.started AND NEW.ended; + + END IF; +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`sharingCart_beforeDelete` + BEFORE DELETE ON `sharingCart` + FOR EACH ROW +BEGIN + DELETE sc FROM sharingCartDaily sc + WHERE sc.dated BETWEEN OLD.started AND OLD.ended AND + sc.ownerFk = OLD.workerFk AND + sc.substituteFk = OLD.workerSubstitute; +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`sharingClient_beforeInsert` + BEFORE INSERT ON `sharingClient` + FOR EACH ROW +BEGIN + SET NEW.ended = GREATEST(util.VN_CURDATE(),NEW.ended); + SET NEW.started = GREATEST(util.VN_CURDATE(),NEW.started); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`sharingClient_beforeUpdate` + BEFORE UPDATE ON `sharingClient` + FOR EACH ROW +BEGIN + SET NEW.ended = GREATEST(util.VN_CURDATE(),NEW.ended); + SET NEW.started = GREATEST(util.VN_CURDATE(),NEW.started); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`shelving_beforeInsert` + BEFORE INSERT ON `shelving` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); + + IF NEW.code = "" THEN + CALL util.throw('NOT_EMPTY_CODE_ALLOWED'); + END IF; + +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`shelving_beforeUpdate` + BEFORE UPDATE ON `shelving` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); + + IF NEW.code = "" THEN + CALL util.throw('NOT_EMPTY_CODE_ALLOWED'); + END IF; + + IF NOT(OLD.parkingFk <=> NEW.parkingFK) THEN + SET NEW.isMoving = FALSE; + END IF; +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`shelving_afterDelete` + AFTER DELETE ON `shelving` + FOR EACH ROW +BEGIN + INSERT INTO shelvingLog + SET `action` = 'delete', + `changedModel` = 'Shelving', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`solunionCAP_afterInsert` + AFTER INSERT ON `solunionCAP` + FOR EACH ROW +BEGIN + UPDATE vn2008.Clientes c + JOIN creditClassification cc ON c.Id_Cliente = cc.client + JOIN creditInsurance ci ON ci.creditClassification = cc.id + SET creditInsurance = ci.credit * 2 WHERE ci.id = NEW.creditInsurance; +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`solunionCAP_afterUpdate` + AFTER UPDATE ON `solunionCAP` + FOR EACH ROW +BEGIN + IF NEW.dateLeaving IS NOT NULL THEN + UPDATE vn2008.Clientes c + JOIN creditClassification cc ON c.Id_Cliente = cc.client + JOIN creditInsurance ci ON ci.creditClassification = cc.id + SET creditInsurance = ci.credit WHERE ci.id = OLD.creditInsurance; + ELSE + UPDATE vn2008.Clientes c + JOIN creditClassification cc ON c.Id_Cliente = cc.client + JOIN creditInsurance ci ON ci.creditClassification = cc.id + SET creditInsurance = ci.credit * 2 WHERE ci.id = OLD.creditInsurance; + END IF; +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`solunionCAP_beforeDelete` + BEFORE DELETE ON `solunionCAP` + FOR EACH ROW +BEGIN + UPDATE vn2008.Clientes c + JOIN creditClassification cc ON c.Id_Cliente = cc.client + JOIN creditInsurance ci ON ci.creditClassification = cc.id + SET creditInsurance = ci.credit WHERE ci.id = OLD.creditInsurance; +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`specie_beforeInsert` + BEFORE INSERT ON `specie` + FOR EACH ROW +BEGIN + SET NEW.name = LCASE(NEW.name); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`specie_beforeUpdate` + BEFORE UPDATE ON `specie` + FOR EACH ROW +BEGIN + SET NEW.name = LCASE(NEW.name); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`supplier_beforeInsert` + BEFORE INSERT ON `supplier` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`supplier_beforeUpdate` + BEFORE UPDATE ON `supplier` + FOR EACH ROW +BEGIN + DECLARE vHasChange BOOL; + DECLARE vPayMethodChanged BOOL; + DECLARE vPayMethodHasVerified BOOL; + DECLARE vParams JSON; + DECLARE vOldPayMethodName VARCHAR(20); + DECLARE vNewPayMethodName VARCHAR(20); + + SET NEW.editorFk = account.myUser_getId(); + + SELECT hasVerified INTO vPayMethodHasVerified + FROM payMethod + WHERE id = NEW.payMethodFk; + + SET vPayMethodChanged = NOT(NEW.payMethodFk <=> OLD.payMethodFk); + + IF vPayMethodChanged THEN + SELECT name INTO vOldPayMethodName + FROM payMethod + WHERE id = OLD.payMethodFk; + SELECT name INTO vNewPayMethodName + FROM payMethod + WHERE id = NEW.payMethodFk; + + SET vParams = JSON_OBJECT( + 'name', NEW.name, + 'oldPayMethod', vOldPayMethodName, + 'newPayMethod', vNewPayMethodName + ); + SELECT util.notification_send('supplier-pay-method-update', vParams, NULL) INTO @id; + END IF; + + SET vHasChange = NOT(NEW.payDemFk <=> OLD.payDemFk AND NEW.payDay <=> OLD.payDay) OR vPayMethodChanged; + + IF vHasChange AND vPayMethodHasVerified THEN + SET NEW.isPayMethodChecked = FALSE; + END IF; + +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`supplier_afterDelete` + AFTER DELETE ON `supplier` + FOR EACH ROW +BEGIN + INSERT INTO supplierLog + SET `action` = 'delete', + `changedModel` = 'Supplier', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`supplierAccount_beforeInsert` + BEFORE INSERT ON `supplierAccount` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`supplierAccount_beforeUpdate` + BEFORE UPDATE ON `supplierAccount` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`supplierAccount_afterDelete` + AFTER DELETE ON `supplierAccount` + FOR EACH ROW +BEGIN + INSERT INTO supplierLog + SET `action` = 'delete', + `changedModel` = 'SupplierAccount', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`supplierAddress_beforeInsert` + BEFORE INSERT ON `supplierAddress` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`supplierAddress_beforeUpdate` + BEFORE UPDATE ON `supplierAddress` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`supplierAddress_afterDelete` + AFTER DELETE ON `supplierAddress` + FOR EACH ROW +BEGIN + INSERT INTO supplierLog + SET `action` = 'delete', + `changedModel` = 'SupplierAddress', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`supplierContact_beforeInsert` + BEFORE INSERT ON `supplierContact` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`supplierContact_beforeUpdate` + BEFORE UPDATE ON `supplierContact` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`supplierContact_afterDelete` + AFTER DELETE ON `supplierContact` + FOR EACH ROW +BEGIN + INSERT INTO supplierLog + SET `action` = 'delete', + `changedModel` = 'SupplierContact', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`supplierDms_beforeInsert` + BEFORE INSERT ON `supplierDms` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`supplierDms_beforeUpdate` + BEFORE UPDATE ON `supplierDms` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`supplierDms_afterDelete` + AFTER DELETE ON `supplierDms` + FOR EACH ROW +BEGIN + INSERT INTO clientLog + SET `action` = 'delete', + `changedModel` = 'supplierDms', + `changedModelId` = OLD.dmsFk, + `userFk` = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`tag_beforeInsert` + BEFORE INSERT ON `tag` + FOR EACH ROW +BEGIN + IF NEW.ediTypeFk IS NULL AND (SELECT COUNT(*) FROM tag WHERE `name` = NEW.`name`) THEN + CALL util.throw('name duplicated'); + END IF; +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticket_beforeInsert` + BEFORE INSERT ON `ticket` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticket_afterInsert` + AFTER INSERT ON `ticket` + FOR EACH ROW +BEGIN + + DECLARE vClientType VARCHAR(255); + DECLARE vStateCode VARCHAR(255); + DECLARE vTransferorFirstShipped DATE; + + -- Borrar cuando se cambie el insert ticket en la APP móvil + + SELECT typeFk INTO vClientType + FROM vn.`client` WHERE id = NEW.clientFk; + + IF vClientType = 'loses' THEN + SET vStateCode = 'DELIVERED'; + ELSE + SET vStateCode = 'FREE'; + END IF; + + CALL ticket_setState(NEW.id, vStateCode); + + IF YEAR(NEW.shipped) > 2000 THEN + + SELECT cnb.firstShipped INTO vTransferorFirstShipped + FROM bs.clientNewBorn cnb + JOIN `client` c ON c.transferorFk = cnb.clientFk + WHERE c.id = NEW.clientFk; + + INSERT INTO bs.clientNewBorn(clientFk, firstShipped, lastShipped) + VALUES(NEW.clientFk, IFNULL(vTransferorFirstShipped, util.VN_CURDATE()), util.VN_CURDATE()) + ON DUPLICATE KEY UPDATE lastShipped = util.VN_CURDATE(); + + END IF; + +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticket_beforeUpdate` + BEFORE UPDATE ON `ticket` + FOR EACH ROW +BEGIN + DECLARE vNewTime TIME; + + SET NEW.editorFk = account.myUser_getId(); + + IF NOT (NEW.routeFk <=> OLD.routeFk) THEN + INSERT IGNORE INTO `vn`.`routeRecalc` (`routeFk`) + SELECT r.id + FROM vn.route r + WHERE r.isOk = FALSE + AND r.id IN (OLD.routeFk,NEW.routeFk) + AND r.created >= util.VN_CURDATE() + GROUP BY r.id; + END IF; + + IF NOT (DATE(NEW.shipped) <=> DATE(OLD.shipped)) THEN + IF YEAR(NEW.shipped) < 2000 THEN + SIGNAL SQLSTATE '46000' + SET MESSAGE_TEXT = 'Year cannot be lesser than 2000'; + END IF; + + IF YEAR(NEW.shipped) = 2000 THEN + SET NEW.isDeleted = TRUE; + END IF; + + END IF; + + IF NOT (NEW.isDeleted <=> OLD.isDeleted) AND NEW.isDeleted THEN + INSERT IGNORE INTO `vn`.`routeRecalc` (`routeFk`) + SELECT r.id + FROM vn.ticket t + JOIN vn.route r ON r.id = t.routeFk + WHERE r.isOk = FALSE + AND t.id = NEW.id + AND r.created >= util.VN_CURDATE() + GROUP BY r.id; + SET NEW.shipped = DATE_FORMAT(NEW.shipped, '2000-%m-%d %T'); + SET NEW.landed = DATE_FORMAT(NEW.landed, '2000-%m-%d %T'); + SET NEW.routeFk = NULL; + SET NEW.zoneFk = NULL; + END IF; + + IF NEW.routeFk AND NEW.isDeleted THEN + CALL util.throw ('This ticket is deleted'); + END IF; + + IF NOT (NEW.routeFk <=> OLD.routeFk) AND NEW.routeFk IS NOT NULL THEN + SELECT MAX(TIME(shipped)) INTO vNewTime + FROM vn.ticket + WHERE routeFk = NEW.routeFk + HAVING MAX(TIME(shipped)) > TIME(NEW.shipped); + + IF vNewTime THEN + SET NEW.shipped = TIMESTAMP(DATE(NEW.shipped), vNewTime); + END IF; + INSERT IGNORE INTO zoneAgencyMode (agencyModeFk,zoneFk) + SELECT r.agencyModeFk, NEW.zoneFk FROM route r + WHERE r.id = NEW.routeFk; + + CALL vn.routeUpdateM3(NEW.routeFk); + END IF; +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticket_afterUpdate` + AFTER UPDATE ON `ticket` + FOR EACH ROW +BEGIN + + IF !(NEW.id <=> OLD.id) + OR !(NEW.warehouseFk <=> OLD.warehouseFk) + OR !(NEW.shipped <=> OLD.shipped) THEN + CALL stock.log_add('ticket', NEW.id, OLD.id); + END IF; + + IF !(NEW.clientFk <=> OLD.clientFk) + OR !(NEW.addressFk <=> OLD.addressFk) + OR !(NEW.companyFk <=> OLD.companyFk) THEN + CALL ticket_requestRecalc(NEW.id); + END IF; + + IF NEW.routeFk <> OLD.routeFk THEN + UPDATE expedition + SET hasNewRoute = TRUE + WHERE ticketFk = NEW.id; + END IF; + +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticket_beforeDelete` + BEFORE DELETE ON `ticket` + FOR EACH ROW +BEGIN + INSERT IGNORE INTO `vn`.`routeRecalc` (`routeFk`) + SELECT r.id + FROM vn.route r + WHERE r.isOk = FALSE + AND r.id = OLD.routeFk + AND r.created >= util.VN_CURDATE() + GROUP BY r.id; + + DELETE FROM sale WHERE ticketFk = OLD.id; + + DELETE FROM ticketDms WHERE ticketFk = OLD.id; +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticket_afterDelete` + AFTER DELETE ON `ticket` + FOR EACH ROW +BEGIN + INSERT INTO ticketLog + SET `action` = 'delete', + `changedModel` = 'Ticket', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb3 */ ; +/*!50003 SET character_set_results = utf8mb3 */ ; +/*!50003 SET collation_connection = utf8mb3_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER ticketCollection_afterDelete +AFTER DELETE +ON ticketCollection FOR EACH ROW +BEGIN + + DECLARE vSalesRemaining INT; + + SELECT count(*) INTO vSalesRemaining + FROM vn.ticketCollection tc + JOIN sale s ON s.ticketFk = tc.ticketFk + WHERE collectionFk = OLD.collectionFk + AND tc.id != OLD.id; + + IF NOT vSalesRemaining THEN + + DELETE FROM vn.collection WHERE id = OLD.collectionFk; + + ELSE + + UPDATE vn.collection + SET saleTotalCount = vSalesRemaining + WHERE id = OLD.collectionFk; + + END IF; + +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketDms_beforeInsert` + BEFORE INSERT ON `ticketDms` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketDms_beforeUpdate` + BEFORE UPDATE ON `ticketDms` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketDms_beforeDelete` + BEFORE DELETE ON `ticketDms` + FOR EACH ROW +BEGIN + UPDATE dms + SET dmsTypeFk = (SELECT id + FROM dmsType + WHERE `code` = 'trash' + ) + WHERE id = OLD.dmsFk AND ( SELECT IF(COUNT(*) > 0, FALSE, TRUE) + FROM ticketDms + WHERE dmsFk = OLD.dmsFk + ) ; +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketDms_afterDelete` + AFTER DELETE ON `ticketDms` + FOR EACH ROW +BEGIN + INSERT INTO ticketLog + SET `action` = 'delete', + `changedModel` = 'ticketDms', + `changedModelId` = OLD.ticketFk, + `userFk` = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketObservation_beforeInsert` + BEFORE INSERT ON `ticketObservation` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketObservation_beforeUpdate` + BEFORE UPDATE ON `ticketObservation` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketObservation_afterDelete` + AFTER DELETE ON `ticketObservation` + FOR EACH ROW +BEGIN + INSERT INTO ticketLog + SET `action` = 'delete', + `changedModel` = 'TicketObservation', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketPackaging_beforeInsert` + BEFORE INSERT ON `ticketPackaging` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); + SET NEW.workerFk = account.myUser_getId(); + +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketPackaging_beforeUpdate` + BEFORE UPDATE ON `ticketPackaging` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketPackaging_afterDelete` + AFTER DELETE ON `ticketPackaging` + FOR EACH ROW +BEGIN + INSERT INTO ticketLog + SET `action` = 'delete', + `changedModel` = 'TicketPackaging', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketParking_beforeInsert` + BEFORE INSERT ON `ticketParking` + FOR EACH ROW +BEGIN + + SET NEW.workerFk = vn.getUser(); + +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketRefund_beforeInsert` + BEFORE INSERT ON `ticketRefund` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); + CALL ticketRefund_beforeUpsert(NEW.refundTicketFk, NEW.originalTicketFk); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketRefund_beforeUpdate` + BEFORE UPDATE ON `ticketRefund` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); + CALL ticketRefund_beforeUpsert(NEW.refundTicketFk, NEW.originalTicketFk); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketRefund_afterDelete` + AFTER DELETE ON `ticketRefund` + FOR EACH ROW +BEGIN + INSERT INTO ticketLog + SET `action` = 'delete', + `changedModel` = 'TicketRefund', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketRequest_beforeInsert` + BEFORE INSERT ON `ticketRequest` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); + + IF NEW.ticketFk IS NULL THEN + SET NEW.ticketFk = (SELECT s.ticketFk FROM sale s WHERE s.id = NEW.saleFk); + END IF; + + IF NEW.requesterFk IS NULL THEN + SET NEW.requesterFk = (SELECT w.id FROM worker w WHERE w.code = NEW.salesPersonCode); + END IF; + + IF NEW.attenderFk IS NULL THEN + SET NEW.attenderFk = (SELECT w.id FROM worker w WHERE w.code = NEW.buyerCode); + END IF; +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketRequest_beforeUpdate` + BEFORE UPDATE ON `ticketRequest` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); + + IF NEW.saleFk <> OLD.saleFk THEN + SET NEW.ticketFk = (SELECT s.ticketFk FROM sale s WHERE s.id = NEW.saleFk); + END IF; + + IF NEW.salesPersonCode <> OLD.salesPersonCode THEN + SET NEW.requesterFk = (SELECT w.id FROM worker w WHERE w.code = NEW.salesPersonCode); + END IF; + + IF NEW.buyerCode <> OLD.buyerCode THEN + SET NEW.attenderFk = (SELECT w.id FROM worker w WHERE w.code = NEW.buyerCode); + END IF; +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketRequest_afterDelete` + AFTER DELETE ON `ticketRequest` + FOR EACH ROW +BEGIN + INSERT INTO ticketLog + SET `action` = 'delete', + `changedModel` = 'TicketRequest', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketService_beforeInsert` + BEFORE INSERT ON `ticketService` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketService_afterInsert` + AFTER INSERT ON `ticketService` + FOR EACH ROW +BEGIN + + CALL ticket_requestRecalc(NEW.ticketFk); + +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketService_beforeUpdate` + BEFORE UPDATE ON `ticketService` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketService_afterUpdate` + AFTER UPDATE ON `ticketService` + FOR EACH ROW +BEGIN + IF !(NEW.price <=> OLD.price) + OR !(NEW.ticketFk <=> OLD.ticketFk) + OR !(NEW.quantity <=> OLD.quantity) THEN + CALL ticket_requestRecalc(NEW.ticketFk); + CALL ticket_requestRecalc(OLD.ticketFk); + END IF; +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketService_afterDelete` + AFTER DELETE ON `ticketService` + FOR EACH ROW +BEGIN + INSERT INTO ticketLog + SET `action` = 'delete', + `changedModel` = 'TicketService', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); + + CALL ticket_requestRecalc(OLD.ticketFk); + +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketTracking_beforeInsert` + BEFORE INSERT ON `ticketTracking` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketTracking_afterInsert` + AFTER INSERT ON `ticketTracking` + FOR EACH ROW +BEGIN + DECLARE vNumTicketsPrepared INT; + + REPLACE vn.ticketLastState(ticketFk, ticketTrackingFk, name) + SELECT NEW.ticketFk, NEW.id, `name` + FROM state + WHERE id = NEW.stateFk; +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketTracking_beforeUpdate` + BEFORE UPDATE ON `ticketTracking` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketTracking_afterUpdate` + AFTER UPDATE ON `ticketTracking` + FOR EACH ROW +BEGIN + DECLARE vTicketFk INT; + DECLARE vTicketTrackingFk INT; + DECLARE vStateName VARCHAR(15); + + IF NEW.stateFk <> OLD.stateFk THEN + REPLACE vn.ticketLastState(ticketFk, ticketTrackingFk, name) + SELECT NEW.ticketFk, NEW.id, `name` + FROM state + WHERE id = NEW.stateFk; + END IF; + + IF NEW.ticketFk <> OLD.ticketFk THEN + SELECT i.ticketFk, i.id, s.`name` + INTO vTicketFk, vTicketTrackingFk, vStateName + FROM ticketTracking i + JOIN state s ON i.stateFk = s.id + WHERE ticketFk = NEW.ticketFk + ORDER BY created DESC + LIMIT 1; + + IF vTicketFk > 0 THEN + REPLACE INTO ticketLastState(ticketFk, ticketTrackingFk,name) + VALUES(vTicketFk, vTicketTrackingFk, vStateName); + END IF; + END IF; +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketTracking_afterDelete` + AFTER DELETE ON `ticketTracking` + FOR EACH ROW +BEGIN + DECLARE vTicketFk INT; + DECLARE vTicketTrackingFk INT; + DECLARE vStateName VARCHAR(15); + + DECLARE CONTINUE HANDLER FOR SQLSTATE '23000' + BEGIN + DELETE FROM vn.ticketLastState + WHERE ticketFk = OLD.ticketFk; + END; + + INSERT INTO ticketLog + SET `action` = 'delete', + `changedModel` = 'TicketTracking', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); + + CALL util.debugAdd('deletedState', + CONCAT('interFk: ', OLD.id, + ' ticketFk: ', OLD.ticketFk, + ' stateFk: ', OLD.stateFk)); + + SELECT i.ticketFk, i.id, s.`name` + INTO vTicketFk, vTicketTrackingFk, vStateName + FROM ticketTracking i + JOIN state s ON i.stateFk = s.id + WHERE ticketFk = OLD.ticketFk + ORDER BY created DESC + LIMIT 1; + + IF vTicketFk > 0 THEN + REPLACE INTO ticketLastState(ticketFk, ticketTrackingFk,name) + VALUES(vTicketFk, vTicketTrackingFk, vStateName); + END IF; +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketWeekly_beforeInsert` + BEFORE INSERT ON `ticketWeekly` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketWeekly_beforeUpdate` + BEFORE UPDATE ON `ticketWeekly` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`ticketWeekly_afterDelete` + AFTER DELETE ON `ticketWeekly` + FOR EACH ROW +BEGIN + INSERT INTO ticketLog + SET `action` = 'delete', + `changedModel` = 'TicketWeekly', + `changedModelId` = OLD.ticketFk, + `userFk` = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`time_afterUpdate` + AFTER UPDATE ON `time` + FOR EACH ROW +BEGIN + /*INSERT INTO vn.mail SET + `sender` = 'jgallego@verdnatura.es', + `replyTo` = 'jgallego@verdnatura.es', + `subject` = 'tabla time modificada', + `body` = CONCAT(account.myUser_getName(), ' ha modificado la tabla time ', + NEW.`dated`);*/ +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`town_beforeInsert` + BEFORE INSERT ON `town` + FOR EACH ROW +BEGIN + SET NEW.geoFk = zoneGeo_new('town', NEW.`name`, + (SELECT geoFk FROM province WHERE id = NEW.provinceFk)); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`town_beforeUpdate` + BEFORE UPDATE ON `town` + FOR EACH ROW +BEGIN + -- IF !(OLD.geoFk <=> NEW.geoFk) THEN + -- CALL zoneGeo_throwNotEditable; + -- END IF; +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`town_afterUpdate` + AFTER UPDATE ON `town` + FOR EACH ROW +BEGIN + IF !(OLD.provinceFk <=> NEW.provinceFk) THEN + CALL zoneGeo_setParent(NEW.geoFk, + (SELECT geoFk FROM province WHERE id = NEW.provinceFk)); + END IF; + + IF !(OLD.`name` <=> NEW.`name`) THEN + UPDATE zoneGeo SET `name` = NEW.`name` + WHERE id = NEW.geoFk; + END IF; +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`town_afterDelete` + AFTER DELETE ON `town` + FOR EACH ROW +BEGIN + CALL zoneGeo_delete(OLD.geoFk); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`travel_beforeInsert` + BEFORE INSERT ON `travel` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); + + CALL travel_checkDates(NEW.shipped, NEW.landed); + + CALL travel_checkWarehouseIsFeedStock(NEW.warehouseInFk); + + IF NEW.awbFk IS NOT NULL AND NOT travel_hasUniqueAwb(NEW.id) THEN + CALL util.throw('The AWB is incorrect, there is a different AWB in the associated entries'); + END IF; +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`travel_beforeUpdate` + BEFORE UPDATE ON `travel` + FOR EACH ROW +BEGIN + DECLARE vHasAnyInvoiceBooked BOOL; + + SET NEW.editorFk = account.myUser_getId(); + + IF NOT (NEW.landed <=> OLD.landed) + OR NOT (NEW.shipped <=> OLD.shipped) THEN + CALL travel_checkDates(NEW.shipped, NEW.landed); + END IF; + + IF NOT (NEW.isReceived <=> OLD.isReceived) THEN + CALL travel_checkPackaging(NEW.id); + END IF; + + IF NOT (NEW.warehouseInFk <=> OLD.warehouseInFk) THEN + CALL travel_checkWarehouseIsFeedStock(NEW.warehouseInFk); + END IF; + + IF NOT (NEW.awbFk <=> OLD.awbFk)THEN + SELECT COUNT(*) INTO vHasAnyInvoiceBooked + FROM travel t + JOIN entry e ON e.travelFk = t.id + JOIN invoiceIn ii ON ii.id = e.invoiceInFk + WHERE t.id = NEW.id + AND ii.isBooked; + + IF vHasAnyInvoiceBooked THEN + CALL util.throw('The travel has entries with booked invoices'); + END IF; + END IF; +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`travel_afterUpdate` + AFTER UPDATE ON `travel` + FOR EACH ROW +BEGIN + CALL stock.log_add('travel', NEW.id, OLD.id); + + IF NOT(NEW.shipped <=> OLD.shipped) THEN + UPDATE entry + SET commission = entry_getCommission(travelFk, currencyFk,supplierFk) + WHERE travelFk = NEW.id; + END IF; + + IF NOT (NEW.agencyModeFk <=> OLD.agencyModeFk) THEN + IF (SELECT hasWeightVolumetric FROM agencyMode WHERE id = NEW.agencyModeFk) THEN + CREATE OR REPLACE TEMPORARY TABLE tmp.buysToCheck + SELECT b.id + FROM entry e + JOIN buy b ON b.entryFk = e.id + JOIN item i ON i.id = b.itemFk + WHERE e.travelFk = NEW.id; + + CALL buy_checkItem(); + END IF; + END IF; + + IF (NOT(NEW.awbFk <=> OLD.awbFk)) AND NEW.awbFk IS NOT NULL AND NOT travel_hasUniqueAwb(NEW.id) THEN + CALL util.throw('The AWB is incorrect, there is a different AWB in the associated entries'); + END IF; +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`travel_afterDelete` + AFTER DELETE ON `travel` + FOR EACH ROW +BEGIN + INSERT INTO travelLog + SET `action` = 'delete', + `changedModel` = 'Travel', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`travelThermograph_beforeInsert` + BEFORE INSERT ON `travelThermograph` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`travelThermograph_beforeUpdate` + BEFORE UPDATE ON `travelThermograph` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`travelThermograph_afterDelete` + AFTER DELETE ON `travelThermograph` + FOR EACH ROW +BEGIN + INSERT INTO travelLog + SET `action` = 'delete', + `changedModel` = 'TravelThermograph', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`vehicle_beforeInsert` + BEFORE INSERT ON `vehicle` + FOR EACH ROW +BEGIN + CALL vehicle_checkNumberPlate(NEW.numberPlate, NEW.countryCodeFk); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`vehicle_beforeUpdate` + BEFORE UPDATE ON `vehicle` + FOR EACH ROW +BEGIN + CALL vehicle_checkNumberPlate(NEW.numberPlate, NEW.countryCodeFk); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`warehouse_afterInsert` + BEFORE UPDATE ON `warehouse` + FOR EACH ROW +BEGIN + IF NEW.isFeedStock AND NEW.isInventory THEN + CALL util.throw("isFeedStock and isInventory cannot both be true"); + END IF; +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`worker_beforeInsert` + BEFORE INSERT ON `worker` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`worker_beforeUpdate` + BEFORE UPDATE ON `worker` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`worker_afterDelete` + AFTER DELETE ON `worker` + FOR EACH ROW +BEGIN + INSERT INTO workerLog + SET `action` = 'delete', + `changedModel` = 'Worker', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`workerDocument_beforeInsert` + BEFORE INSERT ON `workerDocument` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`workerDocument_beforeUpdate` + BEFORE UPDATE ON `workerDocument` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`workerDocument_afterDelete` + AFTER DELETE ON `workerDocument` + FOR EACH ROW +BEGIN + INSERT INTO workerLog + SET `action` = 'delete', + `changedModel` = 'WorkerDocument', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`workerIncome_afterInsert` + AFTER INSERT ON `workerIncome` + FOR EACH ROW +BEGIN + CALL worker_updateBalance(NEW.workerFk,NEW.credit,NEW.debit); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`workerIncome_afterUpdate` + AFTER UPDATE ON `workerIncome` + FOR EACH ROW +BEGIN + CALL worker_updateBalance(NEW.workerFk,-OLD.credit,-OLD.debit); + + CALL worker_updateBalance(NEW.workerFk,NEW.credit,NEW.debit); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`workerIncome_afterDelete` + AFTER DELETE ON `workerIncome` + FOR EACH ROW +BEGIN + CALL worker_updateBalance(OLD.workerFk,-OLD.credit,-OLD.debit); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`workerTimeControl_beforeInsert` + BEFORE INSERT ON `workerTimeControl` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`workerTimeControl_afterInsert` + AFTER INSERT ON `workerTimeControl` + FOR EACH ROW +BEGIN + IF NEW.timed > (util.VN_NOW() + INTERVAL 1 DAY) THEN + CALL util.throw('date in the future'); + END IF; +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`workerTimeControl_beforeUpdate` + BEFORE UPDATE ON `workerTimeControl` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`workerTimeControl_afterDelete` + AFTER DELETE ON `workerTimeControl` + FOR EACH ROW +BEGIN + INSERT INTO workerLog + SET `action` = 'delete', + `changedModel` = 'WorkerTimeControl', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`workingHours_beforeInsert` + BEFORE INSERT ON `workingHours` + FOR EACH ROW +BEGIN + IF (SELECT COUNT(*) FROM workingHours WHERE userId = NEW.userId AND DATE(timeIn) = util.VN_CURDATE()) > 0 THEN + CALL util.throw ('ALREADY_LOGGED'); + END IF; +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`zone_beforeInsert` + BEFORE INSERT ON `zone` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`zone_beforeUpdate` + BEFORE UPDATE ON `zone` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`zone_afterDelete` + AFTER DELETE ON `zone` + FOR EACH ROW +BEGIN + INSERT INTO zoneLog + SET `action` = 'delete', + `changedModel` = 'Zone', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`zoneEvent_beforeInsert` + BEFORE INSERT ON `zoneEvent` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`zoneEvent_beforeUpdate` + BEFORE UPDATE ON `zoneEvent` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`zoneEvent_afterDelete` + AFTER DELETE ON `zoneEvent` + FOR EACH ROW +BEGIN + INSERT INTO zoneLog + SET `action` = 'delete', + `changedModel` = 'zoneEvent', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`zoneExclusion_beforeInsert` + BEFORE INSERT ON `zoneExclusion` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); + SET NEW.userFk = account.myUser_getId(); + +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`zoneExclusion_beforeUpdate` + BEFORE UPDATE ON `zoneExclusion` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); + SET NEW.userFk = account.myUser_getId(); + +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`zoneExclusion_afterDelete` + AFTER DELETE ON `zoneExclusion` + FOR EACH ROW +BEGIN + INSERT INTO zoneLog + SET `action` = 'delete', + `changedModel` = 'zoneExclusion', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`zoneGeo_beforeInsert` + BEFORE INSERT ON `zoneGeo` + FOR EACH ROW +BEGIN + CALL zoneGeo_checkName(NEW.`name`); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`zoneGeo_beforeUpdate` + BEFORE UPDATE ON `zoneGeo` + FOR EACH ROW +BEGIN + IF !(OLD.`name` <=> NEW.`name`) THEN + CALL zoneGeo_checkName(NEW.`name`); + END IF; +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`zoneIncluded_beforeInsert` + BEFORE INSERT ON `zoneIncluded` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`zoneIncluded_beforeUpdate` + BEFORE UPDATE ON `zoneIncluded` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb3 */ ; +/*!50003 SET character_set_results = utf8mb3 */ ; +/*!50003 SET collation_connection = utf8mb3_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`zoneIncluded_afterDelete` + AFTER DELETE ON `zoneIncluded` + FOR EACH ROW +BEGIN + INSERT INTO zoneLog + SET `action` = 'delete', + `changedModel` = 'zoneIncluded', + `changedModelId` = OLD.zoneFk, + `userFk` = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`zoneWarehouse_beforeInsert` + BEFORE INSERT ON `zoneWarehouse` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`zoneWarehouse_beforeUpdate` + BEFORE UPDATE ON `zoneWarehouse` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb4 */ ; +/*!50003 SET character_set_results = utf8mb4 */ ; +/*!50003 SET collation_connection = utf8mb4_unicode_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 TRIGGER `vn`.`zoneWarehouse_afterDelete` + AFTER DELETE ON `zoneWarehouse` + FOR EACH ROW +BEGIN + INSERT INTO zoneLog + SET `action` = 'delete', + `changedModel` = 'ZoneWarehouse', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; + +-- +-- Current Database: `vn2008` +-- + +USE `vn2008`; +/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; + +/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; +/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; +/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; + +-- Dump completed on 2024-03-26 6:55:58 diff --git a/db/dump/Dockerfile b/db/dump/Dockerfile new file mode 100644 index 000000000..91d0fde2c --- /dev/null +++ b/db/dump/Dockerfile @@ -0,0 +1,5 @@ +FROM mariadb:10.11.6 + +ENV TZ Europe/Madrid + +COPY db.cnf /etc/mysql/conf.d/z99-local.cnf diff --git a/db/dump/db.cnf b/db/dump/db.cnf new file mode 100644 index 000000000..3dafaf514 --- /dev/null +++ b/db/dump/db.cnf @@ -0,0 +1,9 @@ +[mysqld] +log-bin = bin.log +max_binlog_size = 1GB +binlog_row_image = noblob +binlog_format = row +expire_logs_days = 2 + +binlog-ignore-db = tmp +binlog-ignore-db = PERCONA_SCHEMA diff --git a/db/dump/dump.after.sql b/db/dump/dump.after.sql new file mode 100644 index 000000000..f1a121b2a --- /dev/null +++ b/db/dump/dump.after.sql @@ -0,0 +1 @@ +-- Executed after dump diff --git a/db/dump/dump.before.sql b/db/dump/dump.before.sql new file mode 100644 index 000000000..24168fe60 --- /dev/null +++ b/db/dump/dump.before.sql @@ -0,0 +1 @@ +-- Executed before dump diff --git a/db/dump/dumpedFixtures.sql b/db/dump/dumpedFixtures.sql deleted file mode 100644 index 2e1511b59..000000000 --- a/db/dump/dumpedFixtures.sql +++ /dev/null @@ -1,773 +0,0 @@ - -USE `util`; --- MariaDB dump 10.19 Distrib 10.5.19-MariaDB, for debian-linux-gnu (x86_64) --- --- Host: db2.static.verdnatura.es Database: util --- ------------------------------------------------------ --- Server version 10.7.7-MariaDB-1:10.7.7+maria~deb11-log - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Dumping data for table `config` --- - -LOCK TABLES `config` WRITE; -/*!40000 ALTER TABLE `config` DISABLE KEYS */; -INSERT INTO `config` VALUES (1,'233401',0,'production',NULL,'2001-01-01 11:00:00',NULL,0); -/*!40000 ALTER TABLE `config` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `version` --- - -LOCK TABLES `version` WRITE; -/*!40000 ALTER TABLE `version` DISABLE KEYS */; -INSERT INTO `version` VALUES ('salix','10230','53f69ae8e526a4a5d827c237a5b076d38507b392','2020-11-09 11:06:43',NULL),('vn-database','10714','aeb89a7b54f62398ddbcf3a48c8d387f275fee47','2023-08-29 12:49:52','10716'); -/*!40000 ALTER TABLE `version` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `versionLog` --- - -LOCK TABLES `versionLog` WRITE; -/*!40000 ALTER TABLE `versionLog` DISABLE KEYS */; -INSERT INTO `versionLog` VALUES ('vn-database','00001','00-test.sql','juan@10.5.1.3','2022-01-31 10:12:26',NULL,NULL),('vn-database','00003','00-sage.sql','juan@10.5.1.3','2022-01-31 10:12:26',NULL,NULL),('vn-database','10008','00-alterRoleConfig.sql','juan@10.5.1.3','2022-01-31 10:12:26',NULL,NULL),('vn-database','10014','00-rolePrefix.sql','jenkins@10.0.2.68','2022-02-11 00:13:25',NULL,NULL),('vn-database','10017','01-firstScript.sql','jenkins@10.0.2.70','2022-03-09 11:36:54',NULL,NULL),('vn-database','10021','00-bankAccount.sql','jenkins@10.0.2.69','2022-03-16 14:11:22',NULL,NULL),('vn-database','10023','00-firstScript.sql','jenkins@10.0.2.69','2022-03-16 15:05:29',NULL,NULL),('vn-database','10026','00-invoiceInIntrastat.sql','jenkins@10.0.2.69','2022-03-21 15:10:53',NULL,NULL),('vn-database','10027','00-Clientes_cedidos.sql','jenkins@10.0.2.69','2022-03-22 15:58:12',NULL,NULL),('vn-database','10028','00-item_last_buy_.sql','jenkins@10.0.2.69','2022-03-22 15:58:12',NULL,NULL),('vn-database','10029','00-bankToViewAccountingToTable.sql','jenkins@10.0.2.69','2022-03-22 15:58:12',NULL,NULL),('vn-database','10030','00-KkejarNiche.sql','jenkins@10.0.2.69','2022-03-22 15:58:12',NULL,NULL),('vn-database','10036','00-updateBuyConfig.sql','jenkins@10.0.2.69','2022-03-29 12:36:54',NULL,NULL),('vn-database','10037','00-firstScript.sql','jenkins@10.0.2.69','2022-03-28 11:14:26',NULL,NULL),('vn-database','10038','00-printServerQueue.sql','jenkins@10.0.2.69','2022-03-29 08:13:24',NULL,NULL),('vn-database','10048','00-firstScript.sql','jenkins@10.0.2.69','2022-03-30 12:29:06',NULL,NULL),('vn-database','10058','00-vehicleAddFields.sql','jenkins@10.0.2.69','2022-04-06 08:48:34',NULL,NULL),('vn-database','10060','00-firstScript.sql','jenkins@10.0.2.69','2022-04-07 08:50:11',NULL,NULL),('vn-database','10062','00-firstScript.sql','jenkins@10.0.2.69','2022-04-06 10:51:45',NULL,NULL),('vn-database','10064','00-firstScript.sql','jenkins@10.0.2.69','2022-04-06 13:57:11',NULL,NULL),('vn-database','10066','00-firstScript.sql','jenkins@10.0.2.69','2022-04-07 08:50:12',NULL,NULL),('vn-database','10067','00-firstScript.sql','jenkins@10.0.2.69','2022-04-08 10:18:20',NULL,NULL),('vn-database','10071','00-packingSiteLog.sql','jenkins@10.0.2.69','2022-04-08 09:37:30',NULL,NULL),('vn-database','10072','00-firstScript.sql','jenkins@10.0.2.69','2022-04-08 11:01:46',NULL,NULL),('vn-database','10073','00-firstScript.sql','jenkins@10.0.2.69','2022-04-08 13:40:56',NULL,NULL),('vn-database','10074','00-firstScript.sql','jenkins@10.0.2.69','2022-04-10 13:15:05',NULL,NULL),('vn-database','10077','00-firstScript.sql','jenkins@10.0.2.69','2022-04-12 08:07:15',NULL,NULL),('vn-database','10078','00-firstScript.sql','jenkins@10.0.2.69','2022-04-13 07:44:21',NULL,NULL),('vn-database','10079','00-firstScript.sql','jenkins@10.0.2.69','2022-04-12 12:01:37',NULL,NULL),('vn-database','10086','00-firstScript.sql','jenkins@10.0.2.69','2022-04-13 08:58:34',NULL,NULL),('vn-database','10087','00-firstScript.sql','jenkins@10.0.2.69','2022-04-13 09:39:49',NULL,NULL),('vn-database','10088','00-firstScript.sql','jenkins@10.0.2.69','2022-04-13 15:05:12',NULL,NULL),('vn-database','10089','00-firstScript.sql','jenkins@10.0.2.69','2022-04-18 14:12:52',NULL,NULL),('vn-database','10090','00-firstScript.sql','jenkins@10.0.2.69','2022-04-18 14:34:46',NULL,NULL),('vn-database','10092','00-firstScript.sql','jenkins@10.0.2.69','2022-04-19 14:45:46',NULL,NULL),('vn-database','10093','00-autoradioConfig.sql','jenkins@10.0.2.69','2022-05-03 09:16:47',NULL,NULL),('vn-database','10094','00-firstScript.sql','jenkins@10.0.2.69','2022-04-20 10:57:30',NULL,NULL),('vn-database','10097','00-firstScript.sql','jenkins@10.0.2.69','2022-05-05 10:12:59',NULL,NULL),('vn-database','10099','00-firstScript.sql','jenkins@10.0.2.69','2022-04-20 14:35:27',NULL,NULL),('vn-database','10100','00-firstScript.sql','jenkins@10.0.2.69','2022-04-20 14:35:27',NULL,NULL),('vn-database','10101','00-firstScript.sql','jenkins@10.0.2.69','2022-04-21 14:59:31',NULL,NULL),('vn-database','10103','00-awbVolume.sql','jenkins@10.0.2.69','2022-05-05 10:12:59',NULL,NULL),('vn-database','10104','00-firstScript.sql','jenkins@10.0.2.69','2022-05-05 10:12:59',NULL,NULL),('vn-database','10105','00-firstScript.sql','jenkins@10.0.2.69','2022-05-05 10:13:00',NULL,NULL),('vn-database','10107','00-firstScript.sql','jenkins@10.0.2.69','2022-04-23 10:53:53',NULL,NULL),('vn-database','10112','00-firstScript.sql','jenkins@10.0.2.69','2022-05-09 09:14:53',NULL,NULL),('vn-database','10113','00-firstScript.sql','jenkins@10.0.2.69','2022-05-05 10:13:00',NULL,NULL),('vn-database','10114','00-updateConfig.sql','jenkins@10.0.2.69','2022-04-27 13:37:25',NULL,NULL),('vn-database','10116','00-firstScript.sql','jenkins@10.0.2.69','2022-04-28 11:10:14',NULL,NULL),('vn-database','10118','00-firstScript.sql','jenkins@10.0.2.69','2022-04-29 08:10:15',NULL,NULL),('vn-database','10119','00-AfegirFKPart1.sql','jenkins@10.0.2.69','2022-05-05 10:13:00',NULL,NULL),('vn-database','10119','01-AfegirFkPart2.sql','jenkins@10.0.2.69','2022-05-05 10:22:25',NULL,NULL),('vn-database','10125','00-firstScript.sql','jenkins@10.0.2.68','2022-05-18 18:44:30',NULL,NULL),('vn-database','10127','00-firstScript.sql','jenkins@10.0.2.69','2022-05-02 11:04:46',NULL,NULL),('vn-database','10128','00-firstScript.sql','jenkins@10.0.2.69','2022-05-02 13:04:31',NULL,NULL),('vn-database','10129','00-firstScript.sql','jenkins@10.0.2.69','2022-05-03 08:21:01',NULL,NULL),('vn-database','10132','00-firstScript.sql','jenkins@10.0.2.69','2022-05-05 10:22:25',NULL,NULL),('vn-database','10133','00-firstScript.sql','jenkins@10.0.2.69','2022-05-05 14:32:30',NULL,NULL),('vn-database','10134','00-firstScript.sql','jenkins@10.0.2.69','2022-05-06 07:45:25',NULL,NULL),('vn-database','10135','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 08:46:17',NULL,NULL),('vn-database','10136','00-workerTimeControl.sql','jenkins@10.0.2.69','2022-05-09 13:51:12',NULL,NULL),('vn-database','10138','00-firstScript.sql','jenkins@10.0.2.69','2022-05-10 13:58:05',NULL,NULL),('vn-database','10139','00-firstScript.sql','jenkins@10.0.2.68','2022-05-16 14:32:37',NULL,NULL),('vn-database','10139','01-secondScript.sql','jenkins@10.0.2.68','2022-05-17 12:16:13',NULL,NULL),('vn-database','10141','00-firstScript.sql','jenkins@10.0.2.70','2022-05-12 08:27:31',NULL,NULL),('vn-database','10142','00-firstScript.sql','jenkins@10.0.2.68','2022-05-20 09:20:31',NULL,NULL),('vn-database','10143','00-firstScript.sql','jenkins@10.0.2.68','2022-05-20 09:20:31',NULL,NULL),('vn-database','10144','00-AfegirFKPArt1.sql','jenkins@10.0.2.68','2022-05-20 09:22:33',NULL,NULL),('vn-database','10144','00-firstScript.sql','jenkins@10.0.2.68','2022-05-13 09:44:25',NULL,NULL),('vn-database','10147','00-firstScript.sql','jenkins@10.0.2.68','2022-05-20 09:22:33',NULL,NULL),('vn-database','10149','00-firstScript.sql','jenkins@10.0.2.68','2022-05-20 09:22:33',NULL,NULL),('vn-database','10150','00-firstScript.sql','jenkins@10.0.2.68','2022-05-17 09:57:16',NULL,NULL),('vn-database','10152','00-firstScript.sql','jenkins@10.0.2.68','2022-05-20 09:22:34',NULL,NULL),('vn-database','10153','00-firstScript.sql','jenkins@10.0.2.68','2022-05-20 09:22:34',NULL,NULL),('vn-database','10154','00-compressionKk.sql','jenkins@10.0.2.68','2022-05-20 09:22:34',NULL,NULL),('vn-database','10157','00-firstScript.sql','jenkins@10.0.2.68','2022-05-20 09:22:35',NULL,NULL),('vn-database','10158','00-firstScript.sql','jenkins@10.0.2.68','2022-06-02 12:47:21',NULL,NULL),('vn-database','10160','00-firstScript.sql','jenkins@10.0.2.69','2022-06-30 09:30:50',NULL,NULL),('vn-database','10163','00-firstScript.sql','jenkins@10.0.2.68','2022-05-23 08:17:14',NULL,NULL),('vn-database','10164','00-borrarSectorsDesus.sql','jenkins@10.0.2.68','2022-06-02 12:47:21',NULL,NULL),('vn-database','10165','00-firstScript.sql','jenkins@10.0.2.68','2022-06-02 12:47:22',NULL,NULL),('vn-database','10166','00-firstScript.sql','jenkins@10.0.2.68','2022-05-24 16:11:21',NULL,NULL),('vn-database','10167','00-renameVnActiveContrat.sql','jenkins@10.0.2.68','2022-06-02 12:47:22',NULL,NULL),('vn-database','10168','00-firstScript.sql','jenkins@10.0.2.68','2022-06-02 12:47:22',NULL,NULL),('vn-database','10169','00-createTableBankEntityConfig.sql','jenkins@10.0.2.68','2022-06-02 12:47:22',NULL,NULL),('vn-database','10169','02-addNotNullToBankEntityBic.sql','jenkins@10.0.2.68','2022-06-02 12:47:22',NULL,NULL),('vn-database','10171','00-volumeConfig.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-18 14:11:11',NULL,NULL),('vn-database','10171','01-itemWeight.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-18 16:01:34',NULL,NULL),('vn-database','10171','02-agencymode.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-18 16:01:34',NULL,NULL),('vn-database','10172','00-firstScript.sql','jenkins@10.0.2.68','2022-06-02 12:47:22',NULL,NULL),('vn-database','10174','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 08:46:17',NULL,NULL),('vn-database','10175','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:03:41',NULL,NULL),('vn-database','10177','00-crearTablaSpecialLabels.sql','jenkins@10.0.2.68','2022-06-02 12:47:22',NULL,NULL),('vn-database','10178','00-firstScript.sql','jenkins@10.0.2.68','2022-06-02 12:47:24',NULL,NULL),('vn-database','10179','00-firstScript.sql','jenkins@10.0.2.68','2022-06-02 12:47:24',NULL,NULL),('vn-database','10183','00-firstScript.sql','jenkins@10.0.2.68','2022-06-02 12:47:24',NULL,NULL),('vn-database','10184','00-firstScript.sql','jenkins@10.0.2.68','2022-06-03 08:05:34',NULL,NULL),('vn-database','10185','00-firstScript.sql','jenkins@10.0.2.68','2022-06-06 09:07:45',NULL,NULL),('vn-database','10186','00-desactivar_trigger.sql','jenkins@10.0.2.68','2022-06-07 09:31:23',NULL,NULL),('vn-database','10186','01-alter_Table_buy.sql','jenkins@10.0.2.68','2022-06-07 09:34:47',NULL,NULL),('vn-database','10186','02-alter_table_entryConfig.sql','jenkins@10.0.2.68','2022-06-07 09:34:47',NULL,NULL),('vn-database','10186','04-regularizar_Sticker_Inventario.sql','jenkins@10.0.2.68','2022-06-07 09:34:51',NULL,NULL),('vn-database','10186','09-reactivar_trigger.sql','jenkins@10.0.2.68','2022-06-07 09:34:51',NULL,NULL),('vn-database','10187','00-firstScript.sql','jenkins@10.0.2.68','2022-06-06 12:37:31',NULL,NULL),('vn-database','10188','00-firstScript.sql','jenkins@10.0.2.68','2022-06-06 14:03:36',NULL,NULL),('vn-database','10189','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:03:41',NULL,NULL),('vn-database','10191','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:03:41',NULL,NULL),('vn-database','10193','00-delete.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-15 12:14:35',NULL,NULL),('vn-database','10193','01-botanicExport.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-15 12:14:43',NULL,NULL),('vn-database','10193','02-item.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-15 12:14:44',NULL,NULL),('vn-database','10193','03-autonomy.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-15 12:14:44',NULL,NULL),('vn-database','10193','03-turn.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-15 12:14:44',NULL,NULL),('vn-database','10193','04-country.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-15 12:14:44',NULL,NULL),('vn-database','10194','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:03:41',NULL,NULL),('vn-database','10195','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:03:41',NULL,NULL),('vn-database','10200','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:04:00',NULL,NULL),('vn-database','10201','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:04:00',NULL,NULL),('vn-database','10202','00-Remove_FK_to_ediGenus.sql','jenkins@10.0.2.69','2022-06-17 09:04:00',NULL,NULL),('vn-database','10203','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:04:01',NULL,NULL),('vn-database','10204','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:04:01',NULL,NULL),('vn-database','10205','00-firstScript.sql','jenkins@10.0.2.69','2022-06-17 09:04:21',NULL,NULL),('vn-database','10207','00-Alter_table_entry.sql','jenkins@10.0.2.69','2022-06-16 07:22:50',NULL,NULL),('vn-database','10207','01-Update_invoiceAmount.sql','jenkins@10.0.2.69','2022-06-16 07:23:00',NULL,NULL),('vn-database','10208','00-firstScript.sql','jenkins@10.0.2.69','2022-06-30 09:31:26',NULL,NULL),('vn-database','10209','00-firstScript.sql','jenkins@10.0.2.69','2022-06-16 08:47:40',NULL,NULL),('vn-database','10210','00-firstScript.sql','jenkins@10.0.2.69','2022-06-16 17:39:17',1046,'Base de datos no seleccionada'),('vn-database','10211','01-firstScript.sql','jenkins@10.0.2.69','2022-06-17 07:11:27',NULL,NULL),('vn-database','10215','00-renameIsInventory.sql','jenkins@10.0.2.69','2022-06-30 09:31:26',NULL,NULL),('vn-database','10216','00-firstScript.sql','jenkins@10.0.2.69','2022-06-23 11:15:28',NULL,NULL),('vn-database','10216','01-batchIndex.sql','jenkins@10.0.2.70','2022-06-27 18:10:55',NULL,NULL),('vn-database','10219','00-AddCollectionFkOnPackingSite.sql','jenkins@10.0.2.70','2022-06-29 09:23:42',NULL,NULL),('vn-database','10219','01-AddFkToCollectionFk.sql','jenkins@10.0.2.70','2022-06-29 09:23:43',NULL,NULL),('vn-database','10220','00-createPersonalProtectionEquipment.sql','jenkins@10.0.2.69','2022-06-30 09:31:26',NULL,NULL),('vn-database','10222','00-firstScript.sql','jenkins@10.0.2.69','2022-07-14 09:12:40',NULL,NULL),('vn-database','10223','00-firstScript.sql','jenkins@10.0.2.69','2022-07-14 09:13:52',NULL,NULL),('vn-database','10224','00-cosetes.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-21 12:03:45',NULL,NULL),('vn-database','10229','00-firstScript.sql','jenkins@10.0.2.69','2022-07-01 11:59:34',NULL,NULL),('vn-database','10231','01-tablaEktConfig.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-11 09:25:39',NULL,NULL),('vn-database','10233','00-firstScript.sql','jenkins@10.0.2.69','2022-07-14 09:13:53',NULL,NULL),('vn-database','10235','00-firstScript.sql','jenkins@10.0.2.69','2022-07-14 09:13:53',NULL,NULL),('vn-database','10236','00-firstScript.sql','jenkins@10.0.2.69','2022-07-05 12:11:40',NULL,NULL),('vn-database','10237','00-firstScript.sql','jenkins@10.0.2.69','2022-07-14 09:13:53',NULL,NULL),('vn-database','10238','00-worker_mobileExtension.sql','jenkins@10.0.2.69','2022-07-14 09:14:09',NULL,NULL),('vn-database','10239','00-firstScript.sql','jenkins@10.0.2.69','2022-07-07 21:51:58',NULL,NULL),('vn-database','10241','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-29 08:14:01',NULL,NULL),('vn-database','10242','00-firstScript.sql','jenkins@10.0.2.69','2022-07-14 09:14:32',NULL,NULL),('vn-database','10243','00-firstScript.sql','jenkins@10.0.2.69','2022-07-14 09:14:32',NULL,NULL),('vn-database','10245','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-28 08:34:51',NULL,NULL),('vn-database','10247','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-28 08:34:51',NULL,NULL),('vn-database','10248','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-20 17:27:51',NULL,NULL),('vn-database','10250','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-28 08:36:40',NULL,NULL),('vn-database','10253','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-28 08:36:57',NULL,NULL),('vn-database','10254','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-28 08:38:48',NULL,NULL),('vn-database','10256','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-28 08:38:48',NULL,NULL),('vn-database','10258','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-12-16 09:14:48',NULL,NULL),('vn-database','10259','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-02 08:54:56',NULL,NULL),('vn-database','10261','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-22 08:42:20',NULL,NULL),('vn-database','10262','00-createTablepackagingWithFreight.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:13',NULL,NULL),('vn-database','10262','01-alterTablePackagingConfig.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:13',NULL,NULL),('vn-database','10262','02-insertsInicials.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:13',NULL,NULL),('vn-database','10262','03-createTablepackingWithoutFreight.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:14',NULL,NULL),('vn-database','10263','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-28 08:38:48',NULL,NULL),('vn-database','10265','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-07-28 08:38:48',NULL,NULL),('vn-database','10267','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-11 09:34:17',NULL,NULL),('vn-database','10267','01-fixMerge.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-11 09:34:17',NULL,NULL),('vn-database','10275','00-improvedGeneralLog.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-01 09:55:56',NULL,NULL),('vn-database','10277','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-08 10:26:32',NULL,NULL),('vn-database','10278','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-01 17:51:41',NULL,NULL),('vn-database','10279','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-11 09:34:17',NULL,NULL),('vn-database','10281','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-11 09:34:18',NULL,NULL),('vn-database','10282','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-11 09:34:18',NULL,NULL),('vn-database','10283','00-alterTable.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-11 09:34:18',NULL,NULL),('vn-database','10284','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-04 16:59:08',NULL,NULL),('vn-database','10285','00-firstScript.sql','jenkins@swarm-worker3.static.verdnatura.es','2022-08-05 09:19:33',NULL,NULL),('vn-database','10287','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-11 09:35:24',NULL,NULL),('vn-database','10288','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-11 09:35:24',NULL,NULL),('vn-database','10289','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:29:36',NULL,NULL),('vn-database','10291','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-10 14:19:34',NULL,NULL),('vn-database','10293','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-08 10:26:32',NULL,NULL),('vn-database','10297','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-16 12:43:36',NULL,NULL),('vn-database','10298','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-08-13 21:04:13',NULL,NULL),('vn-database','10299','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:14',NULL,NULL),('vn-database','10301','00-productionConfig.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:14',NULL,NULL),('vn-database','10301','01-drop.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:14',NULL,NULL),('vn-database','10301','02-collection.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:15',NULL,NULL),('vn-database','10302','00-CreateTableEntryType.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:15',NULL,NULL),('vn-database','10302','01-insertDataEntryType.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:15',NULL,NULL),('vn-database','10302','02-alterTableEntry.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:22',NULL,NULL),('vn-database','10303','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:22:23',NULL,NULL),('vn-database','10304','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:23:48',NULL,NULL),('vn-database','10304','01-altertableticket.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:23:51',NULL,NULL),('vn-database','10305','00-ektAssign.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:24:52',NULL,NULL),('vn-database','10306','00-deliveryInformation.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:25:25',NULL,NULL),('vn-database','10307','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:25:26',NULL,NULL),('vn-database','10308','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-02 17:26:43',NULL,NULL),('vn-database','10309','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-06 11:37:54',NULL,NULL),('vn-database','10310','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-08 10:26:33',NULL,NULL),('vn-database','10311','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-06 11:37:55',NULL,NULL),('vn-database','10312','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-08 10:26:33',NULL,NULL),('vn-database','10313','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-08 10:27:21',NULL,NULL),('vn-database','10314','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-20 12:37:19',NULL,NULL),('vn-database','10315','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-08 10:31:43',NULL,NULL),('vn-database','10317','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-08 10:31:43',NULL,NULL),('vn-database','10318','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-08 10:31:43',NULL,NULL),('vn-database','10319','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-20 12:37:41',NULL,NULL),('vn-database','10320','00-operator.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:29:37',NULL,NULL),('vn-database','10320','01-collection.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:29:37',NULL,NULL),('vn-database','10320','02-productionConfig.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:29:38',NULL,NULL),('vn-database','10321','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-08 11:11:12',NULL,NULL),('vn-database','10322','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-09 09:19:05',NULL,NULL),('vn-database','10326','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:29:38',NULL,NULL),('vn-database','10328','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:29:38',NULL,NULL),('vn-database','10329','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:29:38',NULL,NULL),('vn-database','10330','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:34:30',NULL,NULL),('vn-database','10332','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:34:30',NULL,NULL),('vn-database','10334','00-collectionHotbed.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:34:30',NULL,NULL),('vn-database','10334','01-saleGroupDetail.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:34:32',NULL,NULL),('vn-database','10335','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-06 09:52:38',NULL,NULL),('vn-database','10336','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:34:32',NULL,NULL),('vn-database','10337','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:34:32',NULL,NULL),('vn-database','10339','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-19 09:41:19',NULL,NULL),('vn-database','10340','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-29 11:08:03',NULL,NULL),('vn-database','10341','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:34:32',NULL,NULL),('vn-database','10342','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-29 11:08:03',NULL,NULL),('vn-database','10343','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-22 08:35:30',NULL,NULL),('vn-database','10345','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-11-04 08:25:16',NULL,NULL),('vn-database','10347','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-29 11:08:03',NULL,NULL),('vn-database','10347','01-addVirtualField.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-29 11:08:03',NULL,NULL),('vn-database','10349','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-06 09:52:38',NULL,NULL),('vn-database','10350','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-09-30 10:11:56',NULL,NULL),('vn-database','10352','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-11-04 08:25:16',NULL,NULL),('vn-database','10353','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-06 09:52:38',NULL,NULL),('vn-database','10354','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-06 09:52:38',NULL,NULL),('vn-database','10356','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-10 22:35:00',NULL,NULL),('vn-database','10356','01-orderConfigFk.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-10 22:35:00',NULL,NULL),('vn-database','10356','02-orderConfigDrop.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-10 22:35:00',NULL,NULL),('vn-database','10357','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-06 09:52:38',NULL,NULL),('vn-database','10359','00-improvedGeneralLog_collate.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-06 09:52:39',NULL,NULL),('vn-database','10360','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-06 09:52:39',NULL,NULL),('vn-database','10361','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-06 11:16:07',NULL,NULL),('vn-database','10362','00-dropUdfs.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-10 11:01:15',NULL,NULL),('vn-database','10363','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-11-04 08:25:17',NULL,NULL),('vn-database','10365','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-13 19:30:46',NULL,NULL),('vn-database','10368','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-11-04 08:25:17',NULL,NULL),('vn-database','10369','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-14 13:38:06',NULL,NULL),('vn-database','10370','00-deleteForeignKey.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-17 14:32:41',NULL,NULL),('vn-database','10370','01-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-17 14:32:47',NULL,NULL),('vn-database','10370','02-deleteTable.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-17 14:32:49',NULL,NULL),('vn-database','10370','03-accion.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-17 14:32:49',NULL,NULL),('vn-database','10370','04-inter.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-17 14:32:53',NULL,NULL),('vn-database','10371','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-12 10:56:23',NULL,NULL),('vn-database','10372','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-12-16 09:14:48',NULL,NULL),('vn-database','10373','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-10-19 08:31:58',NULL,NULL),('vn-database','10378','00-rename_routeUserPercentage.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-11-04 08:25:17',NULL,NULL),('vn-database','10379','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-09 08:40:16',NULL,NULL),('vn-database','10382','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-12-01 08:47:20',NULL,NULL),('vn-database','10383','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-17 14:32:53',NULL,NULL),('vn-database','10384','00-business_workcenterFk.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:18:01',NULL,NULL),('vn-database','10385','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-17 14:32:54',NULL,NULL),('vn-database','10386','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-17 14:32:54',NULL,NULL),('vn-database','10387','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-16 14:05:33',NULL,NULL),('vn-database','10388','00-resizeUtilVerionLogCode.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-12-01 08:47:20',NULL,NULL),('vn-database','10388','01-resizeUtilVersionCode.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-12-01 08:47:20',NULL,NULL),('vn-database','10390','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-12-01 08:50:16',NULL,NULL),('vn-database','10391','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-12 10:56:23',NULL,NULL),('vn-database','10394','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-12-01 08:50:24',NULL,NULL),('vn-database','10395','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-12-01 08:50:29',NULL,NULL),('vn-database','10396','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-17 15:36:38',NULL,NULL),('vn-database','10397','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-12-01 08:50:29',NULL,NULL),('vn-database','10399','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-12-01 08:50:29',NULL,NULL),('vn-database','10400','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-12-01 08:50:29',NULL,NULL),('vn-database','10402','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-21 14:11:31',NULL,NULL),('vn-database','10404','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-12-01 08:50:29',NULL,NULL),('vn-database','10405','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-02-16 09:58:22',NULL,NULL),('vn-database','10407','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-12-16 09:14:49',NULL,NULL),('vn-database','10408','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-12 10:56:23',NULL,NULL),('vn-database','10409','00-firstScript.sql','jenkins@swarm-worker2.static.verdnatura.es','2022-12-16 09:14:49',NULL,NULL),('vn-database','10412','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2022-11-30 12:45:44',NULL,NULL),('vn-database','10413','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-12 10:56:24',NULL,NULL),('vn-database','10416','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-12 10:56:24',NULL,NULL),('vn-database','10420','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-12 10:56:25',NULL,NULL),('vn-database','10421','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-12 10:56:26',NULL,NULL),('vn-database','10426','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-20 09:07:40',NULL,NULL),('vn-database','10428','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-26 13:27:05',NULL,NULL),('vn-database','10431','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-23 09:09:22',NULL,NULL),('vn-database','10433','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-26 13:27:05',NULL,NULL),('vn-database','10434','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-26 13:27:05',NULL,NULL),('vn-database','10435','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-13 07:30:10',NULL,NULL),('vn-database','10436','00-createFkWorker.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-02-16 09:58:59',NULL,NULL),('vn-database','10436','01-addStateToWorkerProductivity.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-02-16 09:59:00',NULL,NULL),('vn-database','10436','02-DeprecateVnSaleTrackingState.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-02-16 09:59:00',NULL,NULL),('vn-database','10436','03-DeprecateColumnVnSaleTrackingActionFk.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-02-16 09:59:01',NULL,NULL),('vn-database','10436','04-DropSchemaVnControl.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-02-16 09:59:01',NULL,NULL),('vn-database','10436','05-RemoveFkWorkerProductivity.sql','jenkins@db-proxy2.static.verdnatura.es','2023-02-17 14:51:19',NULL,NULL),('vn-database','10439','00-fixRole.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-25 09:13:26',NULL,NULL),('vn-database','10440','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-23 10:28:41',NULL,NULL),('vn-database','10444','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-02-16 09:59:01',NULL,NULL),('vn-database','10445','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-02-16 09:59:31',NULL,NULL),('vn-database','10448','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-02-16 09:59:31',NULL,NULL),('vn-database','10450','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-27 08:28:04',NULL,NULL),('vn-database','10451','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-02-06 08:08:32',NULL,NULL),('vn-database','10452','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-31 12:30:04',NULL,NULL),('vn-database','10453','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-31 14:04:37',NULL,NULL),('vn-database','10454','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-31 12:30:04',NULL,NULL),('vn-database','10455','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-31 12:30:04',NULL,NULL),('vn-database','10456','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-31 12:00:30',NULL,NULL),('vn-database','10457','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-01-31 12:00:33',NULL,NULL),('vn-database','10458','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-09 08:40:17',NULL,NULL),('vn-database','10459','00-alterTableUtilConfig.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-23 10:28:41',NULL,NULL),('vn-database','10459','01-createFunctionCurdate.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-23 10:28:41',NULL,NULL),('vn-database','10459','02-createFunctionMockTime.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-23 10:28:41',NULL,NULL),('vn-database','10459','03-createFunctionMockTimeBase.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-23 10:28:41',NULL,NULL),('vn-database','10459','04-createFunctionNow.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-23 10:28:41',NULL,NULL),('vn-database','10460','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-02-16 09:59:31',NULL,NULL),('vn-database','10461','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-02-16 09:59:31',NULL,NULL),('vn-database','10463','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-02-03 12:59:26',NULL,NULL),('vn-database','10468','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-02-16 09:59:31',NULL,NULL),('vn-database','10469','00-firstScript.sql','jenkins@swarm-worker1.static.verdnatura.es','2023-02-16 09:59:31',NULL,NULL),('vn-database','10470','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-23 10:28:54',NULL,NULL),('vn-database','10471','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-23 10:28:54',NULL,NULL),('vn-database','10472','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-23 10:28:54',NULL,NULL),('vn-database','10477','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-23 09:09:31',NULL,NULL),('vn-database','10478','00-dropBasket.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-23 10:28:54',NULL,NULL),('vn-database','10478','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-23 10:28:54',NULL,NULL),('vn-database','10478','01-orderConfigured.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-23 10:29:16',NULL,NULL),('vn-database','10478','02-configuredUpdate.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-23 10:29:53',NULL,NULL),('vn-database','10478','99-privileges.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-23 10:29:53',NULL,NULL),('vn-database','10480','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-17 15:09:26',NULL,NULL),('vn-database','10481','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-02-17 16:37:22',NULL,NULL),('vn-database','10482','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-02-21 10:00:28',NULL,NULL),('vn-database','10485','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-09 08:40:17',NULL,NULL),('vn-database','10488','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-09 08:40:17',NULL,NULL),('vn-database','10491','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-09 08:40:18',NULL,NULL),('vn-database','10492','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-09 08:40:18',NULL,NULL),('vn-database','10493','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:18:01',NULL,NULL),('vn-database','10495','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-09 08:40:19',NULL,NULL),('vn-database','10498','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-23 09:09:38',NULL,NULL),('vn-database','10500','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-03-03 07:06:03',NULL,NULL),('vn-database','10501','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-03-03 10:52:24',NULL,NULL),('vn-database','10502','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-23 09:09:48',NULL,NULL),('vn-database','10504','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-25 09:13:27',NULL,NULL),('vn-database','10506','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-23 09:09:48',NULL,NULL),('vn-database','10506','01-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-15 12:30:18',NULL,NULL),('vn-database','10506','02-secondScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-15 12:30:18',NULL,NULL),('vn-database','10506','03-thirdScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-15 12:30:18',NULL,NULL),('vn-database','10507','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-05 10:35:23',NULL,NULL),('vn-database','10508','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-05 10:36:43',NULL,NULL),('vn-database','10510','00-dropBusinessFk.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-05 10:36:47',NULL,NULL),('vn-database','10510','01-createTableProfessionalCategory.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-05 10:36:47',NULL,NULL),('vn-database','10510','02-exportToNewTable.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-05 10:36:47',NULL,NULL),('vn-database','10510','03-RecreateFK.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-05 10:36:51',NULL,NULL),('vn-database','10510','04-kkPostgresqlTable.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-05 10:36:51',NULL,NULL),('vn-database','10511','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-20 09:07:41',NULL,NULL),('vn-database','10512','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-05 10:36:52',NULL,NULL),('vn-database','10513','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-05 10:36:56',NULL,NULL),('vn-database','10514','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-20 09:07:41',NULL,NULL),('vn-database','10516','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-23 09:09:48',NULL,NULL),('vn-database','10521','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-21 06:58:13',NULL,NULL),('vn-database','10522','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-20 09:07:41',NULL,NULL),('vn-database','10523','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-20 09:07:41',NULL,NULL),('vn-database','10524','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-08-10 11:50:12',NULL,NULL),('vn-database','10524','01-rateEditorFk.sql','jenkins@db-proxy2.static.verdnatura.es','2023-08-10 11:50:12',NULL,NULL),('vn-database','10525','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-21 12:42:50',NULL,NULL),('vn-database','10526','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-05 10:36:57',NULL,NULL),('vn-database','10528','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-05 10:37:00',NULL,NULL),('vn-database','10530','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-03-23 14:49:30',NULL,NULL),('vn-database','10531','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-24 11:47:10',NULL,NULL),('vn-database','10532','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-24 11:17:38',NULL,NULL),('vn-database','10533','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-05 10:37:04',NULL,NULL),('vn-database','10537','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-03-29 15:18:36',NULL,NULL),('vn-database','10538','00-createChronopostConfig.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-20 09:07:41',NULL,NULL),('vn-database','10538','01-createChronopostService.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-20 09:07:41',NULL,NULL),('vn-database','10538','02-createChronopostExpedition.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-20 09:07:41',NULL,NULL),('vn-database','10538','03-createChronopostSenderAddress.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-20 09:07:41',NULL,NULL),('vn-database','10538','04-addgrantPrivilegies.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-20 09:07:41',NULL,NULL),('vn-database','10538','05-updateChronopostConfig.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-21 11:54:57',NULL,NULL),('vn-database','10539','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-05 10:37:07',NULL,NULL),('vn-database','10540','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:18:01',NULL,NULL),('vn-database','10545','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-11 08:31:03',NULL,NULL),('vn-database','10546','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-20 09:08:10',NULL,NULL),('vn-database','10547','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:21:58',NULL,NULL),('vn-database','10549','00-updateUpdateLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-21 07:29:22',NULL,NULL),('vn-database','10549','01-updateInsertLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-21 07:30:11',NULL,NULL),('vn-database','10549','02-updateDeleteLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-21 07:30:51',NULL,NULL),('vn-database','10549','03-deleteEmptyLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-21 07:31:34',NULL,NULL),('vn-database','10549','04-optimizeLogTables.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-21 07:33:58',NULL,NULL),('vn-database','10550','00-editorFk.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:42:33',NULL,NULL),('vn-database','10550','01-originFk.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:45:28',NULL,NULL),('vn-database','10552','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-13 08:25:10',NULL,NULL),('vn-database','10554','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-20 09:08:10',NULL,NULL),('vn-database','10557','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-17 07:45:56',NULL,NULL),('vn-database','10559','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-18 10:53:50',NULL,NULL),('vn-database','10560','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-17 09:19:31',NULL,NULL),('vn-database','10562','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:45:28',NULL,NULL),('vn-database','10563','00-delivery_ticketFk.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-20 09:30:53',NULL,NULL),('vn-database','10566','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-20 10:08:41',NULL,NULL),('vn-database','10567','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-20 10:18:06',NULL,NULL),('vn-database','10568','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:45:28',NULL,NULL),('vn-database','10569','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-24 09:14:35',NULL,NULL),('vn-database','10570','00-createSendingConfig.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:45:28',NULL,NULL),('vn-database','10570','01-createSendingServiceWeekday.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:45:28',NULL,NULL),('vn-database','10570','02-createSendingService.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:45:28',NULL,NULL),('vn-database','10570','03-permisos.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:45:28',NULL,NULL),('vn-database','10571','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-25 09:13:27',NULL,NULL),('vn-database','10573','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-27 09:17:23',NULL,NULL),('vn-database','10575','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-26 11:27:32',NULL,NULL),('vn-database','10577','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-27 14:00:12',NULL,NULL),('vn-database','10578','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:45:28',NULL,NULL),('vn-database','10579','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-04-28 11:27:36',NULL,NULL),('vn-database','10580','00-itemTypeDropConstraint.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-28 18:18:52',NULL,NULL),('vn-database','10580','01-itemTypeAddConstraint.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-28 18:19:10',NULL,NULL),('vn-database','10581','00-itemTypeAutoIncrement.sql','jenkins@db-proxy2.static.verdnatura.es','2023-04-28 19:06:46',NULL,NULL),('vn-database','10582','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:45:28',NULL,NULL),('vn-database','10583','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:45:28',NULL,NULL),('vn-database','10584','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:45:28',NULL,NULL),('vn-database','10585','00-ticketLog.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-25 09:20:10',NULL,NULL),('vn-database','10585','01-entryLog.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-25 09:21:12',NULL,NULL),('vn-database','10585','02-claimLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:28:36',NULL,NULL),('vn-database','10585','03-clientLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:28:54',NULL,NULL),('vn-database','10585','04-invoiceInLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:28:55',NULL,NULL),('vn-database','10585','05-itemLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:29:46',NULL,NULL),('vn-database','10585','06-routeLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:30:18',NULL,NULL),('vn-database','10585','07-shelvingLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:30:32',NULL,NULL),('vn-database','10585','08-supplierLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:30:32',NULL,NULL),('vn-database','10585','09-travelLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:30:41',NULL,NULL),('vn-database','10585','10-workerLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:30:42',NULL,NULL),('vn-database','10585','11-zoneLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:30:43',NULL,NULL),('vn-database','10585','12-userLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:30:44',NULL,NULL),('vn-database','10585','13-roleLog.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:30:44',NULL,NULL),('vn-database','10587','00-arcRead_addMinimum.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-16 13:13:15',NULL,NULL),('vn-database','10593','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:30:44',NULL,NULL),('vn-database','10596','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:30:44',NULL,NULL),('vn-database','10597','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:30:44',NULL,NULL),('vn-database','10598','00-workerLog.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:45:29',NULL,NULL),('vn-database','10598','01-supplierLog.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:45:29',NULL,NULL),('vn-database','10598','02-workerTimeControlLog.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:45:29',NULL,NULL),('vn-database','10598','03-workerClockLog.sql','jenkins@db-proxy2.static.verdnatura.es','2023-05-12 09:45:29',NULL,NULL),('vn-database','10599','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 09:30:44',NULL,NULL),('vn-database','10601','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-17 09:26:26',NULL,NULL),('vn-database','10602','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-18 08:52:15',NULL,NULL),('vn-database','10606','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-18 09:26:00',NULL,NULL),('vn-database','10608','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-18 12:36:31',NULL,NULL),('vn-database','10609','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-01 08:28:07',NULL,NULL),('vn-database','10610','00-updateCompanyId.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-01 09:11:07',NULL,NULL),('vn-database','10610','01-updateSupplierId.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-01 09:11:39',NULL,NULL),('vn-database','10610','02-invoiceOutCompany.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-01 09:49:55',NULL,NULL),('vn-database','10611','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-19 14:39:41',NULL,NULL),('vn-database','10613','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-15 12:30:18',NULL,NULL),('vn-database','10614','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-01 09:11:40',NULL,NULL),('vn-database','10615','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-01 09:11:40',NULL,NULL),('vn-database','10616','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-13 11:18:55',NULL,NULL),('vn-database','10616','01-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-13 11:18:55',NULL,NULL),('vn-database','10617','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-01 09:11:41',NULL,NULL),('vn-database','10618','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-25 12:55:56',NULL,NULL),('vn-database','10619','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-15 12:30:18',NULL,NULL),('vn-database','10620','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-13 11:20:53',NULL,NULL),('vn-database','10624','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-05-30 19:01:10',NULL,NULL),('vn-database','10626','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-29 13:32:32',NULL,NULL),('vn-database','10628','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-15 12:30:18',NULL,NULL),('vn-database','10630','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-02 13:30:58',NULL,NULL),('vn-database','10631','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-05 08:37:25',NULL,NULL),('vn-database','10632','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-15 12:30:18',NULL,NULL),('vn-database','10633','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-15 12:30:18',NULL,NULL),('vn-database','10634','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-06 12:15:55',NULL,NULL),('vn-database','10637','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-15 12:30:19',NULL,NULL),('vn-database','10640','00-companyFkDrop.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-07 14:43:23',NULL,NULL),('vn-database','10640','00-updateCompany.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-07 14:22:13',1205,'Tiempo de espera de bloqueo excedido; intente rearrancar la transacción'),('vn-database','10640','01-companyFkAi.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-07 14:43:23',NULL,NULL),('vn-database','10640','02-companyFkCreate.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-07 14:47:04',NULL,NULL),('vn-database','10640','04-supplierFkDrop.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-07 14:48:30',NULL,NULL),('vn-database','10640','05-supplierFkAi.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-07 14:53:17',NULL,NULL),('vn-database','10640','06-supplierFkCreate.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-07 15:06:00',NULL,NULL),('vn-database','10642','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-29 14:04:13',NULL,NULL),('vn-database','10643','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-09 15:04:35',NULL,NULL),('vn-database','10644','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-13 11:22:18',NULL,NULL),('vn-database','10647','00-renombrarTabla.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-29 14:04:13',NULL,NULL),('vn-database','10648','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-27 09:17:24',NULL,NULL),('vn-database','10649','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-16 10:59:06',NULL,NULL),('vn-database','10652','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-06-29 14:04:13',NULL,NULL),('vn-database','10653','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-13 11:22:20',NULL,NULL),('vn-database','10655','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-13 11:22:24',NULL,NULL),('vn-database','10656','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-27 09:17:24',NULL,NULL),('vn-database','10658','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-13 11:22:27',NULL,NULL),('vn-database','10659','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-27 09:17:24',NULL,NULL),('vn-database','10662','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-13 11:22:33',NULL,NULL),('vn-database','10663','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-13 11:22:34',NULL,NULL),('vn-database','10665','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-06-30 08:52:51',NULL,NULL),('vn-database','10666','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-13 11:22:34',NULL,NULL),('vn-database','10667','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-27 09:17:24',NULL,NULL),('vn-database','10668','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-08-10 11:50:13',NULL,NULL),('vn-database','10671','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-25 14:56:50',NULL,NULL),('vn-database','10675','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-27 09:17:24',NULL,NULL),('vn-database','10676','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-27 09:17:24',NULL,NULL),('vn-database','10679','00-tables.sql','jenkins@db-proxy2.static.verdnatura.es','2023-07-27 09:17:24',NULL,NULL),('vn-database','10680','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-07-18 14:58:36',NULL,NULL),('vn-database','10682','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-08-10 11:50:13',NULL,NULL),('vn-database','10690','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-07-27 10:52:26',NULL,NULL),('vn-database','10691','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-07-31 13:37:21',NULL,NULL),('vn-database','10692','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-08-10 11:50:13',NULL,NULL),('vn-database','10693','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-08-10 11:50:13',NULL,NULL),('vn-database','10694','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-08-02 09:50:53',NULL,NULL),('vn-database','10695','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-08-02 13:40:16',NULL,NULL),('vn-database','10696','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-08-03 16:54:57',NULL,NULL),('vn-database','10698','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-08-03 08:53:12',NULL,NULL),('vn-database','10699','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-08-03 15:24:30',NULL,NULL),('vn-database','10700','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-08-29 09:42:11',NULL,NULL),('vn-database','10702','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-08-10 12:50:46',NULL,NULL),('vn-database','10704','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-08-29 09:42:14',NULL,NULL),('vn-database','10705','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-08-16 14:16:05',NULL,NULL),('vn-database','10707','00-firstScript.sql','jenkins@db-proxy1.static.verdnatura.es','2023-08-21 12:31:18',NULL,NULL),('vn-database','10714','00-firstScript.sql','jenkins@db-proxy2.static.verdnatura.es','2023-08-28 13:01:45',NULL,NULL); -/*!40000 ALTER TABLE `versionLog` ENABLE KEYS */; -UNLOCK TABLES; -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2023-08-30 15:53:14 -USE `account`; --- MariaDB dump 10.19 Distrib 10.5.19-MariaDB, for debian-linux-gnu (x86_64) --- --- Host: db2.static.verdnatura.es Database: account --- ------------------------------------------------------ --- Server version 10.7.7-MariaDB-1:10.7.7+maria~deb11-log - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Dumping data for table `role` --- - -LOCK TABLES `role` WRITE; -/*!40000 ALTER TABLE `role` DISABLE KEYS */; -INSERT INTO `role` VALUES (1,'employee','Empleado básico',1,'2017-05-19 07:04:58','2023-06-08 16:47:57',NULL),(2,'customer','Privilegios básicos de un cliente',1,'2017-05-19 07:04:58','2023-06-02 20:33:28',NULL),(3,'agency','Consultar tablas de predicciones de bultos',1,'2017-05-19 07:04:58','2017-05-19 07:04:58',NULL),(5,'administrative','Tareas relacionadas con la contabilidad',1,'2017-05-19 07:04:58','2017-05-19 07:04:58',NULL),(6,'guest','Privilegios para usuarios sin cuenta',1,'2017-05-19 07:04:58','2017-05-19 07:04:58',NULL),(9,'developer','Desarrolladores del sistema',1,'2017-05-19 07:04:58','2017-05-19 07:04:58',NULL),(11,'account','Privilegios relacionados con el login',0,'2017-05-19 07:04:58','2017-09-20 17:06:35',NULL),(13,'teamBoss','Jefe de equipo/departamento',1,'2017-05-19 07:04:58','2021-06-30 13:29:30',NULL),(15,'logistic','Departamento de compras, responsables de la logistica',1,'2017-05-19 07:04:58','2018-02-12 10:50:10',NULL),(16,'logisticBoss','Jefe del departamento de logística',1,'2017-05-19 07:04:58','2017-05-19 07:04:58',NULL),(17,'adminBoss','Jefe del departamento de administración',1,'2017-05-19 07:04:58','2017-05-19 07:04:58',NULL),(18,'salesPerson','Departamento de ventas',1,'2017-05-19 07:04:58','2017-05-19 07:04:58',NULL),(19,'salesBoss','Jefe del departamento de ventas',1,'2017-05-19 07:04:58','2017-08-16 12:38:27',NULL),(20,'manager','Gerencia',1,'2017-06-01 14:57:02','2022-07-29 07:36:15',NULL),(21,'salesAssistant','Jefe auxiliar de ventas',1,'2017-08-16 12:40:52','2017-08-16 12:40:52',NULL),(22,'teamManager','Jefe de departamento con privilegios de auxiliar de venta.',1,'2017-09-07 09:08:12','2017-09-07 09:08:12',NULL),(30,'financialBoss','Director finaciero',1,'2017-09-21 11:05:36','2017-09-21 11:05:36',NULL),(31,'freelancer','Trabajadores por cuenta ajena',1,'2017-10-10 12:57:26','2017-10-10 12:59:27',NULL),(32,'ett','Trabajadores de empresa temporal',1,'2017-10-10 12:58:58','2017-10-10 12:59:20',NULL),(33,'invoicing','Personal con acceso a facturación',0,'2018-01-29 16:43:34','2018-01-29 16:43:34',NULL),(34,'agencyBoss','Jefe/a del departamento de agencias',1,'2018-01-29 16:44:39','2018-02-23 07:58:53',NULL),(35,'buyer','Departamento de compras',1,'2018-02-12 10:35:42','2018-02-12 10:35:42',NULL),(36,'replenisher','Trabajadores de camara',1,'2018-02-16 14:07:10','2019-04-12 05:38:08',NULL),(37,'hr','Gestor/a de recursos humanos',1,'2018-02-22 17:34:53','2018-02-22 17:34:53',NULL),(38,'hrBoss','Jefe/a de recursos humanos',1,'2018-02-22 17:35:09','2018-02-22 17:35:09',NULL),(39,'adminAssistant','Jefe auxiliar administrativo',1,'2018-02-23 10:37:36','2018-02-23 10:38:41',NULL),(40,'handmade','Departamento de confección',1,'2018-02-23 11:14:53','2018-02-23 11:39:12',NULL),(41,'handmadeBoss','Jefe de departamento de confección',1,'2018-02-23 11:15:09','2018-02-23 11:39:26',NULL),(42,'artificial','Departamento de artificial',1,'2018-02-23 11:39:59','2018-02-23 11:39:59',NULL),(43,'artificialBoss','Jefe del departamento de artificial',1,'2018-02-23 11:40:16','2018-02-23 11:40:16',NULL),(44,'accessory','Departamento de complementos',1,'2018-02-23 11:41:12','2018-02-23 11:41:12',NULL),(45,'accessoryBoss','Jefe del departamento de complementos',1,'2018-02-23 11:41:23','2018-02-23 11:41:23',NULL),(47,'cooler','Empleados de cámara',1,'2018-02-23 13:08:18','2018-02-23 13:08:18',NULL),(48,'coolerBoss','Jefe de cámara',1,'2018-02-23 13:12:01','2023-03-13 08:49:43',NULL),(49,'production','Empleado de producción',1,'2018-02-26 15:28:23','2021-02-12 09:42:35',NULL),(50,'productionBoss','Jefe de producción',1,'2018-02-26 15:34:12','2018-02-26 15:34:12',NULL),(51,'marketing','Departamento de marketing',1,'2018-03-01 07:28:39','2018-03-01 07:28:39',NULL),(52,'marketingBoss','Jefe del departamento de marketing',1,'2018-03-01 07:28:57','2018-03-01 07:28:57',NULL),(53,'insurance','Gestor de seguros de cambio',0,'2018-03-05 07:44:35','2019-02-01 13:47:57',NULL),(54,'itemPicker','Sacador en cámara',1,'2018-03-05 12:08:17','2018-03-05 12:08:17',NULL),(55,'itemPickerBoss','Jefe de sacadores',1,'2018-03-05 12:08:31','2018-03-05 12:08:31',NULL),(56,'delivery','Personal de reparto',1,'2018-05-30 06:07:02','2018-05-30 06:07:02',NULL),(57,'deliveryBoss','Jefe de personal de reparto',1,'2018-05-30 06:07:19','2018-05-30 06:07:19',NULL),(58,'packager','Departamento encajadores',1,'2019-01-21 12:43:45','2019-01-21 12:43:45',NULL),(59,'packagerBoss','Jefe departamento encajadores',1,'2019-01-21 12:44:10','2019-01-21 12:44:10',NULL),(60,'productionAssi','Tareas relacionadas con producción y administración',1,'2019-01-29 13:29:01','2019-01-29 13:29:01',NULL),(61,'replenisherBos','Jefe de Complementos/Camara',1,'2019-07-01 06:44:07','2019-07-01 06:44:07',NULL),(62,'noLogin','Role without login access to MySQL',0,'2019-07-01 06:50:19','2019-07-02 13:42:05',NULL),(64,'balanceSheet','Consulta de Balance',0,'2019-07-16 12:12:08','2019-07-16 12:12:08',NULL),(65,'officeBoss','Jefe de filial',1,'2019-08-02 06:54:26','2019-08-02 06:54:26',NULL),(66,'sysadmin','Administrador de sistema',1,'2019-08-08 06:58:56','2019-08-08 06:58:56',NULL),(67,'adminOfficer','categoria profesional oficial de administración',1,'2020-01-03 08:09:23','2020-01-03 08:09:23',NULL),(69,'coolerAssist','Asistente de cámara con permiso compras',1,'2020-02-05 12:36:09','2023-03-13 08:50:07',NULL),(70,'trainee','Alumno de prácticas',1,'2020-03-04 11:00:25','2020-03-04 11:00:25',NULL),(71,'checker','Rol de revisor con privilegios de itemPicker',1,'2020-10-02 10:50:07','2020-10-02 10:50:07',NULL),(72,'claimManager','Personal de reclamaciones',1,'2020-10-13 10:01:32','2020-10-26 07:29:46',NULL),(73,'financial','Departamento de finanzas',1,'2020-11-16 09:30:27','2020-11-16 09:30:27',NULL),(74,'userPhotos','Privilegios para subir fotos de usuario',1,'2021-02-03 10:24:27','2021-02-03 10:24:27',NULL),(75,'catalogPhotos','Privilegios para subir fotos del catálogo',1,'2021-02-03 10:24:27','2021-02-03 10:24:27',NULL),(76,'chat','Rol para utilizar el rocket chat',1,'2020-11-27 13:06:50','2020-12-17 07:49:41',NULL),(100,'root','Rol con todos los privilegios',0,'2018-04-23 14:33:36','2020-11-12 06:50:07',NULL),(101,'buyerBoss','Jefe del departamento de compras',1,'2021-06-16 09:53:17','2021-06-16 09:53:17',NULL),(102,'preservedBoss','Responsable preservado',1,'2021-09-14 13:45:37','2021-09-14 13:45:37',NULL),(103,'it','Departamento de informática',1,'2021-11-11 09:48:22','2021-11-11 09:48:22',NULL),(104,'itBoss','Jefe de departamento de informática',1,'2021-11-11 09:48:49','2021-11-11 09:48:49',NULL),(105,'grant','Adjudicar roles a usuarios',1,'2021-11-11 12:41:09','2021-11-11 12:41:09',NULL),(106,'ext','Usuarios externos de la Base de datos',1,'2021-11-23 14:51:16','2021-11-23 14:51:16',NULL),(107,'productionPlus','Creado para pepe por orden de Juanvi',1,'2022-02-08 06:47:10','2022-02-08 06:47:10',NULL),(108,'system','System user',1,'2022-05-16 08:09:51','2022-05-16 08:09:51',NULL),(109,'salesTeamBoss','Jefe de equipo de comerciales',1,'2022-06-14 13:45:56','2022-06-14 13:45:56',NULL),(110,'palletizer','Paletizadores',1,'2022-12-02 12:56:22','2022-12-02 12:56:30',NULL),(111,'entryEditor','Entry editor',1,'2023-01-13 11:21:55','2023-01-13 11:21:55',NULL),(112,'maintenance','Personal de mantenimiento',1,'2023-01-19 06:23:35','2023-01-19 06:23:35',NULL),(114,'maintenanceBos','Jefe de mantenimiento',1,'2023-01-19 06:31:16','2023-05-17 11:07:21',NULL),(115,'itManagement','TI management',1,'2023-03-29 07:27:55','2023-03-29 07:28:04',NULL),(119,'palletizerBoss','Jefe de paletizadores',1,'2023-06-07 11:51:54','2023-06-07 11:51:54',NULL),(120,'developerBoss','Jefe de proyecto de desarrollo',1,'2023-06-19 07:07:21','2023-06-19 07:07:21',21709),(121,'buyerSalesAssistant','Rol para compradores que también son responsables de ventas',1,'2023-06-23 14:48:19','2023-06-23 14:48:19',NULL),(122,'logisticAssistant','Jefe auxiliar de logística',1,'2023-06-26 07:21:15','2023-06-26 07:21:15',NULL); -/*!40000 ALTER TABLE `role` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `roleInherit` --- - -LOCK TABLES `roleInherit` WRITE; -/*!40000 ALTER TABLE `roleInherit` DISABLE KEYS */; -INSERT INTO `roleInherit` VALUES (1,1,2,NULL),(2,1,3,NULL),(3,1,70,NULL),(4,2,11,NULL),(5,3,11,NULL),(6,5,1,NULL),(8,5,33,NULL),(10,11,6,NULL),(11,13,1,NULL),(12,15,35,NULL),(16,17,20,NULL),(17,17,37,NULL),(18,17,39,NULL),(19,17,64,NULL),(20,18,1,NULL),(21,19,21,NULL),(22,20,13,NULL),(23,20,16,NULL),(24,20,65,NULL),(25,21,13,NULL),(26,21,18,NULL),(27,21,53,NULL),(28,22,13,NULL),(29,22,21,NULL),(30,30,5,NULL),(31,30,20,NULL),(32,30,22,NULL),(33,30,53,NULL),(34,30,64,NULL),(35,31,1,NULL),(36,32,1,NULL),(37,34,1,NULL),(38,34,13,NULL),(39,34,33,NULL),(40,35,1,NULL),(41,36,44,NULL),(42,36,47,NULL),(43,37,1,NULL),(44,38,37,NULL),(45,38,64,NULL),(46,39,5,NULL),(47,39,21,NULL),(48,39,57,NULL),(49,40,1,NULL),(50,40,49,NULL),(51,41,13,NULL),(52,41,35,NULL),(53,41,40,NULL),(54,42,35,NULL),(55,42,49,NULL),(56,43,13,NULL),(57,43,42,NULL),(58,44,1,NULL),(59,45,13,NULL),(60,45,44,NULL),(61,47,1,NULL),(62,48,13,NULL),(63,48,47,NULL),(64,49,36,NULL),(65,49,58,NULL),(66,50,13,NULL),(67,50,21,NULL),(68,50,35,NULL),(69,50,49,NULL),(70,50,57,NULL),(72,51,1,NULL),(73,52,13,NULL),(74,52,19,NULL),(76,52,51,NULL),(77,53,1,NULL),(78,54,1,NULL),(79,55,13,NULL),(80,55,54,NULL),(81,56,1,NULL),(82,57,13,NULL),(83,57,56,NULL),(84,58,1,NULL),(85,59,13,NULL),(87,60,5,NULL),(91,61,13,NULL),(92,61,36,NULL),(94,65,35,NULL),(97,67,5,NULL),(98,67,37,NULL),(99,69,35,NULL),(101,70,11,NULL),(102,71,1,NULL),(103,71,58,NULL),(105,72,18,NULL),(106,73,5,NULL),(107,73,64,NULL),(108,73,19,NULL),(109,59,50,NULL),(115,39,76,NULL),(117,65,76,NULL),(118,30,76,NULL),(124,5,76,NULL),(125,37,76,NULL),(126,38,76,NULL),(128,42,76,NULL),(129,35,76,NULL),(130,60,76,NULL),(131,21,76,NULL),(132,18,76,NULL),(133,50,76,NULL),(134,20,76,NULL),(135,41,76,NULL),(136,17,76,NULL),(137,52,76,NULL),(138,57,76,NULL),(139,37,74,NULL),(140,51,74,NULL),(141,51,75,NULL),(142,35,75,NULL),(143,15,49,NULL),(145,17,67,NULL),(146,38,13,NULL),(147,101,35,NULL),(148,101,13,NULL),(150,15,56,NULL),(152,69,47,NULL),(153,48,35,NULL),(154,102,1,NULL),(167,9,103,NULL),(168,66,9,NULL),(169,104,100,NULL),(172,103,76,NULL),(173,103,1,NULL),(174,103,44,NULL),(175,103,45,NULL),(176,103,11,NULL),(177,103,39,NULL),(178,103,17,NULL),(179,103,5,NULL),(180,103,67,NULL),(181,103,3,NULL),(182,103,34,NULL),(183,103,42,NULL),(184,103,43,NULL),(185,103,64,NULL),(186,103,35,NULL),(187,103,101,NULL),(188,103,75,NULL),(189,103,71,NULL),(190,103,72,NULL),(191,103,47,NULL),(192,103,69,NULL),(193,103,48,NULL),(194,103,2,NULL),(195,103,56,NULL),(196,103,57,NULL),(197,103,32,NULL),(198,103,73,NULL),(199,103,30,NULL),(200,103,31,NULL),(201,103,6,NULL),(202,103,40,NULL),(203,103,41,NULL),(204,103,37,NULL),(205,103,38,NULL),(206,103,53,NULL),(207,103,33,NULL),(210,103,54,NULL),(211,103,55,NULL),(212,103,15,NULL),(213,103,16,NULL),(215,103,51,NULL),(216,103,52,NULL),(218,103,65,NULL),(219,103,58,NULL),(220,103,59,NULL),(221,103,102,NULL),(222,103,49,NULL),(223,103,60,NULL),(224,103,50,NULL),(225,103,36,NULL),(226,103,61,NULL),(228,103,21,NULL),(229,103,19,NULL),(230,103,18,NULL),(231,103,13,NULL),(232,103,22,NULL),(233,103,70,NULL),(234,103,74,NULL),(237,66,103,NULL),(238,103,20,NULL),(239,106,11,NULL),(240,107,60,NULL),(241,21,72,NULL),(242,20,9,NULL),(245,57,33,NULL),(246,102,35,NULL),(247,108,1,NULL),(248,102,13,NULL),(249,109,18,NULL),(250,109,13,NULL),(251,51,21,NULL),(253,48,49,NULL),(254,110,1,NULL),(255,110,76,NULL),(256,48,69,NULL),(257,47,111,NULL),(258,43,111,NULL),(259,72,111,NULL),(260,35,111,NULL),(261,5,111,NULL),(262,112,1,NULL),(263,114,112,NULL),(264,51,35,NULL),(265,72,49,NULL),(266,101,18,NULL),(268,65,57,NULL),(269,65,59,NULL),(270,65,49,NULL),(271,65,18,NULL),(272,65,13,NULL),(273,60,35,NULL),(275,50,59,NULL),(276,60,49,NULL),(280,5,53,NULL),(281,5,18,NULL),(282,50,60,NULL),(283,5,21,NULL),(284,60,57,NULL),(285,58,76,NULL),(287,69,58,NULL),(288,115,66,NULL),(290,104,115,NULL),(291,115,103,NULL),(297,21,33,NULL),(298,49,54,NULL),(299,112,49,NULL),(300,114,13,NULL),(302,5,35,NULL),(303,69,49,NULL),(306,119,110,NULL),(307,1,76,NULL),(309,120,9,NULL),(310,120,66,NULL),(311,120,13,25508),(312,115,120,NULL),(314,43,18,NULL),(315,121,35,NULL),(316,121,21,NULL),(317,122,15,NULL),(318,16,122,NULL),(319,37,49,NULL),(320,37,18,NULL); -/*!40000 ALTER TABLE `roleInherit` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `roleRole` --- - -LOCK TABLES `roleRole` WRITE; -/*!40000 ALTER TABLE `roleRole` DISABLE KEYS */; -INSERT INTO `roleRole` VALUES (285864,1,1),(285865,1,2),(285866,1,3),(285870,1,6),(285869,1,11),(285867,1,70),(285868,1,76),(285871,2,2),(285873,2,6),(285872,2,11),(285874,3,3),(285876,3,6),(285875,3,11),(285878,5,1),(285891,5,2),(285890,5,3),(285877,5,5),(285897,5,6),(285893,5,11),(285888,5,13),(285879,5,18),(285880,5,21),(285881,5,33),(285882,5,35),(285896,5,36),(285899,5,44),(285898,5,47),(285892,5,49),(285883,5,53),(285895,5,54),(285894,5,58),(285889,5,70),(285887,5,72),(285886,5,75),(285884,5,76),(285885,5,111),(285900,6,6),(285903,9,1),(285904,9,2),(285905,9,3),(285906,9,5),(285907,9,6),(285901,9,9),(285908,9,11),(285909,9,13),(285910,9,15),(285911,9,16),(285912,9,17),(285913,9,18),(285914,9,19),(285915,9,20),(285916,9,21),(285917,9,22),(285918,9,30),(285919,9,31),(285920,9,32),(285921,9,33),(285922,9,34),(285923,9,35),(285924,9,36),(285925,9,37),(285926,9,38),(285927,9,39),(285928,9,40),(285929,9,41),(285930,9,42),(285931,9,43),(285932,9,44),(285933,9,45),(285934,9,47),(285935,9,48),(285936,9,49),(285937,9,50),(285938,9,51),(285939,9,52),(285940,9,53),(285941,9,54),(285942,9,55),(285943,9,56),(285944,9,57),(285945,9,58),(285946,9,59),(285947,9,60),(285948,9,61),(285949,9,64),(285950,9,65),(285951,9,67),(285952,9,69),(285953,9,70),(285954,9,71),(285955,9,72),(285956,9,73),(285957,9,74),(285958,9,75),(285959,9,76),(285960,9,101),(285961,9,102),(285902,9,103),(285963,9,111),(285962,9,122),(285965,11,6),(285964,11,11),(285967,13,1),(285968,13,2),(285969,13,3),(285973,13,6),(285972,13,11),(285966,13,13),(285970,13,70),(285971,13,76),(285980,15,1),(285989,15,2),(285988,15,3),(285991,15,6),(285990,15,11),(285974,15,15),(285975,15,35),(285982,15,36),(285986,15,44),(285985,15,47),(285976,15,49),(285983,15,54),(285977,15,56),(285984,15,58),(285987,15,70),(285979,15,75),(285978,15,76),(285981,15,111),(286000,16,1),(286009,16,2),(286008,16,3),(286011,16,6),(286010,16,11),(285994,16,15),(285992,16,16),(285995,16,35),(286002,16,36),(286006,16,44),(286005,16,47),(285996,16,49),(286003,16,54),(285997,16,56),(286004,16,58),(286007,16,70),(285999,16,75),(285998,16,76),(286001,16,111),(285993,16,122),(286020,17,1),(286036,17,2),(286035,17,3),(286027,17,5),(286059,17,6),(286024,17,9),(286058,17,11),(286023,17,13),(286057,17,15),(286022,17,16),(286012,17,17),(286019,17,18),(286056,17,19),(286013,17,20),(286028,17,21),(286055,17,22),(286054,17,30),(286053,17,31),(286052,17,32),(286030,17,33),(286051,17,34),(286038,17,35),(286033,17,36),(286014,17,37),(286050,17,38),(286015,17,39),(286049,17,40),(286048,17,41),(286047,17,42),(286046,17,43),(286045,17,44),(286060,17,45),(286061,17,47),(286062,17,48),(286025,17,49),(286063,17,50),(286064,17,51),(286065,17,52),(286041,17,53),(286032,17,54),(286066,17,55),(286044,17,56),(286029,17,57),(286031,17,58),(286037,17,59),(286067,17,60),(286068,17,61),(286016,17,64),(286021,17,65),(286017,17,67),(286069,17,69),(286034,17,70),(286070,17,71),(286043,17,72),(286071,17,73),(286026,17,74),(286072,17,75),(286018,17,76),(286073,17,101),(286074,17,102),(286040,17,103),(286042,17,111),(286039,17,122),(286076,18,1),(286079,18,2),(286078,18,3),(286082,18,6),(286081,18,11),(286075,18,18),(286080,18,70),(286077,18,76),(286093,19,1),(286099,19,2),(286098,19,3),(286103,19,6),(286102,19,11),(286085,19,13),(286086,19,18),(286083,19,19),(286084,19,21),(286087,19,33),(286096,19,36),(286101,19,44),(286100,19,47),(286092,19,49),(286088,19,53),(286095,19,54),(286094,19,58),(286097,19,70),(286089,19,72),(286090,19,76),(286091,19,111),(286113,20,1),(286125,20,2),(286124,20,3),(286123,20,5),(286122,20,6),(286105,20,9),(286121,20,11),(286106,20,13),(286120,20,15),(286107,20,16),(286119,20,17),(286111,20,18),(286118,20,19),(286104,20,20),(286126,20,21),(286127,20,22),(286128,20,30),(286129,20,31),(286130,20,32),(286131,20,33),(286132,20,34),(286110,20,35),(286133,20,36),(286134,20,37),(286135,20,38),(286136,20,39),(286137,20,40),(286138,20,41),(286139,20,42),(286140,20,43),(286141,20,44),(286142,20,45),(286143,20,47),(286144,20,48),(286115,20,49),(286145,20,50),(286146,20,51),(286147,20,52),(286148,20,53),(286149,20,54),(286150,20,55),(286151,20,56),(286116,20,57),(286152,20,58),(286117,20,59),(286153,20,60),(286154,20,61),(286155,20,64),(286108,20,65),(286156,20,67),(286157,20,69),(286158,20,70),(286159,20,71),(286160,20,72),(286161,20,73),(286162,20,74),(286163,20,75),(286109,20,76),(286164,20,101),(286165,20,102),(286114,20,103),(286166,20,111),(286112,20,122),(286176,21,1),(286182,21,2),(286181,21,3),(286186,21,6),(286185,21,11),(286168,21,13),(286169,21,18),(286167,21,21),(286170,21,33),(286179,21,36),(286184,21,44),(286183,21,47),(286175,21,49),(286171,21,53),(286178,21,54),(286177,21,58),(286180,21,70),(286172,21,72),(286173,21,76),(286174,21,111),(286191,22,1),(286200,22,2),(286199,22,3),(286207,22,6),(286204,22,11),(286188,22,13),(286190,22,18),(286189,22,21),(286187,22,22),(286192,22,33),(286203,22,36),(286206,22,44),(286205,22,47),(286197,22,49),(286193,22,53),(286202,22,54),(286201,22,58),(286198,22,70),(286194,22,72),(286195,22,76),(286196,22,111),(286220,30,1),(286234,30,2),(286233,30,3),(286209,30,5),(286243,30,6),(286221,30,9),(286244,30,11),(286222,30,13),(286242,30,15),(286223,30,16),(286241,30,17),(286219,30,18),(286240,30,19),(286210,30,20),(286218,30,21),(286211,30,22),(286208,30,30),(286239,30,31),(286238,30,32),(286217,30,33),(286237,30,34),(286216,30,35),(286236,30,36),(286235,30,37),(286245,30,38),(286246,30,39),(286247,30,40),(286248,30,41),(286249,30,42),(286250,30,43),(286251,30,44),(286252,30,45),(286253,30,47),(286254,30,48),(286227,30,49),(286255,30,50),(286256,30,51),(286257,30,52),(286212,30,53),(286258,30,54),(286259,30,55),(286260,30,56),(286226,30,57),(286261,30,58),(286225,30,59),(286262,30,60),(286263,30,61),(286213,30,64),(286224,30,65),(286264,30,67),(286265,30,69),(286232,30,70),(286266,30,71),(286231,30,72),(286267,30,73),(286268,30,74),(286230,30,75),(286214,30,76),(286269,30,101),(286270,30,102),(286229,30,103),(286215,30,111),(286228,30,122),(286272,31,1),(286273,31,2),(286274,31,3),(286278,31,6),(286277,31,11),(286271,31,31),(286275,31,70),(286276,31,76),(286280,32,1),(286281,32,2),(286282,32,3),(286286,32,6),(286285,32,11),(286279,32,32),(286283,32,70),(286284,32,76),(286287,33,33),(286289,34,1),(286294,34,2),(286293,34,3),(286297,34,6),(286296,34,11),(286290,34,13),(286291,34,33),(286288,34,34),(286292,34,70),(286295,34,76),(286299,35,1),(286305,35,2),(286304,35,3),(286307,35,6),(286306,35,11),(286298,35,35),(286303,35,70),(286300,35,75),(286301,35,76),(286302,35,111),(286312,36,1),(286314,36,2),(286313,36,3),(286318,36,6),(286317,36,11),(286308,36,36),(286309,36,44),(286310,36,47),(286315,36,70),(286316,36,76),(286311,36,111),(286320,37,1),(286329,37,2),(286328,37,3),(286335,37,6),(286333,37,11),(286321,37,18),(286326,37,36),(286319,37,37),(286332,37,44),(286331,37,47),(286322,37,49),(286325,37,54),(286330,37,58),(286327,37,70),(286323,37,74),(286324,37,76),(286334,37,111),(286344,38,1),(286348,38,2),(286347,38,3),(286355,38,6),(286353,38,11),(286337,38,13),(286343,38,18),(286345,38,36),(286338,38,37),(286336,38,38),(286352,38,44),(286351,38,47),(286342,38,49),(286349,38,54),(286350,38,58),(286339,38,64),(286346,38,70),(286341,38,74),(286340,38,76),(286354,38,111),(286364,39,1),(286374,39,2),(286373,39,3),(286357,39,5),(286381,39,6),(286378,39,11),(286367,39,13),(286363,39,18),(286358,39,21),(286362,39,33),(286361,39,35),(286377,39,36),(286356,39,39),(286380,39,44),(286379,39,47),(286370,39,49),(286365,39,53),(286376,39,54),(286369,39,56),(286359,39,57),(286375,39,58),(286372,39,70),(286368,39,72),(286371,39,75),(286360,39,76),(286366,39,111),(286383,40,1),(286386,40,2),(286385,40,3),(286396,40,6),(286394,40,11),(286389,40,36),(286382,40,40),(286393,40,44),(286392,40,47),(286384,40,49),(286390,40,54),(286391,40,58),(286387,40,70),(286388,40,76),(286395,40,111),(286405,41,1),(286409,41,2),(286408,41,3),(286415,41,6),(286414,41,11),(286398,41,13),(286399,41,35),(286406,41,36),(286400,41,40),(286397,41,41),(286413,41,44),(286412,41,47),(286402,41,49),(286410,41,54),(286411,41,58),(286407,41,70),(286404,41,75),(286401,41,76),(286403,41,111),(286422,42,1),(286430,42,2),(286429,42,3),(286432,42,6),(286431,42,11),(286417,42,35),(286423,42,36),(286416,42,42),(286427,42,44),(286426,42,47),(286418,42,49),(286424,42,54),(286425,42,58),(286428,42,70),(286421,42,75),(286419,42,76),(286420,42,111),(286441,43,1),(286445,43,2),(286444,43,3),(286452,43,6),(286451,43,11),(286434,43,13),(286435,43,18),(286439,43,35),(286446,43,36),(286436,43,42),(286433,43,43),(286450,43,44),(286449,43,47),(286438,43,49),(286447,43,54),(286448,43,58),(286443,43,70),(286442,43,75),(286440,43,76),(286437,43,111),(286454,44,1),(286455,44,2),(286456,44,3),(286460,44,6),(286459,44,11),(286453,44,44),(286457,44,70),(286458,44,76),(286464,45,1),(286466,45,2),(286465,45,3),(286470,45,6),(286469,45,11),(286462,45,13),(286463,45,44),(286461,45,45),(286467,45,70),(286468,45,76),(286472,47,1),(286475,47,2),(286474,47,3),(286479,47,6),(286478,47,11),(286471,47,47),(286476,47,70),(286477,47,76),(286473,47,111),(286490,48,1),(286496,48,2),(286495,48,3),(286498,48,6),(286497,48,11),(286481,48,13),(286482,48,35),(286486,48,36),(286493,48,44),(286483,48,47),(286480,48,48),(286484,48,49),(286491,48,54),(286492,48,58),(286485,48,69),(286494,48,70),(286489,48,75),(286488,48,76),(286487,48,111),(286503,49,1),(286509,49,2),(286508,49,3),(286512,49,6),(286511,49,11),(286500,49,36),(286505,49,44),(286504,49,47),(286499,49,49),(286501,49,54),(286502,49,58),(286507,49,70),(286506,49,76),(286510,49,111),(286529,50,1),(286538,50,2),(286537,50,3),(286533,50,5),(286540,50,6),(286539,50,11),(286514,50,13),(286528,50,18),(286515,50,21),(286527,50,33),(286516,50,35),(286522,50,36),(286535,50,44),(286534,50,47),(286517,50,49),(286513,50,50),(286526,50,53),(286530,50,54),(286532,50,56),(286518,50,57),(286531,50,58),(286519,50,59),(286520,50,60),(286536,50,70),(286525,50,72),(286524,50,75),(286521,50,76),(286523,50,111),(286542,51,1),(286551,51,2),(286550,51,3),(286562,51,6),(286558,51,11),(286547,51,13),(286552,51,18),(286543,51,21),(286553,51,33),(286544,51,35),(286561,51,36),(286564,51,44),(286563,51,47),(286557,51,49),(286541,51,51),(286554,51,53),(286560,51,54),(286559,51,58),(286549,51,70),(286555,51,72),(286545,51,74),(286546,51,75),(286548,51,76),(286556,51,111),(286573,52,1),(286579,52,2),(286578,52,3),(286588,52,6),(286584,52,11),(286566,52,13),(286576,52,18),(286567,52,19),(286572,52,21),(286575,52,33),(286571,52,35),(286587,52,36),(286590,52,44),(286589,52,47),(286583,52,49),(286568,52,51),(286565,52,52),(286580,52,53),(286586,52,54),(286585,52,58),(286577,52,70),(286581,52,72),(286570,52,74),(286574,52,75),(286569,52,76),(286582,52,111),(286592,53,1),(286593,53,2),(286594,53,3),(286598,53,6),(286597,53,11),(286591,53,53),(286595,53,70),(286596,53,76),(286600,54,1),(286601,54,2),(286602,54,3),(286606,54,6),(286605,54,11),(286599,54,54),(286603,54,70),(286604,54,76),(286610,55,1),(286612,55,2),(286611,55,3),(286616,55,6),(286615,55,11),(286608,55,13),(286609,55,54),(286607,55,55),(286613,55,70),(286614,55,76),(286618,56,1),(286619,56,2),(286620,56,3),(286624,56,6),(286623,56,11),(286617,56,56),(286621,56,70),(286622,56,76),(286630,57,1),(286633,57,2),(286632,57,3),(286635,57,6),(286634,57,11),(286626,57,13),(286627,57,33),(286628,57,56),(286625,57,57),(286631,57,70),(286629,57,76),(286637,58,1),(286640,58,2),(286639,58,3),(286643,58,6),(286642,58,11),(286636,58,58),(286641,58,70),(286638,58,76),(286648,59,1),(286660,59,2),(286659,59,3),(286667,59,5),(286671,59,6),(286670,59,11),(286645,59,13),(286657,59,18),(286647,59,21),(286656,59,33),(286649,59,35),(286663,59,36),(286669,59,44),(286668,59,47),(286650,59,49),(286646,59,50),(286655,59,53),(286664,59,54),(286666,59,56),(286651,59,57),(286665,59,58),(286644,59,59),(286652,59,60),(286658,59,70),(286654,59,72),(286661,59,75),(286653,59,76),(286662,59,111),(286682,60,1),(286695,60,2),(286694,60,3),(286673,60,5),(286697,60,6),(286696,60,11),(286688,60,13),(286681,60,18),(286680,60,21),(286679,60,33),(286674,60,35),(286685,60,36),(286691,60,44),(286690,60,47),(286675,60,49),(286678,60,53),(286686,60,54),(286689,60,56),(286676,60,57),(286687,60,58),(286672,60,60),(286693,60,70),(286692,60,72),(286684,60,75),(286677,60,76),(286683,60,111),(286702,61,1),(286706,61,2),(286705,61,3),(286710,61,6),(286709,61,11),(286699,61,13),(286700,61,36),(286701,61,44),(286703,61,47),(286698,61,61),(286704,61,70),(286707,61,76),(286708,61,111),(286711,62,62),(286712,64,64),(286727,65,1),(286736,65,2),(286735,65,3),(286737,65,5),(286741,65,6),(286740,65,11),(286714,65,13),(286715,65,18),(286731,65,21),(286721,65,33),(286716,65,35),(286724,65,36),(286733,65,44),(286732,65,47),(286717,65,49),(286729,65,50),(286739,65,53),(286723,65,54),(286728,65,56),(286718,65,57),(286722,65,58),(286719,65,59),(286730,65,60),(286713,65,65),(286734,65,70),(286738,65,72),(286726,65,75),(286720,65,76),(286725,65,111),(286746,66,1),(286745,66,2),(286747,66,3),(286748,66,5),(286749,66,6),(286743,66,9),(286750,66,11),(286751,66,13),(286752,66,15),(286753,66,16),(286754,66,17),(286755,66,18),(286756,66,19),(286757,66,20),(286758,66,21),(286759,66,22),(286760,66,30),(286761,66,31),(286762,66,32),(286763,66,33),(286764,66,34),(286765,66,35),(286766,66,36),(286767,66,37),(286768,66,38),(286769,66,39),(286770,66,40),(286771,66,41),(286772,66,42),(286773,66,43),(286774,66,44),(286775,66,45),(286776,66,47),(286777,66,48),(286778,66,49),(286779,66,50),(286780,66,51),(286781,66,52),(286782,66,53),(286783,66,54),(286784,66,55),(286785,66,56),(286786,66,57),(286787,66,58),(286788,66,59),(286789,66,60),(286790,66,61),(286791,66,64),(286792,66,65),(286742,66,66),(286793,66,67),(286794,66,69),(286795,66,70),(286796,66,71),(286797,66,72),(286798,66,73),(286799,66,74),(286800,66,75),(286801,66,76),(286802,66,101),(286803,66,102),(286744,66,103),(286805,66,111),(286804,66,122),(286810,67,1),(286827,67,2),(286826,67,3),(286807,67,5),(286831,67,6),(286830,67,11),(286824,67,13),(286809,67,18),(286811,67,21),(286812,67,33),(286813,67,35),(286821,67,36),(286808,67,37),(286829,67,44),(286828,67,47),(286817,67,49),(286814,67,53),(286820,67,54),(286819,67,58),(286806,67,67),(286825,67,70),(286823,67,72),(286818,67,74),(286822,67,75),(286815,67,76),(286816,67,111),(286840,69,1),(286846,69,2),(286845,69,3),(286848,69,6),(286847,69,11),(286833,69,35),(286841,69,36),(286843,69,44),(286834,69,47),(286835,69,49),(286842,69,54),(286836,69,58),(286832,69,69),(286844,69,70),(286839,69,75),(286838,69,76),(286837,69,111),(286851,70,6),(286850,70,11),(286849,70,70),(286853,71,1),(286856,71,2),(286855,71,3),(286860,71,6),(286859,71,11),(286854,71,58),(286857,71,70),(286852,71,71),(286858,71,76),(286867,72,1),(286874,72,2),(286873,72,3),(286876,72,6),(286875,72,11),(286862,72,18),(286865,72,36),(286871,72,44),(286870,72,47),(286863,72,49),(286868,72,54),(286869,72,58),(286872,72,70),(286861,72,72),(286866,72,76),(286864,72,111),(286883,73,1),(286894,73,2),(286893,73,3),(286878,73,5),(286900,73,6),(286896,73,11),(286891,73,13),(286882,73,18),(286879,73,19),(286881,73,21),(286884,73,33),(286885,73,35),(286899,73,36),(286902,73,44),(286901,73,47),(286895,73,49),(286886,73,53),(286898,73,54),(286897,73,58),(286880,73,64),(286892,73,70),(286890,73,72),(286877,73,73),(286889,73,75),(286887,73,76),(286888,73,111),(286903,74,74),(286904,75,75),(286905,76,76),(286907,100,1),(286908,100,2),(286909,100,3),(286910,100,5),(286911,100,6),(286912,100,9),(286913,100,11),(286914,100,13),(286915,100,15),(286916,100,16),(286917,100,17),(286918,100,18),(286919,100,19),(286920,100,20),(286921,100,21),(286922,100,22),(286923,100,30),(286924,100,31),(286925,100,32),(286926,100,33),(286927,100,34),(286928,100,35),(286929,100,36),(286930,100,37),(286931,100,38),(286932,100,39),(286933,100,40),(286934,100,41),(286935,100,42),(286936,100,43),(286937,100,44),(286938,100,45),(286939,100,47),(286940,100,48),(286941,100,49),(286942,100,50),(286943,100,51),(286944,100,52),(286945,100,53),(286946,100,54),(286947,100,55),(286948,100,56),(286949,100,57),(286950,100,58),(286951,100,59),(286952,100,60),(286953,100,61),(286954,100,62),(286955,100,64),(286956,100,65),(286957,100,66),(286958,100,67),(286959,100,69),(286960,100,70),(286961,100,71),(286962,100,72),(286963,100,73),(286964,100,74),(286965,100,75),(286966,100,76),(286906,100,100),(286967,100,101),(286968,100,102),(286969,100,103),(286970,100,104),(286971,100,105),(286972,100,106),(286973,100,107),(286974,100,108),(286975,100,109),(286976,100,110),(286977,100,111),(286978,100,112),(286979,100,114),(286980,100,115),(286981,100,119),(286984,100,120),(286982,100,121),(286983,100,122),(286991,101,1),(286995,101,2),(286994,101,3),(286997,101,6),(286996,101,11),(286986,101,13),(286987,101,18),(286988,101,35),(286993,101,70),(286989,101,75),(286990,101,76),(286985,101,101),(286992,101,111),(286999,102,1),(287004,102,2),(287003,102,3),(287009,102,6),(287008,102,11),(287000,102,13),(287001,102,35),(287002,102,70),(287006,102,75),(287005,102,76),(286998,102,102),(287007,102,111),(287011,103,1),(287012,103,2),(287013,103,3),(287014,103,5),(287015,103,6),(287070,103,9),(287016,103,11),(287017,103,13),(287018,103,15),(287019,103,16),(287020,103,17),(287021,103,18),(287022,103,19),(287023,103,20),(287024,103,21),(287025,103,22),(287026,103,30),(287027,103,31),(287028,103,32),(287029,103,33),(287030,103,34),(287031,103,35),(287032,103,36),(287033,103,37),(287034,103,38),(287035,103,39),(287036,103,40),(287037,103,41),(287038,103,42),(287039,103,43),(287040,103,44),(287041,103,45),(287042,103,47),(287043,103,48),(287044,103,49),(287045,103,50),(287046,103,51),(287047,103,52),(287048,103,53),(287049,103,54),(287050,103,55),(287051,103,56),(287052,103,57),(287053,103,58),(287054,103,59),(287055,103,60),(287056,103,61),(287057,103,64),(287058,103,65),(287059,103,67),(287060,103,69),(287061,103,70),(287062,103,71),(287063,103,72),(287064,103,73),(287065,103,74),(287066,103,75),(287067,103,76),(287068,103,101),(287069,103,102),(287010,103,103),(287072,103,111),(287071,103,122),(287080,104,1),(287079,104,2),(287082,104,3),(287083,104,5),(287084,104,6),(287081,104,9),(287085,104,11),(287086,104,13),(287087,104,15),(287088,104,16),(287089,104,17),(287090,104,18),(287091,104,19),(287092,104,20),(287093,104,21),(287094,104,22),(287095,104,30),(287096,104,31),(287097,104,32),(287098,104,33),(287099,104,34),(287100,104,35),(287101,104,36),(287102,104,37),(287103,104,38),(287104,104,39),(287105,104,40),(287106,104,41),(287107,104,42),(287108,104,43),(287109,104,44),(287110,104,45),(287111,104,47),(287112,104,48),(287113,104,49),(287114,104,50),(287115,104,51),(287116,104,52),(287117,104,53),(287118,104,54),(287119,104,55),(287120,104,56),(287121,104,57),(287122,104,58),(287123,104,59),(287124,104,60),(287125,104,61),(287146,104,62),(287126,104,64),(287127,104,65),(287077,104,66),(287128,104,67),(287129,104,69),(287130,104,70),(287131,104,71),(287132,104,72),(287133,104,73),(287134,104,74),(287135,104,75),(287136,104,76),(287074,104,100),(287137,104,101),(287138,104,102),(287076,104,103),(287073,104,104),(287143,104,105),(287142,104,106),(287149,104,107),(287151,104,108),(287150,104,109),(287147,104,110),(287140,104,111),(287144,104,112),(287145,104,114),(287075,104,115),(287148,104,119),(287078,104,120),(287141,104,121),(287139,104,122),(287152,105,105),(287155,106,6),(287154,106,11),(287153,106,106),(287167,107,1),(287180,107,2),(287179,107,3),(287158,107,5),(287182,107,6),(287181,107,11),(287173,107,13),(287166,107,18),(287165,107,21),(287164,107,33),(287159,107,35),(287170,107,36),(287176,107,44),(287175,107,47),(287160,107,49),(287163,107,53),(287171,107,54),(287174,107,56),(287161,107,57),(287172,107,58),(287157,107,60),(287178,107,70),(287177,107,72),(287169,107,75),(287162,107,76),(287156,107,107),(287168,107,111),(287184,108,1),(287185,108,2),(287186,108,3),(287190,108,6),(287189,108,11),(287187,108,70),(287188,108,76),(287183,108,108),(287195,109,1),(287197,109,2),(287196,109,3),(287200,109,6),(287199,109,11),(287192,109,13),(287193,109,18),(287198,109,70),(287194,109,76),(287191,109,109),(287202,110,1),(287205,110,2),(287204,110,3),(287208,110,6),(287207,110,11),(287206,110,70),(287203,110,76),(287201,110,110),(287209,111,111),(287211,112,1),(287214,112,2),(287213,112,3),(287224,112,6),(287222,112,11),(287217,112,36),(287221,112,44),(287220,112,47),(287212,112,49),(287218,112,54),(287219,112,58),(287215,112,70),(287216,112,76),(287223,112,111),(287210,112,112),(287229,114,1),(287231,114,2),(287230,114,3),(287241,114,6),(287239,114,11),(287226,114,13),(287234,114,36),(287238,114,44),(287237,114,47),(287228,114,49),(287235,114,54),(287236,114,58),(287232,114,70),(287233,114,76),(287240,114,111),(287227,114,112),(287225,114,114),(287247,115,1),(287246,115,2),(287249,115,3),(287250,115,5),(287251,115,6),(287248,115,9),(287252,115,11),(287253,115,13),(287254,115,15),(287255,115,16),(287256,115,17),(287257,115,18),(287258,115,19),(287259,115,20),(287260,115,21),(287261,115,22),(287262,115,30),(287263,115,31),(287264,115,32),(287265,115,33),(287266,115,34),(287267,115,35),(287268,115,36),(287269,115,37),(287270,115,38),(287271,115,39),(287272,115,40),(287273,115,41),(287274,115,42),(287275,115,43),(287276,115,44),(287277,115,45),(287278,115,47),(287279,115,48),(287280,115,49),(287281,115,50),(287282,115,51),(287283,115,52),(287284,115,53),(287285,115,54),(287286,115,55),(287287,115,56),(287288,115,57),(287289,115,58),(287290,115,59),(287291,115,60),(287292,115,61),(287293,115,64),(287294,115,65),(287243,115,66),(287295,115,67),(287296,115,69),(287297,115,70),(287298,115,71),(287299,115,72),(287300,115,73),(287301,115,74),(287302,115,75),(287303,115,76),(287304,115,101),(287305,115,102),(287244,115,103),(287307,115,111),(287242,115,115),(287245,115,120),(287306,115,122),(287310,119,1),(287313,119,2),(287312,119,3),(287316,119,6),(287315,119,11),(287314,119,70),(287311,119,76),(287309,119,110),(287308,119,119),(287363,120,1),(287367,120,2),(287366,120,3),(287365,120,5),(287368,120,6),(287360,120,9),(287369,120,11),(287361,120,13),(287370,120,15),(287371,120,16),(287372,120,17),(287373,120,18),(287374,120,19),(287375,120,20),(287376,120,21),(287377,120,22),(287378,120,30),(287379,120,31),(287380,120,32),(287381,120,33),(287382,120,34),(287383,120,35),(287384,120,36),(287385,120,37),(287386,120,38),(287387,120,39),(287388,120,40),(287389,120,41),(287390,120,42),(287391,120,43),(287392,120,44),(287393,120,45),(287394,120,47),(287395,120,48),(287396,120,49),(287397,120,50),(287398,120,51),(287399,120,52),(287400,120,53),(287401,120,54),(287402,120,55),(287403,120,56),(287404,120,57),(287405,120,58),(287406,120,59),(287407,120,60),(287408,120,61),(287409,120,64),(287410,120,65),(287362,120,66),(287411,120,67),(287412,120,69),(287413,120,70),(287414,120,71),(287415,120,72),(287416,120,73),(287417,120,74),(287418,120,75),(287419,120,76),(287420,120,101),(287421,120,102),(287364,120,103),(287423,120,111),(287359,120,120),(287422,120,122),(287326,121,1),(287331,121,2),(287330,121,3),(287337,121,6),(287333,121,11),(287321,121,13),(287320,121,18),(287318,121,21),(287322,121,33),(287319,121,35),(287336,121,36),(287339,121,44),(287338,121,47),(287332,121,49),(287323,121,53),(287335,121,54),(287334,121,58),(287329,121,70),(287324,121,72),(287327,121,75),(287325,121,76),(287328,121,111),(287317,121,121),(287347,122,1),(287356,122,2),(287355,122,3),(287358,122,6),(287357,122,11),(287341,122,15),(287342,122,35),(287349,122,36),(287353,122,44),(287352,122,47),(287343,122,49),(287350,122,54),(287344,122,56),(287351,122,58),(287354,122,70),(287346,122,75),(287345,122,76),(287348,122,111),(287340,122,122); -/*!40000 ALTER TABLE `roleRole` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `userPassword` --- - -LOCK TABLES `userPassword` WRITE; -/*!40000 ALTER TABLE `userPassword` DISABLE KEYS */; -INSERT INTO `userPassword` VALUES (1,7,1,0,2,1); -/*!40000 ALTER TABLE `userPassword` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `accountConfig` --- - -LOCK TABLES `accountConfig` WRITE; -/*!40000 ALTER TABLE `accountConfig` DISABLE KEYS */; -INSERT INTO `accountConfig` VALUES (1,'/mnt/homes','/bin/bash',10000,5,60,5,30); -/*!40000 ALTER TABLE `accountConfig` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `mailConfig` --- - -LOCK TABLES `mailConfig` WRITE; -/*!40000 ALTER TABLE `mailConfig` DISABLE KEYS */; -INSERT INTO `mailConfig` VALUES (1,'verdnatura.es'); -/*!40000 ALTER TABLE `mailConfig` ENABLE KEYS */; -UNLOCK TABLES; -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2023-08-30 15:53:15 -USE `salix`; --- MariaDB dump 10.19 Distrib 10.5.19-MariaDB, for debian-linux-gnu (x86_64) --- --- Host: db2.static.verdnatura.es Database: salix --- ------------------------------------------------------ --- Server version 10.7.7-MariaDB-1:10.7.7+maria~deb11-log - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Dumping data for table `ACL` --- - -LOCK TABLES `ACL` WRITE; -/*!40000 ALTER TABLE `ACL` DISABLE KEYS */; -INSERT INTO `ACL` VALUES (3,'Address','*','*','ALLOW','ROLE','employee'),(5,'AgencyService','*','READ','ALLOW','ROLE','employee'),(9,'ClientObservation','*','*','ALLOW','ROLE','employee'),(11,'ContactChannel','*','READ','ALLOW','ROLE','trainee'),(13,'Employee','*','READ','ALLOW','ROLE','employee'),(14,'PayMethod','*','READ','ALLOW','ROLE','trainee'),(16,'FakeProduction','*','READ','ALLOW','ROLE','employee'),(17,'Warehouse','* ','READ','ALLOW','ROLE','trainee'),(20,'TicketState','*','*','ALLOW','ROLE','employee'),(24,'Delivery','*','READ','ALLOW','ROLE','employee'),(25,'Zone','*','READ','ALLOW','ROLE','employee'),(26,'ClientCredit','*','*','ALLOW','ROLE','employee'),(27,'ClientCreditLimit','*','READ','ALLOW','ROLE','trainee'),(30,'GreugeType','*','READ','ALLOW','ROLE','trainee'),(31,'Mandate','*','READ','ALLOW','ROLE','trainee'),(32,'MandateType','*','READ','ALLOW','ROLE','trainee'),(33,'Company','*','READ','ALLOW','ROLE','trainee'),(34,'Greuge','*','READ','ALLOW','ROLE','trainee'),(35,'AddressObservation','*','*','ALLOW','ROLE','employee'),(36,'ObservationType','*','*','ALLOW','ROLE','employee'),(37,'Greuge','*','WRITE','ALLOW','ROLE','employee'),(38,'AgencyMode','*','READ','ALLOW','ROLE','employee'),(39,'ItemTag','*','WRITE','ALLOW','ROLE','buyer'),(40,'ItemBotanical','*','WRITE','ALLOW','ROLE','buyer'),(41,'ItemBotanical','*','READ','ALLOW','ROLE','employee'),(42,'ItemPlacement','*','WRITE','ALLOW','ROLE','buyer'),(43,'ItemPlacement','*','WRITE','ALLOW','ROLE','replenisher'),(44,'ItemPlacement','*','READ','ALLOW','ROLE','employee'),(45,'ItemBarcode','*','READ','ALLOW','ROLE','employee'),(46,'ItemBarcode','*','WRITE','ALLOW','ROLE','buyer'),(47,'ItemBarcode','*','WRITE','ALLOW','ROLE','replenisher'),(51,'ItemTag','*','READ','ALLOW','ROLE','employee'),(53,'Item','*','READ','ALLOW','ROLE','employee'),(54,'Item','*','WRITE','ALLOW','ROLE','buyer'),(55,'Recovery','*','READ','ALLOW','ROLE','trainee'),(56,'Recovery','*','WRITE','ALLOW','ROLE','administrative'),(58,'CreditClassification','*','*','ALLOW','ROLE','insurance'),(60,'CreditInsurance','*','*','ALLOW','ROLE','insurance'),(61,'InvoiceOut','*','READ','ALLOW','ROLE','employee'),(63,'TicketObservation','*','*','ALLOW','ROLE','employee'),(64,'Route','*','READ','ALLOW','ROLE','employee'),(65,'Sale','*','READ','ALLOW','ROLE','employee'),(66,'TicketTracking','*','READ','ALLOW','ROLE','employee'),(68,'TicketPackaging','*','*','ALLOW','ROLE','employee'),(69,'Packaging','*','READ','ALLOW','ROLE','employee'),(70,'Packaging','*','WRITE','ALLOW','ROLE','logistic'),(72,'SaleComponent','*','READ','ALLOW','ROLE','employee'),(73,'Expedition','*','READ','ALLOW','ROLE','employee'),(74,'Expedition','*','WRITE','ALLOW','ROLE','deliveryBoss'),(75,'Expedition','*','WRITE','ALLOW','ROLE','production'),(76,'AnnualAverageInvoiced','*','READ','ALLOW','ROLE','employee'),(77,'WorkerMana','*','READ','ALLOW','ROLE','employee'),(78,'TicketTracking','*','WRITE','ALLOW','ROLE','production'),(79,'TicketTracking','changeState','*','ALLOW','ROLE','employee'),(80,'Sale','deleteSales','*','ALLOW','ROLE','employee'),(81,'Sale','moveToTicket','*','ALLOW','ROLE','employee'),(82,'Sale','updateQuantity','*','ALLOW','ROLE','employee'),(83,'Sale','updatePrice','*','ALLOW','ROLE','employee'),(84,'Sale','updateDiscount','*','ALLOW','ROLE','employee'),(85,'SaleTracking','*','READ','ALLOW','ROLE','employee'),(86,'Order','*','*','ALLOW','ROLE','employee'),(87,'OrderRow','*','*','ALLOW','ROLE','employee'),(88,'ClientContact','*','*','ALLOW','ROLE','employee'),(89,'Sale','moveToNewTicket','*','ALLOW','ROLE','employee'),(90,'Sale','reserve','*','ALLOW','ROLE','employee'),(91,'TicketWeekly','*','READ','ALLOW','ROLE','employee'),(94,'Agency','landsThatDay','*','ALLOW','ROLE','employee'),(96,'ClaimEnd','*','READ','ALLOW','ROLE','employee'),(97,'ClaimEnd','*','WRITE','ALLOW','ROLE','claimManager'),(98,'ClaimBeginning','*','*','ALLOW','ROLE','employee'),(99,'ClaimDevelopment','*','READ','ALLOW','ROLE','employee'),(100,'ClaimDevelopment','*','WRITE','ALLOW','ROLE','claimManager'),(102,'Claim','createFromSales','*','ALLOW','ROLE','employee'),(104,'Item','*','WRITE','ALLOW','ROLE','marketingBoss'),(105,'ItemBarcode','*','WRITE','ALLOW','ROLE','marketingBoss'),(106,'ItemBotanical','*','WRITE','ALLOW','ROLE','marketingBoss'),(108,'ItemPlacement','*','WRITE','ALLOW','ROLE','marketingBoss'),(109,'UserConfig','*','*','ALLOW','ROLE','employee'),(110,'Bank','*','READ','ALLOW','ROLE','trainee'),(111,'ClientLog','*','READ','ALLOW','ROLE','trainee'),(112,'Defaulter','*','READ','ALLOW','ROLE','employee'),(113,'ClientRisk','*','READ','ALLOW','ROLE','trainee'),(114,'Receipt','*','READ','ALLOW','ROLE','trainee'),(115,'Receipt','*','WRITE','ALLOW','ROLE','administrative'),(116,'BankEntity','*','*','ALLOW','ROLE','employee'),(117,'ClientSample','*','*','ALLOW','ROLE','employee'),(118,'WorkerTeam','*','*','ALLOW','ROLE','salesPerson'),(119,'Travel','*','READ','ALLOW','ROLE','employee'),(120,'Travel','*','WRITE','ALLOW','ROLE','buyer'),(121,'Item','regularize','*','ALLOW','ROLE','employee'),(122,'TicketRequest','*','*','ALLOW','ROLE','employee'),(124,'Client','confirmTransaction','WRITE','ALLOW','ROLE','administrative'),(125,'Agency','getAgenciesWithWarehouse','*','ALLOW','ROLE','employee'),(126,'Client','activeWorkersWithRole','*','ALLOW','ROLE','employee'),(127,'TicketLog','*','READ','ALLOW','ROLE','employee'),(129,'TicketService','*','*','ALLOW','ROLE','employee'),(130,'Expedition','*','WRITE','ALLOW','ROLE','packager'),(131,'CreditInsurance','*','READ','ALLOW','ROLE','trainee'),(132,'CreditClassification','*','READ','ALLOW','ROLE','trainee'),(133,'ItemTag','*','WRITE','ALLOW','ROLE','marketingBoss'),(135,'ZoneGeo','*','READ','ALLOW','ROLE','employee'),(136,'ZoneCalendar','*','READ','ALLOW','ROLE','employee'),(137,'ZoneIncluded','*','READ','ALLOW','ROLE','employee'),(138,'LabourHoliday','*','READ','ALLOW','ROLE','employee'),(139,'LabourHolidayLegend','*','READ','ALLOW','ROLE','employee'),(140,'LabourHolidayType','*','READ','ALLOW','ROLE','employee'),(141,'Zone','*','*','ALLOW','ROLE','logisticBoss'),(142,'ZoneCalendar','*','WRITE','ALLOW','ROLE','deliveryBoss'),(143,'ZoneIncluded','*','*','ALLOW','ROLE','deliveryBoss'),(144,'Stowaway','*','*','ALLOW','ROLE','employee'),(145,'Ticket','getPossibleStowaways','READ','ALLOW','ROLE','employee'),(147,'UserConfigView','*','*','ALLOW','ROLE','employee'),(148,'UserConfigView','*','*','ALLOW','ROLE','employee'),(149,'Sip','*','READ','ALLOW','ROLE','employee'),(150,'Sip','*','WRITE','ALLOW','ROLE','hr'),(151,'Department','*','READ','ALLOW','ROLE','employee'),(152,'Department','*','WRITE','ALLOW','ROLE','hr'),(153,'Route','*','READ','ALLOW','ROLE','employee'),(154,'Route','*','WRITE','ALLOW','ROLE','delivery'),(155,'Calendar','*','READ','ALLOW','ROLE','hr'),(156,'WorkerLabour','*','READ','ALLOW','ROLE','hr'),(157,'Calendar','absences','READ','ALLOW','ROLE','employee'),(158,'ItemTag','*','WRITE','ALLOW','ROLE','accessory'),(160,'TicketServiceType','*','READ','ALLOW','ROLE','employee'),(161,'TicketConfig','*','READ','ALLOW','ROLE','employee'),(162,'InvoiceOut','delete','WRITE','ALLOW','ROLE','invoicing'),(163,'InvoiceOut','book','WRITE','ALLOW','ROLE','invoicing'),(165,'TicketDms','*','*','ALLOW','ROLE','employee'),(167,'Worker','isSubordinate','READ','ALLOW','ROLE','employee'),(168,'Worker','mySubordinates','READ','ALLOW','ROLE','employee'),(169,'WorkerTimeControl','filter','READ','ALLOW','ROLE','employee'),(170,'WorkerTimeControl','addTime','WRITE','ALLOW','ROLE','employee'),(171,'TicketServiceType','*','WRITE','ALLOW','ROLE','administrative'),(172,'Sms','*','READ','ALLOW','ROLE','employee'),(173,'Sms','send','WRITE','ALLOW','ROLE','employee'),(176,'Device','*','*','ALLOW','ROLE','employee'),(177,'Device','*','*','ALLOW','ROLE','employee'),(178,'WorkerTimeControl','*','*','ALLOW','ROLE','employee'),(179,'ItemLog','*','READ','ALLOW','ROLE','employee'),(180,'RouteLog','*','READ','ALLOW','ROLE','employee'),(181,'Dms','removeFile','WRITE','ALLOW','ROLE','employee'),(182,'Dms','uploadFile','WRITE','ALLOW','ROLE','employee'),(183,'Dms','downloadFile','READ','ALLOW','ROLE','employee'),(184,'Client','uploadFile','WRITE','ALLOW','ROLE','employee'),(185,'ClientDms','removeFile','WRITE','ALLOW','ROLE','employee'),(186,'ClientDms','*','READ','ALLOW','ROLE','trainee'),(187,'Ticket','uploadFile','WRITE','ALLOW','ROLE','employee'),(190,'Route','updateVolume','WRITE','ALLOW','ROLE','deliveryBoss'),(191,'Agency','getLanded','READ','ALLOW','ROLE','employee'),(192,'Agency','getShipped','READ','ALLOW','ROLE','employee'),(194,'Postcode','*','WRITE','ALLOW','ROLE','deliveryBoss'),(195,'Ticket','addSale','WRITE','ALLOW','ROLE','employee'),(196,'Dms','updateFile','WRITE','ALLOW','ROLE','employee'),(197,'Dms','*','READ','ALLOW','ROLE','trainee'),(198,'ClaimDms','removeFile','WRITE','ALLOW','ROLE','employee'),(199,'ClaimDms','*','READ','ALLOW','ROLE','employee'),(200,'Claim','uploadFile','WRITE','ALLOW','ROLE','employee'),(201,'Sale','updateConcept','WRITE','ALLOW','ROLE','employee'),(202,'Claim','updateClaimAction','WRITE','ALLOW','ROLE','claimManager'),(203,'UserPhone','*','*','ALLOW','ROLE','employee'),(204,'WorkerDms','removeFile','WRITE','ALLOW','ROLE','hr'),(205,'WorkerDms','*','READ','ALLOW','ROLE','hr'),(206,'Chat','*','*','ALLOW','ROLE','employee'),(207,'Chat','sendMessage','*','ALLOW','ROLE','employee'),(208,'Sale','recalculatePrice','WRITE','ALLOW','ROLE','employee'),(209,'Ticket','recalculateComponents','WRITE','ALLOW','ROLE','employee'),(211,'TravelLog','*','READ','ALLOW','ROLE','buyer'),(212,'Thermograph','*','*','ALLOW','ROLE','buyer'),(213,'TravelThermograph','*','WRITE','ALLOW','ROLE','buyer'),(214,'Entry','*','*','ALLOW','ROLE','buyer'),(215,'TicketWeekly','*','WRITE','ALLOW','ROLE','buyer'),(216,'TravelThermograph','*','READ','ALLOW','ROLE','employee'),(218,'Intrastat','*','*','ALLOW','ROLE','buyer'),(221,'UserConfig','getUserConfig','READ','ALLOW','ROLE','account'),(222,'Client','*','READ','ALLOW','ROLE','trainee'),(226,'ClientObservation','*','READ','ALLOW','ROLE','trainee'),(227,'Address','*','READ','ALLOW','ROLE','trainee'),(228,'AddressObservation','*','READ','ALLOW','ROLE','trainee'),(230,'ClientCredit','*','READ','ALLOW','ROLE','trainee'),(231,'ClientContact','*','READ','ALLOW','ROLE','trainee'),(232,'ClientSample','*','READ','ALLOW','ROLE','trainee'),(233,'EntryLog','*','READ','ALLOW','ROLE','buyer'),(234,'WorkerLog','find','READ','ALLOW','ROLE','hr'),(235,'CustomsAgent','*','*','ALLOW','ROLE','employee'),(236,'Buy','*','*','ALLOW','ROLE','buyer'),(237,'WorkerDms','filter','*','ALLOW','ROLE','employee'),(238,'Town','*','WRITE','ALLOW','ROLE','deliveryBoss'),(239,'Province','*','WRITE','ALLOW','ROLE','deliveryBoss'),(240,'supplier','*','WRITE','ALLOW','ROLE','administrative'),(241,'SupplierContact','*','WRITE','ALLOW','ROLE','administrative'),(242,'supplier','*','WRITE','ALLOW','ROLE','administrative'),(244,'supplier','*','WRITE','ALLOW','ROLE','administrative'),(248,'RoleMapping','*','READ','ALLOW','ROLE','account'),(249,'UserPassword','*','READ','ALLOW','ROLE','account'),(250,'Town','*','WRITE','ALLOW','ROLE','deliveryBoss'),(251,'Province','*','WRITE','ALLOW','ROLE','deliveryBoss'),(252,'Supplier','*','READ','ALLOW','ROLE','employee'),(253,'Supplier','*','WRITE','ALLOW','ROLE','administrative'),(254,'SupplierLog','*','READ','ALLOW','ROLE','employee'),(256,'Image','*','WRITE','ALLOW','ROLE','employee'),(257,'FixedPrice','*','*','ALLOW','ROLE','buyer'),(258,'PayDem','*','READ','ALLOW','ROLE','employee'),(259,'Client','createReceipt','*','ALLOW','ROLE','salesAssistant'),(260,'PrintServerQueue','*','WRITE','ALLOW','ROLE','employee'),(261,'SupplierAccount','*','*','ALLOW','ROLE','administrative'),(262,'Entry','*','*','ALLOW','ROLE','administrative'),(263,'InvoiceIn','*','*','ALLOW','ROLE','administrative'),(264,'StarredModule','*','*','ALLOW','ROLE','employee'),(265,'ItemBotanical','*','WRITE','ALLOW','ROLE','logisticBoss'),(266,'ZoneLog','*','READ','ALLOW','ROLE','employee'),(267,'Genus','*','WRITE','ALLOW','ROLE','logisticBoss'),(268,'Specie','*','WRITE','ALLOW','ROLE','logisticBoss'),(269,'InvoiceOut','createPdf','WRITE','ALLOW','ROLE','employee'),(270,'SupplierAddress','*','*','ALLOW','ROLE','employee'),(271,'SalesMonitor','*','*','ALLOW','ROLE','employee'),(272,'InvoiceInLog','*','READ','ALLOW','ROLE','employee'),(273,'InvoiceInTax','*','*','ALLOW','ROLE','administrative'),(274,'InvoiceInLog','*','READ','ALLOW','ROLE','administrative'),(275,'InvoiceOut','createManualInvoice','WRITE','ALLOW','ROLE','invoicing'),(276,'InvoiceOut','globalInvoicing','WRITE','ALLOW','ROLE','invoicing'),(278,'RoleInherit','*','WRITE','ALLOW','ROLE','grant'),(279,'MailAlias','*','*','ALLOW','ROLE','marketing'),(283,'EntryObservation','*','*','ALLOW','ROLE','buyer'),(284,'LdapConfig','*','*','ALLOW','ROLE','sysadmin'),(285,'SambaConfig','*','*','ALLOW','ROLE','sysadmin'),(286,'ACL','*','*','ALLOW','ROLE','developer'),(287,'AccessToken','*','*','ALLOW','ROLE','developer'),(293,'RoleInherit','*','*','ALLOW','ROLE','it'),(294,'RoleRole','*','*','ALLOW','ROLE','it'),(295,'AccountConfig','*','*','ALLOW','ROLE','sysadmin'),(296,'Collection','*','READ','ALLOW','ROLE','employee'),(297,'Sale','refund','WRITE','ALLOW','ROLE','invoicing'),(298,'InvoiceInDueDay','*','*','ALLOW','ROLE','administrative'),(299,'Collection','setSaleQuantity','*','ALLOW','ROLE','employee'),(302,'AgencyTerm','*','*','ALLOW','ROLE','administrative'),(303,'ClaimLog','*','READ','ALLOW','ROLE','claimManager'),(304,'Edi','updateData','WRITE','ALLOW','ROLE','employee'),(305,'EducationLevel','*','*','ALLOW','ROLE','employee'),(306,'InvoiceInIntrastat','*','*','ALLOW','ROLE','employee'),(307,'SupplierAgencyTerm','*','*','ALLOW','ROLE','administrative'),(308,'InvoiceInIntrastat','*','*','ALLOW','ROLE','employee'),(309,'Zone','getZoneClosing','*','ALLOW','ROLE','employee'),(310,'ExpeditionState','*','READ','ALLOW','ROLE','employee'),(311,'Expense','*','READ','ALLOW','ROLE','employee'),(312,'Expense','*','WRITE','ALLOW','ROLE','administrative'),(314,'SupplierActivity','*','READ','ALLOW','ROLE','employee'),(315,'SupplierActivity','*','WRITE','ALLOW','ROLE','administrative'),(316,'Dms','deleteTrashFiles','WRITE','ALLOW','ROLE','employee'),(317,'ClientUnpaid','*','*','ALLOW','ROLE','administrative'),(318,'MdbVersion','*','*','ALLOW','ROLE','developer'),(319,'ItemType','*','READ','ALLOW','ROLE','employee'),(320,'ItemType','*','WRITE','ALLOW','ROLE','buyer'),(321,'InvoiceOut','refund','WRITE','ALLOW','ROLE','invoicing'),(322,'InvoiceOut','refund','WRITE','ALLOW','ROLE','salesAssistant'),(323,'InvoiceOut','refund','WRITE','ALLOW','ROLE','claimManager'),(324,'Ticket','refund','WRITE','ALLOW','ROLE','invoicing'),(325,'Ticket','refund','WRITE','ALLOW','ROLE','salesAssistant'),(326,'Ticket','refund','WRITE','ALLOW','ROLE','claimManager'),(327,'Sale','refund','WRITE','ALLOW','ROLE','salesAssistant'),(328,'Sale','refund','WRITE','ALLOW','ROLE','claimManager'),(329,'TicketRefund','*','WRITE','ALLOW','ROLE','invoicing'),(330,'ClaimObservation','*','WRITE','ALLOW','ROLE','salesPerson'),(331,'ClaimObservation','*','READ','ALLOW','ROLE','salesPerson'),(332,'Client','setPassword','WRITE','ALLOW','ROLE','salesPerson'),(333,'Client','updateUser','WRITE','ALLOW','ROLE','salesPerson'),(334,'ShelvingLog','*','READ','ALLOW','ROLE','employee'),(335,'ZoneExclusionGeo','*','READ','ALLOW','ROLE','employee'),(336,'ZoneExclusionGeo','*','WRITE','ALLOW','ROLE','deliveryBoss'),(337,'Parking','*','*','ALLOW','ROLE','employee'),(338,'Shelving','*','*','ALLOW','ROLE','employee'),(339,'OsTicket','*','*','ALLOW','ROLE','employee'),(340,'OsTicketConfig','*','*','ALLOW','ROLE','it'),(341,'ClientConsumptionQueue','*','WRITE','ALLOW','ROLE','employee'),(342,'Ticket','deliveryNotePdf','READ','ALLOW','ROLE','employee'),(343,'Ticket','deliveryNoteEmail','WRITE','ALLOW','ROLE','employee'),(344,'Ticket','deliveryNoteCsvPdf','READ','ALLOW','ROLE','employee'),(345,'Ticket','deliveryNoteCsvEmail','READ','ALLOW','ROLE','employee'),(346,'Client','campaignMetricsPdf','READ','ALLOW','ROLE','employee'),(347,'Client','campaignMetricsEmail','WRITE','ALLOW','ROLE','employee'),(348,'Client','clientWelcomeHtml','READ','ALLOW','ROLE','employee'),(349,'Client','clientWelcomeEmail','WRITE','ALLOW','ROLE','employee'),(350,'Client','creditRequestPdf','READ','ALLOW','ROLE','employee'),(351,'Client','creditRequestHtml','READ','ALLOW','ROLE','employee'),(352,'Client','creditRequestEmail','WRITE','ALLOW','ROLE','employee'),(353,'Client','printerSetupHtml','READ','ALLOW','ROLE','employee'),(354,'Client','printerSetupEmail','WRITE','ALLOW','ROLE','employee'),(355,'Client','sepaCoreEmail','WRITE','ALLOW','ROLE','employee'),(356,'Client','letterDebtorPdf','READ','ALLOW','ROLE','employee'),(357,'Client','letterDebtorStHtml','READ','ALLOW','ROLE','employee'),(358,'Client','letterDebtorStEmail','WRITE','ALLOW','ROLE','employee'),(359,'Client','letterDebtorNdHtml','READ','ALLOW','ROLE','employee'),(360,'Client','letterDebtorNdEmail','WRITE','ALLOW','ROLE','employee'),(361,'Client','clientDebtStatementPdf','READ','ALLOW','ROLE','employee'),(362,'Client','clientDebtStatementHtml','READ','ALLOW','ROLE','employee'),(363,'Client','clientDebtStatementEmail','WRITE','ALLOW','ROLE','employee'),(364,'Client','incotermsAuthorizationPdf','READ','ALLOW','ROLE','employee'),(365,'Client','incotermsAuthorizationHtml','READ','ALLOW','ROLE','employee'),(366,'Client','incotermsAuthorizationEmail','WRITE','ALLOW','ROLE','employee'),(367,'Client','consumptionSendQueued','WRITE','ALLOW','ROLE','system'),(368,'InvoiceOut','invoiceEmail','WRITE','ALLOW','ROLE','employee'),(369,'InvoiceOut','exportationPdf','READ','ALLOW','ROLE','employee'),(370,'InvoiceOut','sendQueued','WRITE','ALLOW','ROLE','system'),(371,'Ticket','invoiceCsvPdf','READ','ALLOW','ROLE','employee'),(372,'Ticket','invoiceCsvEmail','WRITE','ALLOW','ROLE','employee'),(373,'Supplier','campaignMetricsPdf','READ','ALLOW','ROLE','employee'),(374,'Supplier','campaignMetricsEmail','WRITE','ALLOW','ROLE','employee'),(375,'Travel','extraCommunityPdf','READ','ALLOW','ROLE','employee'),(376,'Travel','extraCommunityEmail','WRITE','ALLOW','ROLE','employee'),(377,'Entry','entryOrderPdf','READ','ALLOW','ROLE','employee'),(378,'OsTicket','osTicketReportEmail','WRITE','ALLOW','ROLE','system'),(379,'Item','buyerWasteEmail','WRITE','ALLOW','ROLE','system'),(380,'Claim','claimPickupPdf','READ','ALLOW','ROLE','employee'),(381,'Claim','claimPickupEmail','WRITE','ALLOW','ROLE','claimManager'),(382,'Item','labelPdf','READ','ALLOW','ROLE','employee'),(383,'Sector','*','READ','ALLOW','ROLE','employee'),(384,'Sector','*','WRITE','ALLOW','ROLE','employee'),(385,'Route','driverRoutePdf','READ','ALLOW','ROLE','employee'),(386,'Route','driverRouteEmail','WRITE','ALLOW','ROLE','employee'),(387,'Ticket','deliveryNotePdf','READ','ALLOW','ROLE','customer'),(388,'Supplier','newSupplier','WRITE','ALLOW','ROLE','administrative'),(389,'ClaimRma','*','READ','ALLOW','ROLE','claimManager'),(390,'ClaimRma','*','WRITE','ALLOW','ROLE','claimManager'),(391,'Notification','*','WRITE','ALLOW','ROLE','system'),(392,'Boxing','*','*','ALLOW','ROLE','employee'),(393,'Url','*','READ','ALLOW','ROLE','employee'),(394,'Url','*','WRITE','ALLOW','ROLE','it'),(395,'ItemShelving','*','READ','ALLOW','ROLE','employee'),(396,'ItemShelving','*','WRITE','ALLOW','ROLE','production'),(397,'ItemShelvingPlacementSupplyStock','*','READ','ALLOW','ROLE','employee'),(398,'NotificationQueue','*','*','ALLOW','ROLE','employee'),(399,'InvoiceOut','clientsToInvoice','WRITE','ALLOW','ROLE','invoicing'),(400,'InvoiceOut','invoiceClient','WRITE','ALLOW','ROLE','invoicing'),(401,'Sale','editTracked','WRITE','ALLOW','ROLE','production'),(402,'Sale','editFloramondo','WRITE','ALLOW','ROLE','salesAssistant'),(403,'Receipt','balanceCompensationEmail','WRITE','ALLOW','ROLE','employee'),(404,'Receipt','balanceCompensationPdf','READ','ALLOW','ROLE','employee'),(405,'Ticket','getTicketsFuture','READ','ALLOW','ROLE','employee'),(406,'Ticket','merge','WRITE','ALLOW','ROLE','employee'),(407,'Sale','editFloramondo','WRITE','ALLOW','ROLE','logistic'),(408,'ZipConfig','*','*','ALLOW','ROLE','employee'),(409,'Item','*','WRITE','ALLOW','ROLE','administrative'),(410,'Sale','editCloned','WRITE','ALLOW','ROLE','buyer'),(411,'Sale','editCloned','WRITE','ALLOW','ROLE','salesAssistant'),(414,'MdbVersion','*','READ','ALLOW','ROLE','$everyone'),(416,'TicketLog','getChanges','READ','ALLOW','ROLE','employee'),(417,'Ticket','getTicketsAdvance','READ','ALLOW','ROLE','employee'),(418,'EntryLog','*','READ','ALLOW','ROLE','administrative'),(419,'Sale','editTracked','WRITE','ALLOW','ROLE','buyer'),(420,'MdbBranch','*','READ','ALLOW','ROLE','$everyone'),(421,'ItemShelvingSale','*','*','ALLOW','ROLE','employee'),(422,'Docuware','checkFile','READ','ALLOW','ROLE','employee'),(423,'Docuware','download','READ','ALLOW','ROLE','salesPerson'),(424,'Docuware','upload','WRITE','ALLOW','ROLE','productionAssi'),(425,'Docuware','deliveryNoteEmail','WRITE','ALLOW','ROLE','salesPerson'),(426,'TpvTransaction','confirm','WRITE','ALLOW','ROLE','$everyone'),(427,'TpvTransaction','start','WRITE','ALLOW','ROLE','$authenticated'),(428,'TpvTransaction','end','WRITE','ALLOW','ROLE','$authenticated'),(429,'ItemConfig','*','READ','ALLOW','ROLE','employee'),(431,'Tag','onSubmit','WRITE','ALLOW','ROLE','employee'),(432,'Worker','updateAttributes','WRITE','ALLOW','ROLE','hr'),(433,'Worker','createAbsence','*','ALLOW','ROLE','employee'),(434,'Worker','updateAbsence','WRITE','ALLOW','ROLE','employee'),(435,'Worker','deleteAbsence','*','ALLOW','ROLE','employee'),(436,'Worker','new','WRITE','ALLOW','ROLE','hr'),(438,'Client','getClientOrSupplierReference','READ','ALLOW','ROLE','employee'),(439,'NotificationSubscription','*','*','ALLOW','ROLE','employee'),(440,'NotificationAcl','*','READ','ALLOW','ROLE','employee'),(441,'MdbApp','*','READ','ALLOW','ROLE','$everyone'),(442,'MdbApp','*','*','ALLOW','ROLE','developer'),(443,'ItemConfig','*','*','ALLOW','ROLE','employee'),(444,'DeviceProduction','*','*','ALLOW','ROLE','hr'),(445,'DeviceProductionModels','*','*','ALLOW','ROLE','hr'),(446,'DeviceProductionState','*','*','ALLOW','ROLE','hr'),(447,'DeviceProductionUser','*','*','ALLOW','ROLE','hr'),(448,'DeviceProduction','*','*','ALLOW','ROLE','productionAssi'),(449,'DeviceProductionModels','*','*','ALLOW','ROLE','productionAssi'),(450,'DeviceProductionState','*','*','ALLOW','ROLE','productionAssi'),(451,'DeviceProductionUser','*','*','ALLOW','ROLE','productionAssi'),(452,'Worker','deallocatePDA','*','ALLOW','ROLE','hr'),(453,'Worker','allocatePDA','*','ALLOW','ROLE','hr'),(454,'Worker','deallocatePDA','*','ALLOW','ROLE','productionAssi'),(455,'Worker','allocatePDA','*','ALLOW','ROLE','productionAssi'),(456,'Zone','*','*','ALLOW','ROLE','deliveryBoss'),(457,'Account','setPassword','WRITE','ALLOW','ROLE','itManagement'),(458,'Operator','*','READ','ALLOW','ROLE','employee'),(459,'Operator','*','WRITE','ALLOW','ROLE','employee'),(460,'InvoiceIn','getSerial','READ','ALLOW','ROLE','administrative'),(461,'Ticket','saveSign','WRITE','ALLOW','ROLE','employee'),(462,'InvoiceOut','negativeBases','READ','ALLOW','ROLE','administrative'),(463,'InvoiceOut','negativeBasesCsv','READ','ALLOW','ROLE','administrative'),(464,'WorkerObservation','*','*','ALLOW','ROLE','hr'),(465,'ClientInforma','*','READ','ALLOW','ROLE','employee'),(466,'ClientInforma','*','WRITE','ALLOW','ROLE','financial'),(467,'Receipt','receiptEmail','*','ALLOW','ROLE','salesAssistant'),(468,'Client','setRating','WRITE','ALLOW','ROLE','financial'),(469,'Client','*','READ','ALLOW','ROLE','employee'),(470,'Client','addressesPropagateRe','*','ALLOW','ROLE','employee'),(471,'Client','canBeInvoiced','*','ALLOW','ROLE','employee'),(472,'Client','canCreateTicket','*','ALLOW','ROLE','employee'),(473,'Client','consumption','*','ALLOW','ROLE','employee'),(474,'Client','createAddress','*','ALLOW','ROLE','employee'),(475,'Client','createWithUser','*','ALLOW','ROLE','employee'),(476,'Client','extendedListFilter','*','ALLOW','ROLE','employee'),(477,'Client','getAverageInvoiced','*','ALLOW','ROLE','employee'),(478,'Client','getCard','*','ALLOW','ROLE','employee'),(479,'Client','getDebt','*','ALLOW','ROLE','employee'),(480,'Client','getMana','*','ALLOW','ROLE','employee'),(481,'Client','transactions','*','ALLOW','ROLE','employee'),(482,'Client','hasCustomerRole','*','ALLOW','ROLE','employee'),(483,'Client','isValidClient','*','ALLOW','ROLE','employee'),(484,'Client','lastActiveTickets','*','ALLOW','ROLE','employee'),(485,'Client','sendSms','*','ALLOW','ROLE','employee'),(486,'Client','setPassword','*','ALLOW','ROLE','employee'),(487,'Client','summary','*','ALLOW','ROLE','employee'),(488,'Client','updateAddress','*','ALLOW','ROLE','employee'),(489,'Client','updateFiscalData','*','ALLOW','ROLE','employee'),(491,'Client','uploadFile','*','ALLOW','ROLE','employee'),(492,'Client','campaignMetricsPdf','*','ALLOW','ROLE','employee'),(493,'Client','campaignMetricsEmail','*','ALLOW','ROLE','employee'),(494,'Client','clientWelcomeHtml','*','ALLOW','ROLE','employee'),(495,'Client','clientWelcomeEmail','*','ALLOW','ROLE','employee'),(496,'Client','printerSetupHtml','*','ALLOW','ROLE','employee'),(497,'Client','printerSetupEmail','*','ALLOW','ROLE','employee'),(498,'Client','sepaCoreEmail','*','ALLOW','ROLE','employee'),(499,'Client','letterDebtorPdf','*','ALLOW','ROLE','employee'),(500,'Client','letterDebtorStHtml','*','ALLOW','ROLE','employee'),(501,'Client','letterDebtorStEmail','*','ALLOW','ROLE','employee'),(502,'Client','letterDebtorNdHtml','*','ALLOW','ROLE','employee'),(503,'Client','letterDebtorNdEmail','*','ALLOW','ROLE','employee'),(504,'Client','clientDebtStatementPdf','*','ALLOW','ROLE','employee'),(505,'Client','clientDebtStatementHtml','*','ALLOW','ROLE','employee'),(506,'Client','clientDebtStatementEmail','*','ALLOW','ROLE','employee'),(507,'Client','creditRequestPdf','*','ALLOW','ROLE','employee'),(508,'Client','creditRequestHtml','*','ALLOW','ROLE','employee'),(509,'Client','creditRequestEmail','*','ALLOW','ROLE','employee'),(510,'Client','incotermsAuthorizationPdf','*','ALLOW','ROLE','employee'),(511,'Client','incotermsAuthorizationHtml','*','ALLOW','ROLE','employee'),(512,'Client','incotermsAuthorizationEmail','*','ALLOW','ROLE','employee'),(513,'Client','consumptionSendQueued','*','ALLOW','ROLE','employee'),(514,'Client','filter','*','ALLOW','ROLE','employee'),(515,'Client','getClientOrSupplierReference','*','ALLOW','ROLE','employee'),(516,'Client','upsert','*','ALLOW','ROLE','employee'),(517,'Client','create','*','ALLOW','ROLE','employee'),(518,'Client','replaceById','*','ALLOW','ROLE','employee'),(519,'Client','updateAttributes','*','ALLOW','ROLE','employee'),(520,'Client','updateAttributes','*','ALLOW','ROLE','employee'),(521,'Client','deleteById','*','ALLOW','ROLE','employee'),(522,'Client','replaceOrCreate','*','ALLOW','ROLE','employee'),(523,'Client','updateAll','*','ALLOW','ROLE','employee'),(524,'Client','upsertWithWhere','*','ALLOW','ROLE','employee'),(525,'Defaulter','observationEmail','WRITE','ALLOW','ROLE','employee'),(527,'VnUser','acl','READ','ALLOW','ROLE','account'),(528,'VnUser','getCurrentUserData','READ','ALLOW','ROLE','account'),(530,'Account','exists','READ','ALLOW','ROLE','account'),(531,'Account','exists','READ','ALLOW','ROLE','account'),(532,'UserLog','*','READ','ALLOW','ROLE','employee'),(533,'RoleLog','*','READ','ALLOW','ROLE','employee'),(534,'WagonType','*','*','ALLOW','ROLE','productionAssi'),(535,'WagonTypeColor','*','*','ALLOW','ROLE','productionAssi'),(536,'WagonTypeTray','*','*','ALLOW','ROLE','productionAssi'),(537,'WagonConfig','*','*','ALLOW','ROLE','productionAssi'),(538,'CollectionWagon','*','*','ALLOW','ROLE','productionAssi'),(539,'CollectionWagonTicket','*','*','ALLOW','ROLE','productionAssi'),(540,'Wagon','*','*','ALLOW','ROLE','productionAssi'),(541,'WagonType','createWagonType','*','ALLOW','ROLE','productionAssi'),(542,'WagonType','deleteWagonType','*','ALLOW','ROLE','productionAssi'),(543,'WagonType','editWagonType','*','ALLOW','ROLE','productionAssi'),(544,'Docuware','deliveryNoteEmail','WRITE','ALLOW','ROLE','employee'),(545,'Agency','find','READ','ALLOW','ROLE','employee'),(546,'Agency','seeExpired','READ','ALLOW','ROLE','coolerAssist'),(547,'WorkerLog','models','READ','ALLOW','ROLE','hr'),(548,'Ticket','editDiscount','WRITE','ALLOW','ROLE','claimManager'),(549,'Ticket','editDiscount','WRITE','ALLOW','ROLE','salesPerson'),(550,'Ticket','isRoleAdvanced','*','ALLOW','ROLE','salesAssistant'),(551,'Ticket','isRoleAdvanced','*','ALLOW','ROLE','deliveryBoss'),(552,'Ticket','isRoleAdvanced','*','ALLOW','ROLE','buyer'),(553,'Ticket','isRoleAdvanced','*','ALLOW','ROLE','claimManager'),(554,'Ticket','deleteTicketWithPartPrepared','WRITE','ALLOW','ROLE','salesAssistant'),(555,'Ticket','editZone','WRITE','ALLOW','ROLE','deliveryBoss'),(556,'State','editableStates','READ','ALLOW','ROLE','employee'),(557,'State','seeEditableStates','READ','ALLOW','ROLE','administrative'),(558,'State','seeEditableStates','READ','ALLOW','ROLE','production'),(559,'State','isSomeEditable','READ','ALLOW','ROLE','salesPerson'),(560,'State','isAllEditable','READ','ALLOW','ROLE','production'),(561,'State','isAllEditable','READ','ALLOW','ROLE','administrative'),(562,'Agency','seeExpired','READ','ALLOW','ROLE','administrative'),(563,'Agency','seeExpired','READ','ALLOW','ROLE','productionBoss'),(564,'Claim','createAfterDeadline','WRITE','ALLOW','ROLE','claimManager'),(565,'Client','editAddressLogifloraAllowed','WRITE','ALLOW','ROLE','salesAssistant'),(566,'Client','editFiscalDataWithoutTaxDataCheck','WRITE','ALLOW','ROLE','salesAssistant'),(567,'Client','editVerifiedDataWithoutTaxDataCheck','WRITE','ALLOW','ROLE','salesAssistant'),(568,'Client','editCredit','WRITE','ALLOW','ROLE','financialBoss'),(569,'Client','zeroCreditEditor','WRITE','ALLOW','ROLE','financialBoss'),(570,'InvoiceOut','canCreatePdf','WRITE','ALLOW','ROLE','invoicing'),(571,'Supplier','editPayMethodCheck','WRITE','ALLOW','ROLE','financial'),(572,'Worker','isTeamBoss','WRITE','ALLOW','ROLE','teamBoss'),(573,'Worker','forceIsSubordinate','READ','ALLOW','ROLE','hr'),(574,'Claim','editState','WRITE','ALLOW','ROLE','claimManager'),(575,'Claim','find','READ','ALLOW','ROLE','salesPerson'),(576,'Claim','findById','READ','ALLOW','ROLE','salesPerson'),(577,'Claim','findOne','READ','ALLOW','ROLE','salesPerson'),(578,'Claim','getSummary','READ','ALLOW','ROLE','salesPerson'),(579,'Claim','updateClaim','WRITE','ALLOW','ROLE','salesPerson'),(580,'Claim','regularizeClaim','WRITE','ALLOW','ROLE','claimManager'),(581,'Claim','updateClaimDestination','WRITE','ALLOW','ROLE','claimManager'),(582,'Claim','downloadFile','READ','ALLOW','ROLE','claimManager'),(583,'Claim','deleteById','WRITE','ALLOW','ROLE','claimManager'),(584,'Claim','filter','READ','ALLOW','ROLE','salesPerson'),(585,'Claim','logs','READ','ALLOW','ROLE','claimManager'),(586,'Ticket','find','READ','ALLOW','ROLE','employee'),(587,'Ticket','findById','READ','ALLOW','ROLE','employee'),(588,'Ticket','findOne','READ','ALLOW','ROLE','employee'),(589,'Ticket','getVolume','READ','ALLOW','ROLE','employee'),(590,'Ticket','getTotalVolume','READ','ALLOW','ROLE','employee'),(591,'Ticket','summary','READ','ALLOW','ROLE','employee'),(592,'Ticket','priceDifference','READ','ALLOW','ROLE','employee'),(593,'Ticket','componentUpdate','WRITE','ALLOW','ROLE','employee'),(594,'Ticket','new','WRITE','ALLOW','ROLE','employee'),(595,'Ticket','isEditable','READ','ALLOW','ROLE','employee'),(596,'Ticket','setDeleted','WRITE','ALLOW','ROLE','salesPerson'),(597,'Ticket','restore','WRITE','ALLOW','ROLE','employee'),(598,'Ticket','getSales','READ','ALLOW','ROLE','employee'),(599,'Ticket','getSalesPersonMana','READ','ALLOW','ROLE','employee'),(600,'Ticket','filter','READ','ALLOW','ROLE','employee'),(601,'Ticket','makeInvoice','WRITE','ALLOW','ROLE','employee'),(602,'Ticket','updateEditableTicket','WRITE','ALLOW','ROLE','employee'),(603,'Ticket','updateDiscount','WRITE','ALLOW','ROLE','employee'),(604,'Ticket','transferSales','WRITE','ALLOW','ROLE','employee'),(605,'Ticket','sendSms','WRITE','ALLOW','ROLE','employee'),(606,'Ticket','isLocked','READ','ALLOW','ROLE','employee'),(607,'Ticket','freightCost','READ','ALLOW','ROLE','employee'),(608,'Ticket','getComponentsSum','READ','ALLOW','ROLE','employee'),(609,'Ticket','updateAttributes','WRITE','ALLOW','ROLE','delivery'),(610,'Ticket','deliveryNoteCsv','READ','ALLOW','ROLE','employee'),(611,'State','find','READ','ALLOW','ROLE','employee'),(612,'State','findById','READ','ALLOW','ROLE','employee'),(613,'State','findOne','READ','ALLOW','ROLE','employee'),(614,'Worker','find','READ','ALLOW','ROLE','employee'),(615,'Worker','findById','READ','ALLOW','ROLE','employee'),(616,'Worker','findOne','READ','ALLOW','ROLE','employee'),(617,'Worker','filter','READ','ALLOW','ROLE','employee'),(618,'Worker','getWorkedHours','READ','ALLOW','ROLE','employee'),(619,'Worker','active','READ','ALLOW','ROLE','employee'),(620,'Worker','activeWithRole','READ','ALLOW','ROLE','employee'),(621,'Worker','uploadFile','WRITE','ALLOW','ROLE','hr'),(622,'Worker','contracts','READ','ALLOW','ROLE','employee'),(623,'Worker','holidays','READ','ALLOW','ROLE','employee'),(624,'Worker','activeContract','READ','ALLOW','ROLE','employee'),(625,'Worker','activeWithInheritedRole','READ','ALLOW','ROLE','employee'),(626,'Ticket','collectionLabel','READ','ALLOW','ROLE','employee'),(628,'Ticket','expeditionPalletLabel','READ','ALLOW','ROLE','employee'),(629,'Ticket','editDiscount','WRITE','ALLOW','ROLE','artificialBoss'),(630,'Claim','claimPickupEmail','WRITE','ALLOW','ROLE','salesTeamBoss'),(635,'Ticket','updateAttributes','WRITE','ALLOW','ROLE','administrative'),(636,'Claim','claimPickupEmail','WRITE','ALLOW','ROLE','salesPerson'),(637,'Claim','downloadFile','READ','ALLOW','ROLE','salesPerson'),(638,'Agency','seeExpired','READ','ALLOW','ROLE','artificialBoss'),(639,'Agency','seeExpired','READ','ALLOW','ROLE','logisticAssistant'),(640,'Claim','filter','READ','ALLOW','ROLE','buyer'),(641,'Claim','find','READ','ALLOW','ROLE','buyer'),(642,'Claim','findById','READ','ALLOW','ROLE','buyer'),(643,'Claim','getSummary','READ','ALLOW','ROLE','buyer'),(644,'Claim','filter','READ','ALLOW','ROLE','handmadeBoss'),(645,'Claim','find','READ','ALLOW','ROLE','handmadeBoss'),(646,'Claim','findById','READ','ALLOW','ROLE','handmadeBoss'),(647,'Claim','getSummary','READ','ALLOW','ROLE','handmadeBoss'),(648,'Claim','__get__lines','READ','ALLOW','ROLE','claimManager'),(649,'Claim','__get__lines','READ','ALLOW','ROLE','salesPerson'),(650,'Claim','getSummary','READ','ALLOW','ROLE','deliveryBoss'),(651,'Claim','findById','READ','ALLOW','ROLE','deliveryBoss'),(652,'Claim','find','READ','ALLOW','ROLE','deliveryBoss'),(653,'Claim','filter','READ','ALLOW','ROLE','deliveryBoss'),(654,'Ticket','editZone','WRITE','ALLOW','ROLE','logisticAssistant'),(655,'Entry','addFromPackaging','WRITE','ALLOW','ROLE','production'),(656,'Entry','addFromBuy','WRITE','ALLOW','ROLE','production'),(657,'Supplier','getItemsPackaging','READ','ALLOW','ROLE','production'),(658,'Ticket','closeAll','WRITE','ALLOW','ROLE','system'),(659,'Account','*','*','ALLOW','ROLE','itManagement'),(660,'Account','*','READ','ALLOW','ROLE','employee'),(664,'MailForward','*','*','ALLOW','ROLE','itManagement'),(665,'Role','*','READ','ALLOW','ROLE','employee'),(666,'Role','*','WRITE','ALLOW','ROLE','it'),(667,'VnUser','*','*','ALLOW','ROLE','itManagement'),(668,'VnUser','__get__preview','READ','ALLOW','ROLE','employee'),(669,'VnUser','preview','*','ALLOW','ROLE','employee'),(670,'VnUser','create','*','ALLOW','ROLE','itManagement'),(671,'VnUser','renewToken','WRITE','ALLOW','ROLE','employee'),(672,'PackingSiteAdvanced','*','*','ALLOW','ROLE','production'),(673,'InvoiceOut','makePdfAndNotify','WRITE','ALLOW','ROLE','invoicing'),(674,'InvoiceOutConfig','*','READ','ALLOW','ROLE','invoicing'),(676,'Ticket','invoiceTickets','WRITE','ALLOW','ROLE','employee'),(680,'MailAliasAccount','*','READ','ALLOW','ROLE','employee'),(681,'MailAliasAccount','create','WRITE','ALLOW','ROLE','employee'),(682,'MailAliasAccount','deleteById','WRITE','ALLOW','ROLE','employee'),(683,'MailAliasAccount','canEditAlias','WRITE','ALLOW','ROLE','itManagement'),(684,'WorkerDisableExcluded','*','READ','ALLOW','ROLE','itManagement'),(685,'WorkerDisableExcluded','*','WRITE','ALLOW','ROLE','itManagement'),(686,'MailForward','*','*','ALLOW','ROLE','hr'),(687,'ClientSms','find','READ','ALLOW','ROLE','employee'),(688,'ClientSms','create','WRITE','ALLOW','ROLE','employee'),(689,'Vehicle','sorted','WRITE','ALLOW','ROLE','employee'),(690,'Roadmap','*','*','ALLOW','ROLE','palletizerBoss'),(691,'Roadmap','*','*','ALLOW','ROLE','productionBoss'),(692,'ExpeditionTruck','*','*','ALLOW','ROLE','palletizerBoss'),(693,'ExpeditionTruck','*','*','ALLOW','ROLE','productionBoss'),(694,'MailAliasAccount','canEditAlias','WRITE','ALLOW','ROLE','marketingBoss'),(695,'ViaexpressConfig','internationalExpedition','WRITE','ALLOW','ROLE','employee'),(696,'ViaexpressConfig','renderer','READ','ALLOW','ROLE','employee'),(697,'Ticket','transferClient','WRITE','ALLOW','ROLE','administrative'),(698,'Ticket','canEditWeekly','WRITE','ALLOW','ROLE','buyer'),(699,'TicketSms','find','READ','ALLOW','ROLE','salesPerson'),(701,'Docuware','upload','WRITE','ALLOW','ROLE','deliveryBoss'),(702,'Ticket','docuwareDownload','READ','ALLOW','ROLE','salesPerson'); -/*!40000 ALTER TABLE `ACL` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `fieldAcl` --- - -LOCK TABLES `fieldAcl` WRITE; -/*!40000 ALTER TABLE `fieldAcl` DISABLE KEYS */; -INSERT INTO `fieldAcl` VALUES (1,'Client','name','update','employee'),(2,'Client','contact','update','employee'),(3,'Client','email','update','employee'),(4,'Client','phone','update','employee'),(5,'Client','mobile','update','employee'),(6,'Client','contactChannelFk','update','employee'),(7,'Client','socialName','update','salesPerson'),(8,'Client','fi','update','salesPerson'),(9,'Client','street','update','salesPerson'),(10,'Client','postcode','update','salesPerson'),(11,'Client','city','update','salesPerson'),(12,'Client','countryFk','update','salesPerson'),(13,'Client','provinceFk','update','salesPerson'),(14,'Client','isActive','update','salesPerson'),(15,'Client','salesPersonFk','update','salesAssistant'),(16,'Client','hasToInvoice','update','salesPerson'),(17,'Client','isToBeMailed','update','salesPerson'),(18,'Client','isEqualizated','update','salesPerson'),(19,'Client','isFreezed','update','salesPerson'),(20,'Client','isVies','update','salesPerson'),(21,'Client','hasToInvoiceByAddress','update','salesPerson'),(22,'Client','isTaxDataChecked','update','salesAssistant'),(23,'Client','payMethodFk','update','salesAssistant'),(24,'Client','dueDay','update','salesAssistant'),(25,'Client','iban','update','salesAssistant'),(26,'Client','bankEntityFk','update','salesAssistant'),(27,'Client','hasLcr','update','salesAssistant'),(28,'Client','hasCoreVnl','update','salesAssistant'),(29,'Client','hasSepaVnl','update','salesAssistant'),(30,'Client','credit','update','teamBoss'),(31,'BankEntity','*','insert','salesAssistant'),(32,'Address','isDefaultAddress','*','employee'),(33,'Address','nickname','*','employee'),(34,'Address','postalCode','*','employee'),(35,'Address','provinceFk','*','employee'),(36,'Address','agencyModeFk','*','employee'),(37,'Address','phone','*','employee'),(38,'Address','mobile','*','employee'),(39,'Address','street','*','employee'),(40,'Address','city','*','employee'),(41,'Address','isActive','*','employee'),(42,'Address','isEqualizated','*','salesAssistant'),(43,'Address','clientFk','insert','employee'),(44,'ClientObservation','*','insert','employee'),(45,'Recovery','*','insert','administrative'),(46,'Recovery','finished','update','administrative'),(47,'CreditClassification','finished','update','creditInsurance'),(48,'Account','*','update','employee'),(49,'Greuge','*','insert','salesAssistant'),(50,'ClientSample','*','insert','employee'),(51,'Item','*','*','buyer'),(52,'Item','*','*','marketingBoss'),(53,'ItemBotanical','*','*','buyer'),(54,'ClaimEnd','*','*','salesAssistant'),(55,'Receipt','*','*','administrative'),(56,'ClaimBeginning','*','*','salesAssistant'),(57,'TicketRequest','*','*','salesPerson'),(58,'ClaimBeginning','*','*','salesAssistant'),(59,'TicketRequest','*','*','salesPerson'),(60,'ClaimBeginning','*','*','salesAssistant'),(61,'TicketRequest','*','*','salesPerson'),(62,'ClaimBeginning','*','*','salesAssistant'),(63,'TicketRequest','*','*','salesPerson'),(64,'ClaimBeginning','*','*','salesAssistant'); -/*!40000 ALTER TABLE `fieldAcl` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `module` --- - -LOCK TABLES `module` WRITE; -/*!40000 ALTER TABLE `module` DISABLE KEYS */; -INSERT INTO `module` VALUES ('account'),('claim'),('customer'),('entry'),('invoiceIn'),('invoiceOut'),('item'),('monitor'),('order'),('route'),('shelving'),('supplier'),('ticket'),('travel'),('wagon'),('worker'),('zone'); -/*!40000 ALTER TABLE `module` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `defaultViewConfig` --- - -LOCK TABLES `defaultViewConfig` WRITE; -/*!40000 ALTER TABLE `defaultViewConfig` DISABLE KEYS */; -INSERT INTO `defaultViewConfig` VALUES ('itemsIndex','{\"intrastat\":false,\"stemMultiplier\":false,\"landed\":false,\"producer\":false}'),('latestBuys','{\"intrastat\":false,\"description\":false,\"density\":false,\"isActive\":false,\n \"freightValue\":false,\"packageValue\":false,\"isIgnored\":false,\"price2\":false,\"ektFk\":false,\"weight\":false,\n \"size\":false,\"comissionValue\":false,\"landing\":false}'),('ticketsMonitor','{\"id\":false}'),('clientsDetail','{\"id\":true,\"phone\":true,\"city\":true,\"socialName\":true,\"salesPersonFk\":true,\"email\":true,\"name\":false,\"fi\":false,\"credit\":false,\"creditInsurance\":false,\"mobile\":false,\"street\":false,\"countryFk\":false,\"provinceFk\":false,\"postcode\":false,\"created\":false,\"businessTypeFk\":false,\"payMethodFk\":false,\"sageTaxTypeFk\":false,\"sageTransactionTypeFk\":false,\"isActive\":false,\"isVies\":false,\"isTaxDataChecked\":false,\"isEqualizated\":false,\"isFreezed\":false,\"hasToInvoice\":false,\"hasToInvoiceByAddress\":false,\"isToBeMailed\":false,\"hasLcr\":false,\"hasCoreVnl\":false,\"hasSepaVnl\":false}'); -/*!40000 ALTER TABLE `defaultViewConfig` ENABLE KEYS */; -UNLOCK TABLES; -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2023-08-30 15:53:15 -USE `vn`; --- MariaDB dump 10.19 Distrib 10.5.19-MariaDB, for debian-linux-gnu (x86_64) --- --- Host: db2.static.verdnatura.es Database: vn --- ------------------------------------------------------ --- Server version 10.7.7-MariaDB-1:10.7.7+maria~deb11-log - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Dumping data for table `agencyTermConfig` --- - -LOCK TABLES `agencyTermConfig` WRITE; -/*!40000 ALTER TABLE `agencyTermConfig` DISABLE KEYS */; -INSERT INTO `agencyTermConfig` VALUES ('6240000000','4721000015',21.0000000000,'Adquisiciones intracomunitarias de servicios'); -/*!40000 ALTER TABLE `agencyTermConfig` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `alertLevel` --- - -LOCK TABLES `alertLevel` WRITE; -/*!40000 ALTER TABLE `alertLevel` DISABLE KEYS */; -INSERT INTO `alertLevel` VALUES ('FREE',0,1),('ON_PREPARATION',1,1),('PACKED',2,0),('DELIVERED',3,0); -/*!40000 ALTER TABLE `alertLevel` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `bookingPlanner` --- - -LOCK TABLES `bookingPlanner` WRITE; -/*!40000 ALTER TABLE `bookingPlanner` DISABLE KEYS */; -INSERT INTO `bookingPlanner` VALUES (5,'2017-06-30 22:00:00','4770000002','WORLD',7,4,1),(6,'2017-06-30 22:00:00','4770000010','NATIONAL',3,1,1),(8,'2017-06-30 22:00:00','4770000021','NATIONAL',1,2,1),(9,'2017-06-30 22:00:00','4770000101','EQU',3,1,1),(11,'2017-06-30 22:00:00','4770000110','EQU',4,1,1),(12,'2017-06-30 22:00:00','4770000215','EQU',1,2,1),(13,'2017-06-30 22:00:00','4770000521','EQU',2,2,1),(15,'2017-06-30 22:00:00','4771000000','CEE',3,1,1),(16,'2017-06-30 22:00:00','4771000001','CEE',8,3,1),(19,'2017-07-05 11:54:58','4770000020','NATIONAL',7,4,1),(20,'2017-07-05 12:09:24','4771000000','CEE',1,2,1),(21,'2017-07-05 12:09:24','4771000000','CEE',7,4,1),(22,'2017-07-05 12:12:14','4770000002','WORLD',3,1,1),(23,'2017-07-05 12:12:14','4770000002','WORLD',1,2,1),(24,'2017-07-06 08:07:21','4770000002','WORLD',7,4,5),(25,'2017-07-06 08:07:21','HolandaRED','NATIONAL',3,1,5),(27,'2017-07-06 08:07:21','HolandaGEN','NATIONAL',1,2,5),(32,'2017-07-06 08:07:21','4771000000','CEE',3,1,5),(33,'2017-07-06 08:07:21','4771000001','CEE',8,3,5),(34,'2017-07-06 08:07:21','4770000020','NATIONAL',7,4,5),(35,'2017-07-06 08:07:21','4771000000','CEE',1,2,5),(36,'2017-07-06 08:07:21','4771000000','CEE',7,4,5),(37,'2017-07-06 08:07:21','4770000002','WORLD',3,1,5),(38,'2017-07-06 08:07:21','4770000002','WORLD',1,2,5),(82,'2019-01-01 11:51:56','4770000504','EQU',5,5,1),(83,'2019-09-11 10:54:03','4770000405','EQU',6,5,1),(84,'2019-09-11 10:58:17','4770000004','NATIONAL',5,5,1),(85,'2019-09-18 22:00:00','4771000000','CEE',5,5,1),(86,'2021-10-13 22:00:00','4770000002','WORLD',5,5,1); -/*!40000 ALTER TABLE `bookingPlanner` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `businessType` --- - -LOCK TABLES `businessType` WRITE; -/*!40000 ALTER TABLE `businessType` DISABLE KEYS */; -INSERT INTO `businessType` VALUES ('decoration','Decoración'),('events','Eventos'),('florist','Floristería'),('gardenCentre','Vivero'),('gardening','Jardinería'),('individual','Particular'),('mortuary','Funeraria'),('officialOrganism','Organismo oficial'),('others','Otros'),('otherSector','Profesional de otro sector'),('restoration','Restauración'),('trainingCentre','Centro de formación'),('wholesaler','Mayorista'),('worker','Trabajador'); -/*!40000 ALTER TABLE `businessType` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `cplusInvoiceType472` --- - -LOCK TABLES `cplusInvoiceType472` WRITE; -/*!40000 ALTER TABLE `cplusInvoiceType472` DISABLE KEYS */; -INSERT INTO `cplusInvoiceType472` VALUES (1,'F1 - Factura'),(2,'F2 - Factura simplificada (ticket)'),(3,'F3 - Factura emitida en sustitución de facturas simplificadas facturadas y declaradas'),(4,'F4 - Asiento resumen de facturas'),(5,'F5 - Importaciones (DUA)'),(6,'F6 - Otros justificantes contables'),(7,'R1 - Factura rectificativa (Art. 80.1, 80.2 y error fundado en derecho)'),(8,'R2 - Factura rectificativa (Art. 80.3)'),(9,'R3 - Factura rectificativa (Art. 80.4)'),(10,'R4 - Factura rectificativa (Resto)'),(11,'R5 - Factura rectificativa en facturas simplificadas'); -/*!40000 ALTER TABLE `cplusInvoiceType472` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `cplusInvoiceType477` --- - -LOCK TABLES `cplusInvoiceType477` WRITE; -/*!40000 ALTER TABLE `cplusInvoiceType477` DISABLE KEYS */; -INSERT INTO `cplusInvoiceType477` VALUES (1,'F1 - Factura'),(2,'F2 - Factura simplificada (ticket)'),(3,'F3 - Factura emitida en sustitución de facturas simplificadas facturadas y declaradas'),(4,'F4 - Asiento resumen de facturas'),(5,'R1 - Factura rectificativa (Art. 80.1, 80.2 y error fundado en derecho)'),(6,'R2 - Factura rectificativa (Art. 80.3)'),(7,'R3 - Factura rectificativa (Art. 80.4)'),(8,'R4 - Factura rectificativa (Resto)'),(9,'R5 - Factura rectificativa en facturas simplificadas'); -/*!40000 ALTER TABLE `cplusInvoiceType477` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `cplusRectificationType` --- - -LOCK TABLES `cplusRectificationType` WRITE; -/*!40000 ALTER TABLE `cplusRectificationType` DISABLE KEYS */; -INSERT INTO `cplusRectificationType` VALUES (1,'Campo vacio'),(2,'I – Por diferencias'),(3,'S – Por sustitución'); -/*!40000 ALTER TABLE `cplusRectificationType` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `cplusSubjectOp` --- - -LOCK TABLES `cplusSubjectOp` WRITE; -/*!40000 ALTER TABLE `cplusSubjectOp` DISABLE KEYS */; -INSERT INTO `cplusSubjectOp` VALUES (1,'Campo vacio'),(2,'S1 – Sujeta – No exenta'),(3,'S2 – Sujeta – No exenta – Inv. Suj. Pasivo'); -/*!40000 ALTER TABLE `cplusSubjectOp` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `cplusTaxBreak` --- - -LOCK TABLES `cplusTaxBreak` WRITE; -/*!40000 ALTER TABLE `cplusTaxBreak` DISABLE KEYS */; -INSERT INTO `cplusTaxBreak` VALUES (1,'Campo vacio'),(2,'E1 - Exenta por el artículo 20'),(3,'E2 - Exenta por el artículo 21'),(4,'E3 - Exenta por el artículo 22'),(5,'E4 - Exenta por el artículo 24'),(6,'E5 - Exenta por el artículo 25'),(7,'E6 - Exenta por otros'); -/*!40000 ALTER TABLE `cplusTaxBreak` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `cplusTrascendency472` --- - -LOCK TABLES `cplusTrascendency472` WRITE; -/*!40000 ALTER TABLE `cplusTrascendency472` DISABLE KEYS */; -INSERT INTO `cplusTrascendency472` VALUES (1,'01 - Operación de régimen general'),(2,'02 - Operaciones por las que los empresarios satisfacen compensaciones REAGYP'),(3,'03 - Operaciones a las que se aplique el régimen especial de bienes usados, objetos de arte, antigüedades y objetos de colección (135 - 139 de LIVA)'),(4,'04 - Régimen especial oro de inversión'),(5,'05 - Régimen especial agencias de viajes'),(6,'06 - Régimen especial grupo de entidades en IVA (Nivel Avanzado)'),(7,'07 - Régimen especial criterio de caja'),(8,'08 - Operaciones sujetas al IPSI / IGIC'),(9,'09 - Adquisiciones intracomunitarias de bienes y prestaciones de servicios'),(10,'12 - Operaciones de arrendamiento de local de negocio'),(11,'13 - Factura correspondiente a una importación (informada sin asociar a un DUA)'),(12,'14 - Primer semestre 2017'); -/*!40000 ALTER TABLE `cplusTrascendency472` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `claimResponsible` --- - -LOCK TABLES `claimResponsible` WRITE; -/*!40000 ALTER TABLE `claimResponsible` DISABLE KEYS */; -INSERT INTO `claimResponsible` VALUES (1,'Compradores',0),(2,'Proveedor',0),(3,'Entradores',0),(4,'Camareros',0),(6,'Sacadores',0),(7,'Revisadores',0),(8,'Calidad general',0),(9,'Encajadores',0),(10,'Clima',0),(11,'Comerciales',1),(12,'Clientes',1),(13,'Administración',0),(14,'Agencia',0),(15,'Repartidores',0),(16,'Informatica',0),(17,'Transp.origen',0),(18,'Confeccion',0),(19,'OTROS',0),(21,'Gerencia',0),(22,'Paletizadores',0),(23,'Preparación Previa',0),(24,'Almacén PCA',0),(25,'Huelga',0); -/*!40000 ALTER TABLE `claimResponsible` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `claimReason` --- - -LOCK TABLES `claimReason` WRITE; -/*!40000 ALTER TABLE `claimReason` DISABLE KEYS */; -INSERT INTO `claimReason` VALUES (1,'Prisas',0),(2,'Novato',0),(3,'Exceso de confianza',0),(4,'Exceso de celo',0),(5,'Indiferencia',0),(6,'Extraviado o Hurto',0),(7,'Incompetencia',0),(8,'Ubicación erronea',0),(9,'Dat.Inctos/Pak.conf',0),(10,'Datos duplicados',0),(11,'Fallo stock',0),(12,'Innovación',0),(13,'Distracción',1),(15,'Portes indebidos',0),(16,'Baja calidad',0),(17,'Defectuoso',0),(19,'Endiñado',0),(20,'Calor',0),(21,'Frio',0),(22,'Cambiado',0),(24,'Cansancio',1),(25,'Mal etiquetado',1),(26,'Cantidad malentendido',0),(30,'No revisado',1),(34,'Error fotografia',0),(40,'Fallo Personal VN',0),(41,'Fallo Personal Cliente',0),(42,'Otros',0),(43,'Precio alto',0),(44,'Abuso de confianza',0),(45,'Retraso Agencia',0),(46,'Delicado',0),(47,'Seco',0),(48,'Retraso Reparto',0),(49,'Mal Embalado',0),(50,'Tumbado',0),(51,'Enfermo/Plaga',0),(52,'Mala gestión comercial',0),(53,'Mala gestión comprador',0),(54,'A2',0),(55,'Entrega 48h o más',0); -/*!40000 ALTER TABLE `claimReason` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `claimRedelivery` --- - -LOCK TABLES `claimRedelivery` WRITE; -/*!40000 ALTER TABLE `claimRedelivery` DISABLE KEYS */; -INSERT INTO `claimRedelivery` VALUES (1,'Cliente'),(2,'No dev./No especif.'),(3,'Reparto'),(4,'Agencia'),(5,'Tour'),(6,'Fuera Peninsula'); -/*!40000 ALTER TABLE `claimRedelivery` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `claimResult` --- - -LOCK TABLES `claimResult` WRITE; -/*!40000 ALTER TABLE `claimResult` DISABLE KEYS */; -INSERT INTO `claimResult` VALUES (1,'Otros daños'),(2,'Roces'),(3,'Humedad'),(4,'Deshidratacion'),(5,'Error identidad'),(6,'Incompleto (Faltas)'),(7,'Error packing'),(8,'Error color'),(9,'Error medida'),(10,'Error origen'),(11,'Envejecido'),(12,'Venta Perdida'),(13,'Duplicacion'),(14,'Rechazado'),(15,'Rotura'),(16,'Deterioro/Estropeado'),(17,'Podrido'),(18,'Baboso'),(19,'Cocido'),(20,'Congelado'),(21,'Machacado'),(22,'Error precio'),(23,'Manchado'),(24,'No entregado'),(25,'Cobro indebido'),(26,'Decepcion/Esperaba mas'),(27,'Otros'),(28,'Baboso/Cocido'),(29,'Video Camara'); -/*!40000 ALTER TABLE `claimResult` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `component` --- - -LOCK TABLES `component` WRITE; -/*!40000 ALTER TABLE `component` DISABLE KEYS */; -INSERT INTO `component` VALUES (10,'Precios Especiales',4,NULL,NULL,1,'specialPrices',0),(14,'porte extra por dia semana',6,NULL,NULL,1,'extraCostPerWeekDay',0),(15,'reparto',6,NULL,NULL,1,'delivery',1),(17,'recobro',5,NULL,NULL,1,'debtCollection',0),(21,'ajuste',4,NULL,NULL,1,'adjustment',0),(22,'venta por paquete',9,1,NULL,0,'salePerPackage',0),(23,'venta por caja',9,2,NULL,0,'salePerBox',0),(28,'valor de compra',1,NULL,NULL,1,'purchaseValue',1),(29,'margen',4,NULL,NULL,1,'margin',1),(32,'descuento ultimas unidades',9,3,-0.05,0,'lastUnitsDiscount',0),(33,'venta por caja',9,1,NULL,0,'salePerBox',0),(34,'descuento comprador',4,NULL,NULL,1,'buyerDiscount',0),(35,'cartera comprador',10,NULL,NULL,1,NULL,0),(36,'descuadre',4,NULL,NULL,1,'imbalance',0),(37,'maná',7,4,NULL,0,'mana',0),(38,'embolsado',9,NULL,NULL,1,'bagged',0),(39,'maná auto',7,NULL,NULL,1,'autoMana',0),(40,'cambios Santos 2016',4,NULL,NULL,1,NULL,0),(41,'bonificacion porte',6,NULL,NULL,1,'freightCharge',0),(42,'promocion Francia',4,NULL,NULL,1,'frenchOffer',0),(43,'promocion Floramondo',4,NULL,NULL,1,'floramondoPromo',0),(44,'rappel cadena',2,NULL,NULL,1,'rappel',0),(45,'maná reclamacion',7,4,NULL,0,'manaClaim',0),(46,'recargo a particular',2,NULL,0.25,0,'individual',0),(47,'promocion Italia',4,NULL,NULL,1,'italianOffer',0),(48,'fusión de lineas',4,NULL,NULL,1,'lineFusion',0); -/*!40000 ALTER TABLE `component` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `componentType` --- - -LOCK TABLES `componentType` WRITE; -/*!40000 ALTER TABLE `componentType` DISABLE KEYS */; -INSERT INTO `componentType` VALUES (1,'coste',1,0,'COST'),(2,'com ventas',1,1,NULL),(3,'com compras',1,1,NULL),(4,'empresa',1,1,'MARGIN'),(5,'cliente',0,0,NULL),(6,'agencia',0,0,'FREIGHT'),(7,'cartera_comercial',0,0,'MANA'),(8,'cartera_producto',0,1,NULL),(9,'maniobra',1,0,NULL),(10,'cartera_comprador',0,1,NULL),(11,'errores',0,1,NULL),(12,'otros',0,1,NULL); -/*!40000 ALTER TABLE `componentType` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `continent` --- - -LOCK TABLES `continent` WRITE; -/*!40000 ALTER TABLE `continent` DISABLE KEYS */; -INSERT INTO `continent` VALUES (1,'Asia','AS'),(2,'América','AM'),(3,'África','AF'),(4,'Europa','EU'),(5,'Oceanía','OC'); -/*!40000 ALTER TABLE `continent` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `department` --- - -LOCK TABLES `department` WRITE; -/*!40000 ALTER TABLE `department` DISABLE KEYS */; -INSERT INTO `department` VALUES (1,NULL,'VERDNATURA',1,104,763,0,0,0,0,30,NULL,'/',NULL,0,NULL,0,0,0,0,NULL,NULL),(22,'shopping','COMPRAS',2,3,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL),(23,'CMA','CAMARA',13,14,NULL,72,1,1,2,0,37,'/1/37/',NULL,0,NULL,0,1,1,1,NULL,NULL),(31,'it','INFORMATICA',4,5,NULL,72,0,0,1,0,1,'/1/','informatica-cau',1,NULL,1,0,0,0,NULL,NULL),(34,NULL,'CONTABILIDAD',6,7,NULL,0,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL),(35,NULL,'FINANZAS',8,9,NULL,0,0,0,1,0,1,'/1/',NULL,1,'begonya@verdnatura.es',1,0,0,0,NULL,NULL),(36,NULL,'LABORAL',10,11,NULL,0,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL),(37,'PROD','PRODUCCION',12,27,NULL,72,1,1,1,7,1,'/1/',NULL,0,NULL,0,1,1,1,NULL,NULL),(38,NULL,'SACADO',15,16,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL),(39,NULL,'ENCAJADO',17,18,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL),(41,NULL,'ADMINISTRACION',28,29,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL),(43,'VT','VENTAS',30,53,NULL,0,0,0,1,11,1,'/1/',NULL,1,'',1,0,0,0,NULL,NULL),(44,'management','GERENCIA',54,55,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL),(45,NULL,'LOGISTICA',56,57,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL),(46,'delivery','REPARTO',58,59,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,0,0,NULL,NULL),(48,NULL,'ALMACENAJE',60,61,NULL,0,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL),(49,NULL,'PROPIEDAD',62,63,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL),(52,NULL,'CARGA AEREA',64,65,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL),(53,NULL,'MARKETING Y COMUNICACIÓN',66,67,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,0,0,0,NULL,NULL),(54,NULL,'ORNAMENTALES',68,69,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL),(55,NULL,'TALLER NATURAL',70,73,14548,72,0,0,1,1,1,'/1/',NULL,0,NULL,0,1,1,0,1118,NULL),(56,NULL,'TALLER ARTIFICIAL',71,72,8470,72,0,0,2,0,55,'/1/55/',NULL,0,NULL,0,1,1,0,1927,NULL),(58,'CMP','CAMPOS',74,77,NULL,72,0,0,1,1,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL),(59,NULL,'MANTENIMIENTO',78,79,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,0,0,NULL,NULL),(60,NULL,'RECLAMACIONES',80,81,NULL,72,0,0,1,0,1,'/1/',NULL,1,NULL,1,1,0,0,NULL,NULL),(61,NULL,'VNH',82,85,NULL,73,0,0,1,1,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL),(66,NULL,'VERDNAMADRID',86,87,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL),(68,NULL,'COMPLEMENTOS',19,20,NULL,72,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,1,0,0,NULL,NULL),(69,NULL,'VERDNABARNA',88,89,NULL,74,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL),(80,NULL,'EQUIPO J VALLES',31,32,4250,72,0,0,2,0,43,'/1/43/','jvp_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL,NULL),(86,NULL,'LIMPIEZA',90,91,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL),(89,NULL,'COORDINACION',92,93,NULL,0,1,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL),(90,NULL,'TRAILER',83,84,NULL,0,0,0,2,0,61,'/1/61/',NULL,0,NULL,0,0,0,0,NULL,NULL),(91,NULL,'ARTIFICIAL',21,22,NULL,0,1,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL),(92,NULL,'EQUIPO SILVERIO',33,34,1203,0,0,0,2,0,43,'/1/43/','sdc_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL,NULL),(93,NULL,'CONFECCION',94,95,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,1,0,NULL,NULL),(94,NULL,'EQUIPO J BROCAL',35,36,3797,0,0,0,2,0,43,'/1/43/','jes_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL,NULL),(95,NULL,'EQUIPO C ZAMBRANO',37,38,4667,0,0,0,2,0,43,'/1/43/','czg_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL,NULL),(96,NULL,'EQUIPO C LOPEZ',39,40,4661,0,0,0,2,0,43,'/1/43/','cla_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL,NULL),(115,NULL,'EQUIPO CLAUDI',41,42,3810,0,0,0,2,0,43,'/1/43/','csr_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL,NULL),(123,NULL,'EQUIPO ELENA BASCUÑANA',43,44,7102,0,0,0,2,0,43,'/1/43/','ebt_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL,NULL),(124,NULL,'CONTROL INTERNO',96,97,NULL,72,0,0,1,0,1,'/1/',NULL,0,NULL,1,0,0,0,NULL,NULL),(125,NULL,'EQUIPO MIRIAM MAR',45,46,1118,0,0,0,2,0,43,'/1/43/','mir_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL,NULL),(126,NULL,'PRESERVADO',98,99,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,1,1,0,NULL,NULL),(128,NULL,'PALETIZADO',23,24,NULL,0,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL),(130,NULL,'REVISION',25,26,NULL,0,0,0,2,0,37,'/1/37/',NULL,0,NULL,0,0,0,0,NULL,NULL),(131,NULL,'INVERNADERO',75,76,NULL,0,0,0,2,0,58,'/1/58/',NULL,0,NULL,0,1,0,0,NULL,NULL),(132,NULL,'EQUIPO DC',47,48,1731,0,0,0,2,0,43,'/1/43/','dc_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL,NULL),(133,'franceTeam','EQUIPO FRANCIA',49,50,1731,72,0,0,2,0,43,'/1/43/','fra_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL,NULL),(134,NULL,'EQUIPO RODRI',51,52,6264,0,0,0,2,0,43,'/1/43/','rhr_equipo',1,'gestioncomercial@verdnatura.es',1,0,0,0,NULL,NULL),(135,'routers','ENRUTADORES',100,101,NULL,0,0,0,1,0,1,'/1/',NULL,1,NULL,0,0,0,0,NULL,NULL),(136,'heavyVehicles','VEHICULOS PESADOS',102,103,NULL,0,0,0,1,0,1,'/1/',NULL,0,NULL,0,0,0,0,NULL,NULL); -/*!40000 ALTER TABLE `department` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `docuware` --- - -LOCK TABLES `docuware` WRITE; -/*!40000 ALTER TABLE `docuware` DISABLE KEYS */; -INSERT INTO `docuware` VALUES (1,'deliveryNote','Albaranes cliente','find','find','N__ALBAR_N',NULL),(2,'deliveryNote','Albaranes cliente','store','Archivar','N__ALBAR_N',NULL),(3,'hr','RRHH','find','Búsqueda','N__DOCUMENTO',3); -/*!40000 ALTER TABLE `docuware` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `itemPackingType` --- - -LOCK TABLES `itemPackingType` WRITE; -/*!40000 ALTER TABLE `itemPackingType` DISABLE KEYS */; -INSERT INTO `itemPackingType` VALUES ('F','Fruta y Verdura',0),('H','Horizontal',1),('P','Pienso',0),('V','Vertical',1); -/*!40000 ALTER TABLE `itemPackingType` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `pgc` --- - -LOCK TABLES `pgc` WRITE; -/*!40000 ALTER TABLE `pgc` DISABLE KEYS */; -INSERT INTO `pgc` VALUES ('4722000000',0.00,'Importación Exento ',1,0,0,1,0),('4722000010',10.00,'Importación Reducido ',1,0,0,1,0),('4722000021',21.00,'Importación General ',1,0,0,1,0),('4770000001',8.00,'Reducido',1,1,1,1,0),('4770000002',0.00,'Extra-Community supply',3,1,0,2,0),('4770000004',4.00,'Super reducido',1,1,1,1,0),('4770000010',10.00,'Reducido',1,1,1,1,0),('4770000020',0.00,'Exento',7,1,1,1,0),('4770000021',21.00,'General',1,1,1,1,0),('4770000101',10.00,'Reducido ',1,1,1,1,0),('4770000108',8.00,'Reducido',1,1,1,1,0),('4770000110',1.40,'Rec. Eq. Reducido',1,0,0,1,1),('4770000215',21.00,'General',1,1,1,1,0),('4770000405',0.50,'Rec. Eq. Super Reducido',1,0,0,1,1),('4770000504',4.00,'Super reducido',1,1,1,1,0),('4770000521',5.20,'Rec. Eq. General',1,0,0,1,1),('4770000701',1.00,'Rec. Eq. Reducido',1,0,0,1,1),('4771000000',0.00,'Intra-Community supply',6,1,1,1,0),('4771000001',0.00,'Intra-Community services',7,1,1,1,0),('HolandaGEN',21.00,'General',1,0,0,1,0),('HolandaRED',9.00,'Reducido',1,0,0,1,0),('IGIC cero',0.00,'Cero',1,0,0,1,0),('IGIC gener',6.50,'General',1,0,0,1,0),('IGIC reduc',3.00,'Reducido',1,0,0,1,0); -/*!40000 ALTER TABLE `pgc` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `sample` --- - -LOCK TABLES `sample` WRITE; -/*!40000 ALTER TABLE `sample` DISABLE KEYS */; -INSERT INTO `sample` VALUES (1,'Carta_1','Aviso inicial por saldo deudor',0,0,1,0,NULL),(2,'Carta_2','Reiteracion de aviso por saldo deudor',0,0,1,0,NULL),(3,'Cred_Up','Notificación de aumento de crédito',0,0,1,0,NULL),(4,'Cred_down','Notificación de reducción de crédito',0,0,1,0,NULL),(5,'Pet_CC','Petición de datos bancarios B2B',0,0,1,0,NULL),(6,'SolCredito','Solicitud de crédito',0,0,1,0,NULL),(7,'LeyPago','Ley de pagos',0,0,1,0,NULL),(8,'Pet_CC_Core','Petición de datos bancarios CORE',0,0,1,0,NULL),(9,'nueva_alta','Documento de nueva alta de cliente',0,0,1,0,NULL),(10,'client_welcome','Email de bienvenida para nuevo cliente',0,0,1,0,NULL),(11,'setup_printer','Email de instalación de impresora',0,0,1,0,NULL),(12,'client-welcome','Bienvenida como nuevo cliente',1,0,1,0,'Clients'),(13,'printer-setup','Instalación y configuración de impresora de coronas',1,0,1,0,'Clients'),(14,'sepa-core','Solicitud de domiciliación bancaria',1,1,0,0,'Clients'),(15,'letter-debtor-st','Aviso inicial por saldo deudor',1,1,1,0,'Clients'),(16,'letter-debtor-nd','Aviso reiterado por saldo deudor',1,1,1,0,'Clients'),(17,'client-lcr','Email de solicitud de datos bancarios LCR',0,1,1,0,NULL),(18,'client-debt-statement','Extracto del cliente',1,0,1,1,'Clients'),(19,'credit-request','Solicitud de crédito',1,1,1,0,'Clients'),(20,'incoterms-authorization','Autorización de incoterms',1,1,1,0,'Clients'); -/*!40000 ALTER TABLE `sample` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `state` --- - -LOCK TABLES `state` WRITE; -/*!40000 ALTER TABLE `state` DISABLE KEYS */; -INSERT INTO `state` VALUES (1,'Arreglar',2,0,'FIXING',NULL,1,0,0,0,0,0,0,4,1,'alert'),(2,'Libre',2,0,'FREE',NULL,2,0,0,0,0,0,0,4,1,'notice'),(3,'OK',3,0,'OK',3,28,1,0,0,0,1,1,3,0,'success'),(4,'Impreso',4,0,'PRINTED',2,29,1,0,1,0,0,1,2,0,'success'),(5,'Preparación',6,1,'ON_PREPARATION',7,14,0,0,0,2,0,0,2,0,'warning'),(6,'En Revisión',7,1,'ON_CHECKING',NULL,6,0,1,0,3,0,0,1,0,'warning'),(7,'Sin Acabar',1,0,'NOT_READY',NULL,7,0,0,0,0,0,0,4,1,'alert'),(8,'Revisado',8,1,'CHECKED',NULL,8,0,1,0,3,0,0,1,0,'warning'),(9,'Encajando',9,2,'PACKING',NULL,9,0,1,0,0,0,0,1,0,NULL),(10,'Encajado',10,2,'PACKED',NULL,10,0,1,0,0,0,0,0,0,NULL),(11,'Facturado',0,3,'INVOICED',NULL,11,0,1,0,0,0,0,0,0,NULL),(12,'Bloqueado',0,0,'BLOCKED',NULL,12,0,0,0,0,0,0,4,1,'alert'),(13,'En Reparto',11,3,'ON_DELIVERY',NULL,13,0,1,0,0,0,0,0,0,NULL),(14,'Preparado',6,1,'PREPARED',NULL,14,0,1,0,2,0,0,1,0,'warning'),(15,'Pte Recogida',12,3,'WAITING_FOR_PICKUP',NULL,15,0,1,0,0,0,0,0,0,NULL),(16,'Entregado',13,3,'DELIVERED',NULL,16,0,1,0,0,0,0,0,0,NULL),(20,'Asignado',4,0,'PICKER_DESIGNED',NULL,20,1,0,0,0,0,0,2,0,'success'),(21,'Retornado',4,1,'PRINTED_BACK',6,21,0,0,0,0,0,0,2,0,'success'),(22,'Pte. Ampliar',2,0,'EXPANDABLE',NULL,22,0,0,0,0,0,0,4,1,'alert'),(23,'URGENTE',5,1,'LAST_CALL',NULL,23,1,0,1,0,0,0,4,1,'success'),(24,'Encadenado',4,0,'CHAINED',4,24,0,0,0,0,0,0,3,1,'success'),(25,'Embarcando',3,0,'BOARDING',5,25,1,0,0,0,0,0,3,0,'alert'),(26,'Prep Previa',5,1,'PREVIOUS_PREPARATION',1,28,1,0,0,1,0,0,2,0,'warning'),(27,'Prep Asistida',5,1,'ASSISTED_PREPARATION',7,27,0,0,0,0,0,0,2,0,'success'),(28,'Previa OK',3,0,'OK PREVIOUS',3,28,1,0,1,1,1,1,3,0,'warning'),(29,'Previa Impreso',4,0,'PRINTED PREVIOUS',2,29,1,0,1,0,0,1,2,0,'success'),(30,'Embarcado',4,1,'BOARD',5,30,0,0,0,2,0,0,3,0,'success'),(31,'Polizon Impreso',4,1,'PRINTED STOWAWAY',2,29,1,0,1,0,0,1,2,0,'success'),(32,'Polizon OK',3,1,'OK STOWAWAY',3,31,1,0,0,1,1,1,3,0,'warning'),(33,'Auto_Impreso',4,0,'PRINTED_AUTO',2,29,1,0,1,0,0,1,2,0,'success'),(34,'Pte Pago',3,0,'WAITING_FOR_PAYMENT',NULL,34,0,0,0,0,0,0,4,1,'alert'),(35,'Semi-Encajado',9,2,'HALF_PACKED',NULL,10,0,1,0,0,0,0,1,0,NULL),(36,'Previa Revisando',3,0,'PREVIOUS_CONTROL',2,37,1,0,0,4,0,1,2,0,'warning'),(37,'Previa Revisado',3,0,'PREVIOUS_CONTROLLED',2,29,1,0,1,0,0,1,2,0,'warning'),(38,'Prep Cámara',6,1,'COOLER_PREPARATION',7,14,0,0,0,2,0,0,2,0,'warning'),(41,'Prep Parcial',6,1,'PARTIAL_PREPARATION',7,14,0,0,0,2,0,0,2,0,'warning'); -/*!40000 ALTER TABLE `state` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `ticketUpdateAction` --- - -LOCK TABLES `ticketUpdateAction` WRITE; -/*!40000 ALTER TABLE `ticketUpdateAction` DISABLE KEYS */; -INSERT INTO `ticketUpdateAction` VALUES (1,'Cambiar los precios en el ticket','changePrice'),(3,'Convertir en maná','turnInMana'); -/*!40000 ALTER TABLE `ticketUpdateAction` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `volumeConfig` --- - -LOCK TABLES `volumeConfig` WRITE; -/*!40000 ALTER TABLE `volumeConfig` DISABLE KEYS */; -INSERT INTO `volumeConfig` VALUES (2.67,1.60,0.8,150,0.30,120,57,2.0,0,200,0,167.0); -/*!40000 ALTER TABLE `volumeConfig` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `workCenter` --- - -LOCK TABLES `workCenter` WRITE; -/*!40000 ALTER TABLE `workCenter` DISABLE KEYS */; -INSERT INTO `workCenter` VALUES (1,'Silla',20,859,1,'Av espioca 100',552703,NULL),(2,'Mercaflor',19,NULL,NULL,NULL,NULL,NULL),(3,'Marjales',26,20008,NULL,NULL,NULL,NULL),(4,'VNH',NULL,NULL,NULL,NULL,NULL,NULL),(5,'Madrid',28,2869,5,'Av constitución 3',554145,0.50),(6,'Vilassar',88,88038,NULL,'Cami del Crist, 33',556412,NULL),(7,'Tenerife',NULL,NULL,NULL,NULL,NULL,NULL),(8,'Silla-Agrario',26,NULL,NULL,NULL,NULL,NULL),(9,'Algemesi',20,1354,60,'Fenollars, 2',523549,NULL); -/*!40000 ALTER TABLE `workCenter` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `companyI18n` --- - -LOCK TABLES `companyI18n` WRITE; -/*!40000 ALTER TABLE `companyI18n` DISABLE KEYS */; -INSERT INTO `companyI18n` VALUES (442,'en','In compliance with the provisions of Organic Law 15/1999, on the Protection of Personal Data, we inform you that the personal data you provide will be included in automated files of VERDNATURA LEVANTE SL, being able at all times to exercise the rights of access, rectification, cancellation and opposition, communicating it in writing to the registered office of the entity. The purpose of the file is administrative management, accounting, and billing.'),(442,'fr','Conformément aux dispositions de la loi organique 15/1999 sur la protection des données personnelles, nous vous informons que les données personnelles que vous fournissez seront incluses dans des dossiers. VERDNATURA LEVANTE S.L., vous pouvez à tout moment, exercer les droits d``accès, de rectification, d``annulation et d``opposition, en communiquant par écrit au siège social de la société. Le dossier a pour objet la gestion administrative, la comptabilité et la facturation.'),(442,'pt','Em cumprimento do disposto na lei Orgânica 15/1999, de Protecção de Dados de Carácter Pessoal, comunicamos que os dados pessoais que facilite se incluirão nos ficheiros automatizados de VERDNATURA LEVANTE S.L., podendo em todo momento exercer os direitos de acesso, rectificação, cancelação e oposição, comunicando por escrito ao domicílio social da entidade. A finalidade do ficheiro é a gestão administrativa, contabilidade e facturação.'); -/*!40000 ALTER TABLE `companyI18n` ENABLE KEYS */; -UNLOCK TABLES; -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2023-08-30 15:53:19 -USE `cache`; --- MariaDB dump 10.19 Distrib 10.5.19-MariaDB, for debian-linux-gnu (x86_64) --- --- Host: db2.static.verdnatura.es Database: cache --- ------------------------------------------------------ --- Server version 10.7.7-MariaDB-1:10.7.7+maria~deb11-log - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Dumping data for table `cache` --- - -LOCK TABLES `cache` WRITE; -/*!40000 ALTER TABLE `cache` DISABLE KEYS */; -INSERT INTO `cache` VALUES (1,'equalizator','00:19:00'),(2,'available','00:06:00'),(3,'stock','00:30:00'),(4,'last_buy','23:59:00'),(5,'weekly_sales','12:00:00'),(6,'bionic','00:06:00'),(7,'sales','00:04:00'),(8,'visible','00:04:00'),(9,'item_range','00:03:00'),(10,'barcodes','01:00:00'),(11,'prod_graphic','00:17:00'),(12,'ticketShipping','00:01:00'),(13,'availableNoRaids','00:06:00'),(14,'lastBuy','23:59:00'); -/*!40000 ALTER TABLE `cache` ENABLE KEYS */; -UNLOCK TABLES; -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2023-08-30 15:53:20 -USE `hedera`; --- MariaDB dump 10.19 Distrib 10.5.19-MariaDB, for debian-linux-gnu (x86_64) --- --- Host: db2.static.verdnatura.es Database: hedera --- ------------------------------------------------------ --- Server version 10.7.7-MariaDB-1:10.7.7+maria~deb11-log - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Dumping data for table `browser` --- - -LOCK TABLES `browser` WRITE; -/*!40000 ALTER TABLE `browser` DISABLE KEYS */; -INSERT INTO `browser` VALUES ('Chrome',49),('Edge',79),('Firefox',69),('Opera',36),('Safari',11); -/*!40000 ALTER TABLE `browser` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `imageCollection` --- - -LOCK TABLES `imageCollection` WRITE; -/*!40000 ALTER TABLE `imageCollection` DISABLE KEYS */; -INSERT INTO `imageCollection` VALUES (1,'catalog','Artículo',3840,2160,'Item','image','vn','item','image',1,75),(4,'link','Enlace',200,200,'Link','image','hedera','link','image',1,9),(5,'news','Noticias',800,1200,'New','image','hedera','news','image',1,9),(6,'user','Usuario',800,1200,'VnUser','image','account','user','image',1,74); -/*!40000 ALTER TABLE `imageCollection` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `imageCollectionSize` --- - -LOCK TABLES `imageCollectionSize` WRITE; -/*!40000 ALTER TABLE `imageCollectionSize` DISABLE KEYS */; -INSERT INTO `imageCollectionSize` VALUES (2,1,50,50,1),(3,1,200,200,1),(5,5,200,200,1),(6,1,70,70,1),(8,5,50,50,1),(9,1,1600,900,0),(13,6,160,160,1),(14,6,520,520,1),(15,6,1600,1600,1),(16,1,500,500,1); -/*!40000 ALTER TABLE `imageCollectionSize` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `language` --- - -LOCK TABLES `language` WRITE; -/*!40000 ALTER TABLE `language` DISABLE KEYS */; -INSERT INTO `language` VALUES ('ca','Català','Catalan',1),('en','English','English',1),('es','Español','Spanish',1),('fr','Français','French',1),('mn','Португалий','Mongolian',1),('pt','Português','Portuguese',1); -/*!40000 ALTER TABLE `language` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `link` --- - -LOCK TABLES `link` WRITE; -/*!40000 ALTER TABLE `link` DISABLE KEYS */; -INSERT INTO `link` VALUES (16,'Printing server','Manage the CUPS printing server','http://printnatura.verdnatura.es','printer'),(20,'Webmail','Verdnatura webmail','https://webmail.verdnatura.es/','mail'),(23,'Verdnatura Beta','Trial version of the web page','https://test-shop.verdnatura.es/','vn'),(25,'Shared folder','Shared folder','https://cdn.verdnatura.es/share','backup'),(29,'phpMyAdmin','Manage MySQL database','https://pma.verdnatura.es/','pma'),(30,'Nagios','Monitoring system','https://nagios.verdnatura.es/','nagios'),(33,'Gitea','Version control system','https://gitea.verdnatura.es/','git'),(34,'Wiknatura','Verdnatura wiki page','https://wiki.verdnatura.es/','wiki'),(35,'phpLDAPadmin','Manage the LDAP database','https://pla.verdnatura.es/','pla'),(36,'Applications','Access applications repository','https://cdn.verdnatura.es/vn-access','access'),(37,'Jenkins','CI and CD system','https://jenkins.verdnatura.es','jenkins'),(38,'osTicket','User service center','https://cau.verdnatura.es','osticket'),(39,'Redmine','Flexible project management','https://redmine.verdnatura.es','redmine'),(40,'Grafana','Analytics & monitoring solution','https://grafana.verdnatura.es','grafana'),(41,'Rocket.Chat','Communications platform','https://chat.verdnatura.es','rocketchat'),(42,'Salix','ERP software','https://salix.verdnatura.es','salix'),(43,'Docker','Container management','https://docker.verdnatura.es','docker'),(44,'Proxmox','Virtual environment','https://proxmox.verdnatura.es','proxmox'),(45,'Shinobi','Network video recorder','https://shinobi.verdnatura.es','shinobi'),(46,'DokuWiki','Internal documentation','https://doku.verdnatura.es','dokuwiki'); -/*!40000 ALTER TABLE `link` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `location` --- - -LOCK TABLES `location` WRITE; -/*!40000 ALTER TABLE `location` DISABLE KEYS */; -INSERT INTO `location` VALUES (2,'39.2095886','-0.4173501','Valencia','Calle Fenollar, 2','46680','Algemesi','Valencia','963 242 100','es'),(3,'40.4564969','-3.4875829','Madrid','Avenida de la Constitución, 3 - Nave E','28850','Torrejón de Ardoz','Madrid','963 242 100',NULL),(4,'41.4962045','2.3765504','Barcelona','Camí del crist, 33','08340','Vilassar de Mar','Barcelona','607 562 391','ca'),(5,'52.2612312','4.7818154','Holland','Aalsmeer Flower Auction','1430 BA','Legmeerdijk 313','Aalsmeer','Nederland','nl'),(6,'43.4375416','5.2261456','Marseille','ruben@verdnatura.es','13054','Marigname','Marseille','+33 781 533 900','fr'); -/*!40000 ALTER TABLE `location` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `menu` --- - -LOCK TABLES `menu` WRITE; -/*!40000 ALTER TABLE `menu` DISABLE KEYS */; -INSERT INTO `menu` VALUES (1,'Home','cms/home',6,NULL,1),(2,'Orders',NULL,11,NULL,1),(3,'Catalog','ecomerce/catalog',6,NULL,2),(7,'Administration',NULL,1,NULL,2),(8,'Users','admin/users',1,7,2),(9,'Connections','admin/connections',1,7,2),(11,'Agencies','agencies/packages',3,NULL,2),(12,'News','news/news',1,7,3),(15,'Photos','admin/photos',1,7,3),(17,'Configuration',NULL,11,NULL,3),(19,'Control panel','admin/links',1,7,1),(21,'Basket','ecomerce/basket',11,NULL,1),(22,'Last orders','ecomerce/orders',11,2,2),(23,'Invoices','ecomerce/invoices',11,2,2),(24,'Account','account/conf',11,17,1),(25,'Addresses','account/address-list',11,17,2),(26,'Shelves','reports/shelves',1,29,1),(28,'Visits','admin/visits',1,7,2),(29,'Reports',NULL,1,NULL,2),(30,'Items','admin/items',1,7,3),(31,'Pending orders','ecomerce/pending',11,2,1); -/*!40000 ALTER TABLE `menu` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `message` --- - -LOCK TABLES `message` WRITE; -/*!40000 ALTER TABLE `message` DISABLE KEYS */; -INSERT INTO `message` VALUES (1,'ORDER_DATE_HOLIDAY','No es posible realizar pedidos para días festivos'),(2,'ORDER_EMPTY','El pedido esta vacío'),(3,'ORDER_UNAVAILABLE','Algunos artículos ya no están disponibles, verifica las cantidades resaltadas en rojo'),(4,'SURVEY_MAX_ONE_VOTE','Solo es posible realizar un voto por encuesta'),(5,'ORDER_MAX_EXCEEDED','Has excedido el número máximo de pedidos por confirmar, por favor elimina o confirma los pedidos iniciados'),(6,'LOGIN_INCORRECT','Usuario o contraseña incorrectos. Recuerda que se hace distinción entre mayúsculas y minúsculas.'),(7,'ORDER_DATE_PAST','La fecha de su pedido debe ser mayor o igual al día de hoy'),(8,'ORDER_DATE_LAST','No es posible realizar más para hoy, por favor atrasa la fecha de tu pedido a mañana o días posteriores'),(9,'ORDER_DATE_SUNDAY','No es posible confirmar pedidos para Domingo'),(10,'ORDER_DATE_SATURATED','Estamos saturados de pedidos, por favor selecciona otra fecha de envío o recogida '),(11,'USER_DISCONNECTED','Has sido desconectado del servidor, por favor vuelve a iniciar sesión'),(12,'UNAUTH_ACTION','Acción no permitida'),(13,'ORDER_INVALID_AGENCY','La agencia de envío no es válida'),(14,'ORDER_EMPTY_ADDRESS','Selecciona una dirección de envío'),(15,'ORDER_AMOUNT_ROUNDED','Este artículo se vende agrupado y la cantidad ha sido redondeada'),(17,'orderOutdated','La configuración del pedido es incorrecta, por favor vuelve a configurarlo para continuar comprando'),(18,'orderNotOwnedByUser','El pedido pertenece a otro usuario'),(19,'orderConfirmed','El pedido ya ha sido confirmado y no puede modificarse'),(20,'clientNotVerified','Datos fiscales incompletos, por favor contacte con su comercial'); -/*!40000 ALTER TABLE `message` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `metatag` --- - -LOCK TABLES `metatag` WRITE; -/*!40000 ALTER TABLE `metatag` DISABLE KEYS */; -INSERT INTO `metatag` VALUES (2,'title','Verdnatura Levante SL, mayorista de flores, plantas y complementos para floristería y decoración'),(3,'description','Verdnatura Levante SL, mayorista de flores, plantas y complementos para floristería y decoración. Envío a toda España, pedidos por internet o por teléfono.'),(4,'keywords','verdnatura, mayorista, floristería, flores, verdes, plantas, ramos, complementos, artificial, natural, decoración, rosas, helecho, fern, clavel, lilium, orquídea, tulipan, crisantemo, cala, gerbera, hiedra, eucaliptus, cinerea, aralia'),(6,'revisit-after','15 days'),(7,'rating','general'),(8,'author','Juan Ferrer Toribio'),(9,'owner','Verdnatura Levante S.L.'),(10,'robots','index, follow'); -/*!40000 ALTER TABLE `metatag` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `newsTag` --- - -LOCK TABLES `newsTag` WRITE; -/*!40000 ALTER TABLE `newsTag` DISABLE KEYS */; -INSERT INTO `newsTag` VALUES ('course','Curso'),('new','Noticia'),('offer','Oferta'); -/*!40000 ALTER TABLE `newsTag` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `restPriv` --- - -LOCK TABLES `restPriv` WRITE; -/*!40000 ALTER TABLE `restPriv` DISABLE KEYS */; -INSERT INTO `restPriv` VALUES (1,'tpv/transaction',2),(3,'image/upload',1),(5,'user/supplant',104),(10,'misc/captcha',NULL),(11,'core/log',NULL),(14,'core/query',NULL),(15,'user/recover-password',NULL),(16,'user/restore-password',NULL),(17,'dms/invoice',2),(18,'image/thumb',NULL),(19,'misc/contact',NULL),(20,'misc/production',NULL),(21,'tpv/confirm-post',NULL),(22,'tpv/confirm-soap',NULL),(23,'client/supplant',18),(24,'client/supplant',35),(25,'user/logout',NULL); -/*!40000 ALTER TABLE `restPriv` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `social` --- - -LOCK TABLES `social` WRITE; -/*!40000 ALTER TABLE `social` DISABLE KEYS */; -INSERT INTO `social` VALUES (1,'Blog','https://blog.verdnatura.es/','blog.svg',0),(3,'Facebook','http://www.facebook.com/verdnatura','facebook.svg',2),(4,'YouTube','http://www.youtube.com/user/verdnatura','youtube.svg',2),(5,'Twitter','https://twitter.com/Verdnatura','twitter.svg',1),(6,'Instagram','https://www.instagram.com/verdnatura','instagram.svg',2),(7,'Linkedin','https://www.linkedin.com/company/verdnatura','linkedin.svg',1),(8,'Pinterest','https://es.pinterest.com/verdnatura/','pinterest.svg',1); -/*!40000 ALTER TABLE `social` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `tpvError` --- - -LOCK TABLES `tpvError` WRITE; -/*!40000 ALTER TABLE `tpvError` DISABLE KEYS */; -INSERT INTO `tpvError` VALUES ('SIS0007','Error al desmontar el XML de entrada'),('SIS0008','Error falta Ds_Merchant_MerchantCode'),('SIS0009','Error de formato en Ds_Merchant_MerchantCode'),('SIS0010','Error falta Ds_Merchant_Terminal'),('SIS0011','Error de formato en Ds_Merchant_Terminal'),('SIS0014','Error de formato en Ds_Merchant_Order'),('SIS0015','Error falta Ds_Merchant_Currency'),('SIS0016','Error de formato en Ds_Merchant_Currency'),('SIS0017','Error no se admite operaciones en pesetas'),('SIS0018','Error falta Ds_Merchant_Amount'),('SIS0019','Error de formato en Ds_Merchant_Amount'),('SIS0020','Error falta Ds_Merchant_MerchantSignature'),('SIS0021','Error la Ds_Merchant_MerchantSignature viene vacía'),('SIS0022','Error de formato en Ds_Merchant_TransactionType'),('SIS0023','Error Ds_Merchant_TransactionType desconocido'),('SIS0024','Error Ds_Merchant_ConsumerLanguage tiene más de 3 posiciones'),('SIS0026','Error No existe el comercio / terminal enviado'),('SIS0027','Error Moneda enviada por el comercio es diferente a la que tiene asignada para ese terminal'),('SIS0028','Error Comercio / terminal está dado de baja'),('SIS0030','Error en un pago con tarjeta ha llegado un tipo de operación no valido'),('SIS0031','Método de pago no definido'),('SIS0034','Error de acceso a la Base de Datos'),('SIS0038','Error en java'),('SIS0040','Error el comercio / terminal no tiene ningún método de pago asignado'),('SIS0041','Error en el cálculo de la firma de datos del comercio'),('SIS0042','La firma enviada no es correcta'),('SIS0046','El BIN de la tarjeta no está dado de alta'),('SIS0051','Error número de pedido repetido'),('SIS0054','Error no existe operación sobre la que realizar la devolución'),('SIS0055','Error no existe más de un pago con el mismo número de pedido'),('SIS0056','La operación sobre la que se desea devolver no está autorizada'),('SIS0057','El importe a devolver supera el permitido'),('SIS0058','Inconsistencia de datos, en la validación de una confirmación'),('SIS0059','Error no existe operación sobre la que realizar la devolución'),('SIS0060','Ya existe una confirmación asociada a la preautorización'),('SIS0061','La preautorización sobre la que se desea confirmar no está autorizada'),('SIS0062','El importe a confirmar supera el permitido'),('SIS0063','Error. Número de tarjeta no disponible'),('SIS0064','Error. El número de tarjeta no puede tener más de 19 posiciones'),('SIS0065','Error. El número de tarjeta no es numérico'),('SIS0066','Error. Mes de caducidad no disponible'),('SIS0067','Error. El mes de la caducidad no es numérico'),('SIS0068','Error. El mes de la caducidad no es válido'),('SIS0069','Error. Año de caducidad no disponible'),('SIS0070','Error. El Año de la caducidad no es numérico'),('SIS0071','Tarjeta caducada'),('SIS0072','Operación no anulable'),('SIS0074','Error falta Ds_Merchant_Order'),('SIS0075','Error el Ds_Merchant_Order tiene menos de 4 posiciones o más de 12'),('SIS0076','Error el Ds_Merchant_Order no tiene las cuatro primeras posiciones numéricas'),('SIS0078','Método de pago no disponible'),('SIS0079','Error al realizar el pago con tarjeta'),('SIS0081','La sesión es nueva, se han perdido los datos almacenados'),('SIS0089','El valor de Ds_Merchant_ExpiryDate no ocupa 4 posiciones'),('SIS0092','El valor de Ds_Merchant_ExpiryDate es nulo'),('SIS0093','Tarjeta no encontrada en la tabla de rangos'),('SIS0112','Error. El tipo de transacción especificado en Ds_Merchant_Transaction_Type no esta permitido'),('SIS0115','Error no existe operación sobre la que realizar el pago de la cuota'),('SIS0116','La operación sobre la que se desea pagar una cuota no es una operación válida'),('SIS0117','La operación sobre la que se desea pagar una cuota no está autorizada'),('SIS0118','Se ha excedido el importe total de las cuotas'),('SIS0119','Valor del campo Ds_Merchant_DateFrecuency no válido'),('SIS0120','Valor del campo Ds_Merchant_CargeExpiryDate no válido'),('SIS0121','Valor del campo Ds_Merchant_SumTotal no válido'),('SIS0122','Valor del campo Ds_merchant_DateFrecuency o Ds_Merchant_SumTotal tiene formato incorrecto'),('SIS0123','Se ha excedido la fecha tope para realizar transacciones'),('SIS0124','No ha transcurrido la frecuencia mínima en un pago recurrente sucesivo'),('SIS0132','La fecha de Confirmación de Autorización no puede superar en más de 7 días a la de Preautorización'),('SIS0139','Error el pago recurrente inicial está duplicado SIS0142 Tiempo excedido para el pago'),('SIS0216','Error Ds_Merchant_CVV2 tiene mas de 3/4 posiciones'),('SIS0217','Error de formato en Ds_Merchant_CVV2'),('SIS0221','Error el CVV2 es obligatorio'),('SIS0222','Ya existe una anulación asociada a la preautorización'),('SIS0223','La preautorización que se desea anular no está autorizada'),('SIS0225','Error no existe operación sobre la que realizar la anulación'),('SIS0226','Inconsistencia de datos, en la validación de una anulación'),('SIS0227','Valor del campo Ds_Merchan_TransactionDate no válido'),('SIS0252','El comercio no permite el envío de tarjeta'),('SIS0253','La tarjeta no cumple el check-digit'),('SIS0261','Operación detenida por superar el control de restricciones en la entrada al SIS'),('SIS0274','Tipo de operación desconocida o no permitida por esta entrada al SIS'),('SIS9915','A petición del usuario se ha cancelado el pago'); -/*!40000 ALTER TABLE `tpvError` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `tpvResponse` --- - -LOCK TABLES `tpvResponse` WRITE; -/*!40000 ALTER TABLE `tpvResponse` DISABLE KEYS */; -INSERT INTO `tpvResponse` VALUES (101,'Tarjeta Caducada'),(102,'Tarjeta en excepción transitoria o bajo sospecha de fraude'),(104,'Operación no permitida para esa tarjeta o terminal'),(106,'Intentos de PIN excedidos'),(116,'Disponible Insuficiente'),(118,'Tarjeta no Registrada'),(125,'Tarjeta no efectiva'),(129,'Código de seguridad (CVV2/CVC2) incorrecto'),(180,'Tarjeta ajena al servicio'),(184,'Error en la autenticación del titular'),(190,'Denegación sin especificar motivo'),(191,'Fecha de caducidad errónea'),(202,'Tarjeta en excepción transitoria o bajo sospecha de fraude con retirada de tarjeta'),(904,'Comercio no registrado en FUC'),(909,'Error de sistema'),(912,'Emisor no Disponible'),(913,'Pedido repetido'),(944,'Sesión Incorrecta'),(950,'Operación de devolución no permitida'),(9064,'Número de posiciones de la tarjeta incorrecto'),(9078,'No existe método de pago válido para esa tarjeta'),(9093,'Tarjeta no existente'),(9094,'Rechazo servidores internacionales'),(9104,'A petición del usuario se ha cancelado el pago'),(9218,'El comercio no permite op. seguras por entrada /operaciones'),(9253,'Tarjeta no cumple el check-digit'),(9256,'El comercio no puede realizar preautorizaciones'),(9257,'Esta tarjeta no permite operativa de preautorizaciones'),(9261,'Operación detenida por superar el control de restricciones en la entrada al SIS'),(9912,'Emisor no Disponible'),(9913,'Error en la confirmación que el comercio envía al TPV Virtual (solo aplicable en la opción de sincronización SOAP)'),(9914,'Confirmación “KO” del comercio (solo aplicable en la opción de sincronización SOAP)'),(9915,'A petición del usuario se ha cancelado el pago'),(9928,'Anulación de autorización en diferido realizada por el SIS (proceso batch)'),(9929,'Anulación de autorización en diferido realizada por el comercio'),(9998,'Operación en proceso de solicitud de datos de tarjeta'),(9999,'Operación que ha sido redirigida al emisora autenticar'); -/*!40000 ALTER TABLE `tpvResponse` ENABLE KEYS */; -UNLOCK TABLES; -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2023-08-30 15:53:22 -USE `sage`; --- MariaDB dump 10.19 Distrib 10.5.19-MariaDB, for debian-linux-gnu (x86_64) --- --- Host: db2.static.verdnatura.es Database: sage --- ------------------------------------------------------ --- Server version 10.7.7-MariaDB-1:10.7.7+maria~deb11-log - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Dumping data for table `TiposIva` --- - -LOCK TABLES `TiposIva` WRITE; -/*!40000 ALTER TABLE `TiposIva` DISABLE KEYS */; -INSERT INTO `TiposIva` VALUES (2,0,'Operaciones no sujetas',0.0000000000,0.0000000000,0.0000000000,'','4770000020','','','','','','','95B21A93-5910-489D-83BB-C32788C9B19D','','','','','','','','','',0),(4,0,'I.V.A. 4%',0.0000000000,4.0000000000,0.0000000000,'4720000004','4770000004','','6310000000','','','','','9E6160D5-984E-4643-ACBC-1EBC3BF73360','','','','','','','','','',0),(5,0,'I.V.A. 4% y R.E. 0.5%',0.0000000000,4.0000000000,0.5000000000,'','4770000504','4770000405','','','','','','DBEFA562-63FB-4FFC-8171-64F0C6F065FF','','','','','','','','','',0),(6,0,'H.P. IVA 4% CEE',0.0000000000,4.0000000000,0.0000000000,'4721000004','4771000004','','','','','','','DD0ECBA8-2EF5-425E-911B-623580BADA77','','','','','','','','','',0),(7,0,'H.P. IVA 10% CEE',0.0000000000,10.0000000000,0.0000000000,'4721000011','4771000010','','','','','','','593208CD-6F28-4489-B6EC-907AD689EAC9','','','','','','','','','',0),(8,0,'H.P. IVA 21% CEE',0.0000000000,21.0000000000,0.0000000000,'4721000021','4771000021','','','','','','','27061852-9BC1-4C4F-9B6E-69970E208F23','','','','','','','','','',0),(10,0,'I.V.A. 10% Nacional',0.0000000000,10.0000000000,0.0000000000,'4720000011','4770000010','','6290000553','','','','','828A9D6F-5C01-4C3A-918A-B2E4482830D3','','','','','','','','','',0),(11,0,'I.V.A. 10% y R.E. 1,4%',0.0000000000,10.0000000000,1.4000000000,'','4770000101','4770000110','','','','','','C1F2D910-83A1-4191-A76C-8B3D7AB98348','','','','','','','','','',0),(16,0,'I.V.A. Adqui. servicios CEE',0.0000000000,21.0000000000,0.0000000000,'4721000015','4771000016','','','','','','','E3EDE961-CE8F-41D4-9E6C-D8BCD32275A1','','','','','','','','','',0),(18,0,'H.P. Iva Importación 0% ISP',0.0000000000,0.0000000000,0.0000000000,'4720000005','4770000005','','','','','','','27AD4158-2349-49C2-B53A-A4E0EFAC5D09','','','','','','','','','',0),(20,0,'I.V.A 0% Nacional',0.0000000000,0.0000000000,0.0000000000,'4720000000','','','','','','','','B90B0FBD-E513-4F04-9721-C873504E08DF','','','','','','','','','',0),(21,0,'I.V.A. 21%',0.0000000000,21.0000000000,0.0000000000,'4720000021','4770000021','4770000000','','','','','','BA8C4E28-DCFA-4F7B-AE4F-CA044626B55E','','','','','','','','','',0),(22,0,'IVA 10% importaciones',0.0000000000,10.0000000000,0.0000000000,'4722000010','','','','','','','','540450A8-4B41-4607-96D1-E7F296FB6933','','','','','','','','','',0),(26,0,'I.V.A. 21% y R.E. 5,2%',0.0000000000,21.0000000000,5.2000000000,'4720000021','4770000215','4770000521','631000000','','','','','2BC0765F-7739-49AE-A5F0-28B648B81677','','','','','','','','','',0),(90,0,'IVA 21% importaciones',0.0000000000,21.0000000000,0.0000000000,'4722000021','','','','','','','','EB675F91-5FF2-4E26-A31E-EEB674125945','','','','','','','','','',0),(91,0,'IVA 0% importaciones',0.0000000000,0.0000000000,0.0000000000,'4723000000','','','','','','','','5E5EFA56-2A99-4D54-A16B-5D818274CA18','','','','','','','','','',0),(92,0,'8.5% comp. ganadera o pesquera',0.0000000000,8.5000000000,0.0000000000,'4720000000','4770000000','477000000','631000000','','','','','','','','','','','','','','',0),(93,0,'12% com. agrícola o forestal',0.0000000000,12.0000000000,0.0000000000,'4720000012','','','','','','','','267B1DDB-247F-4A71-AB95-3349FEFC5F92','','','','','','','','','',0),(94,0,'10,5% com. ganadera o pesquera',0.0000000000,10.5000000000,0.0000000000,'4770000000','4720000000','631000000','477000000','','','','','','','','','','','','','','',0),(100,0,'HP IVA SOPORTADO 5%',0.0000000000,5.0000000000,0.0000000000,'4720000055','','','','','','','','3AD36CB2-4172-4CC9-9F87-2BF2B56AAC80','','','','','','','','','',0),(108,0,'I.V.A. 8%',0.0000000000,8.0000000000,0.0000000000,'4720000000','4770000000','477000000','631000000','','','','','','','','','','','','','','',0),(109,0,'I.V.A. 8% y R.E. 1%',0.0000000000,8.0000000000,1.0000000000,'4720000000','4770000000','477000000','631000000','','','','','','','','','','','','','','',0),(110,0,'HP IVA Devengado Exento CEE',0.0000000000,0.0000000000,0.0000000000,'','4771000000','','','','','','','C605BC32-E161-42FD-83F3-3A66B1FBE399','','','','','','','','','',0),(111,0,'H.P. Iva Devengado Exento Ser',0.0000000000,0.0000000000,0.0000000000,'','4771000001','','','','','','','F1AEC4DC-AFE5-498E-A713-2648FFB6DA32','','','','','','','','','',0),(112,0,'H.P. IVA Devengado en exportac',0.0000000000,0.0000000000,0.0000000000,'','4770000002','','','','','','','F980AE74-BF75-4F4C-927F-0CCCE0DB8D15','','','','','','','','','',0),(113,0,'HP DEVENGADO 21 ISP ',0.0000000000,21.0000000000,0.0000000000,'4720000006','4770000006','','','','','','','728D7A76-E936-438C-AF05-3CA38FE16EA5','','','','','','','','','',0),(114,0,'HP.IVA NO DEDUCIBLE 10%',0.0000000000,0.0000000000,0.0000000000,'4720000026','','','','','','','','','','','','','','','','','',0),(115,0,'H.P. IVA Soportado Impor 4% ',0.0000000000,4.0000000000,0.0000000000,'4722000004','','','','','','','','','','','','','','','','','',0); -/*!40000 ALTER TABLE `TiposIva` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `TiposTransacciones` --- - -LOCK TABLES `TiposTransacciones` WRITE; -/*!40000 ALTER TABLE `TiposTransacciones` DISABLE KEYS */; -INSERT INTO `TiposTransacciones` VALUES (1,'Rég.general/Oper.interiores bienes y serv.corrien.','',0,''),(2,'Régimen especial de bienes usados','E',0,''),(3,'Régimen especial de obj. de arte y antigüedades','E',0,''),(4,'Régimen especial agencias de viaje','',0,''),(5,'Régimen especial determinación proporcional','E',0,''),(6,'Oper.en rég.simplificado art.37.1.2º Rgto.IVA','E',0,''),(7,'Oper.en rég.simplificado art.37.1.1º Rgto.IVA','E',0,''),(8,'Oper.en rég.de agricultura, ganadería y pesca','E',0,''),(9,'Oper.en rég.especial de recargo de equivalencia','E',0,''),(10,'Entregas intracomunitarias','E',0,''),(11,'Entregas intermediarias intracomunitarias','E',0,''),(12,'Operaciones sujetas con derecho a devolución','E',0,''),(13,'Prest. Serv. No sujetas derecho devolución','E',0,''),(14,'Exportaciones definitivas','E',0,''),(15,'Envíos definitivos a Canarias, Ceuta y Melilla','E',0,''),(16,'Devoluciones en régimen de viajeros','E',0,''),(17,'Operaciones con áreas exentas','E',0,''),(18,'Operaciones exentas con derecho a deducción','E',0,''),(19,'Operaciones exentas sin derecho a deducción','E',0,''),(20,'Adquisic.intracomunitarias de bienes y serv.corr.','',-1,'P'),(21,'Adquisic.intracomunitarias de bienes de inversión','',-1,'P'),(22,'Adquisic.intermediarias intracomunitarias','',-1,'P'),(23,'Modif.autorizadas en quiebras y susp.de pagos','',0,''),(24,'Entrega de bienes inmuebles no habituales','E',0,''),(25,'Entrega de bienes de inversión','E',0,''),(26,'Op.finan. y Entregas oro inversión, no habituales','E',0,''),(27,'Inversión sujeto pasivo','',-1,'I'),(28,'Prestaciones intracomunitarias de servicios','E',0,''),(29,'Adquisiciones intracomunitarias de servicios','',-1,'I'),(30,'Operaciones interiores de bienes de inversión','R',0,''),(31,'Importaciones de bienes y servicios corrientes','R',0,''),(32,'Importaciones de bienes de inversión','R',0,''),(33,'Operaciones que generan inversión sujeto pasivo','E',0,''),(35,'Compensaciones en rég.de agricultura, gan.y pesca','R',0,''),(36,'Regularización de inversiones','R',0,''),(37,'Operaciones exentas','R',0,''),(38,'Operaciones no sujetas','',0,''),(39,'Gastos devengados op interiores (País Vasco)','R',0,''),(40,'Gastos Adq.intracom. bienes (País Vasco)','',-1,'P'),(42,'Gastos Adq.intermediarias intracom. (País Vasco)','',-1,'P'),(47,'Gastos Inversión sujeto pasivo (País Vasco)','',-1,'I'),(49,'Gastos Adq. intracom. servicios (País Vasco)','',-1,'I'),(51,'Gastos Importaciones (País Vasco)','R',0,''),(53,'Adquisiciones a agencias de viajes en rég.especial','R',0,''),(54,'Entregas intrac.posteriores a importaciones','E',0,''),(55,'Entregas intrac.post.impor.con representante','E',0,''),(56,'Import. bienes y serv. corrientes pdte. liquidar','R',0,''),(57,'Import. bienes de inversión pdte. liquidar','R',0,''),(58,'Servicios prestados por Internet desde España','E',0,''),(59,'Servicios prestados por Internet fuera de España','E',0,''),(60,'Régimen depósito distinto al aduanero','',0,''),(61,'Adquisición de bienes de inversión con ISP','',-1,'I'),(62,'Prest. Serv. Interiores clientes comunit./extranj.','',0,''),(63,'Prest. Serv. Ex. con derecho a deducc. comu./extr.','E',0,''),(64,'Prest. Serv. Ex. sin derecho a deducc. comu./extr.','E',0,''),(65,'Entregas No sujetas derecho devolución','E',0,''),(66,'Operaciones exentas art. 25 ley 19/1994 (Canarias)','',0,''),(67,'Entrega de bienes exenta \"Zona Especial Canaria\"','',0,''),(68,'Prestac. servicios exenta \"Zona Especial Canaria\"','',0,''); -/*!40000 ALTER TABLE `TiposTransacciones` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `TiposRetencion` --- - -LOCK TABLES `TiposRetencion` WRITE; -/*!40000 ALTER TABLE `TiposRetencion` DISABLE KEYS */; -INSERT INTO `TiposRetencion` VALUES (1,'RETENCION ESTIMACION OBJETIVA',1.0000000000,'4730000000','4751000000',NULL,NULL,NULL,'03811652-0F3A-44A1-AE1C-B19624525D7F'),(2,'ACTIVIDADES AGRICOLAS O GANADERAS',2.0000000000,'4730000000','4751000000',NULL,NULL,NULL,'F3F91EF3-FED6-444D-B03C-75B639D13FB4'),(9,'ACTIVIDADES PROFESIONALES 2 PRIMEROS AÑOS',9.0000000000,'4730000000','4751000000',NULL,NULL,NULL,'73F95642-E951-4C91-970A-60C503A4792B'),(15,'ACTIVIDADES PROFESIONALES',15.0000000000,'4730000000','4751000000','6',NULL,NULL,'F6BDE0EE-3B01-4023-8FFF-A73AE9AC50D7'),(19,'ARRENDAMIENTO Y SUBARRENDAMIENTO',19.0000000000,'4730000000','4751000000','8',NULL,NULL,'09B033AE-16E5-4057-8D4A-A7710C8A4FB9'); -/*!40000 ALTER TABLE `TiposRetencion` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Dumping data for table `taxType` --- - -LOCK TABLES `taxType` WRITE; -/*!40000 ALTER TABLE `taxType` DISABLE KEYS */; -INSERT INTO `taxType` VALUES (2,'nonTaxable',0),(4,'national4',0),(5,NULL,0),(6,NULL,1),(7,NULL,1),(8,NULL,1),(10,'national10',0),(11,NULL,0),(16,'CEEServices21',1),(18,NULL,0),(20,'national0',0),(21,'national21',0),(22,'import10',0),(26,NULL,0),(90,'import21',0),(91,NULL,0),(92,NULL,0),(93,NULL,0),(94,NULL,0),(100,NULL,0),(108,NULL,0),(109,NULL,0),(110,NULL,1),(111,NULL,0),(112,NULL,0),(113,'ISP21',0),(114,NULL,0),(115,'import4',0); -/*!40000 ALTER TABLE `taxType` ENABLE KEYS */; -UNLOCK TABLES; -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2023-08-30 15:53:22 diff --git a/db/dump/fixtures.after.sql b/db/dump/fixtures.after.sql new file mode 100644 index 000000000..af5509cfe --- /dev/null +++ b/db/dump/fixtures.after.sql @@ -0,0 +1,327 @@ +-- Extract modified tables from fixtures: +-- awk 'match($0, /INSERT INTO `(\w+)`\.`(\w+)`/, ary) {print ary[1]" - "ary[2]}' dump/fixtures.sql | sort -u + +CALL `cache`.`last_buy_refresh`(FALSE); + +SET foreign_key_checks = 0; + +-- XXX: vn-database + +INSERT INTO util.config (id, environment, mockTime, mockUtcTime, mockEnabled) + VALUES (1, 'local', '2001-01-01 12:00:00', '2001-01-01 11:00:00', TRUE); +/* #5483 +INSERT INTO vn.entryConfig (defaultEntry, mailToNotify, inventorySupplierFk, maxLockTime, defaultSupplierFk) + VALUES(1, NULL, 1, 300, 1); +*/ +-- XXX: eti + +INSERT INTO vn.travel (id,shipped,landed,warehouseInFk,warehouseOutFk,`ref`,m3,kg,cargoSupplierFk) + VALUES (9,'2022-05-20','2022-05-20',13,4,'nine travel',69.0,600,1); +/* #5483 +INSERT INTO vn.entry (id, supplierFk, dated, invoiceNumber, evaNotes, travelFk, companyFk) + VALUES + (9, 1, '0000-00-00 00:00:00', 'Movement 9', 'observation nine', 8, 442), + (10, 1, '0000-00-00 00:00:00', 'Movement 10', 'observation ten', 9, 442); + +INSERT INTO vn.buy (id,entryFk,itemFk,quantity,dispatched,buyingValue,freightValue,isIgnored,stickers,packing,`grouping`,groupingMode,comissionValue,packageValue,packagingFk,price1,price2,price3,minPrice,printedStickers,workerFk,isChecked,isPickedOff,created,`__cm2`,weight) + VALUES + (16,10,1,100,0,50.0,1.5,0,1,1,1,0,0.0,1.5,'4',0.0,99.6,99.4,0.0,0,0,1,0,'2022-06-20 00:00:00',0,1.0), + (17,10,2,450,0,5.0,1.0,0,1,10,10,0,0.0,1.0,'3',0.0,7.3,7.0,0.0,0,0,1,0,'2022-06-20 00:00:00',0,2.5), + (18,10,15,500,0,55.0,1.0,0,1,1,1,0,0.0,1.0,'5',0.0,78.3,75.6,0.0,0,0,1,0,'2022-06-20 00:00:00',0,2.5), + (19,10,11,5000,0,50.0,1.0,0,1,1,1,1,0.0,1.0,'4',0.0,99.6,99.4,0.0,0,0,1,0,'2022-06-20 00:00:00',0,2.5); +*/ +INSERT INTO vn.split (id,ticketFk,entryFk,dated,note) + VALUES + (1,7,2,'00-00-0000 00:00:00.000','nota1'), + (2,10,6,'00-00-0000 00:00:00.000','nota2'), + (3,15,7,'00-00-0000 00:00:00.000','nota3'), + (4,22,10,'00-00-0000 00:00:00.000','nota4'); + +-- XXX: enc + +INSERT INTO vn.mdbVersion (app, branchFk, version) + VALUES('enc', 'master', 1); + +UPDATE vn.warehouse + SET isForTicket = 1, addressFk = 118 + WHERE id = 1; + +UPDATE vn.packaging + SET freightItemFk = 1, isBox = 1 + WHERE id = '94'; +/* #5483 +INSERT INTO `vn`.`packagingConfig`(`upperGap`, `defaultSmallPackageFk`, `defaultBigPackageFk`) + VALUES + ('10', 1, 2); +*/ +UPDATE vn.packaging SET freightItemFk=1 WHERE id='1'; +UPDATE vn.packaging SET freightItemFk=1 WHERE id='2'; + +INSERT INTO vn.packagingWithFreight (packagingFk, priority) VALUES('1', 1); + +INSERT INTO vn.cmrConfig (dayOfMonth, landingDays) + VALUES(5, 1); + +UPDATE vn.supplier + SET isTrucker = 1 + WHERE id = 2; + +-- XXX: tpv + +UPDATE `vn`.`claimRatio` SET `claimAmount` = '10' WHERE (`clientFk` = '1101'); + +INSERT INTO `vn`.`agency` (`name`, `warehouseFk`, `isOwn`, `isAnyVolumeAllowed`) + VALUES + ('Agencia', '1', '1', '1'), + ('Otra agencia ', '1', '0', '0'); + +INSERT INTO `vn`.`expedition` (`agencyModeFk`, `ticketFk`, `isBox`, `counter`, `workerFk`, `externalId`, `packagingFk`, `hostFk`, `itemPackingTypeFk`, `hasNewRoute`) VALUES + ('1', '1', 1, '1', '1', '1', '1', 'pc00', 'F', 0), + ('1', '1', 1, '2', '1', '1', '1', 'pc00', 'F', 0); + +INSERT INTO vn.client (id,name,defaultAddressFk,street,fi,email,dueDay,isTaxDataChecked,accountingAccount,city,provinceFk,postcode,socialName,contact,credit,countryFk,quality,riskCalculated) VALUES + (100,'root',110,'Valle de la muerte','74974747G','root@mydomain.com',0,1,'4300000078','ALGEMESI',1,'46680','rootSocial','rootContact',500.0,1,10,'2025-01-01'); + +INSERT INTO vn.address (clientFk,street,city,provinceFk,postalCode,nickname,isEqualizated,isLogifloraAllowed,isDefaultAddress) VALUES + (100,'rootStreet','ALGEMESI',3,'46680','root',0,0,1); +/* #5483 +INSERT INTO vn.ticket (clientFk,warehouseFk,shipped,nickname,refFk,addressFk,routeFk,companyFk,agencyModeFk,landed,zoneFk, totalWithVat, totalWithoutVat) VALUES + (100,1,'2025-07-06 00:00:00','Saco de patatas',NULL,103,6,442,1,'2025-07-06',13, 500, 450), + (100,1,'2021-07-06 00:00:00','Alubias de la abuelita Enrriqueta','T4444444',103,6,442,1,'2021-07-06',13, 1000, 900); +*/ +INSERT INTO vn.receipt (invoiceFk,amountPaid,payed,workerFk,bankFk,clientFk,isConciliate,companyFk) VALUES + ('Cobro mental',999.0,'2021-06-21 00:00:00',9,3,100,1,442), + ('Cobro web',50.0,'2022-06-21 00:00:00',9,3,100,1,567); + +INSERT INTO vn.workerBosses (workerFk,bossFk) VALUES + (44,100), + (70,100), + (47,100), + (58,100), + (1106,100); + +UPDATE vn.agencyMode + SET deliveryMethodFk=1 + WHERE id=1; + +UPDATE vn.agencyMode + SET deliveryMethodFk=2 + WHERE id=2; +/* #5483 +INSERT INTO vn.ticket (clientFk, warehouseFk, shipped, nickname, refFk, addressFk, workerFk, observations, isSigned, isLabeled, isPrinted, packages, location, `hour`, created, isBlocked, solution, routeFk, priority, hasPriority, companyFk, agencyModeFk, landed, isBoxed, isDeleted, zoneFk, zonePrice, zoneBonus, totalWithVat, totalWithoutVat, weight) VALUES + (100, 3, '2022-07-12 00:00:00', 'root', NULL, 195, NULL, NULL, 0, 0, 0, 0, NULL, 0, '2022-07-12 16:18:58', 1, NULL, 3, NULL, 1, 567, 1, '2022-07-12', 0, 0, 5, NULL, NULL, NULL, NULL, NULL), + (100, 4, '2022-07-12 00:00:00', 'root', NULL, 195, NULL, NULL, 0, 0, 0, 0, NULL, 0, '2022-07-12 16:18:58', 1, NULL, 4, NULL, 1, 567, 1, '2022-07-12', 0, 0, 6, NULL, NULL, NULL, NULL, NULL), + (100, 5, '2022-07-12 00:00:00', 'root', NULL, 195, NULL, NULL, 0, 0, 0, 0, NULL, 0, '2022-07-12 16:18:58', 1, NULL, 5, NULL, 1, 567, 1, '2022-07-12', 0, 0, 1, NULL, NULL, NULL, NULL, NULL); +*/ +INSERT INTO vn.sector (description,warehouseFk) VALUES + ('Sector One',1); + +INSERT INTO vn.saleGroup (userFk,parkingFk,sectorFk) VALUES + (100,1,1); + +INSERT INTO vn.saleGroupDetail (saleFk,saleGroupFk) VALUES + (32,1); +/* #5483 +INSERT INTO vn.itemShelving (id,itemFk,visible,shelvingFk,`grouping`,packing,packagingFk,userFk) VALUES + (4,1,5,'HEJ',12,12,'2',100); +*/ +INSERT INTO vn.beach (code,warehouseFk) VALUES + ('TEST',1); + +INSERT INTO vn.routesMonitor (routeFk,name,beachFk,m3,expeditionTruckFk) VALUES + (1,'TEST','TEST',1.0,1); +/* #5483 +INSERT INTO vn.ticket (clientFk, warehouseFk, shipped, nickname, refFk, addressFk, workerFk, observations, isSigned, isLabeled, isPrinted, packages, location, `hour`, created, isBlocked, solution, routeFk, priority, hasPriority, companyFk, agencyModeFk, landed, isBoxed, isDeleted, zoneFk, zonePrice, zoneBonus, totalWithVat, totalWithoutVat, weight) + VALUES (1101, 1, '2022-07-19 10:00:00', 'Bruce Wayne', NULL, 1, NULL, NULL, 0, 0, 0, 0, NULL, 0, '2022-07-19 08:14:37', 1, NULL, 1, 1, 1, 442, 1, '2022-07-06', 0, 0, 13, 5.00, 1.00, 80.00, 75.00, NULL); + +INSERT INTO vn.sale (itemFk, ticketFk, concept, quantity, originalQuantity, price, discount, priceFixed, reserved, isPicked, isPriceFixed, created, isAdded) + VALUES (1, 24, 'Ranged weapon longbow 2m', 1.00, NULL, 8.07, 0, 0.00, 0, 0, 0, '2022-07-06 00:00:00', 0); +*/ +-- XXX: lab + +INSERT INTO `vn`.`businessReasonEnd` (`id`, `reason`) + VALUES + ('1', 'Baja voluntaria'), + ('2', 'No supera PP empresa'), + ('3', 'Despido'); + +INSERT INTO `vn2008`.`payroll_categorias` (`codcategoria`, `descripcion`, `Tarifa`) + VALUES + ('11', 'INFORMATICA', '2'), + ('12', 'AUX INFORMATICA', '7'); + +INSERT INTO `vn`.`occupationCode` (`code`, `name`) + VALUES + ('a', 'Personal en trabajaos exclusivos de oficina'), + ('b', 'Representantes de comercio'), + ('c', 'Personal de oficios en trabajos de construcción en general, y en instalac.,edificios y obras'); + +INSERT INTO `vn2008`.`payroll_employee` (`CodTrabajador`,`nss`,`codpuesto`,`codempresa`,`codcontrato`,`FAntiguedad`,`grupotarifa`,`codcategoria`,`ContratoTemporal`) + VALUES + (36,'46/10515497-58',6,20,189,'2009-01-02',5,10,0), + (43,'46/10235353-50',7,20,189,'2009-04-21',5,10,0), + (76,'46/10250562-30',1,20,189,'2009-09-07',9,5,0), + (1106,'46/10297768-94',4,20,100,'2021-03-09',7,18,0), + (1107,'46/1627085-11',15,20,402,'2021-03-15',9,6,1), + (1108,'46/10446901-41',25,20,502,'2021-03-22',10,29,1), + (1109,'46/10552113-8',3,20,402,'2021-03-23',9,9,1), + (1110,'46/10723579-75',3,20,402,'2021-03-23',9,9,1); + +INSERT INTO `vn`.`trainingCourseType` (`id`, `name`) + VALUES + ('1', 'Curso 1'), + ('2', 'Curso 2'); + +INSERT INTO `vn`.`trainingCenter` (`id`, `name`) + VALUES + ('1', 'Centro curso 1'), + ('2', 'Centro Curso 2'); + +INSERT INTO `vn`.`medicalCenter` (`id`, `name`) + VALUES + ('1', 'Centro médico 1'), + ('2', 'Centro médico 2'); + +INSERT INTO `vn`.`disabilityGrade` (`id`, `description`) + VALUES + ('1', 'Grado 1'), + ('2', 'Grado 2'); + +INSERT INTO `vn`.`absenceType` (`id`,`name`,`rgb`,`color`,`permissionRate`,`code`,`isAllowedToWork`,`isPrintable`,`discountRate`,`holidayEntitlementRate`) + VALUES + (7,'Excedencia','#C71585',16711935,0.00,'leave',0,0,1.00,1.00), + (10,'Baja mutua','#00ffff',16776960,1.00,'insurance',0,0,1.00,0.00), + (11,'Permiso retribuido','#0080ff',16744448,1.00,NULL,0,1,1.00,0.00), + (12,'Visita médico','#ff80ff',16744703,1.00,NULL,0,0,1.00,0.00), + (13,'Visita mutua','#808040',4227200,0.00,NULL,0,0,1.00,0.00), + (14,'Maternidad/Paternidad','#008040',4227072,1.00,'maternity',0,1,1.00,0.00), + (16,'Visita comercial','#00ff00',65280,1.00,NULL,0,1,1.00,0.00), + (17,'Compensar','#dbec40',4844763,0.00,NULL,0,1,1.00,0.00), + (18,'Parte','#0af5a0',10747402,1.00,'proof',0,0,1.00,0.00), + (19,'Descanso','#664208',4798193,0.00,NULL,0,0,1.00,0.00), + (22,'Sin justificar','#8B3E2F',3096203,1.00,NULL,1,1,1.00,0.00); + +-- XXX: app + +INSERT INTO vn.deviceProductionModels (code) + VALUES('TC210K'); + +INSERT INTO vn.deviceProduction (id, imei, modelFk, macWifi, serialNumber, android_id, purchased) + VALUES(100, NULL, 'TC210K', '78B8D67298A6', '21114523025303', NULL, '1900-01-01'); + +INSERT INTO vn.deviceProductionUser (deviceProductionFk, userFk, created) + VALUES(100, 9, NULL); + +INSERT INTO vn.expeditionStateType (id, description, code) + VALUES(15, 'Perdida', 'LOST'); + +INSERT INTO vn.expedition (agencyModeFk,ticketFk,isBox,counter,hostFk,hasNewRoute) + VALUES (1,21,1,1,'',0); +/* #5483 +INSERT INTO vn.sectorCollection (id, created, userFk, sectorFk) + VALUES(18, '2022-07-29 09:03:31', 9, 1); +*/ +INSERT INTO vn.saleGroup (id, created, userFk, parkingFk, sectorFk) + VALUES(3, '2022-07-29 07:18:49', 9, NULL, 1); + +INSERT INTO vn.sectorCollectionSaleGroup (id, created, sectorCollectionFk, saleGroupFk) + VALUES(7, '2022-07-29 09:05:37', 18, 3); + +INSERT INTO vn.saleGroupDetail (created, saleFk, saleGroupFk) + VALUES + ( '2022-07-29 07:26:44', 14, 3), + ( '2022-07-29 07:26:44', 15, 3); + +INSERT INTO vn.saleTracking (saleFk, isChecked, created, originalQuantity, workerFk, id, stateFk) + VALUES + (15, 1, '2022-07-29 07:56:16', 10.0, 9, 6, 26); +/* #5483 +INSERT INTO vn.ticket (id, clientFk, warehouseFk, shipped, nickname, refFk, addressFk, workerFk, observations, isSigned, isLabeled, isPrinted, packages, location, `hour`, created, isBlocked, solution, routeFk, priority, hasPriority, companyFk, agencyModeFk, landed, isBoxed, isDeleted, zoneFk, zonePrice, zoneBonus, totalWithVat, totalWithoutVat, weight) + VALUES + (3000001, 1110, 1, '2022-07-28 21:00:00', 'ATELIER ART FLORAL', NULL, 129, NULL, NULL, 0, 0, 0, 1, NULL, 0, '2022-07-28 20:27:14', 1, NULL, 1, 16, 1, 442, 1, '2022-07-29', 0, 0, 1, 4.00, 0.00, 41.68, 37.42, NULL); + +INSERT INTO vn.collection (id, created, workerFk, stateFk, itemPackingTypeFk, saleTotalCount, salePickedCount, trainFk) + VALUES + (600001, '2022-07-28 20:04:24', 9, 5, NULL, 5, 5, 1); + +INSERT INTO vn.sale (itemFk, ticketFk, concept, quantity, originalQuantity, price, discount, priceFixed, reserved, isPicked, isPriceFixed, created, isAdded) + VALUES + ( 1, 3000001, 'Ranged weapon longbow 2m', 5.00, NULL, 100.39, 0, 0.00, 0, 1, 0, '2022-06-13 00:00:00', 0); +*/ +INSERT INTO vn.collectionColors(code, shelve, wagon, trainFk) + VALUES + ( 'ROJO', 1, 1, 1); + +INSERT INTO vn.ticketCollection (ticketFk, collectionFk, created, `level`, wagon, smartTagFk, usedShelves, itemCount, liters) + VALUES + (3000001, 600001, '2022-07-28 20:04:24', 1, 1, NULL, NULL, 6, 122); +/* #5483 +INSERT INTO vn.itemShelving (itemFk, shelvingFk, visible, created, `grouping`, packing, packagingFk, userFk, buyFk) + VALUES + ( 1, 'HEJ', 4, '2022-07-13 10:33:34', 12, 12, NULL, 9 , 1), + ( 1, 'GVC', 10, '2022-07-13 10:33:34', 12, 12, NULL, 100, 2), + ( 1, 'UXN', 20, '2022-07-13 10:33:34', 12, 12, NULL, 100, 3); + +INSERT INTO vn.operator (workerFk, numberOfWagons, trainFk, itemPackingTypeFk, warehouseFk) + VALUES + (9, 1, 1, 'V', 1); +*/ +-- XXX: web +/* #5483 +INSERT INTO `hedera`.`config` (`cookieLife`, `defaultForm`) + VALUES (15,'cms/home'); + +INSERT INTO `hedera`.`imageConfig` (`maxSize`, `url`) + VALUES (20, '//cdn.verdnatura.es/image'); + +INSERT INTO `hedera`.`orderConfig` (`employeeFk`, `guestMethod`, `guestAgencyFk`, `defaultCompanyFk`) + VALUES (1, 'PICKUP', 1, 442); + +INSERT INTO `hedera`.`news` (`title`,`text`, `image`, `userFk`, `created`, `priority`, `tag`) + VALUES + ('Foo new', 'Hi, welcome to Verdnatura''s webshop', 'sd', 9, '2022-01-01 00:00:00', 1, 'new'), + ('Bar new', 'Here you can buy any plant you want', 'sd', 9, '2022-01-02 00:00:00', 1, 'new'); + +UPDATE `vn`.`agencyMode` SET `description` = `name`; + +INSERT INTO `hedera`.`tpvConfig` (currency, terminal, transactionType, maxAmount, employeeFk, `url`, testMode, testUrl, testKey, merchantUrl) + VALUES (978, 1, 0, 2000, 9, 'https://sis.redsys.es/sis/realizarPago', 0, 'https://sis-t.redsys.es:25443/sis/realizarPago', 'sq7HjrUOBfKmC576ILgskD5srU870gJ7', NULL); +*/ +INSERT INTO hedera.tpvMerchantEnable (merchantFk, companyFk) + VALUES (1, 442); + +-- XXX + +SET foreign_key_checks = 1; + +INSERT INTO `account`.`userConfig` (`id`, `loginKey`) + VALUES (1, 'loginKey'); + +UPDATE `account`.`roleConfig` + SET `mysqlPassword` = TO_BASE64('nightmare'); + +CREATE USER 'any'@'%' IDENTIFIED BY 'nightmare'; +UPDATE `mysql`.`global_priv` SET `Host` = '' + WHERE `User` = 'any' AND `Host` = '%'; + +USE account; + +CALL role_sync; + +SELECT rolePrefix INTO @rolePrefix FROM roleConfig; + +SET @genRoleHost = '%'; +SET @prefixLen = CHAR_LENGTH(@rolePrefix); +SET @prefixedLike = CONCAT(@rolePrefix, '%'); + +INSERT INTO mysql.global_priv (`User`, `Host`, `Priv`) + SELECT SUBSTR(`User`, @prefixLen + 1), `Host`, `Priv` + FROM mysql.global_priv + WHERE `User` LIKE @prefixedLike AND `Host` = @genRoleHost; + +INSERT INTO mysql.roles_mapping (`User`, `Host`, `Role`, `Admin_option`) + SELECT SUBSTR(`User`, @prefixLen + 1), `Host`, `Role`, `Admin_option` + FROM mysql.roles_mapping + WHERE `User` LIKE @prefixedLike AND `Host` = @genRoleHost; + +FLUSH PRIVILEGES; diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.before.sql similarity index 82% rename from db/dump/fixtures.sql rename to db/dump/fixtures.before.sql index b6c89bd40..1dad68b2c 100644 --- a/db/dump/fixtures.sql +++ b/db/dump/fixtures.before.sql @@ -1,3 +1,16 @@ +/** + * BE CAREFUL! This file is periodically overwritten from: + * https://gitea.verdnatura.es/verdnatura/salix/raw/branch/master/db/dump/fixtures.sql + * + * Any change made here wich is not in source file will be lost! + */ +SET foreign_key_checks = 0; + +DROP ROLE 'salix'; +CREATE ROLE 'salix'; +GRANT 'salix' TO 'root'@'%'; +SET DEFAULT ROLE 'salix' FOR 'root'@'%'; + CREATE SCHEMA IF NOT EXISTS `vn2008`; CREATE SCHEMA IF NOT EXISTS `tmp`; @@ -47,22 +60,18 @@ INSERT INTO `vn`.`ticketConfig` (`id`, `scopeDays`) VALUES ('1', '6'); -INSERT INTO `vn`.`bionicConfig` (`generalInflationCoeficient`, `minimumDensityVolumetricWeight`, `verdnaturaVolumeBox`, `itemCarryBox`) +INSERT INTO `vn`.`bionicConfig` (`id`, `generalInflationCoeficient`, `minimumDensityVolumetricWeight`, `verdnaturaVolumeBox`, `itemCarryBox`) VALUES - (1.30, 167.00, 138000, 71); + (1, 1.30, 167.00, 138000, 71); -INSERT INTO `vn`.`chatConfig` (`host`, `api`) +INSERT INTO `vn`.`chatConfig` (`id`, `host`, `api`) VALUES - ('https://chat.verdnatura.es', 'https://chat.verdnatura.es/api/v1'); + (1, 'https://chat.verdnatura.es', 'https://chat.verdnatura.es/api/v1'); INSERT IGNORE INTO `vn`.`greugeConfig`(`id`, `freightPickUpPrice`) VALUES ('1', '11'); -INSERT INTO `vn`.`packagingConfig`(`upperGap`) - VALUES - ('10'); - UPDATE `account`.`role` SET id = 100 WHERE id = 0; INSERT INTO `account`.`roleConfig`(`id`, `mysqlPassword`, `rolePrefix`, `userPrefix`, `userHost`, `tplUser`) @@ -73,7 +82,7 @@ CALL `account`.`role_sync`; INSERT INTO `account`.`user`(`id`,`name`, `nickname`, `role`,`active`,`email`, `lang`, `image`, `password`) SELECT id, name, CONCAT(name, 'Nick'), id, 1, CONCAT(name, '@mydomain.com'), 'en', '4fa3ada0-3ac4-11eb-9ab8-27f6fc3b85fd', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2' - FROM `account`.`role` WHERE id <> 20 + FROM `account`.`role` ORDER BY id; INSERT INTO `account`.`account`(`id`) @@ -87,9 +96,15 @@ INSERT INTO `vn`.`educationLevel` (`id`, `name`) (1, 'ESTUDIOS PRIMARIOS COMPLETOS'), (2, 'ENSEÑANZAS DE BACHILLERATO'); +INSERT INTO `vn`.`worker`(`id`,`code`, `firstName`, `lastName`, `bossFk`) + SELECT id,UPPER(LPAD(role, 3, '0')), name, name, NULL + FROM `account`.`user` + WHERE `id` = 9; + INSERT INTO `vn`.`worker`(`id`,`code`, `firstName`, `lastName`, `bossFk`) SELECT id,UPPER(LPAD(role, 3, '0')), name, name, 9 - FROM `account`.`user`; + FROM `account`.`user` + WHERE `id` <> 9; UPDATE `vn`.`worker` SET bossFk = NULL WHERE id = 20; UPDATE `vn`.`worker` SET bossFk = 20 WHERE id = 1 OR id = 9; @@ -103,18 +118,18 @@ INSERT INTO `hedera`.`tpvConfig`(`id`, `currency`, `terminal`, `transactionType` INSERT INTO `account`.`user`(`id`,`name`,`nickname`, `password`,`role`,`active`,`email`,`lang`, `image`) VALUES - (1101, 'BruceWayne', 'Bruce Wayne', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'BruceWayne@mydomain.com', 'es', 'e7723f0b24ff05b32ed09d95196f2f29'), - (1102, 'PetterParker', 'Petter Parker', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'PetterParker@mydomain.com', 'en', 'e7723f0b24ff05b32ed09d95196f2f29'), - (1103, 'ClarkKent', 'Clark Kent', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'ClarkKent@mydomain.com', 'fr', 'e7723f0b24ff05b32ed09d95196f2f29'), - (1104, 'TonyStark', 'Tony Stark', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'TonyStark@mydomain.com', 'es', 'e7723f0b24ff05b32ed09d95196f2f29'), - (1105, 'MaxEisenhardt', 'Max Eisenhardt', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'MaxEisenhardt@mydomain.com', 'pt', 'e7723f0b24ff05b32ed09d95196f2f29'), - (1106, 'DavidCharlesHaller', 'David Charles Haller', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'DavidCharlesHaller@mydomain.com', 'en', 'e7723f0b24ff05b32ed09d95196f2f29'), - (1107, 'HankPym', 'Hank Pym', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'HankPym@mydomain.com', 'en', 'e7723f0b24ff05b32ed09d95196f2f29'), - (1108, 'CharlesXavier', 'Charles Xavier', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'CharlesXavier@mydomain.com', 'en', 'e7723f0b24ff05b32ed09d95196f2f29'), - (1109, 'BruceBanner', 'Bruce Banner', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'BruceBanner@mydomain.com', 'en', 'e7723f0b24ff05b32ed09d95196f2f29'), - (1110, 'JessicaJones', 'Jessica Jones', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'JessicaJones@mydomain.com', 'en', NULL), - (1111, 'Missing', 'Missing', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 0, NULL, 'en', NULL), - (1112, 'Trash', 'Trash', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 0, NULL, 'en', NULL); + (1101, 'BruceWayne', 'Bruce Wayne', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'BruceWayne@mydomain.com', 'es','1101'), + (1102, 'PetterParker', 'Petter Parker', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'PetterParker@mydomain.com', 'en','1102'), + (1103, 'ClarkKent', 'Clark Kent', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'ClarkKent@mydomain.com', 'fr','1103'), + (1104, 'TonyStark', 'Tony Stark', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'TonyStark@mydomain.com', 'es','1104'), + (1105, 'MaxEisenhardt', 'Max Eisenhardt', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 1, 'MaxEisenhardt@mydomain.com', 'pt','1105'), + (1106, 'DavidCharlesHaller', 'David Charles Haller', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'DavidCharlesHaller@mydomain.com', 'en','1106'), + (1107, 'HankPym', 'Hank Pym', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'HankPym@mydomain.com', 'en','1107'), + (1108, 'CharlesXavier', 'Charles Xavier', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'CharlesXavier@mydomain.com', 'en','1108'), + (1109, 'BruceBanner', 'Bruce Banner', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'BruceBanner@mydomain.com', 'en','1109'), + (1110, 'JessicaJones', 'Jessica Jones', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 1, 1, 'JessicaJones@mydomain.com', 'en','1110'), + (1111, 'Missing', 'Missing', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 0, NULL, 'en','e7723f0b24ff05b32ed09d95196f2f29'), + (1112, 'Trash', 'Trash', '$2b$10$UzQHth.9UUQ1T5aiQJ21lOU0oVlbxoqH4PFM9V8T90KNSAcg0eEL2', 2, 0, NULL, 'en','e7723f0b24ff05b32ed09d95196f2f29'); UPDATE account.`user` SET passExpired = DATE_SUB(util.VN_CURDATE(), INTERVAL 1 YEAR) @@ -159,26 +174,23 @@ INSERT INTO `vn`.`country`(`id`, `country`, `isUeeMember`, `code`, `currencyFk`, (19,'Francia', 1, 'FR', 1, 27, 4, 0, 1), (30,'Canarias', 1, 'IC', 1, 24, 4, 1, 2); -INSERT INTO `vn`.`warehouseAlias`(`id`, `name`) +INSERT INTO `vn`.`warehouse`(`id`, `name`, `code`, `isComparative`, `isInventory`, `hasAvailable`, `isManaged`, `hasDms`, `hasComission`, `countryFk`, `hasProduction`, `isOrigin`, `isDestiny`) VALUES - (1, 'Main Warehouse'), - (2, 'Gotham'); + (1, 'Warehouse One', 'ALG', 1, 1, 1, 1, 1, 1, 1, 1, 1, 1), + (2, 'Warehouse Two', NULL, 1, 1, 1, 1, 0, 1, 13, 1, 1, 0), + (3, 'Warehouse Three', NULL, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0), + (4, 'Warehouse Four', NULL, 1, 1, 1, 1, 0, 0, 1, 1, 0, 1), + (5, 'Warehouse Five', NULL, 1, 1, 1, 1, 0, 0, 1, 1, 0, 0), + (13, 'Inventory', 'inv', 1, 1, 1, 0, 0, 0, 1, 0, 0, 0), + (60, 'Algemesi', NULL, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0); -INSERT INTO `vn`.`warehouse`(`id`, `name`, `code`, `isComparative`, `isInventory`, `hasAvailable`, `isManaged`, `hasDms`, `hasComission`, `aliasFk`, `countryFk`, `hasProduction`) +INSERT INTO `vn`.`sectorType` (`id`, `code`) + VALUES (1,'normal'); + +INSERT INTO `vn`.`sector`(`id`, `description`, `warehouseFk`, `code`, `typeFk`) VALUES - (1, 'Warehouse One', 'ALG', 1, 1, 1, 1, 1, 1, 2, 1, 1), - (2, 'Warehouse Two', NULL, 1, 1, 1, 1, 0, 1, 2, 13, 1), - (3, 'Warehouse Three', NULL, 1, 1, 1, 1, 0, 0, 2, 1, 1), - (4, 'Warehouse Four', NULL, 1, 1, 1, 1, 0, 0, 2, 1, 1), - (5, 'Warehouse Five', NULL, 1, 1, 1, 1, 0, 0, 2, 1, 1), - (13, 'Inventory', 'inv', 1, 1, 1, 0, 0, 0, 2, 1, 0), - (60, 'Algemesi', NULL, 1, 1, 1, 0, 0, 0, 2, 1, 0); - - -INSERT INTO `vn`.`sector`(`id`, `description`, `warehouseFk`, `isPreviousPreparedByPacking`, `code`) - VALUES - (1, 'First sector', 1, 1, 'FIRST'), - (2, 'Second sector', 2, 0, 'SECOND'); + (1, 'First sector', 1, 'FIRST', 1), + (2, 'Second sector', 2, 'SECOND',1); INSERT INTO `vn`.`printer` (`id`, `name`, `path`, `isLabeler`, `sectorFk`, `ipAddress`) VALUES @@ -188,6 +200,7 @@ INSERT INTO `vn`.`printer` (`id`, `name`, `path`, `isLabeler`, `sectorFk`, `ipAd UPDATE `vn`.`sector` SET mainPrinterFk = 1 WHERE id = 1; + INSERT INTO `vn`.`worker`(`id`, `code`, `firstName`, `lastName`,`bossFk`, `phone`) VALUES (1106, 'LGN', 'David Charles', 'Haller', 19, 432978106), @@ -253,18 +266,18 @@ INSERT INTO `vn`.`deliveryMethod`(`id`, `code`, `description`) (3, 'PICKUP', 'Recogida'), (4, 'OTHER', 'Otros'); -INSERT INTO `vn`.`agency`(`id`, `name`, `warehouseFk`, `warehouseAliasFk`) +INSERT INTO `vn`.`agency`(`id`, `name`, `warehouseFk`) VALUES - (1, 'inhouse pickup' , 1, 1), - (2, 'Super-Man delivery' , 1, 1), - (3, 'Teleportation device' , 1, 1), - (4, 'Entanglement' , 1, 1), - (5, 'Quantum break device' , 1, 1), - (6, 'Walking' , 1, 1), - (7, 'Gotham247' , 1, 1), - (8, 'Gotham247Expensive' , 1, 1), - (9, 'Refund' , 1, 1), - (10, 'Other agency' , 1, 1); + (1, 'inhouse pickup' , 1), + (2, 'Super-Man delivery' , 1), + (3, 'Teleportation device' , 1), + (4, 'Entanglement' , 1), + (5, 'Quantum break device' , 1), + (6, 'Walking' , 1), + (7, 'Gotham247' , 1), + (8, 'Gotham247Expensive' , 1), + (9, 'Refund' , 1), + (10, 'Other agency' , 1); UPDATE `vn`.`agencyMode` SET `id` = 1 WHERE `name` = 'inhouse pickup'; UPDATE `vn`.`agencyMode` SET `id` = 2 WHERE `name` = 'Super-Man delivery'; @@ -339,12 +352,12 @@ INSERT INTO `vn`.`postCode`(`code`, `townFk`, `geoFk`) ('46600', 4, 7), ('EC170150', 5, 8); -INSERT INTO `vn`.`clientType`(`id`, `code`, `type`) +INSERT INTO `vn`.`clientType`(`code`, `type`) VALUES - (1, 'normal', 'Normal'), - (2, 'internalUse', 'Autoconsumo'), - (3, 'handMaking', 'Confección'), - (4, 'loses', 'Mermas'); + ('normal', 'Normal'), + ('internalUse', 'Autoconsumo'), + ('handMaking', 'Confección'), + ('loses', 'Mermas'); INSERT INTO `vn`.`cplusTerIdNif`(`id`, `description`) VALUES @@ -358,23 +371,23 @@ INSERT INTO `vn`.`contactChannel`(`id`, `name`) (4, 'GCN Channel'), (5, 'The Newspaper'); -INSERT INTO `vn`.`client`(`id`,`name`,`fi`,`socialName`,`contact`,`street`,`city`,`postcode`,`phone`,`mobile`,`isRelevant`,`email`,`iban`,`dueDay`,`accountingAccount`,`isEqualizated`,`provinceFk`,`hasToInvoice`,`credit`,`countryFk`,`isActive`,`gestdocFk`,`quality`,`payMethodFk`,`created`,`isToBeMailed`,`contactChannelFk`,`hasSepaVnl`,`hasCoreVnl`,`hasCoreVnh`,`riskCalculated`,`clientTypeFk`, `hasToInvoiceByAddress`,`isTaxDataChecked`,`isFreezed`,`creditInsurance`,`isCreatedAsServed`,`hasInvoiceSimplified`,`salesPersonFk`,`isVies`,`eypbc`, `businessTypeFk`,`typeFk`) +INSERT INTO `vn`.`client`(`id`,`name`,`fi`,`socialName`,`contact`,`street`,`city`,`postcode`,`phone`,`mobile`,`isRelevant`,`email`,`iban`,`dueDay`,`accountingAccount`,`isEqualizated`,`provinceFk`,`hasToInvoice`,`credit`,`countryFk`,`isActive`,`gestdocFk`,`quality`,`payMethodFk`,`created`,`isToBeMailed`,`contactChannelFk`,`hasSepaVnl`,`hasCoreVnl`,`hasCoreVnh`,`riskCalculated`, `hasToInvoiceByAddress`,`isTaxDataChecked`,`isFreezed`,`creditInsurance`,`isCreatedAsServed`,`hasInvoiceSimplified`,`salesPersonFk`,`isVies`,`eypbc`, `businessTypeFk`,`typeFk`) VALUES - (1101, 'Bruce Wayne', '84612325V', 'BATMAN', 'Alfred', '1007 MOUNTAIN DRIVE, GOTHAM', 'Gotham', 46460, 1111111111, 222222222, 1, 'BruceWayne@mydomain.com', NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, NULL, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 0, NULL, 0, 0, 18, 0, 1, 'florist','loses'), - (1102, 'Petter Parker', '87945234L', 'SPIDER MAN', 'Aunt May', '20 INGRAM STREET, QUEENS, USA', 'Gotham', 46460, 1111111111, 222222222, 1, 'PetterParker@mydomain.com', NULL, 0, 1234567890, 0, 2, 1, 300, 1, 1, NULL, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 0, NULL, 0, 0, 18, 0, 1, 'florist','normal'), - (1103, 'Clark Kent', '06815934E', 'SUPER MAN', 'lois lane', '344 CLINTON STREET, APARTAMENT 3-D', 'Gotham', 46460, 1111111111, 222222222, 1, 'ClarkKent@mydomain.com', NULL, 0, 1234567890, 0, 3, 1, 0, 19, 1, NULL, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 0, NULL, 0, 0, 18, 0, 1, 'florist','normal'), - (1104, 'Tony Stark', '06089160W', 'IRON MAN', 'Pepper Potts', '10880 MALIBU POINT, 90265', 'Gotham', 46460, 1111111111, 222222222, 1, 'TonyStark@mydomain.com', NULL, 0, 1234567890, 0, 2, 1, 300, 1, 1, NULL, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 0, NULL, 0, 0, 18, 0, 1, 'florist','normal'), - (1105, 'Max Eisenhardt', '251628698', 'MAGNETO', 'Rogue', 'UNKNOWN WHEREABOUTS', 'Gotham', 46460, 1111111111, 222222222, 1, 'MaxEisenhardt@mydomain.com', NULL, 0, 1234567890, 0, 3, 1, 300, 8, 1, NULL, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 1, NULL, 0, 0, 18, 0, 1, 'florist','normal'), - (1106, 'DavidCharlesHaller', '53136686Q', 'LEGION', 'Charles Xavier', 'CITY OF NEW YORK, NEW YORK, USA', 'Gotham', 46460, 1111111111, 222222222, 1, 'DavidCharlesHaller@mydomain.com', NULL, 0, 1234567890, 0, 1, 1, 300, 1, 0, NULL, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 0, NULL, 0, 0, 19, 0, 1, 'florist','normal'), - (1107, 'Hank Pym', '09854837G', 'ANT MAN', 'Hawk', 'ANTHILL, SAN FRANCISCO, CALIFORNIA', 'Gotham', 46460, 1111111111, 222222222, 1, 'HankPym@mydomain.com', NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, NULL, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, 0, NULL, 0, 0, 19, 0, 1, 'florist','normal'), - (1108, 'Charles Xavier', '22641921P', 'PROFESSOR X', 'Beast', '3800 VICTORY PKWY, CINCINNATI, OH 45207, USA', 'Gotham', 46460, 1111111111, 222222222, 1, 'CharlesXavier@mydomain.com', NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, NULL, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 1, NULL, 0, 0, 19, 0, 1, 'florist','normal'), - (1109, 'Bruce Banner', '16104829E', 'HULK', 'Black widow', 'SOMEWHERE IN NEW YORK', 'Gotham', 46460, 1111111111, 222222222, 1, 'BruceBanner@mydomain.com', NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, NULL, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, 0, NULL, 0, 0, 9, 0, 1, 'florist','normal'), - (1110, 'Jessica Jones', '58282869H', 'JESSICA JONES', 'Luke Cage', 'NYCC 2015 POSTER', 'Gotham', 46460, 1111111111, 222222222, 1, 'JessicaJones@mydomain.com', NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, NULL, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, 0, NULL, 0, 0, NULL, 0, 1, 'florist','normal'), - (1111, 'Missing', NULL, 'MISSING MAN', 'Anton', 'THE SPACE, UNIVERSE FAR AWAY', 'Gotham', 46460, 1111111111, 222222222, 1, NULL, NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, NULL, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 4, 0, 1, 0, NULL, 1, 0, NULL, 0, 1, 'others','normal'), - (1112, 'Trash', NULL, 'GARBAGE MAN', 'Unknown name', 'NEW YORK CITY, UNDERGROUND', 'Gotham', 46460, 1111111111, 222222222, 1, NULL, NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, NULL, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 4, 0, 1, 0, NULL, 1, 0, NULL, 0, 1, 'others','normal'); + (1101, 'Bruce Wayne', '84612325V', 'BATMAN', 'Alfred', '1007 MOUNTAIN DRIVE, GOTHAM', 'Gotham', 46460, 1111111111, 222222222, 1, 'BruceWayne@mydomain.com', NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, NULL, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18, 0, 1, 'florist','normal'), + (1102, 'Petter Parker', '87945234L', 'SPIDER MAN', 'Aunt May', '20 INGRAM STREET, QUEENS, USA', 'Gotham', 46460, 1111111111, 222222222, 1, 'PetterParker@mydomain.com', NULL, 0, 1234567890, 0, 2, 1, 300, 1, 1, NULL, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18, 0, 1, 'florist','normal'), + (1103, 'Clark Kent', '06815934E', 'SUPER MAN', 'lois lane', '344 CLINTON STREET, APARTAMENT 3-D', 'Gotham', 46460, 1111111111, 222222222, 1, 'ClarkKent@mydomain.com', NULL, 0, 1234567890, 0, 3, 1, 0, 19, 1, NULL, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18, 0, 1, 'florist','normal'), + (1104, 'Tony Stark', '06089160W', 'IRON MAN', 'Pepper Potts', '10880 MALIBU POINT, 90265', 'Gotham', 46460, 1111111111, 222222222, 1, 'TonyStark@mydomain.com', NULL, 0, 1234567890, 0, 2, 1, 300, 1, 1, NULL, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 18, 0, 1, 'florist','normal'), + (1105, 'Max Eisenhardt', '251628698', 'MAGNETO', 'Rogue', 'UNKNOWN WHEREABOUTS', 'Gotham', 46460, 1111111111, 222222222, 1, 'MaxEisenhardt@mydomain.com', NULL, 0, 1234567890, 0, 3, 1, 300, 8, 1, NULL, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, NULL, 0, 0, 18, 0, 1, 'florist','normal'), + (1106, 'DavidCharlesHaller', '53136686Q', 'LEGION', 'Charles Xavier', 'CITY OF NEW YORK, NEW YORK, USA', 'Gotham', 46460, 1111111111, 222222222, 1, 'DavidCharlesHaller@mydomain.com', NULL, 0, 1234567890, 0, 1, 1, 300, 1, 0, NULL, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, 19, 0, 1, 'florist','normal'), + (1107, 'Hank Pym', '09854837G', 'ANT MAN', 'Hawk', 'ANTHILL, SAN FRANCISCO, CALIFORNIA', 'Gotham', 46460, 1111111111, 222222222, 1, 'HankPym@mydomain.com', NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, NULL, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, 19, 0, 1, 'florist','normal'), + (1108, 'Charles Xavier', '22641921P', 'PROFESSOR X', 'Beast', '3800 VICTORY PKWY, CINCINNATI, OH 45207, USA', 'Gotham', 46460, 1111111111, 222222222, 1, 'CharlesXavier@mydomain.com', NULL, 0, 1234567890, 0, 5, 1, 300, 13, 1, NULL, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, NULL, 0, 0, 19, 0, 1, 'florist','normal'), + (1109, 'Bruce Banner', '16104829E', 'HULK', 'Black widow', 'SOMEWHERE IN NEW YORK', 'Gotham', 46460, 1111111111, 222222222, 1, 'BruceBanner@mydomain.com', NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, NULL, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, 9, 0, 1, 'florist','normal'), + (1110, 'Jessica Jones', '58282869H', 'JESSICA JONES', 'Luke Cage', 'NYCC 2015 POSTER', 'Gotham', 46460, 1111111111, 222222222, 1, 'JessicaJones@mydomain.com', NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, NULL, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, NULL, 0, 1, 'florist','normal'), + (1111, 'Missing', NULL, 'MISSING MAN', 'Anton', 'THE SPACE, UNIVERSE FAR AWAY', 'Gotham', 46460, 1111111111, 222222222, 1, NULL, NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, NULL, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 0, 1, 0, NULL, 1, 0, NULL, 0, 1, 'others','loses'), + (1112, 'Trash', NULL, 'GARBAGE MAN', 'Unknown name', 'NEW YORK CITY, UNDERGROUND', 'Gotham', 46460, 1111111111, 222222222, 1, NULL, NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, NULL, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 0, 1, 0, NULL, 1, 0, NULL, 0, 1, 'others','loses'); INSERT INTO `vn`.`client`(`id`, `name`, `fi`, `socialName`, `contact`, `street`, `city`, `postcode`, `isRelevant`, `email`, `iban`,`dueDay`,`accountingAccount`, `isEqualizated`, `provinceFk`, `hasToInvoice`, `credit`, `countryFk`, `isActive`, `gestdocFk`, `quality`, `payMethodFk`,`created`, `isTaxDataChecked`) - SELECT id, name, CONCAT(RPAD(CONCAT(id,9),8,id),'A'), CONCAT(name, 'Social'), CONCAT(name, 'Contact'), CONCAT(name, 'Street'), 'GOTHAM', 46460, 1, CONCAT(name,'@mydomain.com'), NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1,NULL, 10, 5, util.VN_CURDATE(), 1 + SELECT id, name, CONCAT(RPAD(CONCAT(id,9),8,id),'A'), UPPER(CONCAT(name, 'Social')), CONCAT(name, 'Contact'), CONCAT(name, 'Street'), 'GOTHAM', 46460, 1, CONCAT(name,'@mydomain.com'), NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1,NULL, 10, 5, util.VN_CURDATE(), 1 FROM `account`.`role` `r` WHERE `r`.`hasLogin` = 1; @@ -405,7 +418,7 @@ INSERT INTO `vn`.`address`(`id`, `nickname`, `street`, `city`, `postalCode`, `pr (5, 'Max Eisenhardt', 'Unknown Whereabouts', 'Gotham', 46460, 1, 1111111111, 222222222, 1, 1105, 2, NULL, NULL, 0, 1), (6, 'DavidCharlesHaller', 'Evil hideout', 'Gotham', 46460, 1, 1111111111, 222222222, 1, 1106, 2, NULL, NULL, 0, 1), (7, 'Hank Pym', 'Anthill', 'Gotham', 46460, 1, 1111111111, 222222222, 1, 1107, 2, NULL, NULL, 0, 1), - (8, 'Charles Xavier', '3800 Victory Pkwy, Cincinnati, OH 45207, USA', 'Gotham', 46460, 1, 1111111111, 222222222, 1, 1108, 2, NULL, NULL, 0, 1), + (8, 'Charles Xavier', '3800 Victory Pkwy, Cincinnati, OH 45207, USA', 'Gotham', 46460, 5, 1111111111, 222222222, 1, 1108, 2, NULL, NULL, 0, 1), (9, 'Bruce Banner', 'Somewhere in New York', 'Gotham', 46460, 1, 1111111111, 222222222, 1, 1109, 2, NULL, NULL, 0, 1), (10, 'Jessica Jones', 'NYCC 2015 Poster', 'Gotham', 46460, 1, 1111111111, 222222222, 1, 1110, 2, NULL, NULL, 0, 1), (11, 'Missing', 'The space', 'Gotham', 46460, 1, 1111111111, 222222222, 1, 1111, 10, NULL, NULL, 0, 1), @@ -437,7 +450,7 @@ INSERT INTO `vn`.`address`(`id`, `nickname`, `street`, `city`, `postalCode`, `pr (125, 'The plastic cell', 'address 25', 'Gotham', 46460, 1, 1111111111, 222222222, 1, 1105, 2, NULL, NULL, 0, 0), (126, 'Many places', 'address 26', 'Gotham', 46460, 1, 1111111111, 222222222, 1, 1106, 2, NULL, NULL, 0, 0), (127, 'Your pocket', 'address 27', 'Gotham', 46460, 1, 1111111111, 222222222, 1, 1107, 2, NULL, NULL, 0, 0), - (128, 'Cerebro', 'address 28', 'Gotham', 46460, 1, 1111111111, 222222222, 1, 1108, 2, NULL, NULL, 0, 0), + (128, 'Cerebro', 'address 28', 'Gotham', 46460, 5, 1111111111, 222222222, 1, 1108, 2, NULL, NULL, 0, 0), (129, 'Luke Cages Bar', 'address 29', 'Gotham', 'EC170150', 1, 1111111111, 222222222, 1, 1110, 2, NULL, NULL, 0, 0), (130, 'Non valid address', 'address 30', 'Gotham', 46460, 1, 1111111111, 222222222, 0, 1101, 2, NULL, NULL, 0, 0); @@ -470,24 +483,24 @@ CREATE TEMPORARY TABLE tmp.address WHERE `defaultAddressFk` IS NULL; DROP TEMPORARY TABLE tmp.address; -INSERT INTO `vn`.`clientCredit`(`id`, `clientFk`, `workerFk`, `amount`, `created`) +INSERT INTO `vn`.`clientCredit`(`clientFk`, `workerFk`, `amount`, `created`) VALUES - (1 , 1101, 5, 300, DATE_ADD(util.VN_CURDATE(), INTERVAL -11 MONTH)), - (2 , 1101, 5, 900, DATE_ADD(util.VN_CURDATE(), INTERVAL -10 MONTH)), - (3 , 1101, 5, 800, DATE_ADD(util.VN_CURDATE(), INTERVAL -9 MONTH)), - (4 , 1101, 5, 700, DATE_ADD(util.VN_CURDATE(), INTERVAL -8 MONTH)), - (5 , 1101, 5, 600, DATE_ADD(util.VN_CURDATE(), INTERVAL -7 MONTH)), - (6 , 1101, 5, 500, DATE_ADD(util.VN_CURDATE(), INTERVAL -6 MONTH)), - (7 , 1101, 5, 400, DATE_ADD(util.VN_CURDATE(), INTERVAL -5 MONTH)), - (8 , 1101, 9, 300, DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH)), - (9 , 1101, 9, 200, DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH)), - (10, 1101, 9, 100, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH)), - (11, 1101, 9, 50 , DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)), - (12, 1102, 9, 800, util.VN_CURDATE()), - (14, 1104, 9, 90 , util.VN_CURDATE()), - (15, 1105, 9, 90 , util.VN_CURDATE()); + (1101, 5, 300, DATE_ADD(util.VN_CURDATE(), INTERVAL -11 MONTH)), + (1101, 5, 900, DATE_ADD(util.VN_CURDATE(), INTERVAL -10 MONTH)), + (1101, 5, 800, DATE_ADD(util.VN_CURDATE(), INTERVAL -9 MONTH)), + (1101, 5, 700, DATE_ADD(util.VN_CURDATE(), INTERVAL -8 MONTH)), + (1101, 5, 600, DATE_ADD(util.VN_CURDATE(), INTERVAL -7 MONTH)), + (1101, 5, 500, DATE_ADD(util.VN_CURDATE(), INTERVAL -6 MONTH)), + (1101, 5, 400, DATE_ADD(util.VN_CURDATE(), INTERVAL -5 MONTH)), + (1101, 9, 300, DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH)), + (1101, 9, 200, DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH)), + (1101, 9, 100, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH)), + (1101, 9, 50 , DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)), + (1102, 9, 800, util.VN_CURDATE()), + (1104, 9, 90 , util.VN_CURDATE()), + (1105, 9, 90 , util.VN_CURDATE()); -INSERT INTO `vn`.`clientCreditLimit`(`id`, `maxAmount`, `roleFk`) +INSERT INTO `vn`.`roleCreditLimit`(`id`, `maxAmount`, `roleFk`) VALUES (1, 9999999, 20), (2, 10000, 21), @@ -549,6 +562,16 @@ INSERT INTO `vn`.`supplierActivity`(`code`, `name`) ('flowerPlants', 'Wholesale of flowers and plants'), ('vegetablesFruits', 'Fruit and vegetable trade'); +INSERT INTO `vn`.`supplier`(`id`, `name`, `nickname`,`account`,`countryFk`,`nif`, `commission`, `created`, `isActive`, `street`, `city`, `provinceFk`, `postCode`, `payMethodFk`, `payDemFk`, `payDay`, `taxTypeSageFk`, `withholdingSageFk`, `transactionTypeSageFk`, `workerFk`, `supplierActivityFk`, `isPayMethodChecked`, `healthRegister`) + VALUES + (1, 'PLANTS SL', 'Plants nick', 4100000001, 1, '06089160W', 0, util.VN_CURDATE(), 1, 'supplier address 1', 'GOTHAM', 1, 46000, 1, 1, 15, 4, 1, 1, 18, 'flowerPlants', 1, '400664487V'), + (2, 'FARMER KING', 'The farmer', 4000020002, 1, '87945234L', 0, util.VN_CURDATE(), 1, 'supplier address 2', 'GOTHAM', 2, 46000, 1, 2, 10, 93, 2, 8, 18, 'animals', 1, '400664487V'), + (69, 'PACKAGING', 'Packaging nick', 4100000069, 1, '94935005K', 0, util.VN_CURDATE(), 1, 'supplier address 5', 'ASGARD', 3, 46600, 1, 1, 15, 4, 1, 1, 18, 'flowerPlants', 1, '400664487V'), + (442, 'VERDNATURA LEVANTE SL', 'Verdnatura', 5115000442, 1, '06815934E', 0, util.VN_CURDATE(), 1, 'supplier address 3', 'GOTHAM', 1, 46000, 1, 2, 15, 6, 9, 3, 18, 'complements', 1, '400664487V'), + (567, 'HOLLAND', 'Holland nick', 4000020567, 1, '14364089Z', 0, util.VN_CURDATE(), 1, 'supplier address 6', 'ASGARD', 3, 46600, 1, 2, 10, 93, 2, 8, 18, 'animals', 1, '400664487V'), + (791, 'BROS SL', 'Bros nick', 5115000791, 1, '37718083S', 0, util.VN_CURDATE(), 1, 'supplier address 7', 'ASGARD', 3, 46600, 1, 2, 15, 6, 9, 3, 18, 'complements', 1, '400664487V'), + (1381, 'ORNAMENTALES', 'Ornamentales', 7185001381, 1, '07972486L', 0, util.VN_CURDATE(), 1, 'supplier address 4', 'GOTHAM', 1, 46000, 1, 2, 15, 6, 9, 3, 18, 'complements', 1, '400664487V'); + INSERT INTO `vn`.`supplierAddress`(`id`, `supplierFk`, `nickname`, `street`, `provinceFk`, `postalCode`, `city`, `phone`, `mobile`) VALUES (1, 1, 'Ace Chemicals', 'The Midtown', 1, '46000', 'Gotham', '111111111', '222222222'), @@ -558,16 +581,6 @@ INSERT INTO `vn`.`supplierAddress`(`id`, `supplierFk`, `nickname`, `street`, `pr (5, 442, 'GCR building', 'Bristol district', 1, '46000', 'Gotham', '111111111', '222222222'), (6, 442, 'The Gotham Tonight building', 'Bristol district', 1, '46000', 'Gotham', '111111111', '222222222'); -INSERT INTO `vn`.`supplier`(`id`, `name`, `nickname`,`account`,`countryFk`,`nif`, `commission`, `created`, `isActive`, `street`, `city`, `provinceFk`, `postCode`, `payMethodFk`, `payDemFk`, `payDay`, `taxTypeSageFk`, `withholdingSageFk`, `transactionTypeSageFk`, `workerFk`, `supplierActivityFk`, `isPayMethodChecked`, `healthRegister`) - VALUES - (1, 'Plants SL', 'Plants nick', 4100000001, 1, '06089160W', 0, util.VN_CURDATE(), 1, 'supplier address 1', 'PONTEVEDRA', 1, 15214, 1, 1, 15, 4, 1, 1, 18, 'flowerPlants', 1, '400664487V'), - (2, 'Farmer King', 'The farmer', 4000020002, 1, '87945234L', 0, util.VN_CURDATE(), 1, 'supplier address 2', 'GOTHAM', 2, 43022, 1, 2, 10, 93, 2, 8, 18, 'animals', 1, '400664487V'), - (69, 'Packaging', 'Packaging nick', 4100000069, 1, '94935005K', 0, util.VN_CURDATE(), 1, 'supplier address 5', 'ASGARD', 3, 46600, 1, 1, 15, 4, 1, 1, 18, 'flowerPlants', 1, '400664487V'), - (442, 'Verdnatura Levante SL', 'Verdnatura', 5115000442, 1, '06815934E', 0, util.VN_CURDATE(), 1, 'supplier address 3', 'GOTHAM', 1, 43022, 1, 2, 15, 6, 9, 3, 18, 'complements', 1, '400664487V'), - (567, 'Holland', 'Holland nick', 4000020567, 1, '14364089Z', 0, util.VN_CURDATE(), 1, 'supplier address 6', 'ASGARD', 3, 46600, 1, 2, 10, 93, 2, 8, 18, 'animals', 1, '400664487V'), - (791, 'Bros SL', 'Bros nick', 5115000791, 1, '37718083S', 0, util.VN_CURDATE(), 1, 'supplier address 7', 'ASGARD', 3, 46600, 1, 2, 15, 6, 9, 3, 18, 'complements', 1, '400664487V'), - (1381, 'Ornamentales', 'Ornamentales', 7185001381, 1, '07972486L', 0, util.VN_CURDATE(), 1, 'supplier address 4', 'GOTHAM', 1, 43022, 1, 2, 15, 6, 9, 3, 18, 'complements', 1, '400664487V'); - INSERT INTO `vn`.`supplierContact`(`id`, `supplierFk`, `phone`, `mobile`, `email`, `observation`, `name`) VALUES (1, 1, 123121212, 654789123, 'supplier1@email.es', 'observation1', 'the boss'), @@ -579,13 +592,13 @@ INSERT INTO `vn`.`supplierAccount`(`id`, `supplierFk`, `iban`, `bankEntityFk`) VALUES (241, 442, 'ES111122333344111122221111', 128); -INSERT INTO `vn`.`company`(`id`, `code`, `supplierAccountFk`, `workerManagerFk`, `companyCode`, `sage200Company`, `expired`, `companyGroupFk`, `phytosanitary` , `clientFk`) +INSERT INTO `vn`.`company`(`id`, `code`, `supplierAccountFk`, `workerManagerFk`, `companyCode`, `expired`, `companyGroupFk`, `phytosanitary` , `clientFk`) VALUES - (69 , 'CCs', NULL, 30, NULL, 0, NULL, 1, NULL , NULL), - (442 , 'VNL', 241, 30, 2 , 1, NULL, 2, 'VNL Company - Plant passport' , 1101), - (567 , 'VNH', NULL, 30, NULL, 4, NULL, 1, 'VNH Company - Plant passport' , NULL), - (791 , 'FTH', NULL, 30, NULL, 3, '2015-11-30', 1, NULL , NULL), - (1381, 'ORN', NULL, 30, NULL, 7, NULL, 1, 'ORN Company - Plant passport' , NULL); + (69 , 'CCs', NULL, 30, 0, NULL, 1, NULL , NULL), + (442 , 'VNL', 241, 30, 1, NULL, 2, 'VNL Company - Plant passport' , 1101), + (567 , 'VNH', NULL, 30, 4, NULL, 1, 'VNH Company - Plant passport' , NULL), + (791 , 'FTH', NULL, 30, 3, '2015-11-30', 1, NULL , NULL), + (1381, 'ORN', NULL, 30, 7, NULL, 1, 'ORN Company - Plant passport' , NULL); INSERT INTO `vn`.`taxArea` (`code`, `claveOperacionFactura`, `CodigoTransaccion`) VALUES @@ -594,20 +607,25 @@ INSERT INTO `vn`.`taxArea` (`code`, `claveOperacionFactura`, `CodigoTransaccion` ('NATIONAL', 0, 1), ('WORLD', 2, 15); +INSERT INTO vn.invoiceOutConfig + SET id = 1, + parallelism = 8; + INSERT INTO `vn`.`invoiceOutSerial` (`code`, `description`, `isTaxed`, `taxAreaFk`, `isCEE`, `type`) VALUES - ('A', 'Global nacional', 1, 'NATIONAL', 0, 'global'), - ('T', 'Española rapida', 1, 'NATIONAL', 0, 'quick'), - ('V', 'Intracomunitaria global', 0, 'CEE', 1, 'global'), - ('M', 'Múltiple nacional', 1, 'NATIONAL', 0, 'quick'), - ('E', 'Exportación rápida', 0, 'WORLD', 0, 'quick'); + ('A', 'Global nacional', 1, 'NATIONAL', 0, 'global'), + ('T', 'Española rapida', 1, 'NATIONAL', 0, 'quick'), + ('V', 'Intracomunitaria global', 0, 'CEE', 1, 'global'), + ('M', 'Múltiple nacional', 1, 'NATIONAL', 0, 'quick'), + ('R', 'Rectificativa', 1, 'NATIONAL', 0, NULL), + ('E', 'Exportación rápida', 0, 'WORLD', 0, 'quick'); INSERT INTO `vn`.`invoiceOut`(`id`, `serial`, `amount`, `issued`,`clientFk`, `created`, `companyFk`, `dued`, `booked`, `bankFk`, `hasPdf`) VALUES - (1, 'T', 1014.24, util.VN_CURDATE(), 1101, util.VN_CURDATE(), 442, util.VN_CURDATE(), util.VN_CURDATE(), 1, 0), + (1, 'T', 1026.24, util.VN_CURDATE(), 1101, util.VN_CURDATE(), 442, util.VN_CURDATE(), util.VN_CURDATE(), 1, 0), (2, 'T', 121.36, util.VN_CURDATE(), 1102, util.VN_CURDATE(), 442, util.VN_CURDATE(), util.VN_CURDATE(), 1, 0), (3, 'T', 8.88, util.VN_CURDATE(), 1103, util.VN_CURDATE(), 442, util.VN_CURDATE(), util.VN_CURDATE(), 1, 0), - (4, 'T', 8.88, util.VN_CURDATE(), 1103, util.VN_CURDATE(), 442, util.VN_CURDATE(), util.VN_CURDATE(), 1, 0), + (4, 'T', 8.88, util.VN_CURDATE(), 1104, util.VN_CURDATE(), 442, util.VN_CURDATE(), util.VN_CURDATE(), 1, 0), (5, 'A', 8.88, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1103, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 442, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 0); UPDATE `vn`.`invoiceOut` SET ref = 'T1111111' WHERE id = 1; @@ -616,9 +634,6 @@ UPDATE `vn`.`invoiceOut` SET ref = 'T3333333' WHERE id = 3; UPDATE `vn`.`invoiceOut` SET ref = 'T4444444' WHERE id = 4; UPDATE `vn`.`invoiceOut` SET ref = 'A1111111' WHERE id = 5; -INSERT INTO vn.invoiceOutConfig - SET parallelism = 8; - INSERT INTO `vn`.`invoiceOutTax` (`invoiceOutFk`, `taxableBase`, `vat`, `pgcFk`) VALUES (1, 895.76, 89.58, 4722000010), @@ -628,7 +643,7 @@ INSERT INTO `vn`.`invoiceOutTax` (`invoiceOutFk`, `taxableBase`, `vat`, `pgcFk`) (4, 8.07, 0.81, 4770000010), (5, 8.07, 0.81, 4770000010); -INSERT INTO `vn`.`expence`(`id`, `name`, `isWithheld`) +INSERT INTO `vn`.`expense`(`id`, `name`, `isWithheld`) VALUES (2000000000, 'Inmovilizado pendiente', 0), (2000000001, 'Compra de bienes de inmovilizado', 0), @@ -639,8 +654,9 @@ INSERT INTO `vn`.`expence`(`id`, `name`, `isWithheld`) (7001000000, 'Mercaderia', 0), (7050000000, 'Prestacion de servicios', 1); +INSERT INTO `vn`.`agencyTermConfig` VALUES ('6240000000','4721000015',21.0000000000,'Adquisiciones intracomunitarias de servicios'); -INSERT INTO `vn`.`invoiceOutExpence`(`id`, `invoiceOutFk`, `amount`, `expenceFk`, `created`) +INSERT INTO `vn`.`invoiceOutExpense`(`id`, `invoiceOutFk`, `amount`, `expenseFk`, `created`) VALUES (1, 1, 813.06, 2000000000, util.VN_CURDATE()), (2, 1, 33.80, 4751000000, util.VN_CURDATE()), @@ -652,19 +668,20 @@ INSERT INTO `vn`.`invoiceOutExpence`(`id`, `invoiceOutFk`, `amount`, `expenceFk` INSERT INTO `vn`.`zone` (`id`, `name`, `hour`, `agencyModeFk`, `travelingDays`, `price`, `bonus`, `itemMaxSize`) VALUES - (1, 'Zone pickup A', CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 1, 0, 0, 0, 100), - (2, 'Zone pickup B', CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 1, 0, 0, 0, 100), + (1, 'Zone pickup A', CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 1, 0, 1, 0, 100), + (2, 'Zone pickup B', CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 1, 0, 1, 0, 100), (3, 'Zone 247 A', CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 7, 1, 2, 0, 100), (4, 'Zone 247 B', CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 7, 1, 2, 0, 100), (5, 'Zone expensive A', CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 8, 1, 1000, 0, 100), (6, 'Zone expensive B', CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 8, 1, 1000, 0, 100), - (7, 'Zone refund', CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 23, 0, 0, 0, 100), - (8, 'Zone others', CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 10, 0, 0, 0, 100), - (9, 'Zone superMan', CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 2, 0, 0, 0, 100), - (10, 'Zone teleportation', CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 3, 0, 0, 0, 100), - (11, 'Zone pickup C', CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 1, 0, 0, 0, 100), - (12, 'Zone entanglement', CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 4, 0, 0, 0, 100), - (13, 'Zone quantum break', CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 5, 0, 0, 0, 100); + (7, 'Zone refund', CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 23, 0, 1, 0, 100), + (8, 'Zone others', CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 10, 0, 1, 0, 100), + (9, 'Zone superMan', CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 2, 0, 1, 0, 100), + (10, 'Zone teleportation', CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 3, 0, 1, 0, 100), + (11, 'Zone pickup C', CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 1, 0, 1, 0, 100), + (12, 'Zone entanglement', CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 4, 0, 1, 0, 100), + (13, 'Zone quantum break', CONCAT(util.VN_CURDATE(), ' ', TIME('23:59')), 5, 0, 1, 0, 100); + INSERT INTO `vn`.`zoneWarehouse` (`id`, `zoneFk`, `warehouseFk`) VALUES @@ -698,7 +715,7 @@ INSERT INTO `vn`.`zoneClosure` (`zoneFk`, `dated`, `hour`) (12, util.VN_CURDATE(), '23:59'), (13, util.VN_CURDATE(), '23:59'); -INSERT INTO `vn`.`zoneConfig` (`scope`) VALUES ('1'); +INSERT INTO `vn`.`zoneConfig` (`id`, `scope`) VALUES (1, '1'); INSERT INTO `vn`.`route`(`id`, `time`, `workerFk`, `created`, `vehicleFk`, `agencyModeFk`, `description`, `m3`, `cost`, `started`, `finished`, `zoneFk`) VALUES @@ -710,41 +727,41 @@ INSERT INTO `vn`.`route`(`id`, `time`, `workerFk`, `created`, `vehicleFk`, `agen (6, NULL, 57, util.VN_CURDATE(), 5, 7, 'sixth route', 1.7, 60, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 3), (7, NULL, 57, util.VN_CURDATE(), 6, 8, 'seventh route', 0, 70, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 5); -INSERT INTO `vn`.`ticket`(`id`, `priority`, `agencyModeFk`,`warehouseFk`,`routeFk`, `shipped`, `landed`, `clientFk`,`nickname`, `addressFk`, `refFk`, `isDeleted`, `zoneFk`, `zonePrice`, `zoneBonus`, `created`, `weight`) +INSERT INTO `vn`.`ticket`(`id`, `priority`, `agencyModeFk`,`warehouseFk`,`routeFk`, `shipped`, `landed`, `clientFk`,`nickname`, `addressFk`, `refFk`, `isDeleted`, `zoneFk`, `zonePrice`, `zoneBonus`, `created`, `weight`, `cmrFk`) VALUES - (1 , 3, 1, 1, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 1101, 'Bat cave', 121, NULL, 0, 1, 5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1), - (2 , 1, 1, 1, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 1104, 'Stark tower', 124, NULL, 0, 1, 5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2), - (3 , 1, 7, 1, 6, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -2 MONTH), INTERVAL +1 DAY), 1104, 'Stark tower', 124, NULL, 0, 3, 5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), NULL), - (4 , 3, 2, 1, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -3 MONTH), INTERVAL +1 DAY), 1104, 'Stark tower', 124, NULL, 0, 9, 5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH), NULL), - (5 , 3, 3, 3, 3, DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -4 MONTH), INTERVAL +1 DAY), 1104, 'Stark tower', 124, NULL, 0, 10, 5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH), NULL), - (6 , 1, 3, 3, 3, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 1101, 'Mountain Drive Gotham', 1, NULL, 0, 10, 5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), NULL), - (7 , NULL, 7, 1, 6, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1101, 'Mountain Drive Gotham', 1, NULL, 0, 3, 5, 1, util.VN_CURDATE(), NULL), - (8 , NULL, 7, 1, 6, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1101, 'Bat cave', 121, NULL, 0, 3, 5, 1, util.VN_CURDATE(), NULL), - (9 , NULL, 7, 1, 6, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1104, 'Stark tower', 124, NULL, 0, 3, 5, 1, util.VN_CURDATE(), NULL), - (10, 1, 1, 5, 1, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1102, 'Ingram Street', 2, NULL, 0, 1, 5, 1, util.VN_CURDATE(), NULL), - (11, 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), - (12, 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), - (13, 1, 7, 1, 6, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1103, 'Phone Box', 123, NULL, 0, 3, 5, 1, util.VN_CURDATE(), NULL), - (14, 1, 2, 1, NULL, util.VN_CURDATE(), util.VN_CURDATE(), 1104, 'Malibu Point', 4, NULL, 0, 9, 5, 1, util.VN_CURDATE(), NULL), - (15, 1, 7, 1, 6, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1105, 'An incredibly long alias for testing purposes', 125, NULL, 0, 3, 5, 1, util.VN_CURDATE(), NULL), - (16, 1, 7, 1, 6, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1106, 'Many Places', 126, NULL, 0, 3, 5, 1, util.VN_CURDATE(), NULL), - (17, 1, 7, 2, 6, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1106, 'Many Places', 126, NULL, 0, 3, 5, 1, util.VN_CURDATE(), NULL), - (18, 1, 4, 4, 4, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1108, 'Cerebro', 128, NULL, 0, 12, 5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL +12 HOUR), NULL), - (19, 1, 5, 5, NULL, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1109, 'Somewhere in Thailand', 129, NULL, 1, NULL, 5, 1, util.VN_CURDATE(), NULL), - (20, 1, 5, 5, 3, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL +1 MONTH), INTERVAL +1 DAY), 1109, 'Somewhere in Thailand', 129, NULL, 0, 13, 5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), NULL), - (21, NULL, 5, 5, 5, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL +1 MONTH), INTERVAL +1 DAY), 1109, 'Somewhere in Holland', 102, NULL, 0, 13, 5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), NULL), - (22, NULL, 5, 5, 5, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL +1 MONTH), INTERVAL +1 DAY), 1109, 'Somewhere in Japan', 103, NULL, 0, 13, 5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), NULL), - (23, NULL, 8, 1, 7, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1101, 'address 21', 121, NULL, 0, 5, 5, 1, util.VN_CURDATE(), NULL), - (24 ,NULL, 8, 1, 7, util.VN_CURDATE(), util.VN_CURDATE(), 1101, 'Bruce Wayne', 1, NULL, 0, 5, 5, 1, util.VN_CURDATE(), NULL), - (25 ,NULL, 8, 1, NULL, util.VN_CURDATE(), util.VN_CURDATE(), 1101, 'Bruce Wayne', 1, NULL, 0, 1, 5, 1, util.VN_CURDATE(), NULL), - (26 ,NULL, 8, 1, NULL, util.VN_CURDATE(), util.VN_CURDATE(), 1101, 'An incredibly long alias for testing purposes', 1, NULL, 0, 1, 5, 1, util.VN_CURDATE(), NULL), - (27 ,NULL, 8, 1, NULL, util.VN_CURDATE(), util.VN_CURDATE(), 1101, 'Wolverine', 1, NULL, 0, 1, 5, 1, util.VN_CURDATE(), NULL), - (28, 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), - (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), - (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), - (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), - (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); - + (1 , 3, 1, 1, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 1101, 'Bat cave', 121, NULL, 0, 1, 5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 1), + (2 , 1, 1, 1, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 1101, 'Bat cave', 1, NULL, 0, 1, 5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2, 2), + (3 , 1, 7, 1, 6, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -2 MONTH), INTERVAL +1 DAY), 1104, 'Stark tower', 124, NULL, 0, 3, 5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), NULL, 3), + (4 , 3, 2, 1, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -3 MONTH), INTERVAL +1 DAY), 1104, 'Stark tower', 124, NULL, 0, 9, 5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH), NULL, NULL), + (5 , 3, 3, 3, 3, DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -4 MONTH), INTERVAL +1 DAY), 1104, 'Stark tower', 124, NULL, 0, 10, 5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH), NULL, NULL), + (6 , 1, 3, 3, 3, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 1101, 'Mountain Drive Gotham', 1, NULL, 0, 10, 5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), NULL, NULL), + (7 , NULL, 7, 1, 6, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1101, 'Mountain Drive Gotham', 1, NULL, 0, 3, 5, 1, util.VN_CURDATE(), NULL, NULL), + (8 , NULL, 7, 1, 6, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1101, 'Bat cave', 121, NULL, 0, 3, 5, 1, util.VN_CURDATE(), NULL, NULL), + (9 , NULL, 7, 1, 6, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1104, 'Stark tower', 124, NULL, 0, 3, 5, 1, util.VN_CURDATE(), NULL, NULL), + (10, 1, 1, 5, 1, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1102, 'Ingram Street', 2, NULL, 0, 1, 5, 1, util.VN_CURDATE(), NULL, NULL), + (11, 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), + (12, 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), + (13, 1, 7, 1, 6, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1103, 'Phone Box', 123, NULL, 0, 3, 5, 1, util.VN_CURDATE(), NULL, NULL), + (14, 1, 2, 1, NULL, util.VN_CURDATE(), util.VN_CURDATE(), 1104, 'Malibu Point', 4, NULL, 0, 9, 5, 1, util.VN_CURDATE(), NULL, NULL), + (15, 1, 7, 1, 6, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1105, 'An incredibly long alias for testing purposes', 125, NULL, 0, 3, 5, 1, util.VN_CURDATE(), NULL, NULL), + (16, 1, 7, 1, 6, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1106, 'Many Places', 126, NULL, 0, 3, 5, 1, util.VN_CURDATE(), NULL, NULL), + (17, 1, 7, 2, 6, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1106, 'Many Places', 126, NULL, 0, 3, 5, 1, util.VN_CURDATE(), NULL, NULL), + (18, 1, 4, 4, 4, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1108, 'Cerebro', 128, NULL, 0, 12, 5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL +12 HOUR), NULL, NULL), + (19, 1, 5, 5, NULL, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1109, 'Somewhere in Thailand', 129, NULL, 1, NULL, 5, 1, util.VN_CURDATE(), NULL, NULL), + (20, 1, 5, 5, 3, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL +1 MONTH), INTERVAL +1 DAY), 1109, 'Somewhere in Thailand', 129, NULL, 0, 13, 5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), NULL, NULL), + (21, NULL, 5, 5, 5, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL +1 MONTH), INTERVAL +1 DAY), 1109, 'Somewhere in Holland', 102, NULL, 0, 13, 5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), NULL, NULL), + (22, NULL, 5, 5, 5, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL +1 MONTH), INTERVAL +1 DAY), 1109, 'Somewhere in Japan', 103, NULL, 0, 13, 5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL +1 MONTH), NULL, NULL), + (23, NULL, 8, 1, 7, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1101, 'address 21', 121, NULL, 0, 5, 5, 1, util.VN_CURDATE(), NULL, NULL), + (24 ,NULL, 8, 1, 7, util.VN_CURDATE(), util.VN_CURDATE(), 1101, 'Bruce Wayne', 1, NULL, 0, 5, 5, 1, util.VN_CURDATE(), NULL, NULL), + (25 ,NULL, 8, 1, NULL, util.VN_CURDATE(), util.VN_CURDATE(), 1101, 'Bruce Wayne', 1, NULL, 0, 1, 5, 1, util.VN_CURDATE(), NULL, NULL), + (26 ,NULL, 8, 1, NULL, util.VN_CURDATE(), util.VN_CURDATE(), 1101, 'An incredibly long alias for testing purposes', 1, NULL, 0, 1, 5, 1, util.VN_CURDATE(), NULL, NULL), + (27 ,NULL, 8, 1, NULL, util.VN_CURDATE(), util.VN_CURDATE(), 1101, 'Wolverine', 1, NULL, 0, 1, 5, 1, util.VN_CURDATE(), NULL, NULL), + (28, 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), + (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), + (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'), @@ -765,7 +782,7 @@ INSERT INTO `vn`.`ticketObservation`(`id`, `ticketFk`, `observationTypeFk`, `des -- FIX for state hours on local, inter_afterInsert -- UPDATE vncontrol.inter SET odbc_date = DATE_ADD(util.VN_CURDATE(), INTERVAL -10 SECOND); -INSERT INTO `vn`.`ticketTracking`(`ticketFk`, `stateFk`, `workerFk`, `created`) +INSERT INTO `vn`.`ticketTracking`(`ticketFk`, `stateFk`, `userFk`, `created`) VALUES (1, 16, 5 , DATE_ADD(util.VN_NOW(), INTERVAL -1 MONTH)), (2, 16, 5 , DATE_ADD(util.VN_NOW(), INTERVAL -1 MONTH)), @@ -809,6 +826,7 @@ INSERT INTO `vn`.`config`(`id`, `mdbServer`, `fakeEmail`, `defaultersMaxAmount`, VALUES (1, 'beta-server', 'nightmare@mydomain.com', '200', DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH)); + INSERT INTO `vn`.`greugeType`(`id`, `name`, `code`) VALUES (1, 'Diff', 'diff'), @@ -920,26 +938,26 @@ INSERT INTO `vn`.`itemFamily`(`code`, `description`) ('SER', 'Services'), ('VT', 'Sales'); -INSERT INTO `vn`.`item`(`id`, `typeFk`, `stems`, `originFk`, `description`, `producerFk`, `intrastatFk`, `expenceFk`, - `comment`, `relevancy`, `image`, `subName`, `minPrice`, `stars`, `family`, `isFloramondo`, `genericFk`, `itemPackingTypeFk`, `hasMinPrice`, `packingShelve`, `weightByPiece`) +INSERT INTO `vn`.`item`(`id`, `typeFk`, `stems`, `originFk`, `description`, `producerFk`, `intrastatFk`, `expenseFk`, + `comment`, `relevancy`, `image`, `subName`, `minPrice`, `family`, `isFloramondo`, `genericFk`, `itemPackingTypeFk`, `hasMinPrice`, `weightByPiece`) VALUES - (1, 2, 1, 1, NULL, 1, 06021010, 2000000000, NULL, 0, '1', NULL, 0, 1, 'EMB', 0, NULL, 'V', 0, 15,3), - (2, 2, 1, 2, NULL, 1, 06021010, 2000000000, NULL, 0, '2', NULL, 0, 2, 'VT', 0, NULL, 'H', 0, 10,2), - (3, 1, 1, 3, NULL, 1, 05080000, 4751000000, NULL, 0, '3', NULL, 0, 5, 'VT', 0, NULL, NULL, 0, 5,5), - (4, 1, 1, 1, 'Increases block', 1, 05080000, 4751000000, NULL, 0, '4', NULL, 0, 3, 'VT', 0, NULL, NULL, 0, NULL,NULL), - (5, 3, 1, 2, NULL, 2, 06021010, 4751000000, NULL, 0, '5', NULL, 0, 3, 'VT', 0, NULL, NULL, 0, NULL,NULL), - (6, 5, 1, 2, NULL, NULL, 06021010, 4751000000, NULL, 0, '6', NULL, 0, 4, 'VT', 0, NULL, NULL, 0, NULL,NULL), - (7, 5, 1, 2, NULL, NULL, 06021010, 4751000000, NULL, 0, '7', NULL, 0, 4, 'VT', 0, NULL, NULL, 0, NULL,NULL), - (8, 2, 1, 1, NULL, 1, 06021010, 2000000000, NULL, 0, '8', NULL, 0, 5, 'VT', 0, NULL, NULL, 0, NULL,NULL), - (9, 2, 1, 2, NULL, 1, 06021010, 2000000000, NULL, 0, '9', NULL, 0, 4, 'VT', 1, NULL, NULL, 0, NULL,NULL), - (10, 1, 1, 3, NULL, 1, 05080000, 4751000000, NULL, 0, '10', NULL, 0, 4, 'VT', 0, NULL, NULL, 0, NULL,NULL), - (11, 1, 1, 1, NULL, 1, 05080000, 4751000000, NULL, 0, '11', NULL, 0, 4, 'VT', 0, NULL, NULL, 0, NULL,NULL), - (12, 3, 1, 2, NULL, 2, 06021010, 4751000000, NULL, 0, '12', NULL, 0, 3, 'VT', 0, NULL, NULL, 0, NULL,NULL), - (13, 5, 1, 2, NULL, NULL, 06021010, 4751000000, NULL, 0, '13', NULL, 1, 2, 'VT', 1, NULL, NULL, 1, NULL,NULL), - (14, 5, 1, 2, NULL, NULL, 06021010, 4751000000, NULL, 0, '', NULL, 0, 4, 'VT', 1, NULL, NULL, 0, NULL,NULL), - (15, 4, NULL, 1, NULL, NULL, 06021010, 4751000000, NULL, 0, '', NULL, 0, 0, 'EMB', 0, NULL, NULL, 0, NULL,NULL), - (16, 6, NULL, 1, NULL, NULL, 06021010, 4751000000, NULL, 0, '', NULL, 0, 0, 'EMB', 0, NULL, NULL, 0, NULL,NULL), - (71, 6, NULL, 1, NULL, NULL, 06021010, 4751000000, NULL, 0, '', NULL, 0, 0, 'VT', 0, NULL, NULL, 0, NULL,NULL); + (1, 2, 1, 1, NULL, 1, 06021010, 2000000000, NULL, 0, '1', NULL, 0, 'EMB', 0, NULL, 'V', 0, 3), + (2, 2, 1, 2, NULL, 1, 06021010, 2000000000, NULL, 0, '2', NULL, 0, 'VT', 0, NULL, 'H', 0, 2), + (3, 1, 1, 3, NULL, 1, 05080000, 4751000000, NULL, 0, '3', NULL, 0, 'VT', 0, NULL, NULL, 0, 5), + (4, 1, 1, 1, 'Increases block', 1, 05080000, 4751000000, NULL, 0, '4', NULL, 0, 'VT', 0, NULL, NULL, 0, NULL), + (5, 3, 1, 2, NULL, 2, 06021010, 4751000000, NULL, 0, '5', NULL, 0, 'VT', 0, NULL, NULL, 0, NULL), + (6, 5, 1, 2, NULL, NULL, 06021010, 4751000000, NULL, 0, '6', NULL, 0, 'VT', 0, NULL, NULL, 0, NULL), + (7, 5, 1, 2, NULL, NULL, 06021010, 4751000000, NULL, 0, '7', NULL, 0, 'VT', 0, NULL, NULL, 0, NULL), + (8, 2, 1, 1, NULL, 1, 06021010, 2000000000, NULL, 0, '8', NULL, 0, 'VT', 0, NULL, NULL, 0, NULL), + (9, 2, 1, 2, NULL, 1, 06021010, 2000000000, NULL, 0, '9', NULL, 0, 'VT', 1, NULL, NULL, 0, NULL), + (10, 1, 1, 3, NULL, 1, 05080000, 4751000000, NULL, 0, '10', NULL, 0, 'VT', 0, NULL, NULL, 0, NULL), + (11, 1, 1, 1, NULL, 1, 05080000, 4751000000, NULL, 0, '11', NULL, 0, 'VT', 0, NULL, NULL, 0, NULL), + (12, 3, 1, 2, NULL, 2, 06021010, 4751000000, NULL, 0, '12', NULL, 0, 'VT', 0, NULL, NULL, 0, NULL), + (13, 5, 1, 2, NULL, NULL, 06021010, 4751000000, NULL, 0, '13', NULL, 1, 'VT', 1, NULL, NULL, 1, NULL), + (14, 5, 1, 2, NULL, NULL, 06021010, 4751000000, NULL, 0, '', NULL, 0, 'VT', 1, NULL, NULL, 0, NULL), + (15, 4, NULL, 1, NULL, NULL, 06021010, 4751000000, NULL, 0, '', NULL, 0, 'EMB', 0, NULL, NULL, 0, NULL), + (16, 6, NULL, 1, NULL, NULL, 06021010, 4751000000, NULL, 0, '', NULL, 0, 'EMB', 0, NULL, NULL, 0, NULL), + (71, 6, NULL, 1, NULL, NULL, 06021010, 4751000000, NULL, 0, '', NULL, 0, 'VT', 0, NULL, NULL, 0, NULL); -- Update the taxClass after insert of the items UPDATE `vn`.`itemTaxCountry` SET `taxClassFk` = 2 @@ -966,6 +984,10 @@ INSERT INTO `vn`.`packaging`(`id`, `volume`, `width`, `height`, `depth`, `isPack ('cc', 1640038.00, 56.00, 220.00, 128.00, 1, util.VN_CURDATE(), 15, 90.00), ('pallet 100', 2745600.00, 100.00, 220.00, 120.00, 1, util.VN_CURDATE(), 16, 0.00); +INSERT INTO `vn`.`packagingConfig`(`id`, `upperGap`, `defaultSmallPackageFk`, `defaultBigPackageFk`) + VALUES + (1, '10', 1, 'pallet 100'); + INSERT INTO `vn`.`expeditionStateType`(`id`, `description`, `code`) VALUES (1, 'En reparto', 'ON DELIVERY'), @@ -1218,6 +1240,7 @@ INSERT INTO `vn`.`train`(`id`, `name`) INSERT INTO `vn`.`operator` (`workerFk`, `numberOfWagons`, `trainFk`, `itemPackingTypeFk`, `warehouseFk`, `sectorFk`, `labelerFk`) VALUES ('1106', '1', '1', 'H', '1', '1', '1'), + ('9', '2', '1', 'H', '1', '1', '1'), ('1107', '1', '1', 'V', '1', '1', '1'); INSERT INTO `vn`.`collection`(`id`, `workerFk`, `stateFk`, `created`, `trainFk`) @@ -1414,16 +1437,29 @@ INSERT INTO `vn`.`ticketWeekly`(`ticketFk`, `weekDay`) (5, 6), (15, 6); -INSERT INTO `vn`.`travel`(`id`,`shipped`, `landed`, `warehouseInFk`, `warehouseOutFk`, `agencyModeFk`, `m3`, `kg`,`ref`, `totalEntries`, `cargoSupplierFk`) +INSERT INTO `vn`.`awb` (id, code, package, weight, created, amount, transitoryFk, taxFk) VALUES - (1, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), 1, 2, 1, 100.00, 1000, 'first travel', 1, 1), - (2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 2, 1, 150, 2000, 'second travel', 2, 2), - (3, util.VN_CURDATE(), util.VN_CURDATE(), 1, 2, 1, 0.00, 0.00, 'third travel', 1, 1), - (4, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 3, 1, 50.00, 500, 'fourth travel', 0, 2), - (5, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 3, 3, 1, 50.00, 500, 'fifth travel', 1, 1), - (6, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 4, 4, 1, 50.00, 500, 'sixth travel', 1, 2), - (7, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 4, 1, 50.00, 500, 'seventh travel', 2, 1), - (8, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 1, 1, 50.00, 500, 'eight travel', 1, 2); + (1, '07546501420', 67, 671, util.VN_CURDATE(), 1761, 1, 1), + (2, '07546491421', 252, 2769, util.VN_CURDATE(), 5231, 1, 1), + (3, '07546500823', 102, 1495, util.VN_CURDATE(), 3221, 1, 1), + (4, '99610288821', 252, 2777, util.VN_CURDATE(), 3641, 1, 1), + (5, '07546500834', 229, 3292, util.VN_CURDATE(), 6601, 2, 1), + (6, '22101929561', 37, 458, util.VN_CURDATE(), 441, 2, 1), + (7, '07546491432', 258, 3034, util.VN_CURDATE(), 6441, 2, 1), + (8, '99610288644', 476, 4461, util.VN_CURDATE(), 5751, 442, 1), + (9, '99610289193', 302, 2972, util.VN_CURDATE(), 3871, 442, 1), + (10, '07546500856', 185, 2364, util.VN_CURDATE(), 5321, 442, 1); + +INSERT INTO `vn`.`travel`(`id`,`shipped`, `landed`, `warehouseInFk`, `warehouseOutFk`, `agencyModeFk`, `m3`, `kg`,`ref`, `totalEntries`, `cargoSupplierFk`, `awbFK`) + VALUES + (1, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), 1, 2, 1, 100.00, 1000, 'first travel', 1, 1, 1), + (2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 2, 1, 150, 2000, 'second travel', 2, 2, 2), + (3, util.VN_CURDATE(), util.VN_CURDATE(), 1, 2, 1, 0.00, 0.00, 'third travel', 1, 1, 3), + (4, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 3, 1, 50.00, 500, 'fourth travel', 0, 2, 4), + (5, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 3, 3, 1, 50.00, 500, 'fifth travel', 1, 1, 5), + (6, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 4, 4, 1, 50.00, 500, 'sixth travel', 1, 2, 6), + (7, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 4, 1, 50.00, 500, 'seventh travel', 2, 1, 7), + (8, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 1, 1, 50.00, 500, 'eight travel', 1, 2, 10); INSERT INTO `vn`.`entry`(`id`, `supplierFk`, `created`, `travelFk`, `isConfirmed`, `companyFk`, `invoiceNumber`, `reference`, `isExcludedFromAvailable`, `isRaid`, `evaNotes`) VALUES @@ -1454,10 +1490,10 @@ INSERT INTO `bs`.`waste`(`buyer`, `year`, `week`, `family`, `itemFk`, `itemTypeF ('HankPym', YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)), WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1), 'Miscellaneous Accessories', 6, 1, '186', '0', '0.0'), ('HankPym', YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)), WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1), 'Adhesives', 7, 1, '277', '0', '0.0'); -INSERT INTO `vn`.`buy`(`id`,`entryFk`,`itemFk`,`buyingValue`,`quantity`,`packageFk`,`stickers`,`freightValue`,`packageValue`,`comissionValue`,`packing`,`grouping`,`groupingMode`,`location`,`price1`,`price2`,`price3`, `printedStickers`,`isChecked`,`isIgnored`,`weight`, `created`) +INSERT INTO `vn`.`buy`(`id`,`entryFk`,`itemFk`,`buyingValue`,`quantity`,`packagingFk`,`stickers`,`freightValue`,`packageValue`,`comissionValue`,`packing`,`grouping`,`groupingMode`,`location`,`price1`,`price2`,`price3`, `printedStickers`,`isChecked`,`isIgnored`,`weight`, `created`) VALUES - (1, 1, 1, 50, 5000, 4, 1, 1.500, 1.500, 0.000, 1, 1, 1, NULL, 0.00, 99.6, 99.4, 0, 1, 0, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH)), - (2, 2, 1, 50, 100, 4, 1, 1.500, 1.500, 0.000, 1, 1, 1, NULL, 0.00, 99.6, 99.4, 0, 1, 0, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)), + (1, 1, 1, 50, 5000, 4, 1, 1.500, 1.500, 0.000, 1, 1, 1, NULL, 0.00, 99.6, 99.4, 0, 1, 0, 1, util.VN_CURDATE() - INTERVAL 2 MONTH), + (2, 2, 1, 50, 100, 4, 1, 1.500, 1.500, 0.000, 1, 1, 1, NULL, 0.00, 99.6, 99.4, 0, 1, 0, 1, util.VN_CURDATE() - INTERVAL 1 MONTH), (3, 3, 1, 50, 100, 4, 1, 1.500, 1.500, 0.000, 1, 1, 0, NULL, 0.00, 99.6, 99.4, 0, 1, 0, 1, util.VN_CURDATE()), (4, 2, 2, 5, 450, 3, 1, 1.000, 1.000, 0.000, 10, 10, 0, NULL, 0.00, 7.30, 7.00, 0, 1, 0, 2.5, util.VN_CURDATE()), (5, 3, 3, 55, 500, 5, 1, 1.000, 1.000, 0.000, 1, 1, 0, NULL, 0.00, 78.3, 75.6, 0, 1, 0, 2.5, util.VN_CURDATE()), @@ -1785,19 +1821,16 @@ INSERT INTO `vn`.`clientSample`(`id`, `clientFk`, `typeFk`, `created`, `workerFk INSERT INTO `vn`.`claimState`(`id`, `code`, `description`, `roleFk`, `priority`, `hasToNotify`) VALUES ( 1, 'pending', 'Pendiente', 1, 1, 0), - ( 2, 'managed', 'Gestionado', 72, 5, 0), ( 3, 'resolved', 'Resuelto', 72, 7, 0), ( 4, 'canceled', 'Anulado', 72, 6, 1), - ( 5, 'incomplete', 'Incompleta', 1, 3, 1), - ( 6, 'mana', 'Mana', 72, 4, 0), - ( 7, 'lack', 'Faltas', 72, 2, 0); + ( 5, 'incomplete', 'Incompleta', 1, 3, 1); -INSERT INTO `vn`.`claim`(`id`, `ticketCreated`, `claimStateFk`, `clientFk`, `workerFk`, `responsibility`, `isChargedToMana`, `created`, `packages`, `rma`, `ticketFk`) +INSERT INTO `vn`.`claim`(`id`, `ticketCreated`, `claimStateFk`, `clientFk`, `workerFk`, `responsibility`, `isChargedToMana`, `created`, `packages`, `ticketFk`) VALUES - (1, util.VN_CURDATE(), 1, 1101, 18, 3, 0, util.VN_CURDATE(), 0, '02676A049183', 11), - (2, util.VN_CURDATE(), 2, 1101, 18, 3, 0, util.VN_CURDATE(), 1, NULL, 16), - (3, util.VN_CURDATE(), 3, 1101, 18, 1, 1, util.VN_CURDATE(), 5, NULL, 7), - (4, util.VN_CURDATE(), 3, 1104, 18, 5, 0, util.VN_CURDATE(), 10, NULL, 8); + (1, util.VN_CURDATE(), 1, 1101, 18, 3, 0, util.VN_CURDATE(), 0, 11), + (2, util.VN_CURDATE(), 4, 1101, 18, 3, 0, util.VN_CURDATE(), 1, 16), + (3, util.VN_CURDATE(), 3, 1101, 18, 1, 1, util.VN_CURDATE(), 5, 7), + (4, util.VN_CURDATE(), 3, 1104, 18, 5, 0, util.VN_CURDATE(), 10, 8); INSERT INTO `vn`.`claimObservation` (`claimFk`, `workerFk`, `text`, `created`) VALUES @@ -1836,8 +1869,7 @@ INSERT INTO `vn`.`claimEnd`(`id`, `saleFk`, `claimFk`, `workerFk`, `claimDestina INSERT INTO `vn`.`claimConfig`(`id`, `maxResponsibility`) VALUES - (1, 50), - (2, 30); + (1, 50); INSERT INTO `vn`.`claimRatio`(`clientFk`, `yearSale`, `claimAmount`, `claimingRate`, `priceIncreasing`, `packingRate`) VALUES @@ -1846,14 +1878,6 @@ INSERT INTO `vn`.`claimRatio`(`clientFk`, `yearSale`, `claimAmount`, `claimingRa (1103, 2000, 0.00, 0.00, 0.02, 1.00), (1104, 2500, 150.00, 0.02, 0.10, 1.00); -INSERT INTO vn.claimRma (`id`, `code`, `created`, `workerFk`) - VALUES - (1, '02676A049183', DEFAULT, 1106), - (2, '02676A049183', DEFAULT, 1106), - (3, '02676A049183', DEFAULT, 1107), - (4, '02676A049183', DEFAULT, 1107), - (5, '01837B023653', DEFAULT, 1106); - INSERT INTO `vn`.`claimLog` (`originFk`, userFk, `action`, changedModel, oldInstance, newInstance, changedModelId, `description`) VALUES (1, 18, 'update', 'Claim', '{"hasToPickUp":false}', '{"hasToPickUp":true}', 1, NULL), @@ -1933,7 +1957,7 @@ INSERT INTO `vn`.`ticketRequest`(`id`, `description`, `requesterFk`, `attenderFk (4, 'Melee weapon combat first 15cm', 18, 35, 15, NULL, 1.30, NULL, NULL, 11, util.VN_CURDATE()), (5, 'Melee weapon combat first 15cm', 18, 35, 15, 4, 1.30, 0, NULL, 18, util.VN_CURDATE()); -INSERT INTO `vn`.`ticketServiceType`(`id`, `name`, `expenceFk`) +INSERT INTO `vn`.`ticketServiceType`(`id`, `name`, `expenseFk`) VALUES (1, 'Porte Agencia', 7001000000), (2, 'Portes Retorno', 7001000000), @@ -1956,10 +1980,10 @@ INSERT INTO `pbx`.`sip`(`user_id`, `extension`) (5, 1102), (9, 1201); -INSERT INTO `vn`.`professionalCategory` (`id`, `name`, `level`, `dayBreak`) +INSERT INTO `vn`.`professionalCategory` (`id`, `description`) VALUES - (1, 'employee', NULL, NULL), - (2, 'florist', NULL, NULL); + (1, 'employee'), + (2, 'florist'); INSERT INTO `vn`.`calendarType` (`id`, `description`, `hoursWeek`, `isPartial`) VALUES @@ -2003,6 +2027,10 @@ UPDATE `vn`.`business` b SET b.`departmentFk` = 43 WHERE b.id IN(18, 19); +UPDATE `vn`.`business` b + SET b.`started` = b.`started` - INTERVAL 100 DAY + WHERE b.id = 1107; + INSERT INTO `vn`.`workCenterHoliday` (`workCenterFk`, `days`, `year`) VALUES ('1', '27.5', YEAR(util.VN_CURDATE())), @@ -2051,22 +2079,22 @@ INSERT INTO `vn`.`absenceType` (`id`, `name`, `rgb`, `code`, `holidayEntitlement INSERT INTO `vn`.`calendar` (`businessFk`, `dayOffTypeFk`, `dated`) VALUES - (1, 6, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, DATE_ADD(util.VN_CURDATE(), INTERVAL -10 DAY), DATE_ADD(util.VN_CURDATE(), INTERVAL 10 DAY))), - (1106, 1, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, DATE_ADD(util.VN_CURDATE(), INTERVAL -10 DAY), DATE_ADD(util.VN_CURDATE(), INTERVAL 10 DAY))), - (1106, 1, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, DATE_ADD(util.VN_CURDATE(), INTERVAL -11 DAY), DATE_ADD(util.VN_CURDATE(), INTERVAL 11 DAY))), - (1106, 1, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, DATE_ADD(util.VN_CURDATE(), INTERVAL -12 DAY), DATE_ADD(util.VN_CURDATE(), INTERVAL 12 DAY))), - (1106, 1, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, DATE_ADD(util.VN_CURDATE(), INTERVAL -20 DAY), DATE_ADD(util.VN_CURDATE(), INTERVAL 20 DAY))), - (1106, 2, IF(MONTH(util.VN_CURDATE()) >= 1 AND DAY(util.VN_CURDATE()) > 20, DATE_ADD(util.VN_CURDATE(), INTERVAL -13 DAY), DATE_ADD(util.VN_CURDATE(), INTERVAL 8 DAY))), - (1106, 1, IF(MONTH(util.VN_CURDATE()) >= 1 AND DAY(util.VN_CURDATE()) > 20, DATE_ADD(util.VN_CURDATE(), INTERVAL -14 DAY), DATE_ADD(util.VN_CURDATE(), INTERVAL 9 DAY))), - (1106, 2, IF(MONTH(util.VN_CURDATE()) >= 1 AND DAY(util.VN_CURDATE()) > 20, DATE_ADD(util.VN_CURDATE(), INTERVAL -15 DAY), DATE_ADD(util.VN_CURDATE(), INTERVAL 7 DAY))), - (1107, 1, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, DATE_ADD(util.VN_CURDATE(), INTERVAL -10 DAY), DATE_ADD(util.VN_CURDATE(), INTERVAL 10 DAY))), - (1107, 1, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, DATE_ADD(util.VN_CURDATE(), INTERVAL -11 DAY), DATE_ADD(util.VN_CURDATE(), INTERVAL 11 DAY))), - (1107, 1, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, DATE_ADD(util.VN_CURDATE(), INTERVAL -12 DAY), DATE_ADD(util.VN_CURDATE(), INTERVAL 12 DAY))), - (1107, 1, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, DATE_ADD(util.VN_CURDATE(), INTERVAL -20 DAY), DATE_ADD(util.VN_CURDATE(), INTERVAL 20 DAY))), - (1107, 2, IF(MONTH(util.VN_CURDATE()) >= 1 AND DAY(util.VN_CURDATE()) > 20, DATE_ADD(util.VN_CURDATE(), INTERVAL -13 DAY), DATE_ADD(util.VN_CURDATE(), INTERVAL 8 DAY))), - (1107, 1, IF(MONTH(util.VN_CURDATE()) >= 1 AND DAY(util.VN_CURDATE()) > 20, DATE_ADD(util.VN_CURDATE(), INTERVAL -14 DAY), DATE_ADD(util.VN_CURDATE(), INTERVAL 9 DAY))), - (1107, 2, IF(MONTH(util.VN_CURDATE()) >= 1 AND DAY(util.VN_CURDATE()) > 20, DATE_ADD(util.VN_CURDATE(), INTERVAL -15 DAY), DATE_ADD(util.VN_CURDATE(), INTERVAL 7 DAY))), - (1107, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL - 16 DAY)); + (1, 6, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, util.VN_CURDATE() - INTERVAL 10 DAY, util.VN_CURDATE() + INTERVAL 10 DAY)), + (1106, 1, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, util.VN_CURDATE() - INTERVAL 10 DAY, util.VN_CURDATE() + INTERVAL 10 DAY)), + (1106, 1, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, util.VN_CURDATE() - INTERVAL 11 DAY, util.VN_CURDATE() + INTERVAL 11 DAY)), + (1106, 1, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, util.VN_CURDATE() - INTERVAL 12 DAY, util.VN_CURDATE() + INTERVAL 12 DAY)), + (1106, 1, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, util.VN_CURDATE() - INTERVAL 20 DAY, util.VN_CURDATE() + INTERVAL 20 DAY)), + (1106, 2, IF(MONTH(util.VN_CURDATE()) >= 1 AND DAY(util.VN_CURDATE()) > 20, util.VN_CURDATE() - INTERVAL 13 DAY, util.VN_CURDATE() + INTERVAL 8 DAY)), + (1106, 1, IF(MONTH(util.VN_CURDATE()) >= 1 AND DAY(util.VN_CURDATE()) > 20, util.VN_CURDATE() - INTERVAL 14 DAY, util.VN_CURDATE() + INTERVAL 9 DAY)), + (1106, 2, IF(MONTH(util.VN_CURDATE()) >= 1 AND DAY(util.VN_CURDATE()) > 20, util.VN_CURDATE() - INTERVAL 15 DAY, util.VN_CURDATE() + INTERVAL 7 DAY)), + (1107, 1, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, util.VN_CURDATE() - INTERVAL 10 DAY, util.VN_CURDATE() + INTERVAL 10 DAY)), + (1107, 1, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, util.VN_CURDATE() - INTERVAL 11 DAY, util.VN_CURDATE() + INTERVAL 11 DAY)), + (1107, 1, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, util.VN_CURDATE() - INTERVAL 12 DAY, util.VN_CURDATE() + INTERVAL 12 DAY)), + (1107, 1, IF(MONTH(util.VN_CURDATE()) = 12 AND DAY(util.VN_CURDATE()) > 10, util.VN_CURDATE() - INTERVAL 20 DAY, util.VN_CURDATE() + INTERVAL 20 DAY)), + (1107, 2, IF(MONTH(util.VN_CURDATE()) >= 1 AND DAY(util.VN_CURDATE()) > 20, util.VN_CURDATE() - INTERVAL 13 DAY, util.VN_CURDATE() + INTERVAL 8 DAY)), + (1107, 1, IF(MONTH(util.VN_CURDATE()) >= 1 AND DAY(util.VN_CURDATE()) > 20, util.VN_CURDATE() - INTERVAL 14 DAY, util.VN_CURDATE() + INTERVAL 9 DAY)), + (1107, 2, IF(MONTH(util.VN_CURDATE()) >= 1 AND DAY(util.VN_CURDATE()) > 20, util.VN_CURDATE() - INTERVAL 15 DAY, util.VN_CURDATE() + INTERVAL 7 DAY)), + (1107, 2, util.VN_CURDATE() - INTERVAL 16 DAY); INSERT INTO `vn`.`smsConfig` (`id`, `uri`, `title`, `apiKey`) VALUES @@ -2333,9 +2361,11 @@ INSERT INTO `vn`.`zoneEvent`(`zoneFk`, `type`, `weekDays`) (8, 'indefinitely', 'mon,tue,wed,thu,fri,sat,sun'), (10, 'indefinitely', 'mon,tue,wed,thu,fri,sat,sun'); -INSERT INTO `vn`.`zoneEvent`(`zoneFk`, `type`, `started`, `ended`) +INSERT INTO `vn`.`zoneEvent`(`zoneFk`, `type`, `started`, `ended`, `weekDays`) VALUES - (9, 'range', DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR), DATE_ADD(util.VN_CURDATE(), INTERVAL +1 YEAR)); + (9, 'range', DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR), DATE_ADD(util.VN_CURDATE(), INTERVAL +1 YEAR), 'mon'), + (9, 'range', util.VN_CURDATE(), NULL, 'tue'), + (9, 'range', NULL, util.VN_CURDATE(), 'wed'); INSERT INTO `vn`.`workerTimeControl`(`userFk`, `timed`, `manual`, `direction`, `isSendMail`) VALUES @@ -2348,28 +2378,30 @@ INSERT INTO `vn`.`workerTimeControl`(`userFk`, `timed`, `manual`, `direction`, ` (1107, CONCAT(util.VN_CURDATE(), ' 10:20'), TRUE, 'middle', 1), (1107, CONCAT(util.VN_CURDATE(), ' 14:50'), TRUE, 'out', 1); -INSERT INTO `vn`.`dmsType`(`id`, `name`, `path`, `readRoleFk`, `writeRoleFk`, `code`) +INSERT INTO `vn`.`dmsType`(`id`, `name`, `readRoleFk`, `writeRoleFk`, `code`) VALUES - (1, 'Facturas Recibidas', 'recibidas', NULL, NULL, 'invoiceIn'), - (2, 'Doc oficial', 'oficial', NULL, NULL, 'officialDoc'), - (3, 'Laboral', 'laboral', 37, 37, 'hhrrData'), - (4, 'Albaranes recibidos', 'entradas', NULL, NULL, 'deliveryNote'), - (5, 'Otros', 'otros', 1, 1, 'miscellaneous'), - (6, 'Pruebas', 'pruebas', NULL, NULL, 'tests'), - (7, 'IAE Clientes', 'IAE_Clientes', 1, 1, 'economicActivitiesTax'), - (8, 'Fiscal', 'fiscal', NULL, NULL, 'fiscal'), - (9, 'Vehiculos', 'vehiculos', NULL, NULL, 'vehicles'), - (10, 'Plantillas', 'plantillas', NULL, NULL, 'templates'), - (11, 'Contratos', 'contratos', NULL, NULL, 'contracts'), - (12, 'ley de pagos', 'ley pagos', 1, 1, 'paymentsLaw'), - (13, 'Basura', 'basura', 1, 1, 'trash'), - (14, 'Ticket', 'tickets', 1, 1, 'ticket'), - (15, 'Presupuestos', 'Presupuestos', NULL, NULL, 'budgets'), - (16, 'Logistica', 'logistica', NULL, NULL, 'logistics'), - (17, 'cmr', 'cmr', NULL, NULL, 'cmr'), - (18, 'dua', 'dua', NULL, NULL, 'dua'), - (19, 'inmovilizado', 'inmovilizado', NULL, NULL, 'fixedAssets'), - (20, 'Reclamación', 'reclamacion', 1, 1, 'claim'); + (1, 'Facturas Recibidas', NULL, NULL, 'invoiceIn'), + (2, 'Doc oficial', NULL, NULL, 'officialDoc'), + (3, 'Laboral', 37, 37, 'hhrrData'), + (4, 'Albaranes recibidos', NULL, NULL, 'deliveryNote'), + (5, 'Otros', 1, 1, 'miscellaneous'), + (6, 'Pruebas', NULL, NULL, 'tests'), + (7, 'IAE Clientes', 1, 1, 'economicActivitiesTax'), + (8, 'Fiscal', NULL, NULL, 'fiscal'), + (9, 'Vehiculos', NULL, NULL, 'vehicles'), + (10, 'Plantillas', NULL, NULL, 'templates'), + (11, 'Contratos', NULL, NULL, 'contracts'), + (12, 'ley de pagos', 1, 1, 'paymentsLaw'), + (13, 'Basura', 1, 1, 'trash'), + (14, 'Ticket', 1, 1, 'ticket'), + (15, 'Presupuestos', NULL, NULL, 'budgets'), + (16, 'Logistica', NULL, NULL, 'logistics'), + (17, 'cmr', 1, 1, 'cmr'), + (18, 'dua', NULL, NULL, 'dua'), + (19, 'inmovilizado', NULL, NULL, 'fixedAssets'), + (20, 'Reclamación', 1, 1, 'claim'), + (21, 'Entrada', 1, 1, 'entry'), + (22, 'Proveedor', 1, 1, 'supplier'); INSERT INTO `vn`.`dms`(`id`, `dmsTypeFk`, `file`, `contentType`, `workerFk`, `warehouseFk`, `companyFk`, `hardCopyNumber`, `hasFile`, `reference`, `description`, `created`) VALUES @@ -2380,7 +2412,9 @@ INSERT INTO `vn`.`dms`(`id`, `dmsTypeFk`, `file`, `contentType`, `workerFk`, `wa (5, 5, '5.txt', 'text/plain', 5, 1, 442, NULL, TRUE, 'travel: 1', 'dmsForThermograph', util.VN_CURDATE()), (6, 5, '6.txt', 'text/plain', 5, 1, 442, NULL, TRUE, 'NotExists', 'DoesNotExists', util.VN_CURDATE()), (7, 20, '7.jpg', 'image/jpeg', 9, 1, 442, NULL, FALSE, '1', 'TICKET ID DEL CLIENTE BRUCE WAYNE ID 1101', util.VN_CURDATE()), - (8, 20, '8.mp4', 'video/mp4', 9, 1, 442, NULL, FALSE, '1', 'TICKET ID DEL CLIENTE BRUCE WAYNE ID 1101', util.VN_CURDATE()); + (8, 20, '8.mp4', 'video/mp4', 9, 1, 442, NULL, FALSE, '1', 'TICKET ID DEL CLIENTE BRUCE WAYNE ID 1101', util.VN_CURDATE()), + (9, 21, '7.jpg', 'image/jpeg', 9, 1, 442, NULL, FALSE, '1', 'ENTRADA ID 1', util.VN_CURDATE()), + (10, 21, '7.jpg', 'image/jpeg', 9, 1, 442, NULL, FALSE, '1', 'ENTRADA DE PRUEBA', util.VN_CURDATE()); INSERT INTO `vn`.`claimDms`(`claimFk`, `dmsFk`) VALUES @@ -2472,29 +2506,16 @@ INSERT INTO `hedera`.`imageCollectionSize`(`id`, `collectionFk`,`width`, `height VALUES (1, 4, 160, 160); -INSERT INTO `vn`.`rateConfig`(`rate0`, `rate1`, `rate2`, `rate3`) +INSERT INTO `vn`.`rateConfig`(`id`, `rate0`, `rate1`, `rate2`, `rate3`) VALUES - (36, 31, 25, 21); + (1, 36, 31, 25, 21); INSERT INTO `vn`.`rate`(`dated`, `warehouseFk`, `rate0`, `rate1`, `rate2`, `rate3`) VALUES (DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR), 1, 10, 15, 20, 25), (util.VN_CURDATE(), 1, 12, 17, 22, 27); -INSERT INTO `vn`.`awb` (id, code, package, weight, created, amount, transitoryFk, taxFk) - VALUES - (1, '07546501420', 67, 671, util.VN_CURDATE(), 1761, 1, 1), - (2, '07546491421', 252, 2769, util.VN_CURDATE(), 5231, 1, 1), - (3, '07546500823', 102, 1495, util.VN_CURDATE(), 3221, 1, 1), - (4, '99610288821', 252, 2777, util.VN_CURDATE(), 3641, 1, 1), - (5, '07546500834', 229, 3292, util.VN_CURDATE(), 6601, 2, 1), - (6, '22101929561', 37, 458, util.VN_CURDATE(), 441, 2, 1), - (7, '07546491432', 258, 3034, util.VN_CURDATE(), 6441, 2, 1), - (8, '99610288644', 476, 4461, util.VN_CURDATE(), 5751, 442, 1), - (9, '99610289193', 302, 2972, util.VN_CURDATE(), 3871, 442, 1), - (10, '07546500856', 185, 2364, util.VN_CURDATE(), 5321, 442, 1); - -INSERT INTO `vn`.`dua` (id, code, awbFk, issued, operated, booked, bookEntried, gestdocFk, customsValue, companyFk) +INSERT INTO `vn`.`dua` (id, code, awbFk__, issued, operated, booked, bookEntried, gestdocFk, customsValue, companyFk) VALUES (1, '19ES0028013A481523', 1, util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 1, 11276.95, 442), (2, '21ES00280136115760', 2, util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 2, 1376.20, 442), @@ -2507,6 +2528,17 @@ INSERT INTO `vn`.`dua` (id, code, awbFk, issued, operated, booked, bookEntried, (9, '19ES00280132025491', 9, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 2, 7126.23, 442), (10, '19ES00280132025492', 10, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 2, 4631.45, 442); +INSERT INTO `vn`.`duaEntry` (`duaFk`, `entryFk`, `value`, `customsValue`, `euroValue`) + VALUES + (1, 1, 1.00, 1.00, 1.00), + (2, 2, 1.00, 1.00, 1.00), + (3, 3, 1.00, 1.00, 1.00), + (4, 4, 1.00, 1.00, 1.00), + (5, 5, 1.00, 1.00, 1.00), + (6, 6, 1.00, 1.00, 1.00), + (7, 7, 1.00, 1.00, 1.00), + (8, 8, 1.00, 1.00, 1.00); + REPLACE INTO `vn`.`invoiceIn`(`id`, `serialNumber`,`serial`, `supplierFk`, `issued`, `created`, `supplierRef`, `isBooked`, `companyFk`, `docFk`) VALUES (1, 1001, 'R', 1, util.VN_CURDATE(), util.VN_CURDATE(), 1234, 0, 442, 1), @@ -2551,7 +2583,7 @@ INSERT INTO `vn`.`duaInvoiceIn`(`id`, `duaFk`, `invoiceInFk`) (9, 9, 9), (10, 10, 10); -INSERT INTO `vn`.`invoiceInTax` (`invoiceInFk`, `taxableBase`, `expenceFk`, `foreignValue`, `taxTypeSageFk`, `transactionTypeSageFk`) +INSERT INTO `vn`.`invoiceInTax` (`invoiceInFk`, `taxableBase`, `expenseFk`, `foreignValue`, `taxTypeSageFk`, `transactionTypeSageFk`) VALUES (1, 99.99, '2000000000', NULL, NULL, NULL), (2, 999.99, '2000000000', NULL, NULL, NULL), @@ -2667,9 +2699,9 @@ INSERT INTO `bs`.`sale` (`saleFk`, `amount`, `dated`, `typeFk`, `clientFk`) (4, 33.8, util.VN_CURDATE(), 1, 1101), (30, 34.4, util.VN_CURDATE(), 1, 1108); -INSERT INTO `vn`.`docuwareConfig` (`url`) +INSERT INTO `vn`.`docuwareConfig` (`id`, `url`) VALUES - ('http://docuware.url/'); + (1, 'http://docuware.url/'); INSERT INTO `vn`.`calendarHolidaysName` (`id`, `name`) VALUES @@ -2697,10 +2729,10 @@ INSERT INTO `vn`.`chat` (`senderFk`, `recipient`, `dated`, `checkUserStatus`, `m (1101, '@PetterParker', util.VN_CURDATE(), 0, 'Second test message', 0, 'pending'); -INSERT INTO `vn`.`mobileAppVersionControl` (`appName`, `version`, `isVersionCritical`) +INSERT INTO `vn`.`mobileAppVersionControl` (`appName`, `version`, `isVersionCritical`,`versionBeta`) VALUES - ('delivery', '9.2', 0), - ('warehouse', '8.1', 0); + ('delivery', '9.2', 0,'9.7'), + ('warehouse', '8.1', 0,'8.3'); INSERT INTO `vn`.`machine` (`plate`, `maker`, `model`, `warehouseFk`, `departmentFk`, `type`, `use`, `productionYear`, `workerFk`, `companyFk`) VALUES @@ -2754,9 +2786,9 @@ INSERT INTO `vn`.`sectorCollectionSaleGroup` (`sectorCollectionFk`, `saleGroupFk VALUES (1, 1); -INSERT INTO `vn`.`workerTimeControlConfig` (`id`, `dayBreak`, `dayBreakDriver`, `shortWeekBreak`, `longWeekBreak`, `weekScope`, `mailPass`, `mailHost`, `mailSuccessFolder`, `mailErrorFolder`, `mailUser`, `minHoursToBreak`, `breakHours`, `hoursCompleteWeek`, `startNightlyHours`, `endNightlyHours`, `maxTimePerDay`, `breakTime`, `timeToBreakTime`, `dayMaxTime`, `shortWeekDays`, `longWeekDays`, `teleworkingStart`, `teleworkingStartBreakTime`) +INSERT INTO `vn`.`workerTimeControlConfig` (`id`, `dayBreak`, `dayBreakDriver`, `shortWeekBreak`, `longWeekBreak`, `weekScope`, `mailPass`, `mailHost`, `mailSuccessFolder`, `mailErrorFolder`, `mailUser`, `minHoursToBreak`, `breakHours`, `hoursCompleteWeek`, `startNightlyHours`, `endNightlyHours`, `maxTimePerDay`, `breakTime`, `timeToBreakTime`, `dayMaxTime`, `shortWeekDays`, `longWeekDays`, `teleworkingStart`, `teleworkingStartBreakTime`, `maxTimeToBreak`, `maxWorkShortCycle`, `maxWorkLongCycle`) VALUES - (1, 43200, 32400, 129600, 259200, 604800, '', '', 'Leidos.exito', 'Leidos.error', 'timeControl', 5.33, 0.33, 40, '22:00:00', '06:00:00', 57600, 1200, 18000, 57600, 6, 13, 28800, 32400); + (1, 43200, 32400, 129600, 259200, 1080000, '', 'imap.verdnatura.es', 'Leidos.exito', 'Leidos.error', 'timeControl', 5.00, 0.33, 40, '22:00:00', '06:00:00', 72000, 1200, 18000, 72000, 6, 13, 28800, 32400, 3600, 561600, 950400); INSERT INTO `vn`.`host` (`id`, `code`, `description`, `warehouseFk`, `bankFk`) VALUES @@ -2766,12 +2798,13 @@ INSERT INTO `vn`.`packingSite` (`id`, `code`, `hostFk`, `monitorId`) VALUES (1, 'h1', 1, ''); -INSERT INTO `vn`.`packingSiteConfig` (`shinobiUrl`, `shinobiToken`, `shinobiGroupKey`, `avgBoxingTime`) +INSERT INTO `vn`.`packingSiteConfig` (`id`, `shinobiUrl`, `shinobiToken`, `shinobiGroupKey`, `avgBoxingTime`) VALUES - ('', 'SHINNOBI_TOKEN', 'GROUP_TOKEN', 6000); + (1, '', 'SHINNOBI_TOKEN', 'GROUP_TOKEN', 6000); INSERT INTO `util`.`notificationConfig` - SET `cleanDays` = 90; - + SET `id` = 1, + `cleanDays` = 90; +TRUNCATE `util`.`notification`; INSERT INTO `util`.`notification` (`id`, `name`, `description`) VALUES (1, 'print-email', 'notification fixture one'), @@ -2779,28 +2812,40 @@ INSERT INTO `util`.`notification` (`id`, `name`, `description`) (3, 'not-main-printer-configured', 'A printer distinct than main has been configured'), (4, 'supplier-pay-method-update', 'A supplier pay method has been updated'), (5, 'modified-entry', 'An entry has been modified'), - (6, 'book-entry-deleted', 'accounting entries deleted'); + (6, 'book-entry-deleted', 'accounting entries deleted'), + (7, 'zone-included','An email to notify zoneCollisions'); +TRUNCATE `util`.`notificationAcl`; INSERT INTO `util`.`notificationAcl` (`notificationFk`, `roleFk`) VALUES (1, 9), - (6, 9); + (1, 1), + (2, 1), + (3, 9), + (4, 1), + (5, 9), + (6, 9), + (7, 9); +TRUNCATE `util`.`notificationQueue`; INSERT INTO `util`.`notificationQueue` (`id`, `notificationFk`, `params`, `authorFk`, `status`, `created`) VALUES (1, 'print-email', '{"id": "1"}', 9, 'pending', util.VN_CURDATE()), (2, 'print-email', '{"id": "2"}', null, 'pending', util.VN_CURDATE()), (3, 'print-email', null, null, 'pending', util.VN_CURDATE()); +TRUNCATE `util`.`notificationSubscription`; INSERT INTO `util`.`notificationSubscription` (`notificationFk`, `userFk`) VALUES (1, 1109), (1, 1110), + (2, 1110), + (4, 1110), (2, 1109), (1, 9), (1, 3), - (6, 9); - + (6, 9), + (7, 9); INSERT INTO `vn`.`routeConfig` (`id`, `defaultWorkCenterFk`) VALUES @@ -2816,7 +2861,7 @@ INSERT INTO `vn`.`collection` (`id`, `created`, `workerFk`, `stateFk`, `itemPack INSERT INTO `vn`.`itemConfig` (`id`, `isItemTagTriggerDisabled`, `monthToDeactivate`, `wasteRecipients`, `validPriorities`, `defaultPriority`, `defaultTag`, `warehouseFk`) VALUES - (0, 0, 24, '', '[1,2,3]', 2, 56, 60); + (1, 0, 24, '', '[1,2,3]', 2, 56, 60); INSERT INTO `vn`.`ticketCollection` (`ticketFk`, `collectionFk`, `created`, `level`, `wagon`, `smartTagFk`, `usedShelves`, `itemCount`, `liters`) VALUES @@ -2853,7 +2898,7 @@ INSERT INTO `vn`.`ticketLog` (originFk, userFk, `action`, creationDate, changedM (1, 18, 'insert', '1999-05-09 10:00:00', 'Ticket', 45, 'Super Man' , NULL, '{"id":45,"clientFk":8608,"warehouseFk":60,"shipped":"2023-05-16T22:00:00.000Z","nickname":"Super Man","addressFk":48637,"isSigned":true,"isLabeled":true,"isPrinted":true,"packages":0,"hour":0,"created":"2023-05-16T11:42:56.000Z","isBlocked":false,"hasPriority":false,"companyFk":442,"agencyModeFk":639,"landed":"2023-05-17T22:00:00.000Z","isBoxed":true,"isDeleted":true,"zoneFk":713,"zonePrice":13,"zoneBonus":0}', NULL); INSERT INTO `vn`.`osTicketConfig` (`id`, `host`, `user`, `password`, `oldStatus`, `newStatusId`, `day`, `comment`, `hostDb`, `userDb`, `passwordDb`, `portDb`, `responseType`, `fromEmailId`, `replyTo`) VALUES - (0, 'http://localhost:56596/scp', 'ostadmin', 'Admin1', '1,6', 3, 60, 'Este CAU se ha cerrado automáticamente. Si el problema persiste responda a este mensaje.', 'localhost', 'osticket', 'osticket', 40003, 'reply', 1, 'all'); + (1, 'http://localhost:56596/scp', 'ostadmin', 'Admin1', '1,6', 3, 60, 'Este CAU se ha cerrado automáticamente. Si el problema persiste responda a este mensaje.', 'localhost', 'osticket', 'osticket', 40003, 'reply', 1, 'all'); INSERT INTO `vn`.`mdbApp` (`app`, `baselineBranchFk`, `userFk`, `locked`) VALUES @@ -2867,6 +2912,7 @@ INSERT INTO `vn`.`profileType` (`id`, `name`) INSERT INTO `salix`.`url` (`appName`, `environment`, `url`) VALUES ('lilium', 'development', 'http://localhost:9000/#/'), + ('hedera', 'development', 'http://localhost:9090/'), ('salix', 'development', 'http://localhost:5000/#!/'); INSERT INTO `vn`.`report` (`id`, `name`, `paperSizeFk`, `method`) @@ -2875,7 +2921,9 @@ INSERT INTO `vn`.`report` (`id`, `name`, `paperSizeFk`, `method`) INSERT INTO `vn`.`payDemDetail` (`id`, `detail`) VALUES - (1, 1); + (1, 1), + (2, 20), + (7, 1); INSERT INTO `vn`.`workerConfig` (`id`, `businessUpdated`, `roleFk`, `payMethodFk`, `businessTypeFk`) VALUES @@ -2883,8 +2931,7 @@ INSERT INTO `vn`.`workerConfig` (`id`, `businessUpdated`, `roleFk`, `payMethodFk INSERT INTO `vn`.`ticketRefund`(`refundTicketFk`, `originalTicketFk`) VALUES - (1, 12), - (8, 10); + (24, 8); INSERT INTO `vn`.`deviceProductionModels` (`code`) VALUES @@ -2940,9 +2987,9 @@ INSERT INTO `vn`.`wagonTypeTray` (`id`, `typeFk`, `height`, `colorFk`) (2, 1, 50, 2), (3, 1, 0, 3); -INSERT INTO `salix`.`accessTokenConfig` (`id`, `renewPeriod`, `renewInterval`) +INSERT INTO `salix`.`accessTokenConfig` (`id`, `renewPeriod`, `courtesyTime`, `renewInterval`) VALUES - (1, 21600, 300); + (1, 21600, 60, 300); INSERT INTO `vn`.`travelConfig` (`id`, `warehouseInFk`, `warehouseOutFk`, `agencyFk`, `companyFk`) VALUES @@ -2976,3 +3023,726 @@ INSERT INTO vn.XDiario (id, ASIEN, FECHA, SUBCTA, CONTRA, CONCEPTO, EURODEBE, EU INSERT INTO `vn`.`mistakeType` (`id`, `description`) VALUES (1, 'Incorrect quantity'); + +INSERT INTO `vn`.`invoiceCorrectionType` (`id`, `description`) + VALUES + (1, 'Error in VAT calculation'), + (2, 'Error in sales details'), + (3, 'Error in customer data'); + +UPDATE `vn`.`client` + SET fi='65004204V' + WHERE id=1; + +UPDATE `vn`.`worker` + SET fi='59328808D' + WHERE id=1106; + + +INSERT INTO `account`.`mailAliasAcl` (`mailAliasFk`, `roleFk`) + VALUES + (1, 1), + (2, 9), + (3, 15); + +INSERT INTO `vn`.`docuwareTablet` (`tablet`,`description`) + VALUES + ('Tablet1','Jarvis tablet'), + ('Tablet2','Avengers tablet'); + +INSERT INTO `vn`.`sms` (`id`, `senderFk`, `sender`, `destination`, `message`, `statusCode`, `status`, `created`) + VALUES (1, 66, '111111111', '0001111111111', 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.', 0, 'OK', util.VN_CURDATE()), + (2, 66, '222222222', '0002222222222', 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.', 0, 'PENDING', util.VN_CURDATE()), + (3, 66, '333333333', '0003333333333', 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.', 0, 'ERROR', util.VN_CURDATE()), + (4, 66, '444444444', '0004444444444', 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.', 0, 'OK', util.VN_CURDATE()); + +INSERT INTO `vn`.`clientSms` (`id`, `clientFk`, `smsFk`, `ticketFk`) + VALUES(1, 1103, 1, NULL), + (2, 1103, 2, NULL), + (3, 1103, 3, 32), + (4, 1103, 4, 32), + (13, 1101, 1, NULL), + (14, 1101, 4, 27); + +INSERT INTO `vn`.`entryDms`(`entryFk`, `dmsFk`, `editorFk`) + VALUES + (1, 9, 9); + +INSERT INTO `vn`.`cmr` (id,truckPlate,observations,senderInstruccions,paymentInstruccions,specialAgreements,companyFk,addressToFk,addressFromFk,supplierFk,packagesList,merchandiseDetail,state) + VALUES (1,'123456A','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet',442,1,2,1,'Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet'), + (2,'123456N','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet',69,3,4,2,'Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet'), + (3,'123456B','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet',567,5,6,69,'Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet','Lorem ipsum dolor sit amet'); + +UPDATE vn.department + SET workerFk = null; + +INSERT INTO vn.packaging + VALUES('--', 2745600.00, 100.00, 120.00, 220.00, 0.00, 1, '2001-01-01 00:00:00.000', NULL, NULL, NULL, 0.00, 16, 0.00, 0, NULL, 0.00, NULL, NULL, 0, NULL, 0, 0); + + +INSERT IGNORE INTO vn.intrastat + SET id = 44219999, + description = 'Manufacturas de madera', + taxClassFk = 1, + taxCodeFk = 1; + +INSERT IGNORE INTO vn.warehouse + SET id = 999, + name = 'TestingWarehouse', + hasAvailable = TRUE, + isForTicket = TRUE, + isInventory = TRUE, + hasUbications = TRUE, + hasProduction = TRUE; + +INSERT IGNORE INTO vn.sector + SET id = 9991, + description = 'NormalSector', + warehouseFk = 999, + code = 'NS', + isPackagingArea = FALSE, + sonFk = NULL, + isMain = TRUE, + itemPackingTypeFk = NULL; + +INSERT IGNORE INTO vn.sector + SET id = 9992, + description = 'PreviousSector', + warehouseFk = 999, + code = 'PS', + isPackagingArea = FALSE, + sonFk = NULL, + isMain = TRUE, + itemPackingTypeFk = NULL; + +INSERT IGNORE INTO vn.sector + SET id = 9993, + description = 'MezaninneSector', + warehouseFk = 999, + code = 'MS', + isPackagingArea = FALSE, + sonFk = 9991, + isMain = TRUE, + itemPackingTypeFk = NULL; + + +INSERT INTO vn.parking (id,sectorFk, code, pickingOrder) + VALUES (4,9991, 'A-01-1', 1), + (5,9991, 'A-02-2', 2), + (6,9991, 'A-03-3', 3), + (7,9991, 'A-04-4', 4), + (8,9991, 'A-05-5', 5), + (9,9992, 'P-01-1', 6), + (10,9992, 'P-02-2', 7), + (11,9992, 'P-03-3', 8), + (12,9993, 'M-01-1', 9), + (13,9993, 'M-02-2', 10), + (14,9993, 'M-03-3', 11); + +INSERT INTO vn.shelving (code, parkingFk, priority) + VALUES ('NAA', 4, 1), + ('NBB', 5, 1), + ('NCC', 6, 1), + ('NDD', 7, 1), + ('NEE', 8, 1), + ('PAA', 9, 1), + ('PBB', 10, 1), + ('PCC', 11, 1), + ('MAA', 12, 1), + ('MBB', 13, 1), + ('MCC', 14, 1); + +INSERT IGNORE INTO vn.itemType + SET id = 999, + code = 'WOO', + name = 'Wood Objects', + categoryFk = 3, + workerFk = 103, + isInventory = TRUE, + life = 10, + density = 250, + itemPackingTypeFk = NULL, + temperatureFk = 'warm'; + +INSERT IGNORE INTO vn.travel + SET id = 99, + shipped = CURDATE(), + landed = CURDATE(), + warehouseInFk = 999, + warehouseOutFk = 1, + isReceived = TRUE; + +INSERT INTO vn.entry + SET id = 999, + supplierFk = 791, + isConfirmed = TRUE, + dated = CURDATE(), + travelFk = 99, + companyFk = 442; + +INSERT INTO vn.ticket + SET id = 999999, + clientFk = 2, + warehouseFk = 999, + shipped = CURDATE(), + nickname = 'Cliente', + addressFk = 1, + companyFk = 442, + agencyModeFk = 10, + landed = CURDATE(); + +INSERT INTO vn.collection + SET id = 10101010, + workerFk = 9; + +INSERT IGNORE INTO vn.ticketCollection + SET id = 10101010, + ticketFk = 999999, + collectionFk = 10101010; + +INSERT INTO vn.item + SET id = 999991, + name = 'Palito para pinchos', + `size` = 25, + stems = NULL, + category = 'EXT', + typeFk = 999, + longName = 'Palito para pinchos', + itemPackingTypeFk = NULL, + originFk = 1, + weightByPiece = 6, + intrastatFk = 44219999; + +INSERT INTO vn.buy + SET id = 9999991, + entryFk = 999, + itemFk = 999991, + quantity = 8, + buyingValue = 0.61, + stickers = 1, + packing = 20, + `grouping` = 1, + groupingMode = 1, + packageFk = 94, + price1 = 1, + price2 = 1, + price3 = 1, + minPrice = 1, + weight = 50; + +INSERT INTO vn.sale + SET id = 99991, + itemFk = 999991, + ticketFk = 999999, + concept = 'Palito para pinchos', + quantity = 3, + price = 1, + discount = 0; + +INSERT INTO vn.item + SET id = 999992, + name = 'Madera verde', + `size` = 10, + stems = NULL, + category = 'EXT', + typeFk = 999, + longName = 'Madera verde', + itemPackingTypeFk = NULL, + originFk = 1, + weightByPiece = 50, + intrastatFk = 44219999; + +INSERT INTO vn.buy + SET id = 9999992, + entryFk = 999, + itemFk = 999992, + quantity = 40, + buyingValue = 0.62, + stickers = 1, + packing = 40, + `grouping` = 5, + groupingMode = 1, + packageFk = 94, + price1 = 1, + price2 = 1, + price3 = 1, + minPrice = 1, + weight = 25; + +INSERT INTO vn.sale + SET id = 99992, + itemFk = 999992, + ticketFk = 999999, + concept = 'Madera Verde', + quantity = 10, + price = 1, + discount = 0; + +INSERT INTO vn.item + SET id = 999993, + name = 'Madera Roja/Morada', + `size` = 12, + stems = 2, + category = 'EXT', + typeFk = 999, + longName = 'Madera Roja/Morada', + itemPackingTypeFk = NULL, + originFk = 1, + weightByPiece = 35, + intrastatFk = 44219999; + +INSERT INTO vn.buy + SET id = 9999993, + entryFk = 999, + itemFk = 999993, + quantity = 20, + buyingValue = 0.63, + stickers = 2, + packing = 10, + `grouping` = 5, + groupingMode = 1, + packageFk = 94, + price1 = 1, + price2 = 1, + price3 = 1, + minPrice = 1, + weight = 25; + +INSERT INTO vn.itemShelving + SET id = 9931, + itemFk = 999993, + shelvingFk = 'NCC', + visible = 10, + `grouping` = 5, + packing = 10; + +INSERT INTO vn.sale + SET id = 99993, + itemFk = 999993, + ticketFk = 999999, + concept = 'Madera Roja/Morada', + quantity = 15, + price = 1, + discount = 0; + +INSERT INTO vn.item + SET id = 999994, + name = 'Madera Naranja', + `size` = 18, + stems = 1, + category = 'EXT', + typeFk = 999, + longName = 'Madera Naranja', + itemPackingTypeFk = NULL, + originFk = 1, + weightByPiece = 160, + intrastatFk = 44219999; + +INSERT INTO vn.buy + SET id = 9999994, + entryFk = 999, + itemFk = 999994, + quantity = 20, + buyingValue = 0.64, + stickers = 1, + packing = 20, + `grouping` = 4, + groupingMode = 1, + packageFk = 94, + price1 = 1, + price2 = 1, + price3 = 1, + minPrice = 1, + weight = 25; + +INSERT INTO vn.sale + SET id = 99994, + itemFk = 999994, + ticketFk = 999999, + concept = 'Madera Naranja', + quantity = 4, + price = 1, + discount = 0; + +INSERT INTO vn.item + SET id = 999995, + name = 'Madera Amarilla', + `size` = 11, + stems = 5, + category = 'EXT', + typeFk = 999, + longName = 'Madera Amarilla', + itemPackingTypeFk = NULL, + originFk = 1, + weightByPiece = 78, + intrastatFk = 44219999; + +INSERT INTO vn.buy + SET id = 9999995, + entryFk = 999, + itemFk = 999995, + quantity = 4, + buyingValue = 0.65, + stickers = 1, + packing = 20, + `grouping` = 1, + groupingMode = 1, + packageFk = 94, + price1 = 1, + price2 = 1, + price3 = 1, + minPrice = 1, + weight = 35; + +INSERT INTO vn.sale + SET id = 99995, + itemFk = 999995, + ticketFk = 999999, + concept = 'Madera Amarilla', + quantity = 5, + price = 1, + discount = 0; + +-- Palito naranja +INSERT INTO vn.item + SET id = 999998, + name = 'Palito naranja', + `size` = 11, + stems = 1, + category = 'EXT', + typeFk = 999, + longName = 'Palito naranja', + itemPackingTypeFk = NULL, + originFk = 1, + weightByPiece = 78, + intrastatFk = 44219999; + +INSERT INTO vn.buy + SET id = 9999998, + entryFk = 999, + itemFk = 999998, + quantity = 80, + buyingValue = 0.65, + stickers = 1, + packing = 200, + `grouping` = 30, + groupingMode = 1, + packageFk = 94, + price1 = 1, + price2 = 1, + price3 = 1, + minPrice = 1, + weight = 35; + +INSERT INTO vn.sale + SET id = 99998, + itemFk = 999998, + ticketFk = 999999, + concept = 'Palito naranja', + quantity = 60, + price = 1, + discount = 0; + +-- Palito amarillo +INSERT INTO vn.item + SET id = 999999, + name = 'Palito amarillo', + `size` = 11, + stems = 1, + category = 'EXT', + typeFk = 999, + longName = 'Palito amarillo', + itemPackingTypeFk = NULL, + originFk = 1, + weightByPiece = 78, + intrastatFk = 44219999; + +INSERT INTO vn.buy + SET id = 9999999, + entryFk = 999, + itemFk = 999999, + quantity = 70, + buyingValue = 0.65, + stickers = 1, + packing = 500, + `grouping` = 10, + groupingMode = 1, + packageFk = 94, + price1 = 1, + price2 = 1, + price3 = 1, + minPrice = 1, + weight = 35; + +INSERT INTO vn.sale + SET id = 99999, + itemFk = 999999, + ticketFk = 999999, + concept = 'Palito amarillo', + quantity = 50, + price = 1, + discount = 0; + +-- Palito azul +INSERT INTO vn.item + SET id = 1000000, + name = 'Palito azul', + `size` = 10, + stems = 1, + category = 'EXT', + typeFk = 999, + longName = 'Palito azul', + itemPackingTypeFk = NULL, + originFk = 1, + weightByPiece = 78, + intrastatFk = 44219999; + +INSERT INTO vn.buy + SET id = 10000000, + entryFk = 999, + itemFk = 1000000, + quantity = 75, + buyingValue = 0.65, + stickers = 2, + packing = 300, + `grouping` = 50, + groupingMode = 1, + packageFk = 94, + price1 = 1, + price2 = 1, + price3 = 1, + minPrice = 1, + weight = 35; + +INSERT INTO vn.sale + SET id = 100000, + itemFk = 1000000, + ticketFk = 999999, + concept = 'Palito azul', + quantity = 50, + price = 1, + discount = 0; + +-- Palito rojo +INSERT INTO vn.item + SET id = 1000001, + name = 'Palito rojo', + `size` = 10, + stems = NULL, + category = 'EXT', + typeFk = 999, + longName = 'Palito rojo', + itemPackingTypeFk = NULL, + originFk = 1, + weightByPiece = 78, + intrastatFk = 44219999; + +INSERT INTO vn.buy + SET id = 10000001, + entryFk = 999, + itemFk = 1000001, + quantity = 12, + buyingValue = 0.65, + stickers = 2, + packing = 50, + `grouping` = 5, + groupingMode = 1, + packageFk = 94, + price1 = 1, + price2 = 1, + price3 = 1, + minPrice = 1, + weight = 35; + + +INSERT INTO vn.sale + SET id = 100001, + itemFk = 1000001, + ticketFk = 999999, + concept = 'Palito rojo', + quantity = 10, + price = 1, + discount = 0; + +-- Previa +INSERT IGNORE INTO vn.item + SET id = 999996, + name = 'Bolas de madera', + `size` = 2, + stems = 4, + category = 'EXT', + typeFk = 999, + longName = 'Bolas de madera', + itemPackingTypeFk = NULL, + originFk = 1, + weightByPiece = 20, + intrastatFk = 44219999; + +INSERT vn.buy + SET id = 9999996, + entryFk = 999, + itemFk = 999996, + quantity = 5, + buyingValue = 3, + stickers = 1, + packing = 5, + `grouping` = 2, + groupingMode = 1, + packageFk = 94, + price1 = 7, + price2 = 7, + price3 = 7, + minPrice = 7, + weight = 80; + +INSERT vn.sale + SET id = 99996, + itemFk = 999996, + ticketFk = 999999, + concept = 'Bolas de madera', + quantity = 4, + price = 7, + discount = 0, + isPicked = TRUE; + +INSERT IGNORE INTO vn.item + SET id = 999997, + name = 'Palitos de polo MIX', + `size` = 14, + stems = NULL, + category = 'EXT', + typeFk = 999, + longName = 'Palitos de polo MIX', + itemPackingTypeFk = NULL, + originFk = 1, + weightByPiece = 20, + intrastatFk = 44219999; + +INSERT vn.buy + SET id = 9999997, + entryFk = 999, + itemFk = 999997, + quantity = 100, + buyingValue = 3.2, + stickers = 1, + packing = 100, + `grouping` = 5, + groupingMode = 1, + packageFk = 94, + price1 = 7, + price2 = 7, + price3 = 7, + minPrice = 7, + weight = 80; + +INSERT vn.sale + SET id = 99997, + itemFk = 999997, + ticketFk = 999999, + concept = 'Palitos de polo MIX', + quantity = 5, + price = 7, + discount = 0; + +USE vn; +DELETE ish.* FROM vn.itemShelving ish + JOIN vn.shelving sh ON sh.code = ish.shelvingFk + JOIN vn.parking p ON p.id = sh.parkingFk + JOIN vn.sector s ON s.id = p.sectorFk + JOIN vn.warehouse w ON w.id = s.warehouseFk + WHERE w.name = 'TestingWarehouse'; + +INSERT INTO vn.itemShelving +(itemFk, shelvingFk, visible, created, `grouping`, packing, packagingFk, userFk, isChecked) +VALUES + (999991, 'NAA', 8, '2023-09-20', 1, 20, NULL, 103, NULL), + (999998, 'NAA', 80, '2023-09-20', 10, 30, NULL, 103, NULL), + (1000001, 'NAA', 6, '2023-09-20', 3, 50, NULL, 103, NULL), + (1000000, 'NBB', 50, '2023-09-18', 25, 500, NULL, 103, NULL), + (999993, 'NBB', 25, '2023-09-18', NULL, 10, NULL, 103, NULL), + (999999, 'NBB', 30, '2023-09-18', 10, 500, NULL, 103, NULL), + (999993, 'NCC', 25, '2023-09-20', 5, 10, NULL, 103, NULL), + (999997, 'NCC', 10, '2023-09-20', NULL, 100, NULL, 103, NULL), + (999999, 'NCC', 40, '2023-09-20', 10, 500, NULL, 103, NULL), + (999995, 'NDD', 10, '2023-09-19', NULL, 20, NULL, 103, NULL), + (999994, 'NDD', 48, '2023-09-19', 4, 20, NULL, 103, NULL), + (1000001, 'NEE', 6, '2023-09-21', 3, 50, NULL, 103, NULL), + (999992, 'NEE', 50, '2023-09-21', NULL, 1, NULL, 103, NULL), + (1000000, 'NEE', 25, '2023-09-21', 25, 500, NULL, 103, NULL), + (999996, 'PAA', 5, '2023-09-27', 1, 5, NULL, 103, NULL), + (999997, 'PCC', 10, '2023-09-27', 5, 100, NULL, 103, NULL); + +-- Previous for Bolas de madera +INSERT IGNORE INTO vn.sectorCollection + SET id = 99, + userFk = 1, + sectorFk = 9992; + +INSERT IGNORE INTO vn.saleGroup + SET id = 4, + userFk = 1, + parkingFk = 9, + sectorFk = 9992; + +INSERT IGNORE INTO vn.sectorCollectionSaleGroup + SET id = 9999, + sectorCollectionFk = 99, + saleGroupFk = 999; + +INSERT vn.saleGroupDetail + SET id = 99991, + saleFk = 99996, + saleGroupFk = 999; + +INSERT INTO vn.saleTracking + SET id = 7, + saleFk = 99996, + isChecked = TRUE, + workerFk = 103, + stateFk = 28; + +INSERT IGNORE INTO vn.itemShelvingSale + SET id = 991, + itemShelvingFk = 9962, + saleFk = 99996, + quantity = 5, + userFk = 1; + +UPDATE vn.ticket + SET zoneFk=1 + WHERE id=999999; + +UPDATE vn.collection + SET workerFk=9 + WHERE id=10101010; + +UPDATE vn.sale + SET isPicked =FALSE; + +INSERT INTO vn.machineWorkerConfig(id, maxHours) + VALUES(1, 12); + +INSERT INTO vn.workerAppTester(workerFk) VALUES(66); + +INSERT INTO `vn`.`machine` (`plate`, `maker`, `model`, `warehouseFk`, `departmentFk`, `type`, `use`, `productionYear`, `workerFk`, `companyFk`) + VALUES + ('RE-003', 'IRON', 'JPH-24', 60, 23, 'ELECTRIC TOW', 'Drag cars', 2020, 103, 442); + + +INSERT INTO vn.machineWorker(workerFk,machineFk,inTimed) VALUES (104,1,'2001-01-01 10:00:00.00.000'); + +UPDATE vn.buy SET itemOriginalFk = 1 WHERE id = 1; + +UPDATE vn.saleTracking SET stateFk = 26 WHERE id = 5; + +INSERT INTO vn.report (name) VALUES ('LabelCollection'); + +INSERT INTO vn.parkingLog(originFk, userFk, `action`, creationDate, description, changedModel,oldInstance, newInstance, changedModelId, changedModelValue) + VALUES(1, 18, 'update', util.VN_CURDATE(), NULL, 'SaleGroup', '{"parkingFk":null}', '{"parkingFk":1}', 1, NULL); + +INSERT INTO vn.ticketLog (originFk,userFk,`action`,creationDate,changedModel,newInstance,changedModelId,changedModelValue) + VALUES (18,9,'insert','2001-01-01 11:01:00.000','Ticket','{"isDeleted":true}',45,'Super Man'); + +INSERT INTO `vn`.`supplierDms`(`supplierFk`, `dmsFk`, `editorFk`) + VALUES + (1, 10, 9); \ No newline at end of file diff --git a/db/dump/mockDate.sql b/db/dump/mockDate.sql index 5d4d0c351..1ed5d76be 100644 --- a/db/dump/mockDate.sql +++ b/db/dump/mockDate.sql @@ -1,22 +1,17 @@ - DELIMITER $$ - -CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`mockTime`() RETURNS datetime - DETERMINISTIC +CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION util.mockTime() + RETURNS DATETIME + DETERMINISTIC BEGIN - RETURN CONVERT_TZ('@mockDate', 'utc', 'Europe/Madrid'); -END$$ - -CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`mockUtcTime`() RETURNS datetime - DETERMINISTIC -BEGIN - RETURN CONVERT_TZ('@mockDate', 'utc', 'Europe/Madrid'); -END$$ - -CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`mockTimeBase`(vIsUtc BOOL) RETURNS datetime - DETERMINISTIC -BEGIN - RETURN CONVERT_TZ('@mockDate', 'utc', 'Europe/Madrid'); + RETURN @mockDate; END$$ DELIMITER ; +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION util.mockUtcTime() + RETURNS DATETIME + DETERMINISTIC +BEGIN + RETURN @mockDate; +END$$ +DELIMITER ; diff --git a/db/export-data.sh b/db/export-data.sh deleted file mode 100755 index 7d346b235..000000000 --- a/db/export-data.sh +++ /dev/null @@ -1,107 +0,0 @@ -#!/bin/bash - -DUMPED_FILE="dump/dumpedFixtures.sql" -INI_FILE="config.production.ini" - -dump_tables() { - SCHEMA=$1 - echo "USE \`$SCHEMA\`;" >> "$DUMPED_FILE" - mysqldump --defaults-file="$INI_FILE" --no-create-info --skip-triggers $@ >> "$DUMPED_FILE" -} - -echo "" > "$DUMPED_FILE" - -TABLES=( - util - config - version - versionLog -) -dump_tables ${TABLES[@]} - -TABLES=( - account - role - roleInherit - roleRole - userPassword - accountConfig - mailConfig -) -dump_tables ${TABLES[@]} - -TABLES=( - salix - ACL - fieldAcl - module - defaultViewConfig -) -dump_tables ${TABLES[@]} - -TABLES=( - vn - agencyTermConfig - alertLevel - bookingPlanner - businessType - cplusInvoiceType472 - cplusInvoiceType477 - cplusRectificationType - cplusSubjectOp - cplusTaxBreak - cplusTrascendency472 - claimResponsible - claimReason - claimRedelivery - claimResult - component - componentType - continent - department - docuware - itemPackingType - pgc - sample - state - ticketUpdateAction - volumeConfig - workCenter - companyI18n -) -dump_tables ${TABLES[@]} - -TABLES=( - cache - cache -) -dump_tables ${TABLES[@]} - -TABLES=( - hedera - browser - imageCollection - imageCollectionSize - language - link - location - menu - message - metatag - newsTag - restPriv - social - tpvError - tpvResponse - -) -dump_tables ${TABLES[@]} - -TABLES=( - sage - TiposIva - TiposTransacciones - TiposRetencion - taxType -) -dump_tables ${TABLES[@]} diff --git a/db/export-structure.sh b/db/export-structure.sh deleted file mode 100755 index 4ecbfa7e8..000000000 --- a/db/export-structure.sh +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/bash - -SCHEMAS=( - account - bs - cache - edi - hedera - pbx - sage - salix - stock - util - vn -) - -IGNORETABLES=( - --ignore-table=bi.last_Id_Cubo - --ignore-table=bi.v_clientes_jerarquia - --ignore-table=bi.v_ventas_contables - --ignore-table=bs.horasSilla - --ignore-table=bs.productionIndicators - --ignore-table=bs.VentasPorCliente - --ignore-table=bs.v_ventas - --ignore-table=vn.accounting__ - --ignore-table=vn.agencyModeZone - --ignore-table=vn.agencyProvince - --ignore-table=vn.agencyWarehouse - --ignore-table=vn.botanicExport__ - --ignore-table=vn.clientDefaultCompany - --ignore-table=vn.color - --ignore-table=vn.comparative - --ignore-table=vn.comparativeFilter - --ignore-table=vn.coolerPath - --ignore-table=vn.coolerPathDetail - --ignore-table=vn.config__ - --ignore-table=vn.department__ - --ignore-table=vn.doc - --ignore-table=vn.entity - --ignore-table=vn.especialPrice - --ignore-table=vn.exchangeInsurance - --ignore-table=vn.exchangeInsuranceInPrevious - --ignore-table=vn.exchangeReportSource - --ignore-table=vn.grant - --ignore-table=vn.grantGroup - --ignore-table=vn.invoiceCorrection__ - --ignore-table=vn.itemTaxCountrySpain - --ignore-table=vn.itemShelvingPlacementSupplyStock__ - --ignore-table=vn.itemFreeNumber__ - --ignore-table=vn.mail__ - --ignore-table=vn.manaSpellers - --ignore-table=vn.outgoingInvoiceKk - --ignore-table=vn.paymentExchangeInsurance - --ignore-table=vn.payrollCenter - --ignore-table=vn.plantpassport__ - --ignore-table=vn.plantpassportAuthority__ - --ignore-table=vn.preparationException - --ignore-table=vn.priceFixed__ - --ignore-table=vn.printingQueue - --ignore-table=vn.printServerQueue__ - --ignore-table=vn.promissoryNote - --ignore-table=vn.referenceRate__ - --ignore-table=vn.routesControl - --ignore-table=vn.salesToPrePrepare - --ignore-table=vn.specialPrice__ - --ignore-table=vn.ticketDownBuffer - --ignore-table=vn.ticketeToPreparePrepared - --ignore-table=vn.ticketObservation__ - --ignore-table=vn.ticketRequest__ - --ignore-table=vn.ticket_print__ - --ignore-table=vn.ticketToPrepare - --ignore-table=vn.till__ - --ignore-table=vn.travelThermograph__ - --ignore-table=vn.travel_cloneWeekly - --ignore-table=vn.unary - --ignore-table=vn.unaryScan - --ignore-table=vn.unaryScanLine - --ignore-table=vn.unaryScanLineBuy - --ignore-table=vn.unaryScanLineExpedition - --ignore-table=vn.warehouseAlias__ - --ignore-table=vn.warehouseJoined - --ignore-table=vn.workerTeam__ - --ignore-table=vn.XDiario__ - --ignore-table=sage.movContaCopia -) -mysqldump \ - --defaults-file=config.production.ini \ - --default-character-set=utf8 \ - --no-data --comments \ - --triggers --routines --events \ - --databases \ - ${SCHEMAS[@]} \ - ${IGNORETABLES[@]} \ - | sed 's/ AUTO_INCREMENT=[0-9]* //g' \ - > dump/structure.sql diff --git a/db/import-changes.sh b/db/import-changes.sh deleted file mode 100755 index 5461f003b..000000000 --- a/db/import-changes.sh +++ /dev/null @@ -1,119 +0,0 @@ -#!/bin/bash - -FORCE=FALSE - -usage() { - echo "[ERROR] Usage: $0 [-f] [environment]" - exit 1 -} - -while getopts ":f" option -do - case $option in - f) - FORCE=TRUE - ;; - \?|:) - usage - ;; - esac -done - -shift $(($OPTIND - 1)) - -ENV=$1 -DIR="$(dirname "${BASH_SOURCE[0]}")" - -# Production protection - -if [ "$ENV" == "production" ]; then - echo "" - echo " ( ( ) ( ( ) ) " - echo " )\ ))\ ) ( /( )\ ) ( ))\ ) ( /( ( /( " - echo "(()/(()/( )\()|()/( ( )\ ) /(()/( )\()) )\())" - echo " /(_))(_)|(_)\ /(_)) )\ (((_) ( )(_))(_)|(_)\ ((_)\ " - echo "(_))(_)) ((_|_))_ _ ((_))\___(_(_()|_)) ((_) _((_)" - echo "| _ \ _ \ / _ \| \| | | ((/ __|_ _|_ _| / _ \| \| |" - echo "| _/ /| (_) | |) | |_| || (__ | | | | | (_) | . |" - echo "|_| |_|_\ \___/|___/ \___/ \___| |_| |___| \___/|_|\_|" - echo "" - - if [ "$FORCE" != "TRUE" ]; then - read -p "[INTERACTIVE] Are you sure? (Default: no) [yes|no]: " ANSWER - - if [ "$ANSWER" != "yes" ]; then - echo "[INFO] Aborting changes." - exit - fi - fi -fi - -# Configuration file - -if [ -z "$ENV" ]; then - INI_FILE="$DIR/config.ini" -else - INI_FILE="$DIR/config.$ENV.ini" -fi - -if [ ! -f "$INI_FILE" ]; then - echo "[ERROR] Config file doesn't exists: $INI_FILE" - exit 2 -fi - -echo "[INFO] Using config file: $INI_FILE" - -# Fetching database version - -GET_VERSION="SELECT dbVersion FROM util.config LIMIT 1" -DB_VERSION=`echo "$GET_VERSION" | mysql --defaults-file="$INI_FILE" --silent --raw` - -echo "[INFO] Current database version: $DB_VERSION" - -if [[ ! "$DB_VERSION" =~ ^[0-9]+$ ]]; then - echo "[ERROR] Cannot fetch the database version." - exit 3 -fi - -# Applying changes - -N_CHANGES=0 - -for DIR_PATH in "$DIR/changes/"*; do - DIR_NAME=$(basename $DIR_PATH) - DIR_VERSION=${DIR_NAME:0:6} - - if [[ ! "$DIR_NAME" =~ ^[0-9]{6}$ ]]; then - echo "[WARN] Ignoring wrong directory name: $DIR_NAME" - continue - fi - if [ "$DB_VERSION" -ge "$DIR_VERSION" ]; then - echo "[INFO] Ignoring already applied version: $DIR_NAME" - continue - fi - - echo "[INFO] Applying version: $DIR_NAME" - - for FILE in "$DIR_PATH/"*; do - FILE_NAME=$(basename "$FILE") - - if [[ ! "$FILE_NAME" =~ ^[0-9]{2}-[a-zA-Z0-9_]+\.sql$ ]]; then - echo "[WARN] Ignoring wrong file name: $FILE_NAME" - continue - fi - - echo "[INFO] -> $FILE_NAME" - mysql --defaults-file="$INI_FILE" --comments < $FILE - N_CHANGES=$((N_CHANGES + 1)) - done - - UPDATE_VERSION="UPDATE util.config SET dbVersion='$DIR_VERSION'" - echo "$UPDATE_VERSION" | mysql --defaults-file="$INI_FILE" -done - -if [ "$N_CHANGES" -eq "0" ]; then - echo "[INFO] No changes applied." -else - echo "[INFO] Changes applied succesfully." -fi - diff --git a/db/remotes/ca.pem b/db/remotes/ca.pem new file mode 100644 index 000000000..50204e199 --- /dev/null +++ b/db/remotes/ca.pem @@ -0,0 +1,23 @@ +-----BEGIN CERTIFICATE----- +MIIDvzCCAqegAwIBAgIUG3Pd897tVM9pYLpPJFsulfk1z9EwDQYJKoZIhvcNAQEL +BQAwaDELMAkGA1UEBhMCRVMxDjAMBgNVBAgMBVNwYWluMREwDwYDVQQHDAhWYWxl +bmNpYTEeMBwGA1UECgwVVmVyZG5hdHVyYSBMZXZhbnRlIFNMMRYwFAYDVQQDDA1W +ZXJkbmF0dXJhIENBMB4XDTIwMTEwNjEyNTE0NVoXDTQwMTEwMTEyNTE0NVowaDEL +MAkGA1UEBhMCRVMxDjAMBgNVBAgMBVNwYWluMREwDwYDVQQHDAhWYWxlbmNpYTEe +MBwGA1UECgwVVmVyZG5hdHVyYSBMZXZhbnRlIFNMMRYwFAYDVQQDDA1WZXJkbmF0 +dXJhIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArKqvodZFH2RN +fSJ5tzNlxdcrSKl3iLF7ImeU/WlXXnUKxdsXFTq+HbychOc6fYOzTccvUxcgBz14 +j1ikqF98NLqEHy1vR5tfUGWLuNIQQ+aEaycuZupeCVNxo9LZ5L2HOJvBZdrhFE92 +op9BRNiNV4yqS+nkIvUyo4YJljUYAyVG5ZQAd5bEC5DXwehBaNkCcpIipWkYuFGh +3UpHd85FCcmEXXBuyMQhb7FYiqcK9yRfky10jf6K6JyxYBvHCnna5/rDFqQZthWU +CgIfIS090EEKkIBqUNsuLdhFSZGFXXBgVwslmAynoDF4CUddFrpyAhQmg5DND96W +EHbW4K+3vQIDAQABo2EwXzAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB +/zAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0OBBYEFD36Jl1/ +uks1Ai3Gzijjd00VkPQJMA0GCSqGSIb3DQEBCwUAA4IBAQCDovHrdChX5e6/wGrr +8g8Xs1j2Lph9tIVtbP+mm9tsIvd8GV2LZIxEiw9GKdSZcx0vivT8Y2dM2b8pjkUY +8a7/ByLhEhxSDKcMk0cHwfD4zdhKcQBVb7DIYmBXLaiKlGFG04407klCRomzU+5y +SEte8AsCGmz7MOkDQ2IjghF5iM+Cagktlya3u2uefXN4CF81VOJlm5nICrc1ltPM +RsqTl8uxrgNxvqlODxC5kMePMulcJF3ybmhZwNqjraV4HupuwphedpaUypUQTSxp +mcUbG0MFkFnVF812ZN8QvNdmnguJ8o5Fzb6PvtEDgnJpU9CPQaqqec5ILMjBETFz +U438 +-----END CERTIFICATE----- diff --git a/db/config.ini b/db/remotes/docker.ini similarity index 53% rename from db/config.ini rename to db/remotes/docker.ini index 0d496dedd..f628fd3d1 100644 --- a/db/config.ini +++ b/db/remotes/docker.ini @@ -1,6 +1,5 @@ [client] -host = localhost +host = host.docker.internal port = 3306 user = root password = root -default-character-set=utf8 \ No newline at end of file diff --git a/db/remotes/local.ini b/db/remotes/local.ini new file mode 100644 index 000000000..126871f6a --- /dev/null +++ b/db/remotes/local.ini @@ -0,0 +1,5 @@ +[client] +host = 127.0.0.1 +port = 3306 +user = root +password = root diff --git a/db/remotes/old-ca.pem b/db/remotes/old-ca.pem new file mode 100644 index 000000000..a1c6710ce --- /dev/null +++ b/db/remotes/old-ca.pem @@ -0,0 +1,26 @@ +-----BEGIN CERTIFICATE----- +MIIEXTCCA0WgAwIBAgIURUPRgeHoKVUN5MQywkR+C7+CXgkwDQYJKoZIhvcNAQEL +BQAwgbYxCzAJBgNVBAYTAkVTMR0wGwYDVQQIDBRDb211bmlkYWQgVmFsZW5jaWFu +YTERMA8GA1UEBwwIVmFsZW5jaWExHjAcBgNVBAoMFVZlcmRuYXR1cmEgTGV2YW50 +ZSBTTDEUMBIGA1UECwwLSW5mb3JtYXRpY2ExFjAUBgNVBAMMDXZlcmRuYXR1cmEu +ZXMxJzAlBgkqhkiG9w0BCQEWGGhvc3RtYXN0ZXJAdmVyZG5hdHVyYS5lczAeFw0y +MjA4MDMyMDI2NTlaFw00MjA3MjkyMDI2NTlaMIG2MQswCQYDVQQGEwJFUzEdMBsG +A1UECAwUQ29tdW5pZGFkIFZhbGVuY2lhbmExETAPBgNVBAcMCFZhbGVuY2lhMR4w +HAYDVQQKDBVWZXJkbmF0dXJhIExldmFudGUgU0wxFDASBgNVBAsMC0luZm9ybWF0 +aWNhMRYwFAYDVQQDDA12ZXJkbmF0dXJhLmVzMScwJQYJKoZIhvcNAQkBFhhob3N0 +bWFzdGVyQHZlcmRuYXR1cmEuZXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK +AoIBAQCsqq+h1kUfZE19Inm3M2XF1ytIqXeIsXsiZ5T9aVdedQrF2xcVOr4dvJyE +5zp9g7NNxy9TFyAHPXiPWKSoX3w0uoQfLW9Hm19QZYu40hBD5oRrJy5m6l4JU3Gj +0tnkvYc4m8Fl2uEUT3ain0FE2I1XjKpL6eQi9TKjhgmWNRgDJUbllAB3lsQLkNfB +6EFo2QJykiKlaRi4UaHdSkd3zkUJyYRdcG7IxCFvsViKpwr3JF+TLXSN/oronLFg +G8cKedrn+sMWpBm2FZQKAh8hLT3QQQqQgGpQ2y4t2EVJkYVdcGBXCyWYDKegMXgJ +R10WunICFCaDkM0P3pYQdtbgr7e9AgMBAAGjYTBfMA4GA1UdDwEB/wQEAwIBhjAP +BgNVHRMBAf8EBTADAQH/MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAd +BgNVHQ4EFgQUPfomXX+6SzUCLcbOKON3TRWQ9AkwDQYJKoZIhvcNAQELBQADggEB +AEoDI+hUiV+pWpmh188b0f47fdLw+Zh1/AfQUj6dnVM6oXPDBjgbuhV8GiL0YtZX +i+rmeelLunmeBg0nYjaeF31x0ZIwl0slDN8PFkcPzhAOYwv9QWWgHKBxIQrJ/Vtp +0xSsWmyxyw7Ax+pSEXOM9kSKMZQZOPpE/G9yoA0rMF80DgSHc2DBl2BBOFC+VPdE +j4JbK9iL8fpyRJccsRFy9OQ/0hhKUQyLhahz577o5ZX4IjxLxcfHKxrJGVJeVXYD +mRGOnabIeJQfTGviEdnkyH2DdLxi7y6aKMlPWnutRutcsyJS6hOGlhFsyGJVN6lU +umCc9ZVn7zD1QWO7GVY2qao= +-----END CERTIFICATE----- diff --git a/db/routines/account/functions/myUser_checkLogin.sql b/db/routines/account/functions/myUser_checkLogin.sql new file mode 100644 index 000000000..ed55f0d13 --- /dev/null +++ b/db/routines/account/functions/myUser_checkLogin.sql @@ -0,0 +1,27 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `account`.`myUser_checkLogin`() + RETURNS tinyint(1) + DETERMINISTIC + READS SQL DATA +BEGIN +/** + * Checks that variables @userId and @userName haven't been altered. + * + * @return %TRUE if they are unaltered or unset, otherwise %FALSE + */ + DECLARE vSignature VARCHAR(128); + DECLARE vKey VARCHAR(255); + + IF @userId IS NOT NULL + AND @userName IS NOT NULL + AND @userSignature IS NOT NULL + THEN + SELECT loginKey INTO vKey FROM userConfig; + SET vSignature = util.hmacSha2(256, CONCAT_WS('/', @userId, @userName), vKey); + RETURN vSignature = @userSignature; + END IF; + + RETURN FALSE; + +END$$ +DELIMITER ; diff --git a/db/routines/account/functions/myUser_getId.sql b/db/routines/account/functions/myUser_getId.sql new file mode 100644 index 000000000..bc86c87dc --- /dev/null +++ b/db/routines/account/functions/myUser_getId.sql @@ -0,0 +1,24 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `account`.`myUser_getId`() + RETURNS int(11) + DETERMINISTIC + READS SQL DATA +BEGIN +/** + * Returns the current user id. + * + * @return The user id + */ + DECLARE vUser INT DEFAULT NULL; + + IF myUser_checkLogin() + THEN + SET vUser = @userId; + ELSE + SELECT id INTO vUser FROM user + WHERE name = LEFT(USER(), INSTR(USER(), '@') - 1); + END IF; + + RETURN vUser; +END$$ +DELIMITER ; diff --git a/db/routines/account/functions/myUser_getName.sql b/db/routines/account/functions/myUser_getName.sql new file mode 100644 index 000000000..541f7c086 --- /dev/null +++ b/db/routines/account/functions/myUser_getName.sql @@ -0,0 +1,23 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `account`.`myUser_getName`() + RETURNS varchar(30) CHARSET utf8mb3 COLLATE utf8mb3_general_ci + DETERMINISTIC + NO SQL +BEGIN +/** + * Returns the current user name. + * + * @return The user name + */ + DECLARE vUser VARCHAR(30) DEFAULT NULL; + + IF myUser_checkLogin() + THEN + SET vUser = @userName; + ELSE + SET vUser = LEFT(USER(), INSTR(USER(), '@') - 1); + END IF; + + RETURN vUser; +END$$ +DELIMITER ; diff --git a/db/routines/account/functions/myUser_hasPriv.sql b/db/routines/account/functions/myUser_hasPriv.sql new file mode 100644 index 000000000..b53580d74 --- /dev/null +++ b/db/routines/account/functions/myUser_hasPriv.sql @@ -0,0 +1,18 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `account`.`myUser_hasPriv`(vChain VARCHAR(100), + vPrivilege ENUM('SELECT','INSERT','UPDATE','DELETE') +) + RETURNS tinyint(1) + NOT DETERMINISTIC + READS SQL DATA +BEGIN +/** + * Search if my user has privileges on table or column + * + * @param vChain string passed with this syntax dbName.tableName[.columnName] + * @param vPrivilege privileges to check ('SELECT','INSERT','UPDATE','DELETE') + * @return vHasPrivilege + */ + RETURN user_hasPriv(vChain, vPrivilege, myUser_getId()); +END$$ +DELIMITER ; diff --git a/db/routines/account/functions/myUser_hasRole.sql b/db/routines/account/functions/myUser_hasRole.sql new file mode 100644 index 000000000..8cc8aafb5 --- /dev/null +++ b/db/routines/account/functions/myUser_hasRole.sql @@ -0,0 +1,14 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `account`.`myUser_hasRole`(vRoleName VARCHAR(255)) + RETURNS tinyint(1) + DETERMINISTIC +BEGIN +/** + * Checks if current user has/inherits a role. + * + * @param vRoleName Role to check + * @return %TRUE if it has role, %FALSE otherwise + */ + RETURN user_hasRole(myUser_getName(), vRoleName); +END$$ +DELIMITER ; diff --git a/db/routines/account/functions/myUser_hasRoleId.sql b/db/routines/account/functions/myUser_hasRoleId.sql new file mode 100644 index 000000000..d059b095d --- /dev/null +++ b/db/routines/account/functions/myUser_hasRoleId.sql @@ -0,0 +1,14 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `account`.`myUser_hasRoleId`(vRoleId INT) + RETURNS tinyint(1) + DETERMINISTIC +BEGIN +/** + * Checks if current user has/inherits a role. + * + * @param vRoleName Role id to check + * @return %TRUE if it has role, %FALSE otherwise + */ + RETURN user_hasRoleId(myUser_getName(), vRoleId); +END$$ +DELIMITER ; diff --git a/db/routines/account/functions/myUser_hasRoutinePriv.sql b/db/routines/account/functions/myUser_hasRoutinePriv.sql new file mode 100644 index 000000000..9e9563a5f --- /dev/null +++ b/db/routines/account/functions/myUser_hasRoutinePriv.sql @@ -0,0 +1,18 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `account`.`myUser_hasRoutinePriv`(vType ENUM('PROCEDURE', 'FUNCTION'), + vChain VARCHAR(100) +) + RETURNS tinyint(1) + NOT DETERMINISTIC + READS SQL DATA +BEGIN +/** + * Search if my user has privileges on routines + * + * @param vType procedure or function + * @param vChain string passed with this syntax dbName.tableName + * @return vHasPrivilege + */ + RETURN user_hasRoutinePriv(vType, vChain, myUser_getId()); +END$$ +DELIMITER ; diff --git a/db/routines/account/functions/passwordGenerate.sql b/db/routines/account/functions/passwordGenerate.sql new file mode 100644 index 000000000..952a8912c --- /dev/null +++ b/db/routines/account/functions/passwordGenerate.sql @@ -0,0 +1,53 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `account`.`passwordGenerate`() + RETURNS text CHARSET utf8mb3 COLLATE utf8mb3_unicode_ci + NOT DETERMINISTIC + READS SQL DATA +BEGIN +/** + * Generates a random password that meets the minimum requirements. + * + * @return Generated password + */ + DECLARE vMinLength TINYINT; + DECLARE vMinAlpha TINYINT; + DECLARE vMinUpper TINYINT; + DECLARE vMinDigits TINYINT; + DECLARE vMinPunct TINYINT; + DECLARE vAlpha TINYINT DEFAULT 0; + DECLARE vUpper TINYINT DEFAULT 0; + DECLARE vDigits TINYINT DEFAULT 0; + DECLARE vPunct TINYINT DEFAULT 0; + DECLARE vRandIndex INT; + DECLARE vPwd TEXT DEFAULT ''; + + DECLARE vAlphaChars TEXT DEFAULT 'abcdefghijklmnopqrstuvwxyz'; + DECLARE vUpperChars TEXT DEFAULT 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'; + DECLARE vDigitChars TEXT DEFAULT '1234567890'; + DECLARE vPunctChars TEXT DEFAULT '!$%&()=.'; + + SELECT length, nAlpha, nUpper, nDigits, nPunct + INTO vMinLength, vMinAlpha, vMinUpper, vMinDigits, vMinPunct FROM userPassword; + + WHILE LENGTH(vPwd) < vMinLength OR vAlpha < vMinAlpha + OR vUpper < vMinUpper OR vDigits < vMinDigits OR vPunct < vMinPunct DO + SET vRandIndex = FLOOR((RAND() * 4) + 1); + + CASE + WHEN vRandIndex = 1 THEN + SET vPwd = CONCAT(vPwd, SUBSTRING(vAlphaChars, FLOOR((RAND() * 26) + 1), 1)); + SET vAlpha = vAlpha + 1; + WHEN vRandIndex = 2 THEN + SET vPwd = CONCAT(vPwd, SUBSTRING(vUpperChars, FLOOR((RAND() * 26) + 1), 1)); + SET vUpper = vUpper + 1; + WHEN vRandIndex = 3 THEN + SET vPwd = CONCAT(vPwd, SUBSTRING(vDigitChars, FLOOR((RAND() * 10) + 1), 1)); + SET vDigits = vDigits + 1; + WHEN vRandIndex = 4 THEN + SET vPwd = CONCAT(vPwd, SUBSTRING(vPunctChars, FLOOR((RAND() * LENGTH(vPunctChars)) + 1), 1)); + SET vPunct = vPunct + 1; + END CASE; + END WHILE; + RETURN vPwd; +END$$ +DELIMITER ; diff --git a/db/routines/account/functions/toUnixDays.sql b/db/routines/account/functions/toUnixDays.sql new file mode 100644 index 000000000..db908060b --- /dev/null +++ b/db/routines/account/functions/toUnixDays.sql @@ -0,0 +1,14 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `account`.`toUnixDays`(vDate DATE) + RETURNS int(11) + DETERMINISTIC +BEGIN +/** + * Devuelve el timestamp unix en días de una fecha. + * + * @param vData La fecha + * @return Unix timestamp en días + */ + RETURN UNIX_TIMESTAMP(vDate) DIV 86400; +END$$ +DELIMITER ; diff --git a/db/routines/account/functions/user_getMysqlRole.sql b/db/routines/account/functions/user_getMysqlRole.sql new file mode 100644 index 000000000..91540bc6b --- /dev/null +++ b/db/routines/account/functions/user_getMysqlRole.sql @@ -0,0 +1,23 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `account`.`user_getMysqlRole`(vUserName VARCHAR(255)) + RETURNS varchar(255) CHARSET utf8mb3 COLLATE utf8mb3_unicode_ci + DETERMINISTIC +BEGIN +/** + * From a username, it returns the associated MySQL wich should be used when + * using external authentication systems. + * + * @param vUserName The user name + * @return The associated MySQL role + */ + DECLARE vRole VARCHAR(255); + + SELECT CONCAT(IF(r.hasLogin, c.rolePrefix, ''), r.name) INTO vRole + FROM role r + JOIN user u ON u.role = r.id + JOIN roleConfig c + WHERE u.name = vUserName; + + RETURN vRole; +END$$ +DELIMITER ; diff --git a/db/routines/account/functions/user_getNameFromId.sql b/db/routines/account/functions/user_getNameFromId.sql new file mode 100644 index 000000000..b06facd7a --- /dev/null +++ b/db/routines/account/functions/user_getNameFromId.sql @@ -0,0 +1,20 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `account`.`user_getNameFromId`(vSelf INT) + RETURNS varchar(30) CHARSET utf8mb3 COLLATE utf8mb3_unicode_ci + DETERMINISTIC +BEGIN +/** + * Gets user name from it's id. + * + * @param vSelf The user id + * @return The user name + */ + DECLARE vName VARCHAR(30); + + SELECT `name` INTO vName + FROM user + WHERE id = vSelf; + + RETURN vName; +END$$ +DELIMITER ; diff --git a/db/routines/account/functions/user_hasPriv.sql b/db/routines/account/functions/user_hasPriv.sql new file mode 100644 index 000000000..83bdfaa19 --- /dev/null +++ b/db/routines/account/functions/user_hasPriv.sql @@ -0,0 +1,109 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `account`.`user_hasPriv`(vChain VARCHAR(100), + vPrivilege ENUM('SELECT','INSERT','UPDATE','DELETE'), + vUserFk INT +) + RETURNS tinyint(1) + NOT DETERMINISTIC + READS SQL DATA +BEGIN +/** + * Search if the user has privileges on table or column + * + * @param vChain string passed with this syntax dbName.tableName[.columnName] + * @param vPrivilege privileges to check('SELECT','INSERT','UPDATE','DELETE') + * @param vUserFk user to check + * @return vHasPrivilege + */ + DECLARE vHasPrivilege BOOL DEFAULT FALSE; + DECLARE vDb VARCHAR(50); + DECLARE vTableName VARCHAR(50); + DECLARE vColumnName VARCHAR(50); + DECLARE vPrivilegeFlag INT; + DECLARE vChainExists BOOL; + + SET vDb = SUBSTRING_INDEX(vChain, '.', 1); + SET vChain = SUBSTRING(vChain, LENGTH(vDb) + 2); + IF LOCATE('.', vChain) > 0 THEN + SET vTableName = SUBSTRING_INDEX(vChain, '.', 1); + SET vColumnName = SUBSTRING(vChain, LENGTH(vTableName) + 2); + ELSE + SET vTableName = vChain; + END IF; + + SELECT COUNT(*) INTO vChainExists + FROM information_schema.COLUMNS + WHERE TABLE_SCHEMA = vDb + AND TABLE_NAME = vTableName + AND (COLUMN_NAME = vColumnName OR vColumnName IS NULL) + LIMIT 1; + + IF NOT vChainExists THEN + RETURN FALSE; + END IF; + + CASE vPrivilege + WHEN 'Select' THEN SET vPrivilegeFlag = 1; + WHEN 'Insert' THEN SET vPrivilegeFlag = 2; + WHEN 'Update' THEN SET vPrivilegeFlag = 4; + WHEN 'Delete' THEN SET vPrivilegeFlag = 8; + ELSE BEGIN END; + END CASE; + + DROP TEMPORARY TABLE IF EXISTS tRole; + CREATE TEMPORARY TABLE tRole + (INDEX (`name`)) + ENGINE = MEMORY + SELECT r.`name` + FROM user u + JOIN roleRole rr ON rr.role = u.role + JOIN `role` r ON r.id = rr.inheritsFrom + WHERE u.id = vUserFk; + + SELECT hasPrivilege INTO vHasPrivilege + FROM (SELECT JSON_VALUE(Priv, '$.access') & vPrivilegeFlag hasPrivilege + FROM mysql.global_priv gp + JOIN tRole tr ON CONCAT(tr.name) = gp.User + HAVING hasPrivilege + LIMIT 1)sub; + + IF NOT vHasPrivilege THEN + + SELECT sub.privilege = 'Y' INTO vHasPrivilege + FROM + (SELECT CASE vPrivilege + WHEN 'SELECT' THEN Select_priv + WHEN 'INSERT' THEN Insert_priv + WHEN 'UPDATE' THEN Update_priv + WHEN 'DELETE' THEN Delete_priv + END privilege + FROM mysql.db db + JOIN tRole tr ON tr.name = db.User + WHERE db.Db = vDb)sub; + + END IF; + + IF NOT vHasPrivilege THEN + + SELECT TRUE INTO vHasPrivilege + FROM tRole tr + LEFT JOIN ( + SELECT User, Table_priv privilege + FROM mysql.tables_priv + WHERE Db = vDb + AND Table_name = vTableName + UNION + SELECT User, Column_priv + FROM mysql.columns_priv + WHERE Db = vDb + AND Table_name = vTableName + AND Column_name = vColumnName + )sub ON sub.`User` = tr.name + WHERE sub.privilege = vPrivilege; + END IF; + + DROP TEMPORARY TABLE tRole; + + RETURN vHasPrivilege; +END$$ +DELIMITER ; diff --git a/db/routines/account/functions/user_hasRole.sql b/db/routines/account/functions/user_hasRole.sql new file mode 100644 index 000000000..fb88efeec --- /dev/null +++ b/db/routines/account/functions/user_hasRole.sql @@ -0,0 +1,24 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `account`.`user_hasRole`(vUserName VARCHAR(255), vRoleName VARCHAR(255)) + RETURNS tinyint(1) + DETERMINISTIC +BEGIN +/** + * Checks if user has/inherits a role. + * + * @param vUserName The user name + * @param vRoleName Role to check + * @return %TRUE if it has role, %FALSE otherwise + */ + DECLARE vHasRole BOOL DEFAULT FALSE; + + SELECT COUNT(*) > 0 INTO vHasRole + FROM user u + JOIN roleRole rr ON rr.role = u.role + JOIN role r ON r.id = rr.inheritsFrom + WHERE u.`name` = vUserName + AND r.`name` = vRoleName COLLATE 'utf8_unicode_ci'; + + RETURN vHasRole; +END$$ +DELIMITER ; diff --git a/db/routines/account/functions/user_hasRoleId.sql b/db/routines/account/functions/user_hasRoleId.sql new file mode 100644 index 000000000..a35624d3d --- /dev/null +++ b/db/routines/account/functions/user_hasRoleId.sql @@ -0,0 +1,24 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `account`.`user_hasRoleId`(vUser VARCHAR(255), vRoleId INT) + RETURNS tinyint(1) + DETERMINISTIC +BEGIN +/** + * Checks if user has/inherits a role. + * + * @param vUserName The user name + * @param vRoleId Role id to check + * @return %TRUE if it has role, %FALSE otherwise + */ + DECLARE vHasRole BOOL DEFAULT FALSE; + + SELECT COUNT(*) > 0 INTO vHasRole + FROM user u + JOIN roleRole rr ON rr.role = u.role + JOIN role r ON r.id = rr.inheritsFrom + WHERE u.`name` = vUser + AND r.id = vRoleId; + + RETURN vHasRole; +END$$ +DELIMITER ; diff --git a/db/routines/account/functions/user_hasRoutinePriv.sql b/db/routines/account/functions/user_hasRoutinePriv.sql new file mode 100644 index 000000000..6f87f160c --- /dev/null +++ b/db/routines/account/functions/user_hasRoutinePriv.sql @@ -0,0 +1,81 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `account`.`user_hasRoutinePriv`(vType ENUM('PROCEDURE', 'FUNCTION'), + vChain VARCHAR(100), + vUserFk INT +) + RETURNS tinyint(1) + NOT DETERMINISTIC + READS SQL DATA +BEGIN +/** + * Search if the user has privileges on routines. + * + * @param vType procedure or function + * @param vChain string passed with this syntax dbName.tableName + * @param vUserFk user to ckeck + * @return vHasPrivilege + */ + DECLARE vHasPrivilege BOOL DEFAULT FALSE; + DECLARE vDb VARCHAR(50); + DECLARE vObject VARCHAR(50); + DECLARE vChainExists BOOL; + DECLARE vExecutePriv INT DEFAULT 262144; + -- 262144 = CONV(1000000000000000000, 2, 10) + -- 1000000000000000000 execution permission expressed in binary base + + SET vDb = SUBSTRING_INDEX(vChain, '.', 1); + SET vChain = SUBSTRING(vChain, LENGTH(vDb) + 2); + SET vObject = SUBSTRING_INDEX(vChain, '.', 1); + + SELECT COUNT(*) INTO vChainExists + FROM mysql.proc + WHERE db = vDb + AND `name` = vObject + AND `type` = vType + LIMIT 1; + + IF NOT vChainExists THEN + RETURN FALSE; + END IF; + + DROP TEMPORARY TABLE IF EXISTS tRole; + CREATE TEMPORARY TABLE tRole + (INDEX (`name`)) + ENGINE = MEMORY + SELECT r.`name` + FROM user u + JOIN roleRole rr ON rr.role = u.role + JOIN `role` r ON r.id = rr.inheritsFrom + WHERE u.id = vUserFk; + + SELECT TRUE INTO vHasPrivilege + FROM mysql.global_priv gp + JOIN tRole tr ON tr.name = gp.`User` + OR CONCAT('$', tr.name) = gp.`User` + WHERE JSON_VALUE(gp.Priv, '$.access') >= vExecutePriv + AND gp.Host = '' + LIMIT 1; + + IF NOT vHasPrivilege THEN + SELECT TRUE INTO vHasPrivilege + FROM mysql.db db + JOIN tRole tr ON tr.name = db.`User` + WHERE db.Db = vDb + AND db.Execute_priv = 'Y'; + END IF; + + IF NOT vHasPrivilege THEN + SELECT TRUE INTO vHasPrivilege + FROM mysql.procs_priv pp + JOIN tRole tr ON tr.name = pp.`User` + WHERE pp.Db = vDb + AND pp.Routine_name = vObject + AND pp.Routine_type = vType + AND pp.Proc_priv = 'Execute' + LIMIT 1; + END IF; + + DROP TEMPORARY TABLE tRole; + RETURN vHasPrivilege; +END$$ +DELIMITER ; diff --git a/db/routines/account/procedures/account_enable.sql b/db/routines/account/procedures/account_enable.sql new file mode 100644 index 000000000..9f43c97a3 --- /dev/null +++ b/db/routines/account/procedures/account_enable.sql @@ -0,0 +1,24 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `account`.`account_enable`(vSelf INT) +BEGIN +/** + * Enables an account and sets up email configuration. + */ + UPDATE user + SET active = TRUE + WHERE id = vSelf; + + INSERT IGNORE INTO account + SET id = vSelf; + + INSERT IGNORE INTO mailAliasAccount (mailAlias, account) + SELECT id, vSelf + FROM mailAlias + WHERE alias = 'general'; + + INSERT IGNORE INTO mailForward (account, forwardTo) + SELECT vSelf, email + FROM user + WHERE id = vSelf; +END$$ +DELIMITER ; diff --git a/db/routines/account/procedures/myUser_login.sql b/db/routines/account/procedures/myUser_login.sql new file mode 100644 index 000000000..be547292e --- /dev/null +++ b/db/routines/account/procedures/myUser_login.sql @@ -0,0 +1,25 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `account`.`myUser_login`(vUserName VARCHAR(255), vPassword VARCHAR(255)) + READS SQL DATA +BEGIN +/** + * Logs in using the user credentials. + * + * @param vUserName The user name + * @param vPassword The user password + */ + DECLARE vAuthIsOk BOOLEAN DEFAULT FALSE; + + SELECT COUNT(*) = 1 INTO vAuthIsOk FROM user + WHERE name = vUserName + AND password = MD5(vPassword) + AND active; + + IF vAuthIsOk + THEN + CALL myUser_loginWithName (vUserName); + ELSE + CALL util.throw ('INVALID_CREDENTIALS'); + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/account/procedures/myUser_loginWithKey.sql b/db/routines/account/procedures/myUser_loginWithKey.sql new file mode 100644 index 000000000..67d8c9923 --- /dev/null +++ b/db/routines/account/procedures/myUser_loginWithKey.sql @@ -0,0 +1,21 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `account`.`myUser_loginWithKey`(vUserName VARCHAR(255), vKey VARCHAR(255)) + READS SQL DATA +BEGIN +/** + * Logs in using the user name and MySQL master key. + * + * @param vUserName The user name + * @param vKey The MySQL master key + */ + DECLARE vLoginKey VARCHAR(255); + + SELECT loginKey INTO vLoginKey FROM userConfig; + + IF vLoginKey = vKey THEN + CALL myUser_loginWithName(vUserName); + ELSE + CALL util.throw('INVALID_KEY'); + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/account/procedures/myUser_loginWithName.sql b/db/routines/account/procedures/myUser_loginWithName.sql new file mode 100644 index 000000000..522da77dd --- /dev/null +++ b/db/routines/account/procedures/myUser_loginWithName.sql @@ -0,0 +1,24 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `account`.`myUser_loginWithName`(vUserName VARCHAR(255)) + READS SQL DATA +BEGIN +/** + * Logs in using only the user name. This procedure is intended to be executed + * by users with a high level of privileges so that normal users should not have + * execute permissions on it. + * + * @param vUserName The user name + */ + DECLARE vUserId INT DEFAULT NULL; + DECLARE vKey VARCHAR(255); + + SELECT id INTO vUserId FROM user + WHERE name = vUserName; + + SELECT loginKey INTO vKey FROM userConfig; + + SET @userId = vUserId; + SET @userName = vUserName; + SET @userSignature = util.hmacSha2(256, CONCAT_WS('/', vUserId, vUserName), vKey); +END$$ +DELIMITER ; diff --git a/db/routines/account/procedures/myUser_logout.sql b/db/routines/account/procedures/myUser_logout.sql new file mode 100644 index 000000000..a1d7db361 --- /dev/null +++ b/db/routines/account/procedures/myUser_logout.sql @@ -0,0 +1,11 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `account`.`myUser_logout`() +BEGIN +/** + * Logouts the user. + */ + SET @userId = NULL; + SET @userName = NULL; + SET @userSignature = NULL; +END$$ +DELIMITER ; diff --git a/db/routines/account/procedures/role_checkName.sql b/db/routines/account/procedures/role_checkName.sql new file mode 100644 index 000000000..55d9d80a9 --- /dev/null +++ b/db/routines/account/procedures/role_checkName.sql @@ -0,0 +1,16 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `account`.`role_checkName`(vRoleName VARCHAR(255)) +BEGIN +/** + * Checks that role name meets the necessary syntax requirements, otherwise it + * throws an exception. + * Role name must be written in camelCase. + * + * @param vRoleName The role name + */ + IF BINARY vRoleName NOT REGEXP '^[a-z][a-zA-Z]+$' THEN + SIGNAL SQLSTATE '45000' + SET MESSAGE_TEXT = 'Role name must be written in camelCase'; + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/account/procedures/role_getDescendents.sql b/db/routines/account/procedures/role_getDescendents.sql new file mode 100644 index 000000000..ecd4a8790 --- /dev/null +++ b/db/routines/account/procedures/role_getDescendents.sql @@ -0,0 +1,64 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `account`.`role_getDescendents`(vSelf INT) +BEGIN +/** + * Gets the identifiers of all the subroles implemented by a role (Including + * itself). + * + * @param vSelf The role identifier + * @table tmp.role Subroles implemented by the role + */ + DECLARE vIsRoot BOOL; + + DROP TEMPORARY TABLE IF EXISTS + tmp.role, parents, childs; + + CREATE TEMPORARY TABLE tmp.role + (UNIQUE (id)) + ENGINE = MEMORY + SELECT vSelf AS id; + + CREATE TEMPORARY TABLE parents + ENGINE = MEMORY + SELECT vSelf AS id; + + CREATE TEMPORARY TABLE childs + LIKE parents; + + REPEAT + DELETE FROM childs; + INSERT INTO childs + SELECT DISTINCT r.inheritsFrom id + FROM parents p + JOIN roleInherit r ON r.role = p.id + LEFT JOIN tmp.role t ON t.id = r.inheritsFrom + WHERE t.id IS NULL; + + DELETE FROM parents; + INSERT INTO parents + SELECT * FROM childs; + + INSERT INTO tmp.role + SELECT * FROM childs; + + UNTIL ROW_COUNT() <= 0 + END REPEAT; + + -- If it is root all the roles are added + + SELECT COUNT(*) > 0 INTO vIsRoot + FROM tmp.role t + JOIN role r ON r.id = t.id + WHERE r.`name` = 'root'; + + IF vIsRoot THEN + INSERT IGNORE INTO tmp.role (id) + SELECT id FROM role; + END IF; + + -- Cleaning + + DROP TEMPORARY TABLE + parents, childs; +END$$ +DELIMITER ; diff --git a/db/routines/account/procedures/role_sync.sql b/db/routines/account/procedures/role_sync.sql new file mode 100644 index 000000000..139193a31 --- /dev/null +++ b/db/routines/account/procedures/role_sync.sql @@ -0,0 +1,51 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `account`.`role_sync`() +BEGIN +/** + * Synchronize the @roleRole table with the current role hierarchy. This + * procedure must be called every time the @roleInherit table is modified so + * that the changes made on it are effective. + */ + DECLARE vRoleId INT; + DECLARE vDone BOOL; + + DECLARE cur CURSOR FOR + SELECT id FROM role; + + DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; + + DROP TEMPORARY TABLE IF EXISTS tRoleRole; + CREATE TEMPORARY TABLE tRoleRole + ENGINE = MEMORY + SELECT * FROM roleRole LIMIT 0; + + OPEN cur; + + l: LOOP + SET vDone = FALSE; + FETCH cur INTO vRoleId; + + IF vDone THEN + LEAVE l; + END IF; + + CALL role_getDescendents(vRoleId); + + INSERT INTO tRoleRole (role, inheritsFrom) + SELECT vRoleId, id FROM tmp.role; + + DROP TEMPORARY TABLE tmp.role; + END LOOP; + + CLOSE cur; + + START TRANSACTION; + DELETE FROM roleRole; + INSERT INTO roleRole SELECT * FROM tRoleRole; + COMMIT; + + DROP TEMPORARY TABLE tRoleRole; + + CALL role_syncPrivileges; +END$$ +DELIMITER ; diff --git a/db/routines/account/procedures/role_syncPrivileges.sql b/db/routines/account/procedures/role_syncPrivileges.sql new file mode 100644 index 000000000..cf265b4bd --- /dev/null +++ b/db/routines/account/procedures/role_syncPrivileges.sql @@ -0,0 +1,565 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `account`.`role_syncPrivileges`() +BEGIN +/** + * Synchronizes permissions of MySQL role users based on role hierarchy. + * The computed role users of permission mix will be named according to + * pattern [vGenRolePrefix][roleName]. + * + * If [vTplUser]@[vRoleHost] user exists, it will be taken as a template for + * basic attributes. + * + * Warning! This procedure should only be called when MySQL privileges + * are modified. If role hierarchy is modified, you must call the role_sync() + * procedure wich calls this internally. + */ + DECLARE vIsMariaDb BOOL DEFAULT VERSION() LIKE '%MariaDB%'; + DECLARE vVersion INT DEFAULT SUBSTRING_INDEX(VERSION(), '.', 1); + DECLARE vTplUser VARCHAR(255); + DECLARE vRoleHost VARCHAR(255); + DECLARE vUserPrefix VARCHAR(2); + DECLARE vUserHost VARCHAR(255); + DECLARE vGenRolePrefix VARCHAR(2); + DECLARE vGenRoleHost VARCHAR(255); + DECLARE vPrefixedLike VARCHAR(255); + DECLARE vPassword VARCHAR(255) DEFAULT ''; + + SELECT rolePrefix, userPrefix, userHost, tplUser + INTO vGenRolePrefix, vUserPrefix, vUserHost, vTplUser + FROM roleConfig; + + -- Deletes computed role users + + SET vPrefixedLike = CONCAT(vGenRolePrefix, '%'); + SET vGenRoleHost = vUserHost; + + IF vIsMariaDb THEN + SET vRoleHost = ''; + + DELETE FROM mysql.global_priv + WHERE `User` LIKE vPrefixedLike; + + DELETE FROM mysql.roles_mapping + WHERE `User` LIKE vPrefixedLike + OR ( + `Role` LIKE vPrefixedLike + AND (`User`, `Host`) = ('root', 'localhost') + ); + ELSE + SET vRoleHost = 'localhost'; + + DELETE FROM mysql.user + WHERE `User` LIKE vPrefixedLike; + END IF; + + DELETE FROM mysql.db + WHERE `User` LIKE vPrefixedLike; + + DELETE FROM mysql.tables_priv + WHERE `User` LIKE vPrefixedLike; + + DELETE FROM mysql.columns_priv + WHERE `User` LIKE vPrefixedLike; + + DELETE FROM mysql.procs_priv + WHERE `User` LIKE vPrefixedLike; + + DELETE FROM mysql.proxies_priv + WHERE `Proxied_user` LIKE vPrefixedLike; + + -- Temporary tables + + DROP TEMPORARY TABLE IF EXISTS tRole; + CREATE TEMPORARY TABLE tRole + (INDEX (id)) + ENGINE = MEMORY + SELECT + id, + `name` `role`, + CONCAT(vGenRolePrefix, `name`) prefixedRole + FROM `role` + WHERE hasLogin; + + -- Get role inheritance + + DROP TEMPORARY TABLE IF EXISTS tRoleInherit; + CREATE TEMPORARY TABLE tRoleInherit + (INDEX (inheritsFrom)) + ENGINE = MEMORY + SELECT + r.prefixedRole, + ri.`name` inheritsFrom + FROM tRole r + JOIN `roleRole` rr ON rr.role = r.id + JOIN `role` ri ON ri.id = rr.inheritsFrom + JOIN mysql.`user` u + ON u.`User` = ri.`name` AND u.`Host` = vRoleHost; + + -- Recreate role users + + IF vIsMariaDb THEN + -- Roles + + INSERT INTO mysql.global_priv (`Host`, `User`, `Priv`) + SELECT vRoleHost, prefixedRole, + JSON_OBJECT( + 'is_role', TRUE, + 'access', 0 + ) + FROM tRole r + UNION + SELECT vRoleHost, CONCAT(vGenRolePrefix, 'root'), + JSON_OBJECT( + 'is_role', TRUE, + 'access', 0 + ); + + INSERT INTO mysql.roles_mapping (`Host`, `User`, `Role`, `Admin_option`) + SELECT vRoleHost, prefixedRole, inheritsFrom, 'N' + FROM tRoleInherit + UNION + SELECT vRoleHost, CONCAT(vGenRolePrefix, 'root'), prefixedRole, 'Y' + FROM tRole; + + INSERT INTO mysql.roles_mapping (`Host`, `User`, `Role`, `Admin_option`) + SELECT 'localhost', 'root', prefixedRole, 'Y' + FROM tRole + UNION + SELECT 'localhost', 'root', CONCAT(vGenRolePrefix, 'root'), 'Y'; + + -- Role users + + INSERT INTO mysql.global_priv ( + `User`, + `Host`, + `Priv` + ) + SELECT + r.prefixedRole, + vGenRoleHost, + JSON_MERGE_PATCH( + IFNULL(t.`Priv`, '{}'), + IFNULL(u.`Priv`, '{}'), + JSON_OBJECT( + 'mysql_old_password', JSON_VALUE(t.`Priv`, '$.mysql_old_password'), + 'mysql_native_password', JSON_VALUE(t.`Priv`, '$.mysql_native_password'), + 'authentication_string', JSON_VALUE(t.`Priv`, '$.authentication_string'), + 'ssl_type', JSON_VALUE(t.`Priv`, '$.ssl_type'), + 'default_role', r.prefixedRole, + 'access', 0, + 'is_role', FALSE + ) + ) + FROM tRole r + LEFT JOIN mysql.global_priv t + ON (t.`User`, t.Host) = (vTplUser, vRoleHost) + LEFT JOIN mysql.global_priv u + ON (u.`User`, u.Host) = (r.`role`, vRoleHost); + + INSERT INTO mysql.roles_mapping (`Host`, `User`, `Role`, `Admin_option`) + SELECT vGenRoleHost, prefixedRole, prefixedRole, 'N' + FROM tRole; + + -- Accounts + + DROP TEMPORARY TABLE IF EXISTS tAccounts; + CREATE TEMPORARY TABLE tAccounts + (INDEX (`name`)) + ENGINE = MEMORY + SELECT p.`User` `name`, r.prefixedRole + FROM mysql.global_priv p + JOIN `user` u ON u.`name` = p.`User` + JOIN tRole r ON r.`id` = u.`role` + WHERE JSON_EXTRACT(p.`Priv`, '$.autogenerated') = 'true'; + + UPDATE mysql.global_priv p + JOIN tAccounts c ON c.`name` = p.`User` + SET p.`Priv` = JSON_SET(p.`Priv`, '$.default_role', c.prefixedRole) + WHERE p.`Host` = vUserHost; + + UPDATE IGNORE mysql.roles_mapping m + JOIN tAccounts c ON c.`name` = m.`User` + SET m.`Role` = c.prefixedRole + WHERE m.`Host` = vUserHost; + + DROP TEMPORARY TABLE tAccounts; + ELSE + DROP TEMPORARY TABLE IF EXISTS tUser; + CREATE TEMPORARY TABLE tUser + SELECT + r.prefixedRole `User`, + vGenRoleHost `Host`, + IFNULL(t.`authentication_string`, + '') `authentication_string`, + IFNULL(t.`plugin`, + 'mysql_native_password') `plugin`, + IFNULL(IF('' != u.`ssl_type`, + u.`ssl_type`, t.`ssl_type`), + '') `ssl_type`, + IFNULL(IF('' != u.`ssl_cipher`, + u.`ssl_cipher`, t.`ssl_cipher`), + '') `ssl_cipher`, + IFNULL(IF('' != u.`x509_issuer`, + u.`x509_issuer`, t.`x509_issuer`), + '') `x509_issuer`, + IFNULL(IF('' != u.`x509_subject`, + u.`x509_subject`, t.`x509_subject`), + '') `x509_subject`, + IFNULL(IF(0 != u.`max_questions`, + u.`max_questions`, t.`max_questions`), + 0) `max_questions`, + IFNULL(IF(0 != u.`max_updates`, + u.`max_updates`, t.`max_updates`), + 0) `max_updates`, + IFNULL(IF(0 != u.`max_connections`, + u.`max_connections`, t.`max_connections`), + 0) `max_connections`, + IFNULL(IF(0 != u.`max_user_connections`, + u.`max_user_connections`, t.`max_user_connections`), + 0) `max_user_connections` + FROM tRole r + LEFT JOIN mysql.user t + ON t.`User` = vTplUser + AND t.`Host` = vRoleHost + LEFT JOIN mysql.user u + ON u.`User` = r.role + AND u.`Host` = vRoleHost; + + IF vVersion <= 5 THEN + SELECT `Password` INTO vPassword + FROM mysql.user + WHERE `User` = vTplUser + AND `Host` = vRoleHost; + + INSERT INTO mysql.user ( + `User`, + `Host`, + `Password`, + `authentication_string`, + `plugin`, + `ssl_type`, + `ssl_cipher`, + `x509_issuer`, + `x509_subject`, + `max_questions`, + `max_updates`, + `max_connections`, + `max_user_connections` + ) + SELECT + `User`, + `Host`, + vPassword, + `authentication_string`, + `plugin`, + `ssl_type`, + `ssl_cipher`, + `x509_issuer`, + `x509_subject`, + `max_questions`, + `max_updates`, + `max_connections`, + `max_user_connections` + FROM tUser; + ELSE + INSERT INTO mysql.user ( + `User`, + `Host`, + `authentication_string`, + `plugin`, + `ssl_type`, + `ssl_cipher`, + `x509_issuer`, + `x509_subject`, + `max_questions`, + `max_updates`, + `max_connections`, + `max_user_connections` + ) + SELECT + `User`, + `Host`, + `authentication_string`, + `plugin`, + `ssl_type`, + `ssl_cipher`, + `x509_issuer`, + `x509_subject`, + `max_questions`, + `max_updates`, + `max_connections`, + `max_user_connections` + FROM tUser; + END IF; + + DROP TEMPORARY TABLE tUser; + + -- Proxy privileges + + INSERT INTO mysql.proxies_priv ( + `User`, + `Host`, + `Proxied_user`, + `Proxied_host`, + `Grantor` + ) + SELECT + '', + vUserHost, + prefixedRole, + vGenRoleHost, + CONCAT(prefixedRole, '@', vGenRoleHost) + FROM tRole; + + -- Global privileges + + DROP TEMPORARY TABLE IF EXISTS tUserPriv; + CREATE TEMPORARY TABLE tUserPriv + (INDEX (prefixedRole)) + ENGINE = MEMORY + SELECT + r.prefixedRole, + MAX(u.`Select_priv`) `Select_priv`, + MAX(u.`Insert_priv`) `Insert_priv`, + MAX(u.`Update_priv`) `Update_priv`, + MAX(u.`Delete_priv`) `Delete_priv`, + MAX(u.`Create_priv`) `Create_priv`, + MAX(u.`Drop_priv`) `Drop_priv`, + MAX(u.`Reload_priv`) `Reload_priv`, + MAX(u.`Shutdown_priv`) `Shutdown_priv`, + MAX(u.`Process_priv`) `Process_priv`, + MAX(u.`File_priv`) `File_priv`, + MAX(u.`Grant_priv`) `Grant_priv`, + MAX(u.`References_priv`) `References_priv`, + MAX(u.`Index_priv`) `Index_priv`, + MAX(u.`Alter_priv`) `Alter_priv`, + MAX(u.`Show_db_priv`) `Show_db_priv`, + MAX(u.`Super_priv`) `Super_priv`, + MAX(u.`Create_tmp_table_priv`) `Create_tmp_table_priv`, + MAX(u.`Lock_tables_priv`) `Lock_tables_priv`, + MAX(u.`Execute_priv`) `Execute_priv`, + MAX(u.`Repl_slave_priv`) `Repl_slave_priv`, + MAX(u.`Repl_client_priv`) `Repl_client_priv`, + MAX(u.`Create_view_priv`) `Create_view_priv`, + MAX(u.`Show_view_priv`) `Show_view_priv`, + MAX(u.`Create_routine_priv`) `Create_routine_priv`, + MAX(u.`Alter_routine_priv`) `Alter_routine_priv`, + MAX(u.`Create_user_priv`) `Create_user_priv`, + MAX(u.`Event_priv`) `Event_priv`, + MAX(u.`Trigger_priv`) `Trigger_priv`, + MAX(u.`Create_tablespace_priv`) `Create_tablespace_priv` + FROM tRoleInherit r + JOIN mysql.user u + ON u.`User` = r.inheritsFrom + AND u.`Host`= vRoleHost + GROUP BY r.prefixedRole; + + UPDATE mysql.user u + JOIN tUserPriv t + ON u.`User` = t.prefixedRole + AND u.`Host` = vGenRoleHost + SET + u.`Select_priv` + = t.`Select_priv`, + u.`Insert_priv` + = t.`Insert_priv`, + u.`Update_priv` + = t.`Update_priv`, + u.`Delete_priv` + = t.`Delete_priv`, + u.`Create_priv` + = t.`Create_priv`, + u.`Drop_priv` + = t.`Drop_priv`, + u.`Reload_priv` + = t.`Reload_priv`, + u.`Shutdown_priv` + = t.`Shutdown_priv`, + u.`Process_priv` + = t.`Process_priv`, + u.`File_priv` + = t.`File_priv`, + u.`Grant_priv` + = t.`Grant_priv`, + u.`References_priv` + = t.`References_priv`, + u.`Index_priv` + = t.`Index_priv`, + u.`Alter_priv` + = t.`Alter_priv`, + u.`Show_db_priv` + = t.`Show_db_priv`, + u.`Super_priv` + = t.`Super_priv`, + u.`Create_tmp_table_priv` + = t.`Create_tmp_table_priv`, + u.`Lock_tables_priv` + = t.`Lock_tables_priv`, + u.`Execute_priv` + = t.`Execute_priv`, + u.`Repl_slave_priv` + = t.`Repl_slave_priv`, + u.`Repl_client_priv` + = t.`Repl_client_priv`, + u.`Create_view_priv` + = t.`Create_view_priv`, + u.`Show_view_priv` + = t.`Show_view_priv`, + u.`Create_routine_priv` + = t.`Create_routine_priv`, + u.`Alter_routine_priv` + = t.`Alter_routine_priv`, + u.`Create_user_priv` + = t.`Create_user_priv`, + u.`Event_priv` + = t.`Event_priv`, + u.`Trigger_priv` + = t.`Trigger_priv`, + u.`Create_tablespace_priv` + = t.`Create_tablespace_priv`; + + DROP TEMPORARY TABLE tUserPriv; + + -- Schema level privileges + + INSERT INTO mysql.db ( + `User`, + `Host`, + `Db`, + `Select_priv`, + `Insert_priv`, + `Update_priv`, + `Delete_priv`, + `Create_priv`, + `Drop_priv`, + `Grant_priv`, + `References_priv`, + `Index_priv`, + `Alter_priv`, + `Create_tmp_table_priv`, + `Lock_tables_priv`, + `Create_view_priv`, + `Show_view_priv`, + `Create_routine_priv`, + `Alter_routine_priv`, + `Execute_priv`, + `Event_priv`, + `Trigger_priv` + ) + SELECT + r.prefixedRole, + vGenRoleHost, + t.`Db`, + MAX(t.`Select_priv`), + MAX(t.`Insert_priv`), + MAX(t.`Update_priv`), + MAX(t.`Delete_priv`), + MAX(t.`Create_priv`), + MAX(t.`Drop_priv`), + MAX(t.`Grant_priv`), + MAX(t.`References_priv`), + MAX(t.`Index_priv`), + MAX(t.`Alter_priv`), + MAX(t.`Create_tmp_table_priv`), + MAX(t.`Lock_tables_priv`), + MAX(t.`Create_view_priv`), + MAX(t.`Show_view_priv`), + MAX(t.`Create_routine_priv`), + MAX(t.`Alter_routine_priv`), + MAX(t.`Execute_priv`), + MAX(t.`Event_priv`), + MAX(t.`Trigger_priv`) + FROM tRoleInherit r + JOIN mysql.db t + ON t.`User` = r.inheritsFrom + AND t.`Host`= vRoleHost + GROUP BY r.prefixedRole, t.`Db`; + + -- Table level privileges + + INSERT INTO mysql.tables_priv ( + `User`, + `Host`, + `Db`, + `Table_name`, + `Grantor`, + `Timestamp`, + `Table_priv`, + `Column_priv` + ) + SELECT + r.prefixedRole, + vGenRoleHost, + t.`Db`, + t.`Table_name`, + t.`Grantor`, + MAX(t.`Timestamp`), + IFNULL(GROUP_CONCAT(NULLIF(t.`Table_priv`, '')), ''), + IFNULL(GROUP_CONCAT(NULLIF(t.`Column_priv`, '')), '') + FROM tRoleInherit r + JOIN mysql.tables_priv t + ON t.`User` = r.inheritsFrom + AND t.`Host`= vRoleHost + GROUP BY r.prefixedRole, t.`Db`, t.`Table_name`; + + -- Column level privileges + + INSERT INTO mysql.columns_priv ( + `User`, + `Host`, + `Db`, + `Table_name`, + `Column_name`, + `Timestamp`, + `Column_priv` + ) + SELECT + r.prefixedRole, + vGenRoleHost, + t.`Db`, + t.`Table_name`, + t.`Column_name`, + MAX(t.`Timestamp`), + IFNULL(GROUP_CONCAT(NULLIF(t.`Column_priv`, '')), '') + FROM tRoleInherit r + JOIN mysql.columns_priv t + ON t.`User` = r.inheritsFrom + AND t.`Host`= vRoleHost + GROUP BY r.prefixedRole, t.`Db`, t.`Table_name`, t.`Column_name`; + + -- Routine privileges + + INSERT IGNORE INTO mysql.procs_priv ( + `User`, + `Host`, + `Db`, + `Routine_name`, + `Routine_type`, + `Grantor`, + `Timestamp`, + `Proc_priv` + ) + SELECT + r.prefixedRole, + vGenRoleHost, + t.`Db`, + t.`Routine_name`, + t.`Routine_type`, + t.`Grantor`, + t.`Timestamp`, + t.`Proc_priv` + FROM tRoleInherit r + JOIN mysql.procs_priv t + ON t.`User` = r.inheritsFrom + AND t.`Host`= vRoleHost; + END IF; + + -- Cleanup + + DROP TEMPORARY TABLE + tRole, + tRoleInherit; + + FLUSH PRIVILEGES; +END$$ +DELIMITER ; diff --git a/db/routines/account/procedures/user_checkName.sql b/db/routines/account/procedures/user_checkName.sql new file mode 100644 index 000000000..4f954ad00 --- /dev/null +++ b/db/routines/account/procedures/user_checkName.sql @@ -0,0 +1,15 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `account`.`user_checkName`(vUserName VARCHAR(255)) +BEGIN +/** + * Checks that username meets the necessary syntax requirements, otherwise it + * throws an exception. + * The user name must only contain lowercase letters or, starting with second + * character, numbers or underscores. + */ + IF vUserName NOT REGEXP '^[a-z0-9_-]*$' THEN + SIGNAL SQLSTATE '45000' + SET MESSAGE_TEXT = 'INVALID_USER_NAME'; + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/account/procedures/user_checkPassword.sql b/db/routines/account/procedures/user_checkPassword.sql new file mode 100644 index 000000000..eb0990533 --- /dev/null +++ b/db/routines/account/procedures/user_checkPassword.sql @@ -0,0 +1,55 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `account`.`user_checkPassword`(vPassword VARCHAR(255)) +BEGIN +/** + * Comprueba si la contraseña cumple los requisitos de seguridad + * establecidos. Lanza una excepción si no se cumplen. + * + * @param vPassword Contraseña a comprobar + */ + DECLARE vChr CHAR(1); + DECLARE vPasswordOk TINYINT; + DECLARE vI TINYINT DEFAULT 1; + DECLARE vNAlpha TINYINT DEFAULT 0; + DECLARE vNUpper TINYINT DEFAULT 0; + DECLARE vNDigits TINYINT DEFAULT 0; + DECLARE vNPunct TINYINT DEFAULT 0; + + WHILE vI <= CHAR_LENGTH(vPassword) + DO + SET vChr = SUBSTRING(vPassword, vI, 1); + + IF vChr REGEXP '[[:alpha:]]' + THEN + SET vNAlpha = vNAlpha+1; + + IF vChr REGEXP '[A-Z]' + THEN + SET vNUpper = vNUpper+1; + END IF; + ELSEIF vChr REGEXP '[[:digit:]]' + THEN + SET vNDigits = vNDigits+1; + ELSEIF vChr REGEXP '[[:punct:]]' + THEN + SET vNPunct = vNPunct+1; + END IF; + + SET vI = vI+1; + END WHILE; + + SELECT + CHAR_LENGTH(vPassword) >= length + AND vNAlpha >= nAlpha + AND vNUpper >= nUpper + AND vNDigits >= nDigits + AND vNPunct >= nPunct + INTO vPasswordOk + FROM userPassword LIMIT 1; + + IF NOT vPasswordOk THEN + SIGNAL SQLSTATE '45000' + SET MESSAGE_TEXT = 'Password does not meet requirements'; + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/account/triggers/account_afterDelete.sql b/db/routines/account/triggers/account_afterDelete.sql new file mode 100644 index 000000000..be0e5901f --- /dev/null +++ b/db/routines/account/triggers/account_afterDelete.sql @@ -0,0 +1,15 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`account_afterDelete` + AFTER DELETE ON `account` + FOR EACH ROW +BEGIN + INSERT INTO userLog + SET `action` = 'delete', + `changedModel` = 'Account', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); + + INSERT IGNORE INTO userSync (`name`) + SELECT `name` FROM `user` WHERE id = OLD.id; +END$$ +DELIMITER ; diff --git a/db/routines/account/triggers/account_afterInsert.sql b/db/routines/account/triggers/account_afterInsert.sql new file mode 100644 index 000000000..be2959ab6 --- /dev/null +++ b/db/routines/account/triggers/account_afterInsert.sql @@ -0,0 +1,9 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`account_afterInsert` + AFTER INSERT ON `account` + FOR EACH ROW +BEGIN + INSERT IGNORE INTO userSync (`name`) + SELECT `name` FROM `user` WHERE id = NEW.id; +END$$ +DELIMITER ; diff --git a/db/routines/account/triggers/account_beforeInsert.sql b/db/routines/account/triggers/account_beforeInsert.sql new file mode 100644 index 000000000..43b611990 --- /dev/null +++ b/db/routines/account/triggers/account_beforeInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`account_beforeInsert` + BEFORE INSERT ON `account` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/account/triggers/account_beforeUpdate.sql b/db/routines/account/triggers/account_beforeUpdate.sql new file mode 100644 index 000000000..bbcea028d --- /dev/null +++ b/db/routines/account/triggers/account_beforeUpdate.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`account_beforeUpdate` + BEFORE UPDATE ON `account` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/account/triggers/mailAlias_afterDelete.sql b/db/routines/account/triggers/mailAlias_afterDelete.sql new file mode 100644 index 000000000..fe944246d --- /dev/null +++ b/db/routines/account/triggers/mailAlias_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`mailAlias_afterDelete` + AFTER DELETE ON `mailAlias` + FOR EACH ROW +BEGIN + INSERT INTO userLog + SET `action` = 'delete', + `changedModel` = 'MailAlias', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/account/triggers/mailAlias_beforeInsert.sql b/db/routines/account/triggers/mailAlias_beforeInsert.sql new file mode 100644 index 000000000..37a9546ca --- /dev/null +++ b/db/routines/account/triggers/mailAlias_beforeInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`mailAlias_beforeInsert` + BEFORE INSERT ON `mailAlias` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/account/triggers/mailAlias_beforeUpdate.sql b/db/routines/account/triggers/mailAlias_beforeUpdate.sql new file mode 100644 index 000000000..e3940cfda --- /dev/null +++ b/db/routines/account/triggers/mailAlias_beforeUpdate.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`mailAlias_beforeUpdate` + BEFORE UPDATE ON `mailAlias` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/account/triggers/mailForward_afterDelete.sql b/db/routines/account/triggers/mailForward_afterDelete.sql new file mode 100644 index 000000000..cb02b746d --- /dev/null +++ b/db/routines/account/triggers/mailForward_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`mailForward_afterDelete` + AFTER DELETE ON `mailForward` + FOR EACH ROW +BEGIN + INSERT INTO userLog + SET `action` = 'delete', + `changedModel` = 'MailForward', + `changedModelId` = OLD.account, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/account/triggers/mailForward_beforeInsert.sql b/db/routines/account/triggers/mailForward_beforeInsert.sql new file mode 100644 index 000000000..bc4e5ef17 --- /dev/null +++ b/db/routines/account/triggers/mailForward_beforeInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`mailForward_beforeInsert` + BEFORE INSERT ON `mailForward` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/account/triggers/mailForward_beforeUpdate.sql b/db/routines/account/triggers/mailForward_beforeUpdate.sql new file mode 100644 index 000000000..88594979a --- /dev/null +++ b/db/routines/account/triggers/mailForward_beforeUpdate.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`mailForward_beforeUpdate` + BEFORE UPDATE ON `mailForward` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/account/triggers/roleInherit_afterDelete.sql b/db/routines/account/triggers/roleInherit_afterDelete.sql new file mode 100644 index 000000000..c7c82eedb --- /dev/null +++ b/db/routines/account/triggers/roleInherit_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`roleInherit_afterDelete` + AFTER DELETE ON `roleInherit` + FOR EACH ROW +BEGIN + INSERT INTO roleLog + SET `action` = 'delete', + `changedModel` = 'RoleInherit', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/account/triggers/roleInherit_beforeInsert.sql b/db/routines/account/triggers/roleInherit_beforeInsert.sql new file mode 100644 index 000000000..77932c12d --- /dev/null +++ b/db/routines/account/triggers/roleInherit_beforeInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`roleInherit_beforeInsert` + BEFORE INSERT ON `roleInherit` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/account/triggers/roleInherit_beforeUpdate.sql b/db/routines/account/triggers/roleInherit_beforeUpdate.sql new file mode 100644 index 000000000..05aef0b95 --- /dev/null +++ b/db/routines/account/triggers/roleInherit_beforeUpdate.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`roleInherit_beforeUpdate` + BEFORE UPDATE ON `roleInherit` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/account/triggers/role_afterDelete.sql b/db/routines/account/triggers/role_afterDelete.sql new file mode 100644 index 000000000..be382cba6 --- /dev/null +++ b/db/routines/account/triggers/role_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`role_afterDelete` + AFTER DELETE ON `role` + FOR EACH ROW +BEGIN + INSERT INTO roleLog + SET `action` = 'delete', + `changedModel` = 'Role', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/account/triggers/role_beforeInsert.sql b/db/routines/account/triggers/role_beforeInsert.sql new file mode 100644 index 000000000..f68a211a7 --- /dev/null +++ b/db/routines/account/triggers/role_beforeInsert.sql @@ -0,0 +1,9 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`role_beforeInsert` + BEFORE INSERT ON `role` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); + CALL role_checkName(NEW.`name`); +END$$ +DELIMITER ; diff --git a/db/routines/account/triggers/role_beforeUpdate.sql b/db/routines/account/triggers/role_beforeUpdate.sql new file mode 100644 index 000000000..a2f471b64 --- /dev/null +++ b/db/routines/account/triggers/role_beforeUpdate.sql @@ -0,0 +1,11 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`role_beforeUpdate` + BEFORE UPDATE ON `role` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); + IF !(NEW.`name` <=> OLD.`name`) THEN + CALL role_checkName (NEW.`name`); + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/account/triggers/user_afterDelete.sql b/db/routines/account/triggers/user_afterDelete.sql new file mode 100644 index 000000000..eabe60d8c --- /dev/null +++ b/db/routines/account/triggers/user_afterDelete.sql @@ -0,0 +1,16 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`user_afterDelete` + AFTER DELETE ON `user` + FOR EACH ROW +BEGIN + INSERT INTO userLog + SET `action` = 'delete', + `changedModel` = 'User', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); + + CALL hedera.image_unref('user', OLD.image); + + INSERT IGNORE INTO userSync SET `name` = OLD.`name`; +END$$ +DELIMITER ; diff --git a/db/routines/account/triggers/user_afterInsert.sql b/db/routines/account/triggers/user_afterInsert.sql new file mode 100644 index 000000000..31f992c16 --- /dev/null +++ b/db/routines/account/triggers/user_afterInsert.sql @@ -0,0 +1,10 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`user_afterInsert` + AFTER INSERT ON `user` + FOR EACH ROW +BEGIN + CALL hedera.image_ref('user', NEW.image); + + INSERT IGNORE INTO userSync SET `name` = NEW.`name`; +END$$ +DELIMITER ; diff --git a/db/routines/account/triggers/user_afterUpdate.sql b/db/routines/account/triggers/user_afterUpdate.sql new file mode 100644 index 000000000..7fb4e644f --- /dev/null +++ b/db/routines/account/triggers/user_afterUpdate.sql @@ -0,0 +1,18 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`user_afterUpdate` + AFTER UPDATE ON `user` + FOR EACH ROW +BEGIN + IF !(NEW.image <=> OLD.image) THEN + CALL hedera.image_unref('user', OLD.image); + CALL hedera.image_ref('user', NEW.image); + END IF; + + INSERT IGNORE INTO userSync SET `name` = NEW.`name`; + + IF !(OLD.`name` <=> NEW.`name`) THEN + INSERT IGNORE INTO userSync SET `name` = OLD.`name`; + END IF; + +END$$ +DELIMITER ; diff --git a/db/routines/account/triggers/user_beforeInsert.sql b/db/routines/account/triggers/user_beforeInsert.sql new file mode 100644 index 000000000..6cafa8b3f --- /dev/null +++ b/db/routines/account/triggers/user_beforeInsert.sql @@ -0,0 +1,14 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`user_beforeInsert` + BEFORE INSERT ON `user` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); + + CALL user_checkName(NEW.`name`); + + IF NEW.nickname = '' THEN + SET NEW.nickname = NEW.`name`; + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/account/triggers/user_beforeUpdate.sql b/db/routines/account/triggers/user_beforeUpdate.sql new file mode 100644 index 000000000..849dfbd91 --- /dev/null +++ b/db/routines/account/triggers/user_beforeUpdate.sql @@ -0,0 +1,16 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `account`.`user_beforeUpdate` + BEFORE UPDATE ON `user` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); + + IF !(NEW.`name` <=> OLD.`name`) THEN + CALL user_checkName (NEW.`name`); + END IF; + + IF !(NEW.`password` <=> OLD.`password`) THEN + SET NEW.lastPassChange = util.VN_NOW(); + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/account/views/accountDovecot.sql b/db/routines/account/views/accountDovecot.sql new file mode 100644 index 000000000..1e30946f3 --- /dev/null +++ b/db/routines/account/views/accountDovecot.sql @@ -0,0 +1,10 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `account`.`accountDovecot` +AS SELECT `u`.`name` AS `name`, + `u`.`password` AS `password` +FROM ( + `account`.`user` `u` + JOIN `account`.`account` `a` ON(`a`.`id` = `u`.`id`) + ) +WHERE `u`.`active` <> 0 diff --git a/db/routines/account/views/emailUser.sql b/db/routines/account/views/emailUser.sql new file mode 100644 index 000000000..dcb435454 --- /dev/null +++ b/db/routines/account/views/emailUser.sql @@ -0,0 +1,9 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `account`.`emailUser` +AS SELECT `u`.`id` AS `userFk`, + concat(`u`.`name`, '@', `mc`.`domain`) AS `email` +FROM ( + `account`.`user` `u` + JOIN `account`.`mailConfig` `mc` + ) diff --git a/db/routines/account/views/myRole.sql b/db/routines/account/views/myRole.sql new file mode 100644 index 000000000..68364f0bc --- /dev/null +++ b/db/routines/account/views/myRole.sql @@ -0,0 +1,9 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `account`.`myRole` +AS SELECT `r`.`inheritsFrom` AS `id` +FROM ( + `account`.`roleRole` `r` + JOIN `account`.`user` `u` ON(`u`.`role` = `r`.`role`) + ) +WHERE `u`.`id` = `myUser_getId`() diff --git a/db/routines/account/views/myUser.sql b/db/routines/account/views/myUser.sql new file mode 100644 index 000000000..f520d893b --- /dev/null +++ b/db/routines/account/views/myUser.sql @@ -0,0 +1,14 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `account`.`myUser` +AS SELECT `u`.`id` AS `id`, + `u`.`name` AS `name`, + `u`.`active` AS `active`, + `u`.`email` AS `email`, + `u`.`nickname` AS `nickname`, + `u`.`lang` AS `lang`, + `u`.`role` AS `role`, + `u`.`recoverPass` AS `recoverPass` +FROM `account`.`user` `u` +WHERE `u`.`name` = `myUser_getName`() +WITH CASCADED CHECK OPTION diff --git a/db/routines/bi/procedures/Greuge_Evolution_Add.sql b/db/routines/bi/procedures/Greuge_Evolution_Add.sql new file mode 100644 index 000000000..1d4bf4355 --- /dev/null +++ b/db/routines/bi/procedures/Greuge_Evolution_Add.sql @@ -0,0 +1,115 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`Greuge_Evolution_Add`() +BEGIN +/* + Inserta en la tabla Greuge_Evolution el saldo acumulado de cada cliente, + así como las ventas acumuladas en los ultimos 365 dias, para poder controlar + su evolucion. +*/ + DECLARE datFEC DATE; + DECLARE datFEC_TOMORROW DATE; + DECLARE datFEC_LASTYEAR DATE; + + DECLARE EXIT HANDLER FOR SQLEXCEPTION BEGIN + + GET DIAGNOSTICS CONDITION 2 @errno = MYSQL_ERRNO, @text = MESSAGE_TEXT; + SELECT CONCAT('ERROR ', IFNULL(@errno,0), ': ', ifnull(@text,'texto')); + CALL vn.mail_insert( + 'jgallego@verdnatura.es,pako@verdnatura.es', + 'noreply@verdnatura.es', + 'Greuge_Evolution_Add', + CONCAT('ERROR ', IFNULL(@errno, 0), ': ', ifnull(@text, 'texto')) + ); + + END; + + SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED; + + DELETE FROM bi.Greuge_Evolution WHERE Fecha >= TIMESTAMPADD(MONTH,-1,util.VN_CURDATE()); + + SELECT TIMESTAMPADD(DAY,1,MAX(Fecha)), + TIMESTAMPADD(DAY,2,MAX(Fecha)) + INTO datFEC, + datFEC_TOMORROW + FROM bi.Greuge_Evolution; + + SET datFEC_LASTYEAR = TIMESTAMPADD(YEAR,-1,datFEC); + + DELETE FROM bi.Greuge_Evolution WHERE Fecha >= datFEC; + + DROP TEMPORARY TABLE IF EXISTS maxInvoice; + + CREATE TEMPORARY TABLE maxInvoice + (PRIMARY KEY (Id_Cliente)) + ENGINE = MEMORY + SELECT DISTINCT clientFk Id_Cliente, max(issued) as maxFecha + FROM vn.invoiceOut + GROUP BY clientFk + HAVING maxFecha < timestampadd(month,-2,datFEC); + + WHILE datFEC < util.VN_CURDATE() DO + + REPLACE bi.Greuge_Evolution(Id_Cliente, Fecha, Greuge, Ventas, Fosil) + + SELECT Id_Cliente, datFEC as Fecha, Greuge, Ventas, 0 + FROM ( + SELECT clientFk Id_Cliente, sum(amount) as Greuge + FROM vn.greuge + where shipped <= datFEC + group by clientFk + ) sub + RIGHT JOIN + + ( + + SELECT Id_Cliente, sum(Ventas) as Ventas + FROM + ( + + SELECT Id_Cliente, IF (fecha != datFEC, -1,1) * (importe + recargo) as Ventas + FROM bs.ventas + WHERE fecha = datFEC or fecha = datFEC_LASTYEAR + + UNION ALL + + SELECT Id_Cliente, Ventas + FROM bi.Greuge_Evolution + WHERE Fecha = TIMESTAMPADD(DAY, -1, datFEC) + + ) sub + group by Id_Cliente + + ) v using(Id_Cliente) + ; + + -- Ahora calcularemos el greuge muerto + UPDATE bi.Greuge_Evolution ge + JOIN maxInvoice m using(Id_Cliente) + SET FOSIL = GREUGE + WHERE m.maxFecha < TIMESTAMPADD(MONTH,-2,ge.Fecha); + + -- Recobro + 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 + JOIN vn2008.Movimientos_componentes mc on mc.Id_Movimiento = m.Id_Movimiento + WHERE t.Fecha >= datFEC + AND t.Fecha < datFEC_TOMORROW + AND mc.Id_Componente = 17 -- Recobro + GROUP BY cs.Id_Cliente + ) sub using(Id_Cliente) + SET Recobro = Importe + WHERE ge.Fecha = datFEC; + + SET datFEC = datFEC_TOMORROW; + SET datFEC_TOMORROW = TIMESTAMPADD(DAY,1,datFEC_TOMORROW); + SET datFEC_LASTYEAR = TIMESTAMPADD(YEAR,-1,datFEC); + + END WHILE; + + DROP TEMPORARY TABLE IF EXISTS maxInvoice; +END$$ +DELIMITER ; diff --git a/db/routines/bi/procedures/analisis_ventas_evolution_add.sql b/db/routines/bi/procedures/analisis_ventas_evolution_add.sql new file mode 100644 index 000000000..fca749681 --- /dev/null +++ b/db/routines/bi/procedures/analisis_ventas_evolution_add.sql @@ -0,0 +1,232 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`analisis_ventas_evolution_add`() +BEGIN + DECLARE vPreviousPeriod INT; + DECLARE vCurrentPeriod INT; + DECLARE vLastPeriod INT; + DECLARE vMinPeriod INT DEFAULT 201400; + DECLARE vMaxPeriod INT; + DECLARE vYear INT; + DECLARE vWeek INT; + + SELECT t.period INTO vMaxPeriod + FROM vn.`time` t + WHERE t.dated = util.VN_CURDATE(); + + -- Almacen + + SET vCurrentPeriod = IFNULL(vLastPeriod, vMinPeriod); + + WHILE vCurrentPeriod < vMaxPeriod + DO + SELECT MAX(Periodo) INTO vPreviousPeriod + FROM analisis_ventas_almacen_evolution + WHERE Periodo < vMaxPeriod; + + SELECT MIN(period) INTO vCurrentPeriod + FROM vn2008.time + WHERE period > vPreviousPeriod; + + SET vYear = FLOOR(vCurrentPeriod / 100); + SET vWeek = vCurrentPeriod - (vYear * 100); + + DELETE FROM analisis_ventas_almacen_evolution + WHERE Periodo = vCurrentPeriod; + + REPLACE analisis_ventas_almacen_evolution(Almacen, Ventas, Semana,Año, Periodo) + SELECT Almacen, SUM(Ventas) AS Ventas, vWeek, vYear, vCurrentPeriod + FROM ( + SELECT almacen, SUM(Importe) AS Ventas + FROM analisis_ventas + WHERE vYear = Año + AND vWeek = Semana + GROUP BY almacen + UNION ALL + SELECT almacen, - SUM(Importe) AS Ventas + FROM analisis_ventas + WHERE vYear - 1 = Año + AND vWeek = Semana + GROUP BY almacen + UNION ALL + SELECT Almacen, Ventas + FROM analisis_ventas_almacen_evolution + WHERE Periodo = vPreviousPeriod + ) sub + GROUP BY Almacen; + END WHILE; + + -- Reino + + SET vCurrentPeriod = vMinPeriod; + + WHILE vCurrentPeriod < vMaxPeriod + DO + SELECT MAX(periodo) INTO vPreviousPeriod + FROM analisis_ventas_reino_evolution + WHERE periodo < vMaxPeriod; + + SELECT MIN(period) INTO vCurrentPeriod + FROM vn2008.time + WHERE period > vPreviousPeriod; + + SET vYear = FLOOR(vCurrentPeriod / 100); + SET vWeek = vCurrentPeriod - (vYear * 100); + + DELETE FROM analisis_ventas_reino_evolution + WHERE Periodo = vCurrentPeriod; + + REPLACE analisis_ventas_reino_evolution(reino, ventas, semana,año, periodo) + SELECT reino, SUM(ventas) AS ventas, vWeek, vYear, vCurrentPeriod + FROM ( + SELECT Reino, SUM(Importe) AS ventas + FROM analisis_ventas + WHERE vYear = Año + AND vWeek = Semana + GROUP BY Reino + UNION ALL + SELECT Reino, - SUM(Importe) AS ventas + FROM analisis_ventas + WHERE vYear - 1 = Año + AND vWeek = Semana + GROUP BY Reino + UNION ALL + SELECT reino, ventas + FROM analisis_ventas_reino_evolution + WHERE Periodo = vPreviousPeriod + ) sub + GROUP BY reino; + END WHILE; + + -- Provincia + + SET vCurrentPeriod = vMinPeriod; + + WHILE vCurrentPeriod < vMaxPeriod + DO + SELECT MAX(periodo) INTO vPreviousPeriod + FROM analisis_ventas_provincia_evolution + WHERE periodo < vMaxPeriod; + + SELECT MIN(period) INTO vCurrentPeriod + FROM vn2008.time + WHERE period > vPreviousPeriod; + + SET vYear = FLOOR(vCurrentPeriod / 100); + SET vWeek = vCurrentPeriod - (vYear * 100); + + DELETE FROM analisis_ventas_provincia_evolution + WHERE Periodo = vCurrentPeriod; + + REPLACE analisis_ventas_provincia_evolution(provincia, countryCode, ventas, semana,año, periodo) + SELECT Provincia, code, SUM(ventas) AS ventas, vWeek, vYear, vCurrentPeriod + FROM ( + SELECT a.Provincia, c.code, SUM(a.Importe) AS ventas + FROM analisis_ventas a + JOIN vn.province p ON p.name= a.provincia + JOIN vn.country c ON c.id = p.countryFk + WHERE vYear = a.Año + AND vWeek = a.Semana + GROUP BY a.Provincia + UNION ALL + SELECT a.Provincia, c.code, - SUM(a.Importe) AS ventas + FROM analisis_ventas a + JOIN vn.province p ON p.name= a.provincia + JOIN vn.country c ON c.id = p.countryFk + WHERE vYear - 1 = a.Año + AND vWeek = a.Semana + GROUP BY a.Provincia + UNION ALL + SELECT a.provincia,a.countryCode, a.ventas + FROM analisis_ventas_provincia_evolution a + WHERE a.Periodo = vPreviousPeriod + ) sub + GROUP BY Provincia; + + + END WHILE; + + -- Vista + + SET vCurrentPeriod = vMinPeriod; + + WHILE vCurrentPeriod < vMaxPeriod + DO + SELECT MAX(periodo) INTO vPreviousPeriod + FROM analisis_ventas_vista_evolution + WHERE periodo < vMaxPeriod; + + SELECT MIN(period) INTO vCurrentPeriod + FROM vn2008.time + WHERE period > vPreviousPeriod; + + SET vYear = FLOOR(vCurrentPeriod / 100); + SET vWeek = vCurrentPeriod - (vYear * 100); + + DELETE FROM analisis_ventas_vista_evolution + WHERE Periodo = vCurrentPeriod; + + REPLACE analisis_ventas_vista_evolution(vista, ventas, semana,año, periodo) + SELECT vista, SUM(ventas) AS ventas, vWeek, vYear, vCurrentPeriod + FROM ( + SELECT Vista, SUM(Importe) AS ventas + FROM analisis_ventas + WHERE vYear = Año + AND vWeek = Semana + GROUP BY Vista + UNION ALL + SELECT Vista, - SUM(Importe) AS ventas + FROM analisis_ventas + WHERE vYear - 1 = Año + AND vWeek = Semana + GROUP BY Vista + UNION ALL + SELECT vista, ventas + FROM analisis_ventas_vista_evolution + WHERE Periodo = vPreviousPeriod + ) sub + GROUP BY Vista; + END WHILE; + + -- Vendedor + + SET vCurrentPeriod = vMinPeriod; + + WHILE vCurrentPeriod < vMaxPeriod + DO + SELECT MAX(periodo) INTO vPreviousPeriod + FROM analisis_ventas_vendedor_evolution + WHERE periodo < vMaxPeriod; + + SELECT MIN(period) INTO vCurrentPeriod + FROM vn2008.time + WHERE period > vPreviousPeriod; + + SET vYear = FLOOR(vCurrentPeriod / 100); + SET vWeek = vCurrentPeriod - (vYear * 100); + + DELETE FROM analisis_ventas_vendedor_evolution + WHERE Periodo = vCurrentPeriod; + + REPLACE analisis_ventas_vendedor_evolution(vendedor, ventas, semana,año, periodo) + SELECT Comercial AS vendedor, SUM(ventas) AS ventas, vWeek, vYear, vCurrentPeriod + FROM ( + SELECT Comercial, SUM(Importe) AS ventas + FROM analisis_ventas + WHERE vYear = Año + AND vWeek = Semana + GROUP BY Comercial + UNION ALL + SELECT Comercial, - SUM(Importe) AS ventas + FROM analisis_ventas + WHERE vYear - 1 = Año + AND vWeek = Semana + GROUP BY Comercial + UNION ALL + SELECT vendedor, ventas + FROM analisis_ventas_vendedor_evolution + WHERE Periodo = vPreviousPeriod + ) sub + GROUP BY vendedor; + END WHILE; +END$$ +DELIMITER ; diff --git a/db/routines/bi/procedures/analisis_ventas_simple.sql b/db/routines/bi/procedures/analisis_ventas_simple.sql new file mode 100644 index 000000000..5c67584ee --- /dev/null +++ b/db/routines/bi/procedures/analisis_ventas_simple.sql @@ -0,0 +1,13 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`analisis_ventas_simple`() +BEGIN +/** + * Vacia y rellena la tabla 'analisis_grafico_simple' desde 'analisis_grafico_ventas' + */ + TRUNCATE bi.analisis_grafico_simple; + + INSERT INTO bi.analisis_grafico_simple + SELECT * + FROM bi.analisis_grafico_ventas; +END$$ +DELIMITER ; diff --git a/db/routines/bi/procedures/analisis_ventas_update.sql b/db/routines/bi/procedures/analisis_ventas_update.sql new file mode 100644 index 000000000..6d357275a --- /dev/null +++ b/db/routines/bi/procedures/analisis_ventas_update.sql @@ -0,0 +1,53 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`analisis_ventas_update`() +BEGIN + DECLARE vLastMonth DATE; + + SET vLastMonth = util.firstDayOfMonth(TIMESTAMPADD(MONTH, -1, util.VN_CURDATE())); + + DELETE FROM analisis_ventas + WHERE Año > YEAR(vLastMonth) + 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 + ) + SELECT + tp.Tipo AS Familia, + r.reino AS Reino, + tr.CodigoTrabajador AS Comercial, + tr2.CodigoTrabajador AS Comprador, + p.name AS Provincia, + w.name AS almacen, + tm.year AS Año, + tm.month AS Mes, + tm.week AS Semana, + 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; +END$$ +DELIMITER ; diff --git a/db/routines/bi/procedures/claim_ratio_routine.sql b/db/routines/bi/procedures/claim_ratio_routine.sql new file mode 100644 index 000000000..10cb717cf --- /dev/null +++ b/db/routines/bi/procedures/claim_ratio_routine.sql @@ -0,0 +1,168 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`claim_ratio_routine`() +BEGIN + DECLARE vMonthToRefund INT DEFAULT 4; + + /* + * PAK 2015-11-20 + * Se trata de añadir a la tabla Greuges todos los + * cargos que luego vamos a utilizar para calcular el recobro + */ + + -- Reclamaciones demasiado sensibles + + INSERT INTO vn.greuge(shipped, clientFk, description, + amount, greugeTypeFk, ticketFk) + SELECT cm.Fecha + , cm.Id_Cliente + , concat('Claim ',cm.id,' : ', m.Concepte) + ,round( -1 * ((sensib -1)/4) * Cantidad * + Preu * (100 - Descuento) / 100, 2) AS Reclamaciones + , 4 + , m.Id_Ticket + FROM vn2008.Movimientos m + JOIN vn2008.cl_act ca USING(Id_Movimiento) + JOIN vn2008.cl_main cm ON cm.id = ca.cl_main_id + WHERE ca.cl_sol_id NOT IN (1,5) + AND ca.greuge = 0 + AND cm.cl_est_id = 3; + + -- Reclamaciones que pasan a Maná + + INSERT INTO vn.greuge(shipped, clientFk, description, + amount, greugeTypeFk, ticketFk) + SELECT cm.Fecha + , cm.Id_Cliente + , concat('Claim_mana ',cm.id,' : ', m.Concepte) + ,round( ((sensib -1)/4) * Cantidad * Preu * (100 - Descuento) / 100, 2) + AS Reclamaciones + ,3 + ,m.Id_Ticket + FROM vn2008.Movimientos m + JOIN vn2008.cl_act ca USING(Id_Movimiento) + JOIN vn2008.cl_main cm ON cm.id = ca.cl_main_id + WHERE ca.cl_sol_id NOT IN (1,5) + AND ca.greuge = 0 + AND cm.cl_est_id = 3 + AND cm.mana; + + -- Marcamos para no repetir + UPDATE vn2008.cl_act ca + JOIN vn2008.cl_main cm ON cm.id = ca.cl_main_id + SET greuge = 1 + WHERE ca.cl_sol_id NOT IN (1,5) + AND ca.greuge = 0 + AND cm.cl_est_id = 3; + + -- Recobros + + DROP TEMPORARY TABLE IF EXISTS tmp.ticket_list; + CREATE TEMPORARY TABLE tmp.ticket_list + (PRIMARY KEY (Id_Ticket)) + SELECT DISTINCT t.Id_Ticket + 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 + 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; + + DELETE g.* + FROM vn.greuge g + JOIN tmp.ticket_list t ON g.ticketFk = t.Id_Ticket + WHERE g.greugeTypeFk = 2; + + INSERT INTO vn.greuge(clientFk, description, amount,shipped, + greugeTypeFk, ticketFk) + SELECT Id_Cliente + ,concat('recobro ', m.Id_Ticket), - round(SUM(mc.Valor*Cantidad),2) + AS dif + ,date(t.Fecha) + , 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 vn2008.Movimientos_componentes mc + ON mc.Id_Movimiento = m.Id_Movimiento AND mc.Id_Componente = 17 + GROUP BY t.Id_Ticket + HAVING ABS(dif) > 1; + + UPDATE vn2008.Movimientos_componentes mc + JOIN vn2008.Movimientos m ON m.Id_Movimiento = mc.Id_Movimiento + JOIN tmp.ticket_list tt ON tt.Id_Ticket = m.Id_Ticket + SET greuge = 1 + WHERE Id_Componente = 17; + + /* + * Recalculamos la ratio de las reclamaciones, que luego + * se va a utilizar en el recobro + */ + + REPLACE bi.claims_ratio(Id_Cliente, Consumo, Reclamaciones, Ratio, recobro) + SELECT Id_Cliente, 0,0,0,0 + FROM vn2008.Clientes; + + REPLACE bi.claims_ratio(Id_Cliente, Consumo, Reclamaciones, Ratio, recobro) + SELECT fm.Id_Cliente, 12 * fm.Consumo, Reclamaciones, + round(Reclamaciones / (12*fm.Consumo),4) AS Ratio, 0 + FROM bi.facturacion_media_anual fm + LEFT JOIN( + SELECT cm.Id_Cliente, round(sum(-1 * ((sensib -1)/4) * + Cantidad * Preu * (100 - Descuento) / 100)) + AS Reclamaciones + FROM vn2008.Movimientos m + JOIN vn2008.cl_act ca + ON ca.Id_Movimiento = m.Id_Movimiento + JOIN vn2008.cl_main cm ON cm.id = ca.cl_main_id + WHERE ca.cl_sol_id NOT IN (1,5) + AND cm.cl_est_id = 3 + AND cm.Fecha >= TIMESTAMPADD(YEAR, -1, util.VN_CURDATE()) + GROUP BY cm.Id_Cliente + ) claims ON claims.Id_Cliente = fm.Id_Cliente; + + + -- Calculamos el porcentaje del recobro para añadirlo al precio de venta + UPDATE bi.claims_ratio cr + JOIN ( + SELECT clientFk Id_Cliente, IFNULL(SUM(amount), 0) AS Greuge + FROM vn.greuge + WHERE shipped <= util.VN_CURDATE() + GROUP BY clientFk + ) g ON g.Id_Cliente = cr.Id_Cliente + SET recobro = GREATEST(0,round(IFNULL(Greuge, 0) / + (IFNULL(Consumo, 0) * vMonthToRefund / 12 ) ,3)); + + -- Protección neonatos + UPDATE bi.claims_ratio cr + JOIN vn.firstTicketShipped fts ON fts.clientFk = cr.Id_Cliente + SET recobro = 0, Ratio = 0 + WHERE fts.shipped > TIMESTAMPADD(MONTH,-1,util.VN_CURDATE()); + + -- CLIENTE 7983, JULIAN SUAU + UPDATE bi.claims_ratio SET recobro = LEAST(0.05, recobro) WHERE Id_Cliente = 7983; + + -- CLIENTE 4358 + UPDATE bi.claims_ratio SET recobro = GREATEST(0.05, recobro) WHERE Id_Cliente = 4358; + + -- CLIENTE 5523, VERDECORA + UPDATE bi.claims_ratio SET recobro = GREATEST(0.12, recobro) WHERE Id_Cliente = 5523; + + -- CLIENTE 15979, SERVEIS VETERINARIS + UPDATE bi.claims_ratio SET recobro = GREATEST(0.05, recobro) WHERE Id_Cliente = 15979; + + -- CLIENTE 5189 i 8942, son de CSR i son el mateix client + UPDATE bi.claims_ratio cr + JOIN (SELECT sum(Consumo * recobro)/sum(Consumo) as recobro + FROM bi.claims_ratio + WHERE Id_Cliente IN ( 5189,8942) + ) sub + SET cr.recobro = sub.recobro + WHERE Id_Cliente IN ( 5189,8942); +END$$ +DELIMITER ; diff --git a/db/routines/bi/procedures/clean.sql b/db/routines/bi/procedures/clean.sql new file mode 100644 index 000000000..ba43b609c --- /dev/null +++ b/db/routines/bi/procedures/clean.sql @@ -0,0 +1,19 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`clean`() +BEGIN + DECLARE vDateShort DATETIME; + DECLARE vDateLong DATETIME; + DECLARE vOneYearAgo DATETIME; + + SET vDateShort = TIMESTAMPADD(MONTH, -2, util.VN_CURDATE()); + SET vDateLong = TIMESTAMPADD(MONTH, -18,util.VN_CURDATE()); + SET vOneYearAgo = TIMESTAMPADD(YEAR, -1,util.VN_CURDATE()); + + DELETE FROM bi.Greuge_Evolution + WHERE (Fecha < vDateShort AND weekday(Fecha) != 1) + OR Fecha < vOneYearAgo; + + DELETE FROM bi.defaulters WHERE `date` < vDateLong; + DELETE FROM bi.defaulting WHERE `date` < vDateLong; +END$$ +DELIMITER ; diff --git a/db/routines/bi/procedures/clean_launcher.sql b/db/routines/bi/procedures/clean_launcher.sql new file mode 100644 index 000000000..9eea34584 --- /dev/null +++ b/db/routines/bi/procedures/clean_launcher.sql @@ -0,0 +1,9 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`clean_launcher`() +BEGIN +/** + * Borra registros de las principales tablas (excepto de "ticket"). + */ + CALL vn2008.clean(0); +END$$ +DELIMITER ; diff --git a/db/routines/bi/procedures/comparativa_add.sql b/db/routines/bi/procedures/comparativa_add.sql new file mode 100644 index 000000000..4297c8aff --- /dev/null +++ b/db/routines/bi/procedures/comparativa_add.sql @@ -0,0 +1,32 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`comparativa_add`() +BEGIN + DECLARE lastCOMP INT; # Se trata de una variable para almacenar el ultimo valor del Periodo + DECLARE vMaxPeriod INT; + DECLARE vMaxWeek INT; + + SELECT t.period, t.`week` INTO vMaxPeriod, vMaxWeek + FROM vn.`time` t + WHERE t.dated = util.VN_CURDATE(); + + SELECT MAX(Periodo) INTO lastCOMP FROM vn2008.Comparativa; + -- Fijaremos las ventas con más de un mes de antiguedad en la tabla Comparativa + + 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) + 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 + 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; + + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/bi/procedures/comparativa_add_manual.sql b/db/routines/bi/procedures/comparativa_add_manual.sql new file mode 100644 index 000000000..281e15b23 --- /dev/null +++ b/db/routines/bi/procedures/comparativa_add_manual.sql @@ -0,0 +1,40 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`comparativa_add_manual`(IN vStarted DATE, IN vEnded DATE) +BEGIN +/** + * Recalcula la tabla Comparativa para dos valores dados + * + * @param vStarted fecha desde + * @param vEnded fecha hasta + */ + + DECLARE periodStart INT; + DECLARE periodEnd INT; + + -- Seleccionamos la fecha minima/maxima del periodo que vamos a consultar + + SELECT t.period INTO periodStart + FROM vn.`time` t + WHERE t.dated = vStarted; + + SELECT t.period INTO periodEnd + FROM vn.`time` t + WHERE t.dated = vEnded; + + DELETE FROM vn2008.Comparativa + 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) + 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 + 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; +END$$ +DELIMITER ; diff --git a/db/routines/bi/procedures/defaultersFromDate.sql b/db/routines/bi/procedures/defaultersFromDate.sql new file mode 100644 index 000000000..267c90dab --- /dev/null +++ b/db/routines/bi/procedures/defaultersFromDate.sql @@ -0,0 +1,24 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`defaultersFromDate`(IN vDate DATE) +BEGIN + + SELECT t1.*, c.Cliente, w.code AS workerCode, c.pay_met_id,c.Vencimiento + FROM ( + -- Filtramos aquellos clientes cuyo saldo se ha incrementado de ayer a hoy + select * from( + select today.client, today.amount todayAmount, yesterday.amount yesterdayAmount, round(yesterday.amount - today.amount,2) as difference, defaulterSince + from + (select client, amount, defaulterSince + from defaulters + where date = vDate and hasChanged) today + join + (select client, amount + from defaulters + where date = TIMESTAMPADD(DAY,-1,vDate)) yesterday using(client) + + having today.amount > 0 and difference <> 0 + ) newDefaulters + )t1 left join vn2008.Clientes c ON t1.client = c.Id_Cliente + left join vn.worker w ON w.id = c.Id_Trabajador; +END$$ +DELIMITER ; diff --git a/db/routines/bi/procedures/defaulting.sql b/db/routines/bi/procedures/defaulting.sql new file mode 100644 index 000000000..e8ba5e682 --- /dev/null +++ b/db/routines/bi/procedures/defaulting.sql @@ -0,0 +1,98 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`defaulting`(IN `vDate` DATE) +BEGIN + DECLARE vDone BOOLEAN; + DECLARE vClient INT; + DECLARE vAmount INT; + DECLARE vDued DATE; + DECLARE vAmountInvoice DECIMAL(10,2); + DECLARE vGraceDays INT; + DECLARE defaulters CURSOR FOR + SELECT client, amount, graceDays FROM bi.defaulters d + JOIN vn2008.Clientes c ON c.Id_Cliente = d.client + JOIN vn2008.pay_met pm ON pm.id = c.pay_met_id + WHERE hasChanged AND date = vDate; + + DECLARE invoices CURSOR FOR + SELECT dued Vencimiento, amount importe FROM vn.invoiceOut + WHERE issued >= '2016-01-01' AND clientFk = vClient ORDER BY issued DESC; + + DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; + + DELETE FROM bi.defaulters WHERE date = vDate; + + INSERT INTO bi.defaulters(client, date, amount) + SELECT c.id, vDate, IFNULL(FLOOR(SUM(cro.amount)),0) AS amount + FROM vn.`client` c + LEFT JOIN bi.customerRiskOverdue cro ON c.id = cro.customer_id + GROUP BY c.id; + + -- marcamos si ha cambiado y heredamos la fecha defaulterSince + UPDATE bi.defaulters d + LEFT JOIN ( + SELECT * FROM( + SELECT client, amount , defaulterSince, frozened FROM bi.defaulters + WHERE date <= TIMESTAMPADD(DAY,-1, vDate) + ORDER BY date DESC + LIMIT 10000000000000000000) t GROUP BY client + ) yesterday using(client) + SET d.hasChanged = (IFNULL(d.amount,0) <> IFNULL(yesterday.amount,0)), + d.defaulterSince = yesterday.defaulterSince, + d.frozened = yesterday.frozened + WHERE d.date = vDate ; + + OPEN defaulters; + defaulters: LOOP + SET vDone = FALSE; + SET vAmount = 0; + FETCH defaulters INTO vClient,vAmount, vGraceDays; + IF vDone THEN + LEAVE defaulters; + END IF; + OPEN invoices; + invoices:LOOP + + FETCH invoices INTO vDued, vAmountInvoice; + IF vDone THEN + LEAVE invoices; + END IF; + + IF TIMESTAMPADD(DAY, vGraceDays, vDued) <= vDate THEN + SET vAmount = vAmount - vAmountInvoice; + IF vAmount <= 0 THEN + + UPDATE defaulters SET defaulterSince = vDued + WHERE client = vClient and date = vDate; + + SET vAmount = 0; + LEAVE invoices; + END IF; + END IF; + END LOOP; + CLOSE invoices; + END LOOP; + CLOSE defaulters; + + DELETE FROM defaulters + WHERE amount = 0 + AND hasChanged = FALSE + AND `date` = vDate; + + UPDATE defaulters d + JOIN vn.config ON TRUE + SET d.frozened = NULL + WHERE `date` = vDate + AND d.amount <= config.defaultersMaxAmount; + + CALL vn.clientFreeze(); + + -- actualizamos defaulting + DELETE FROM bi.defaulting WHERE date = vDate; + + INSERT INTO bi.defaulting(date, amount) + SELECT vDate, SUM(amount) + FROM bi.defaulters + WHERE date = vDate and amount > 0; + +END$$ +DELIMITER ; diff --git a/db/routines/bi/procedures/defaulting_launcher.sql b/db/routines/bi/procedures/defaulting_launcher.sql new file mode 100644 index 000000000..585abdc09 --- /dev/null +++ b/db/routines/bi/procedures/defaulting_launcher.sql @@ -0,0 +1,9 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`defaulting_launcher`() +BEGIN +/** + * Calcula la morosidad de los clientes. + */ + CALL bi.defaulting(util.VN_CURDATE()); +END$$ +DELIMITER ; diff --git a/db/routines/bi/procedures/facturacion_media_anual_update.sql b/db/routines/bi/procedures/facturacion_media_anual_update.sql new file mode 100644 index 000000000..b956f353a --- /dev/null +++ b/db/routines/bi/procedures/facturacion_media_anual_update.sql @@ -0,0 +1,16 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`facturacion_media_anual_update`() +BEGIN + TRUNCATE TABLE bs.clientAnnualConsumption; + + REPLACE bi.facturacion_media_anual(Id_Cliente, Consumo) + SELECT clientFk, avg(Facturacion) + FROM ( + SELECT clientFk, YEAR(issued) year, MONTH(issued) month, sum(amount) as Facturacion + FROM vn.invoiceOut + WHERE issued BETWEEN TIMESTAMPADD(YEAR,-1,util.VN_CURDATE()) AND TIMESTAMPADD(DAY, - DAY(util.VN_CURDATE()),util.VN_CURDATE()) + GROUP BY clientFk, year, month + ) vol + GROUP BY clientFk; +END$$ +DELIMITER ; diff --git a/db/routines/bi/procedures/greuge_dif_porte_add.sql b/db/routines/bi/procedures/greuge_dif_porte_add.sql new file mode 100644 index 000000000..02bd9eae4 --- /dev/null +++ b/db/routines/bi/procedures/greuge_dif_porte_add.sql @@ -0,0 +1,93 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`greuge_dif_porte_add`() +BEGIN + DECLARE datSTART DATETIME DEFAULT TIMESTAMPADD(DAY,-60,util.VN_CURDATE()); -- '2019-07-01' + DECLARE datEND DATETIME DEFAULT TIMESTAMPADD(DAY,-1,util.VN_CURDATE()); + + DROP TEMPORARY TABLE IF EXISTS tmp.dp; + + -- Agencias que no cobran por volumen + CREATE TEMPORARY TABLE tmp.dp + (PRIMARY KEY (ticketFk)) + ENGINE = MEMORY + SELECT t.id ticketFk, + SUM((t.zonePrice - t.zoneBonus) * ebv.ratio) AS teorico, + 00000.00 as practico, + 00000.00 as greuge, + t.clientFk, + t.shipped + FROM + vn.ticket t + JOIN vn2008.Clientes cli ON cli.Id_cliente = t.clientFk + LEFT JOIN vn.expedition e ON e.ticketFk = t.id + JOIN vn.expeditionBoxVol ebv ON ebv.boxFk = e.freightItemFk + JOIN vn.zone z ON t.zoneFk = z.id + WHERE + t.shipped between datSTART AND datEND + AND cli.`real` + AND t.companyFk IN (442 , 567) + AND z.isVolumetric = FALSE + GROUP BY t.id; + + -- Agencias que cobran por volumen + INSERT INTO tmp.dp + SELECT sv.ticketFk, + SUM(IFNULL(sv.freight,0)) AS teorico, + 00000.00 as practico, + 00000.00 as greuge, + sv.clientFk, + sv.shipped + FROM vn.saleVolume sv + JOIN vn.zone z ON z.id = sv.zoneFk + AND sv.shipped BETWEEN datSTART AND datEND + AND z.isVolumetric != FALSE + GROUP BY sv.ticketFk; + + DROP TEMPORARY TABLE IF EXISTS tmp.dp_aux; + + CREATE TEMPORARY TABLE tmp.dp_aux + (PRIMARY KEY (ticketFk)) + ENGINE = MEMORY + SELECT dp.ticketFk, sum(Cantidad * Valor) as valor + FROM tmp.dp + JOIN vn2008.Movimientos m ON m.Id_Ticket = dp.ticketFk + JOIN vn2008.Movimientos_componentes mc using(Id_Movimiento) + WHERE mc.Id_Componente = 15 + GROUP BY dp.ticketFk; + + UPDATE tmp.dp + JOIN tmp.dp_aux USING(ticketFk) + SET practico = IFNULL(valor,0); + + DROP TEMPORARY TABLE tmp.dp_aux; + + CREATE TEMPORARY TABLE tmp.dp_aux + (PRIMARY KEY (ticketFk)) + ENGINE = MEMORY + SELECT dp.ticketFk, sum(g.amount) Importe + FROM tmp.dp + JOIN vn.greuge g ON g.ticketFk = dp.ticketFk + WHERE g.greugeTypeFk = 1 -- dif_porte + GROUP BY dp.ticketFk; + + UPDATE tmp.dp + JOIN tmp.dp_aux USING(ticketFk) + SET greuge = IFNULL(Importe,0); + + INSERT INTO vn.greuge (clientFk,description,amount,shipped,greugeTypeFk,ticketFk) + SELECT dp.clientFk + , concat('dif_porte ', dp.ticketFk) + , round(IFNULL(dp.teorico,0) - IFNULL(dp.practico,0) - IFNULL(dp.greuge,0),2) as Importe + , date(dp.shipped) + , 1 + ,dp.ticketFk + FROM tmp.dp + JOIN vn.client c ON c.id = dp.clientFk + WHERE ABS(IFNULL(dp.teorico,0) - IFNULL(dp.practico,0) - IFNULL(dp.greuge,0)) > 1 + AND c.isRelevant; + + DROP TEMPORARY TABLE + tmp.dp, + tmp.dp_aux; +END$$ +DELIMITER ; diff --git a/db/routines/bi/procedures/nigthlyAnalisisVentas.sql b/db/routines/bi/procedures/nigthlyAnalisisVentas.sql new file mode 100644 index 000000000..c21a3bae5 --- /dev/null +++ b/db/routines/bi/procedures/nigthlyAnalisisVentas.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`nigthlyAnalisisVentas`() +BEGIN + CALL analisis_ventas_update; + CALL analisis_ventas_simple; + CALL analisis_ventas_evolution_add; +END$$ +DELIMITER ; diff --git a/db/routines/bi/procedures/rutasAnalyze.sql b/db/routines/bi/procedures/rutasAnalyze.sql new file mode 100644 index 000000000..5f0d55c7a --- /dev/null +++ b/db/routines/bi/procedures/rutasAnalyze.sql @@ -0,0 +1,117 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`rutasAnalyze`( + vDatedFrom DATE, + vDatedTo DATE +) +BEGIN +/** + * Analiza los costes de las rutas de reparto + * y lo almacena en la tabla bi.rutasBoard + */ + DELETE FROM rutasBoard + WHERE Fecha BETWEEN vDatedFrom AND vDatedTo; + + -- Rellenamos la tabla con los datos de las rutas VOLUMETRICAS, especialmente con los bultos "virtuales" + INSERT INTO rutasBoard( + Id_Ruta, + Id_Agencia, + Fecha, + bultos) + SELECT r.id, + r.agencyModeFk, + r.created, + SUM(sv.volume / ebv.m3) + FROM vn.route r + JOIN vn.ticket t ON t.routeFk = r.id + LEFT JOIN vn.`zone` z ON z.id = t.zoneFk + JOIN vn.saleVolume sv ON sv.ticketFk = t.id + JOIN vn.expeditionBoxVol ebv ON ebv.code = 'transportBox' + WHERE r.created BETWEEN vDatedFrom AND vDatedTo + AND z.isVolumetric + GROUP BY r.id; + + -- Rellenamos la tabla con los datos de las rutas NO VOLUMETRICAS, especialmente con los bultos "virtuales" + INSERT INTO rutasBoard( + Id_Ruta, + Id_Agencia, + Fecha, + Bultos) + SELECT r.id, + r.agencyModeFk, + r.created, + SUM(t.packages) + FROM vn.route r + JOIN vn.ticket t ON t.routeFk = r.id + LEFT JOIN vn.`zone` z ON z.id = t.zoneFk + WHERE r.created BETWEEN vDatedFrom AND vDatedTo + AND NOT z.isVolumetric + GROUP BY r.id + ON DUPLICATE KEY UPDATE Bultos = Bultos + VALUES(Bultos); + + -- Coste PRACTICO de cada bulto, de acuerdo con los componentes de tipo AGENCIA en cada linea de venta + UPDATE rutasBoard r + JOIN ( + SELECT t.routeFk, + SUM(s.quantity * sc.value) totalPractice + FROM vn.route r + JOIN vn.ticket t ON t.routeFk = r.id + JOIN vn.sale s ON s.ticketFk = t.id + JOIN vn.saleComponent sc ON sc.saleFk = s.id + JOIN vn.component c ON c.id = sc.componentFk + JOIN vn.componentType ct ON ct.id = c.typeFk + WHERE ct.code = 'FREIGHT' + AND r.created BETWEEN vDatedFrom AND vDatedTo + GROUP BY r.id + ) sub ON sub.routeFk = r.Id_Ruta + SET r.practico = IFNULL(sub.totalPractice / r.Bultos, 0); + + -- Coste TEORICO de una caja "virtual" para cada ruta, teniendo en cuenta que hay carros, pallets, etc + UPDATE rutasBoard r + JOIN ( + SELECT t.routeFk, + SUM(t.zonePrice/ ebv.ratio) / COUNT(*) averageTheoreticalVolume + FROM vn.ticket t + JOIN vn.route r ON r.id = t.routeFk + JOIN vn.expedition e ON e.ticketFk = t.id + JOIN vn.expeditionBoxVol ebv ON ebv.boxFk = e.freightItemFk + JOIN vn.address ad ON ad.id = t.addressFk + JOIN vn.client c ON c.id = ad.clientFk + LEFT JOIN vn.`zone` z ON z.id = t.zoneFk + WHERE r.created BETWEEN vDatedFrom AND vDatedTo + AND NOT z.isVolumetric + GROUP BY t.routeFk + ) sub ON r.Id_Ruta = sub.routeFk + SET r.teorico = IFNULL(sub.averageTheoreticalVolume, 0); + + -- Coste VOLUMETRICO TEORICO de una caja "virtual" para cada ruta + UPDATE rutasBoard r + JOIN ( + SELECT t.routeFk, + SUM(freight) averageTheoreticalVolume + FROM vn.ticket t + JOIN vn.route r ON r.id = t.routeFk + JOIN vn.saleVolume sf ON sf.ticketFk = t.id + JOIN vn.client c ON c.id = t.clientFk + JOIN vn.`zone` z ON z.id = t.zoneFk + WHERE r.created BETWEEN vDatedFrom AND vDatedTo + AND z.isVolumetric + GROUP BY t.routeFk + ) sub ON r.Id_Ruta = sub.routeFk + SET r.teorico = IFNULL(sub.averageTheoreticalVolume / r.Bultos, 0); + + -- La diferencia entre el teorico y el practico se deberia de cobrar en greuges, cada noche + UPDATE rutasBoard r + JOIN ( + SELECT t.routeFk, + SUM(g.amount) greuge + FROM vn.ticket t + JOIN vn.route r ON r.id = t.routeFk + JOIN vn.greuge g ON g.ticketFk = t.id + JOIN vn.greugeType gt ON gt.id = g.greugeTypeFk + WHERE r.created BETWEEN vDatedFrom AND vDatedTo + AND gt.code = 'freightDifference' + GROUP BY t.routeFk + ) sub ON r.Id_Ruta = sub.routeFk + SET r.greuge = sub.greuge / r.Bultos; +END$$ +DELIMITER ; diff --git a/db/routines/bi/procedures/rutasAnalyze_launcher.sql b/db/routines/bi/procedures/rutasAnalyze_launcher.sql new file mode 100644 index 000000000..02f5e1b9c --- /dev/null +++ b/db/routines/bi/procedures/rutasAnalyze_launcher.sql @@ -0,0 +1,9 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`rutasAnalyze_launcher`() +BEGIN +/** + * Call rutasAnalyze + */ + CALL rutasAnalyze(util.VN_CURDATE() - INTERVAL 30 DAY , util.VN_CURDATE()); +END$$ +DELIMITER ; diff --git a/db/routines/bi/views/analisis_grafico_ventas.sql b/db/routines/bi/views/analisis_grafico_ventas.sql new file mode 100644 index 000000000..f5956f27a --- /dev/null +++ b/db/routines/bi/views/analisis_grafico_ventas.sql @@ -0,0 +1,9 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `bi`.`analisis_grafico_ventas` +AS SELECT `bi`.`analisis_ventas`.`Año` AS `Año`, + `bi`.`analisis_ventas`.`Semana` AS `Semana`, + sum(`bi`.`analisis_ventas`.`Importe`) AS `Importe` +FROM `bi`.`analisis_ventas` +GROUP BY `bi`.`analisis_ventas`.`Año`, + `bi`.`analisis_ventas`.`Semana` diff --git a/db/routines/bi/views/analisis_ventas_simple.sql b/db/routines/bi/views/analisis_ventas_simple.sql new file mode 100644 index 000000000..109378c8a --- /dev/null +++ b/db/routines/bi/views/analisis_ventas_simple.sql @@ -0,0 +1,9 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `bi`.`analisis_ventas_simple` +AS SELECT `bi`.`analisis_ventas`.`Año` AS `Año`, + `bi`.`analisis_ventas`.`Semana` AS `Semana`, + sum(`bi`.`analisis_ventas`.`Importe`) AS `Importe` +FROM `bi`.`analisis_ventas` +GROUP BY `bi`.`analisis_ventas`.`Año`, + `bi`.`analisis_ventas`.`Semana` diff --git a/db/routines/bi/views/claims_ratio.sql b/db/routines/bi/views/claims_ratio.sql new file mode 100644 index 000000000..cfd9b6231 --- /dev/null +++ b/db/routines/bi/views/claims_ratio.sql @@ -0,0 +1,10 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `bi`.`claims_ratio` +AS SELECT `cr`.`clientFk` AS `Id_Cliente`, + `cr`.`yearSale` AS `Consumo`, + `cr`.`claimAmount` AS `Reclamaciones`, + `cr`.`claimingRate` AS `Ratio`, + `cr`.`priceIncreasing` AS `recobro`, + `cr`.`packingRate` AS `inflacion` +FROM `vn`.`claimRatio` `cr` diff --git a/db/routines/bi/views/customerRiskOverdue.sql b/db/routines/bi/views/customerRiskOverdue.sql new file mode 100644 index 000000000..27ef7ca47 --- /dev/null +++ b/db/routines/bi/views/customerRiskOverdue.sql @@ -0,0 +1,40 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `bi`.`customerRiskOverdue` +AS SELECT `cr`.`clientFk` AS `customer_id`, + `cr`.`amount` AS `amount`, + `cr`.`companyFk` AS `company_id` +FROM ( + ( + ( + `vn`.`clientRisk` `cr` + JOIN `vn`.`company` `co` ON(`co`.`id` = `cr`.`companyFk`) + ) + JOIN `vn`.`client` `c` ON(`cr`.`clientFk` = `c`.`id`) + ) + JOIN `vn`.`payMethod` `pm` ON(`pm`.`id` = `c`.`payMethodFk`) + ) +WHERE `cr`.`amount` <> 0 + AND `co`.`isDefaulter` <> 0 + AND `pm`.`outstandingDebt` <> 0 + AND `c`.`typeFk` = 'normal' +UNION ALL +SELECT `i`.`clientFk` AS `Id_Cliente`, + - round(`i`.`amount`, 2) AS `importe`, + `i`.`companyFk` AS `empresa_id` +FROM ( + ( + ( + `vn`.`invoiceOut` `i` + JOIN `vn`.`client` `c` ON(`i`.`clientFk` = `c`.`id`) + ) + JOIN `vn`.`company` `co` ON(`co`.`id` = `i`.`companyFk`) + ) + JOIN `vn`.`payMethod` `pm` ON(`pm`.`id` = `c`.`payMethodFk`) + ) +WHERE `i`.`issued` > `util`.`VN_CURDATE`() + INTERVAL -101 DAY + AND `i`.`dued` + INTERVAL `pm`.`graceDays` DAY > `util`.`VN_CURDATE`() + AND `i`.`amount` > 0 + AND `co`.`isDefaulter` <> 0 + AND `pm`.`outstandingDebt` <> 0 + AND `c`.`typeFk` = 'normal' diff --git a/db/routines/bi/views/defaulters.sql b/db/routines/bi/views/defaulters.sql new file mode 100644 index 000000000..927503245 --- /dev/null +++ b/db/routines/bi/views/defaulters.sql @@ -0,0 +1,10 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `bi`.`defaulters` +AS SELECT `d`.`clientFk` AS `client`, + `d`.`created` AS `date`, + `d`.`amount` AS `amount`, + `d`.`defaulterSinced` AS `defaulterSince`, + `d`.`hasChanged` AS `hasChanged`, + `d`.`frozened` AS `frozened` +FROM `bs`.`defaulter` `d` diff --git a/db/routines/bi/views/facturacion_media_anual.sql b/db/routines/bi/views/facturacion_media_anual.sql new file mode 100644 index 000000000..2e0c2ca6e --- /dev/null +++ b/db/routines/bi/views/facturacion_media_anual.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `bi`.`facturacion_media_anual` +AS SELECT `cac`.`clientFk` AS `Id_Cliente`, + `cac`.`invoiced` AS `Consumo` +FROM `bs`.`clientAnnualConsumption` `cac` diff --git a/db/routines/bi/views/last_Id_Cubo.sql b/db/routines/bi/views/last_Id_Cubo.sql new file mode 100644 index 000000000..758b524fd --- /dev/null +++ b/db/routines/bi/views/last_Id_Cubo.sql @@ -0,0 +1,19 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `bi`.`last_Id_Cubo` +AS SELECT `C`.`Id_Compra` AS `Id_Compra`, + `C`.`Id_Article` AS `Id_Article`, + `tr`.`warehouse_id` AS `warehouse_id`, + `C`.`Id_Cubo` AS `Id_Cubo`, + `C`.`Packing` AS `Packing` +FROM ( + ( + `vn2008`.`Compres` `C` + JOIN `vn2008`.`Entradas` `E` ON(`C`.`Id_Entrada` = `E`.`Id_Entrada`) + ) + JOIN `vn2008`.`travel` `tr` ON(`E`.`travel_id` = `tr`.`id`) + ) +WHERE `C`.`Id_Cubo` IS NOT NULL + AND `C`.`Id_Cubo` <> '--' + AND `tr`.`landing` > `util`.`VN_CURDATE`() - INTERVAL 18 MONTH +ORDER BY `C`.`Id_Compra` DESC diff --git a/db/routines/bi/views/rotacion.sql b/db/routines/bi/views/rotacion.sql new file mode 100644 index 000000000..65a5db923 --- /dev/null +++ b/db/routines/bi/views/rotacion.sql @@ -0,0 +1,15 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `bi`.`rotacion` +AS SELECT `ic`.`itemFk` AS `Id_Article`, + `ic`.`warehouseFk` AS `warehouse_id`, + `ic`.`quantity` AS `total`, + `ic`.`rotation` AS `rotacion`, + `ic`.`cm3` AS `cm3`, + `ic`.`storage` AS `almacenaje`, + `ic`.`handling` AS `manipulacion`, + `ic`.`extraCharge` AS `auxiliar`, + `ic`.`wasted` AS `mermas`, + `ic`.`cm3delivery` AS `cm3reparto`, + `ic`.`grams` AS `grams` +FROM `vn`.`itemCost` `ic` diff --git a/db/routines/bi/views/tarifa_componentes.sql b/db/routines/bi/views/tarifa_componentes.sql new file mode 100644 index 000000000..42ea9fa81 --- /dev/null +++ b/db/routines/bi/views/tarifa_componentes.sql @@ -0,0 +1,11 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `bi`.`tarifa_componentes` +AS SELECT `c`.`id` AS `Id_Componente`, + `c`.`name` AS `Componente`, + `c`.`typeFk` AS `tarifa_componentes_series_id`, + `c`.`classRate` AS `tarifa_class`, + `c`.`tax` AS `tax`, + `c`.`isRenewable` AS `is_renewable`, + `c`.`code` AS `code` +FROM `vn`.`component` `c` diff --git a/db/routines/bi/views/tarifa_componentes_series.sql b/db/routines/bi/views/tarifa_componentes_series.sql new file mode 100644 index 000000000..f231ae420 --- /dev/null +++ b/db/routines/bi/views/tarifa_componentes_series.sql @@ -0,0 +1,8 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `bi`.`tarifa_componentes_series` +AS SELECT `ct`.`id` AS `tarifa_componentes_series_id`, + `ct`.`type` AS `Serie`, + `ct`.`isBase` AS `base`, + `ct`.`isMargin` AS `margen` +FROM `vn`.`componentType` `ct` diff --git a/db/routines/bi/views/v_ventas_contables.sql b/db/routines/bi/views/v_ventas_contables.sql new file mode 100644 index 000000000..373fcdd3f --- /dev/null +++ b/db/routines/bi/views/v_ventas_contables.sql @@ -0,0 +1,23 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `bi`.`v_ventas_contables` +AS SELECT `time`.`year` AS `year`, + `time`.`month` AS `month`, + cast( + sum( + `m`.`Cantidad` * `m`.`Preu` * (100 - `m`.`Descuento`) / 100 + ) AS decimal(10, 0) + ) AS `importe` +FROM ( + ( + ( + `vn2008`.`Tickets` `t` + JOIN `bi`.`f_tvc` ON(`t`.`Id_Ticket` = `bi`.`f_tvc`.`Id_Ticket`) + ) + JOIN `vn2008`.`Movimientos` `m` ON(`t`.`Id_Ticket` = `m`.`Id_Ticket`) + ) + JOIN `vn2008`.`time` ON(`time`.`date` = cast(`t`.`Fecha` AS date)) + ) +WHERE `t`.`Fecha` >= '2014-01-01' +GROUP BY `time`.`year`, + `time`.`month` diff --git a/db/routines/bs/events/clientDied_recalc.sql b/db/routines/bs/events/clientDied_recalc.sql new file mode 100644 index 000000000..db912658a --- /dev/null +++ b/db/routines/bs/events/clientDied_recalc.sql @@ -0,0 +1,28 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `bs`.`clientDied_recalc` + ON SCHEDULE EVERY 1 DAY + STARTS '2023-06-01 03:00:00.000' + ON COMPLETION PRESERVE + ENABLE +DO BEGIN + DECLARE vDone INT DEFAULT FALSE; + DECLARE vCountryFk INT; + DECLARE vDays INT; + + DECLARE cur CURSOR FOR + SELECT countryFk, days + FROM clientDiedPeriod; + DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; + + OPEN cur; + read_loop: LOOP + SET vDone = FALSE; + FETCH cur INTO vCountryFk, vDays; + IF vDone THEN + LEAVE read_loop; + END IF; + CALL clientDied_recalc(vDays, (SELECT code FROM vn.country WHERE id = vCountryFk)); + END LOOP; + CLOSE cur; +END$$ +DELIMITER ; diff --git a/db/routines/bs/events/inventoryDiscrepancy_launch.sql b/db/routines/bs/events/inventoryDiscrepancy_launch.sql new file mode 100644 index 000000000..3ee165846 --- /dev/null +++ b/db/routines/bs/events/inventoryDiscrepancy_launch.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `bs`.`inventoryDiscrepancy_launch` + ON SCHEDULE EVERY 15 MINUTE + STARTS '2023-07-18 00:00:00.000' + ON COMPLETION PRESERVE + ENABLE +DO CALL bs.inventoryDiscrepancyDetail_replace()$$ +DELIMITER ; diff --git a/db/routines/bs/events/nightTask_launchAll.sql b/db/routines/bs/events/nightTask_launchAll.sql new file mode 100644 index 000000000..1a55ca1a3 --- /dev/null +++ b/db/routines/bs/events/nightTask_launchAll.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `bs`.`nightTask_launchAll` + ON SCHEDULE EVERY 1 DAY + STARTS '2022-02-08 04:14:00.000' + ON COMPLETION PRESERVE + ENABLE +DO CALL bs.nightTask_launchAll$$ +DELIMITER ; diff --git a/db/routines/bs/functions/tramo.sql b/db/routines/bs/functions/tramo.sql new file mode 100644 index 000000000..0415cfc92 --- /dev/null +++ b/db/routines/bs/functions/tramo.sql @@ -0,0 +1,21 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `bs`.`tramo`(vDateTime DATETIME) + RETURNS varchar(20) CHARSET utf8mb3 COLLATE utf8mb3_unicode_ci + NOT DETERMINISTIC + NO SQL +BEGIN + + DECLARE vTramo VARCHAR(20); + DECLARE vHour INT; + + SET vHour = HOUR(vDateTime) ; + + SET vTramo = + CASE + WHEN vHour BETWEEN 0 AND 14 THEN 'Mañana' + WHEN vHour BETWEEN 15 AND 24 THEN 'Tarde' + END ; + +RETURN vTramo; +END$$ +DELIMITER ; diff --git a/db/routines/bs/procedures/bancos_evolution_add.sql b/db/routines/bs/procedures/bancos_evolution_add.sql new file mode 100644 index 000000000..f0a3b3709 --- /dev/null +++ b/db/routines/bs/procedures/bancos_evolution_add.sql @@ -0,0 +1,112 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`bancos_evolution_add`(vStartingDate DATE) +BEGIN +/** + * Inserta en la tabla bancos_evolution los saldos acumulados de cada banco + * + * @param vStartingDate Fecha desde la cual se recalculan la tabla bs.bancos_evolution + */ + DECLARE vCurrentDate DATE; + DECLARE vMaxDate DATE DEFAULT TIMESTAMPADD(MONTH, 7, util.VN_CURDATE()); + IF IFNULL(vStartingDate,0) < TIMESTAMPADD(YEAR, -5, util.VN_CURDATE()) THEN + CALL util.throw('invalid date'); + END IF; + DELETE FROM bs.bancos_evolution WHERE Fecha >= vStartingDate; + + SET vCurrentDate = vStartingDate; + + INSERT INTO bs.bancos_evolution(Fecha, Id_Banco, saldo) + SELECT vCurrentDate, Id_Banco, deuda + FROM bs.bancos_evolution + WHERE Fecha = TIMESTAMPADD(DAY,-1,vCurrentDate); + + WHILE vCurrentDate < vMaxDate DO +-- insertar solo el dia de ayer + INSERT INTO bs.bancos_evolution(Fecha ,Id_Banco, saldo) + SELECT vCurrentDate, Id_Banco, SUM(saldo) + FROM ( + SELECT Id_Banco ,saldo + FROM bs.bancos_evolution + WHERE Fecha = TIMESTAMPADD(DAY,-1,vCurrentDate) -- los saldos acumulados del dia anterior + UNION ALL + + SELECT c.Id_Banco, IFNULL(SUM(Entrada),0) - IFNULL(SUM(Salida),0) as saldo + FROM vn2008.Cajas c + JOIN vn2008.Bancos b using(Id_Banco) -- saldos de las cajas + JOIN vn.accountingType at2 ON at2.id = b.cash + WHERE at2.code IN ('wireTransfer','fundingLine') + AND Cajafecha = vCurrentDate + AND (Serie = 'MB' OR at2.code = 'fundingLine') + GROUP BY Id_Banco + )sub + GROUP BY Id_Banco + ON DUPLICATE KEY UPDATE saldo = saldo + VALUES(saldo); + + SET vCurrentDate = TIMESTAMPADD(DAY,1,vCurrentDate); + + END WHILE; + + -- Ahora actualizamos la quilla + UPDATE bs.bancos_evolution be + JOIN + ( + SELECT bp.Id_Banco, - sum(bp.importe) as quilla, t.dated + FROM vn.time t + JOIN vn2008.Bancos_poliza bp ON t.dated between apertura AND IFNULL(cierre, t.dated) + WHERE t.dated BETWEEN vStartingDate AND vMaxDate + GROUP BY Id_Banco, t.dated + ) sub ON be.Id_Banco = sub.Id_Banco AND sub.dated = be.Fecha + SET be.quilla = sub.quilla; + + -- pagos futuros no concilidados + INSERT INTO bs.bancos_evolution(Fecha, Id_Banco, saldo) + SELECT t.dated, p.id_banco, - importe + FROM vn.time t + join vn2008.pago p ON p.fecha <= t.dated + WHERE t.dated BETWEEN util.VN_CURDATE() AND vMaxDate + AND p.fecha BETWEEN util.VN_CURDATE() AND vMaxDate + AND NOT conciliado + ON DUPLICATE KEY UPDATE saldo = saldo + VALUES(saldo); + + -- cobros futuros + INSERT INTO bs.bancos_evolution(Fecha, Id_Banco, saldo) + SELECT t.dated, r.Id_Banco, SUM(Entregado) + FROM vn.time t + JOIN vn2008.Recibos r ON r.Fechacobro <= t.dated + WHERE r.Fechacobro > util.VN_CURDATE() AND r.Fechacobro <= vMaxDate + AND t.dated BETWEEN util.VN_CURDATE() AND vMaxDate + GROUP BY t.dated, r.Id_Banco + ON DUPLICATE KEY UPDATE saldo = saldo + VALUES(saldo); + + -- saldos de la tabla prevision + INSERT INTO bs.bancos_evolution(Fecha, Id_Banco, saldo) + SELECT t.dated, sp.Id_Banco, SUM(Importe) + FROM vn.time t + JOIN vn2008.Saldos_Prevision sp ON sp.Fecha <= t.dated + JOIN vn2008.Bancos b ON sp.Id_Banco = b.Id_Banco + JOIN vn.accountingType at2 ON at2.id = b.cash + WHERE at2.code IN ('wireTransfer','fundingLine') + AND t.dated BETWEEN vStartingDate AND vMaxDate + GROUP BY t.dated, sp.Id_Banco + ON DUPLICATE KEY UPDATE saldo = saldo + VALUES(saldo); + + -- Utilizamos el saldo_auxiliar para calcular lo dispuesto en las polizas + UPDATE bs.bancos_evolution be + SET saldo_aux = saldo + WHERE Fecha >= vStartingDate; + + -- Deuda + UPDATE bs.bancos_evolution be + JOIN vn2008.Bancos b using(Id_Banco) + JOIN vn.accountingType at2 ON at2.id = b.cash + SET be.deuda = IF(at2.code = 'fundingLine', be.saldo_aux, 0) + , be.saldo = IF(at2.code = 'fundingLine', 0, be.saldo_aux) + WHERE Fecha >= vStartingDate; + + -- Liquidez + update bs.bancos_evolution set liquidez = saldo - quilla + deuda WHERE Fecha >= vStartingDate; + -- Disponibilidad + update bs.bancos_evolution set `disponibilidad ajena` = - quilla + deuda WHERE Fecha >= vStartingDate; + +END$$ +DELIMITER ; diff --git a/db/routines/bs/procedures/campaignComparative.sql b/db/routines/bs/procedures/campaignComparative.sql new file mode 100644 index 000000000..6b4b983b5 --- /dev/null +++ b/db/routines/bs/procedures/campaignComparative.sql @@ -0,0 +1,42 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`campaignComparative`(vDateFrom DATE, vDateTo DATE) +BEGIN + SELECT + workerName, + id, + name, + CAST(SUM(previousAmmount) AS DECIMAL(10, 0)) AS previousAmmount, + CAST(SUM(currentAmmount) AS DECIMAL(10, 0)) AS currentAmmount + FROM ( + (SELECT + CONCAT(w.firstname, ' ', w.lastName) AS workerName, + c.id, + c.name, + SUM(v.importe) AS previousAmmount, + 0 currentAmmount + FROM bs.ventas v + INNER JOIN vn.`client` c ON v.Id_Cliente = c.id + INNER JOIN vn.worker w ON c.salesPersonFk = w.id + WHERE v.fecha BETWEEN DATE_ADD(vDateFrom, INTERVAL - 1 YEAR) + AND DATE_ADD(vDateTo, INTERVAL - 1 YEAR) + GROUP BY w.id, v.Id_Cliente) + UNION ALL + (SELECT + CONCAT(w.firstname, ' ', w.lastName) AS workerName, + c.id, + c.name, + 0 AS previousAmmount, + SUM(s.quantity * s.price) AS currentAmmount + FROM vn.sale s + JOIN vn.ticket t ON t.id = s.ticketFk + JOIN vn.client c ON c.id = t.clientFk + JOIN vn.worker w ON c.salesPersonFk = w.id + WHERE t.shipped BETWEEN vDateFrom + AND vDateTo + GROUP BY w.id, c.id) + ) comparative + GROUP BY workerName, id + HAVING (previousAmmount <> 0 OR currentAmmount <> 0) + ORDER BY workerName, id; +END$$ +DELIMITER ; diff --git a/db/routines/bs/procedures/carteras_add.sql b/db/routines/bs/procedures/carteras_add.sql new file mode 100644 index 000000000..6de377371 --- /dev/null +++ b/db/routines/bs/procedures/carteras_add.sql @@ -0,0 +1,27 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`carteras_add`() +BEGIN +/** + * Inserta en la tabla @bs.carteras las ventas desde el año pasado + * agrupadas por trabajador, año y mes + */ + DECLARE vYear INT DEFAULT YEAR(util.VN_CURDATE()) - 1; + + DELETE FROM bs.carteras WHERE Año >= vYear; + + CALL util.time_generate( + MAKEDATE(vYear, 1), + (SELECT MAX(fecha) FROM ventas) + ); + + INSERT INTO carteras(Año, Mes , CodigoTrabajador, Peso) + SELECT t.`year`, t.`month`, w.code, SUM(v.importe) + FROM tmp.time t + JOIN ventas v on t.dated = v.fecha + JOIN vn.client c on c.id = v.Id_Cliente + JOIN vn.worker w ON w.id = c.salesPersonFk + GROUP BY w.code, t.`year`, t.`month`; + + DROP TEMPORARY TABLE tmp.time; +END$$ +DELIMITER ; diff --git a/db/routines/bs/procedures/clean.sql b/db/routines/bs/procedures/clean.sql new file mode 100644 index 000000000..eff2faadb --- /dev/null +++ b/db/routines/bs/procedures/clean.sql @@ -0,0 +1,35 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`clean`() +BEGIN + + DECLARE vOneYearAgo DATE DEFAULT util.VN_CURDATE() - INTERVAL 1 YEAR; + DECLARE vTwoYearAgo DATE DEFAULT util.VN_CURDATE() - INTERVAL 2 YEAR; + DECLARE vThreeYearAgo DATE DEFAULT util.VN_CURDATE() - INTERVAL 3 YEAR; + DECLARE vFourYearsAgo DATE DEFAULT util.VN_CURDATE() - INTERVAL 4 YEAR; + DECLARE vEighteenMonths DATE DEFAULT util.VN_CURDATE() - INTERVAL 18 MONTH; + + DELETE FROM clientNewBorn + WHERE lastShipped < vOneYearAgo; + + DELETE FROM ventas + WHERE fecha < vFourYearsAgo; + + DELETE FROM payMethodClient + WHERE dated < vOneYearAgo; + + DELETE FROM payMethodClientEvolution + WHERE dated < vFourYearsAgo; + + DELETE FROM salesByclientSalesPerson + WHERE dated < vFourYearsAgo; + + DELETE FROM m3 + WHERE fecha < vTwoYearAgo; + + DELETE FROM salesByItemTypeDay + WHERE dated < vThreeYearAgo; + + DELETE FROM waste + WHERE MAKEDATE(`year`, 1) + INTERVAL (`week` - 1) WEEK + INTERVAL 1 DAY < vEighteenMonths; +END$$ +DELIMITER ; diff --git a/db/routines/bs/procedures/clientDied_recalc.sql b/db/routines/bs/procedures/clientDied_recalc.sql new file mode 100644 index 000000000..1b5cb5ac8 --- /dev/null +++ b/db/routines/bs/procedures/clientDied_recalc.sql @@ -0,0 +1,62 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`clientDied_recalc`( + vDays INT, + vCountryCode VARCHAR(2) +) +BEGIN +/** + * Recalcula los clientes inactivos y hace insert en la tabla clientDied + * estableciendo hasta 3 avisos en función del periodo y el código de país. + * + * @param vDays El número de días a considerar para la inactividad del cliente + * @param vCountryCode El código del país para filtrar los clientes + */ + DECLARE vFirstPeriod , vSecondPeriod, vThridPeriod DATE; + SET vFirstPeriod = util.VN_CURDATE() - INTERVAL vDays DAY; + SET vSecondPeriod = util.VN_CURDATE() - INTERVAL vDays * 2 DAY; + SET vThridPeriod = util.VN_CURDATE() - INTERVAL vDays * 3 DAY; + + DELETE cd.* FROM clientDied cd + JOIN ( + SELECT c.id FROM vn.client c + JOIN vn.country co ON co.id = c.countryFk + WHERE co.code = vCountryCode + ) sub ON sub.id = cd.clientFk; + + INSERT INTO clientDied (clientFk, lastInvoiced, warning) + SELECT c.id, + sub.lastShipped, + CASE + WHEN lastShipped < vThridPeriod OR lastShipped IS NULL THEN 'third' + WHEN lastShipped < vSecondPeriod THEN 'second' + WHEN lastShipped < vFirstPeriod THEN 'first' + END + FROM vn.client c + JOIN vn.country co ON co .id = c.countryFk + JOIN vn.worker w ON w.id = c.salesPersonFk + JOIN vn.worker b ON b.id = w.bossFk + JOIN vn.workerMana wm ON wm.workerFk = c.salesPersonFk + LEFT JOIN ( + SELECT c.id, DATE(MAX(t.shipped)) lastShipped + FROM vn.client c + LEFT JOIN vn.ticket t ON t.clientFk = c.id + LEFT JOIN vn.country co ON co.id = c.countryFk + WHERE co.code = vCountryCode + AND (t.shipped <= util.VN_CURDATE() OR t.shipped IS NULL) + GROUP BY c.id + ) sub ON sub.id = c.id + LEFT JOIN vn.clientObservation cob ON cob.clientFk = c.id + AND cob.created > vThridPeriod + WHERE (sub.lastShipped < vFirstPeriod OR sub.lastShipped IS NULL) + AND c.created < vThridPeriod + AND co.code = vCountryCode + AND cob.`text` IS NULL + AND c.id NOT IN ( + SELECT DISTINCT clientFk + FROM vn.ticket + WHERE refFk IS NULL + AND shipped >= vFirstPeriod + ) + GROUP BY c.id; +END$$ +DELIMITER ; diff --git a/db/routines/bs/procedures/clientNewBorn_recalc.sql b/db/routines/bs/procedures/clientNewBorn_recalc.sql new file mode 100644 index 000000000..1c89b5745 --- /dev/null +++ b/db/routines/bs/procedures/clientNewBorn_recalc.sql @@ -0,0 +1,87 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`clientNewBorn_recalc`() +BLOCK1: BEGIN + + DECLARE vClientFk INT; + DECLARE vShipped DATE; + DECLARE vPreviousShipped DATE; + DECLARE vDone boolean; + DECLARE cur cursor for + + SELECT clientFk, firstShipped + FROM bs.clientNewBorn; + + DECLARE continue HANDLER FOR NOT FOUND SET vDone = TRUE; + SET vDone := FALSE; + + DELETE FROM bs.clientNewBorn WHERE isModified = FALSE; + + INSERT INTO clientNewBorn(clientFk, firstShipped, lastShipped) + SELECT c.id, MAX(t.shipped), MAX(t.shipped) + FROM vn.client c + JOIN vn.ticket t on t.clientFk = c.id + LEFT JOIN clientNewBorn cb on cb.clientFk = c.id + WHERE t.shipped BETWEEN TIMESTAMPADD(YEAR, -1, util.VN_CURDATE()) AND util.VN_CURDATE() AND cb.isModified is null + GROUP BY c.id; + OPEN cur; + + LOOP1: LOOP + SET vDone := FALSE; + FETCH cur INTO vClientFk, vShipped; + + IF vDone THEN + CLOSE cur; + LEAVE LOOP1; + END IF; + + BLOCK2: BEGIN + DECLARE vCurrentShipped DATE; + DECLARE vDone2 boolean; + DECLARE cur2 CURSOR FOR + SELECT shipped + FROM vn.ticket + WHERE clientFk = vClientFk AND shipped <= util.VN_CURDATE() + ORDER BY shipped DESC; + + DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone2 = TRUE; + SET vDone2 := FALSE; + OPEN cur2; + + SET vPreviousShipped := vShipped; + LOOP2: LOOP + SET vDone2 := FALSE; + FETCH cur2 INTO vCurrentShipped; + + IF DATEDIFF(vPreviousShipped,vCurrentShipped) > 365 THEN + UPDATE bs.clientNewBorn + SET firstShipped = vPreviousShipped + WHERE clientFk= vClientFk; + + CLOSE cur2; + LEAVE LOOP2; + END IF; + + SET vPreviousShipped := vCurrentShipped; + + IF vDone2 THEN + UPDATE bs.clientNewBorn + SET firstShipped = vCurrentShipped + WHERE clientFk= vClientFk; + CLOSE cur2; + LEAVE LOOP2; + END IF; + + END LOOP LOOP2; + END BLOCK2; + END LOOP LOOP1; + + UPDATE bs.clientNewBorn cnb + LEFT JOIN (SELECT DISTINCT t.clientFk + FROM vn.ticket t + JOIN vn.productionConfig pc + WHERE t.shipped BETWEEN util.VN_CURDATE() + INTERVAL -(`notBuyingMonths`) MONTH + AND util.VN_CURDATE() + INTERVAL -(`pc`.`rookieDays`) DAY) notRookie ON notRookie.clientFk = cnb.clientFk + SET cnb.isRookie = ISNULL(notRookie.clientFk); + +END BLOCK1$$ +DELIMITER ; diff --git a/db/routines/bs/procedures/comercialesCompleto.sql b/db/routines/bs/procedures/comercialesCompleto.sql new file mode 100644 index 000000000..101173740 --- /dev/null +++ b/db/routines/bs/procedures/comercialesCompleto.sql @@ -0,0 +1,111 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`comercialesCompleto`(IN vWorker INT, vDate DATE) +BEGIN + DECLARE vAYearAgoStarted DATE DEFAULT DATE_FORMAT(TIMESTAMPADD(YEAR, - 1, vDate), '%Y-%m-01'); + DECLARE vAYearAgoEnded DATE DEFAULT TIMESTAMPADD(YEAR, - 1, LAST_DAY(vDate)); + + CALL vn.worker_GetHierarchy(vWorker); + + INSERT IGNORE INTO tmp.workerHierarchyList (workerFk) + SELECT wd2.workerFk + FROM vn.workerDepartment wd2 + WHERE wd2.workerFk = vWorker; + + -- Falta que en algunos casos solo tenga en cuenta los tipos afectados. + SELECT + c.Id_Cliente id_cliente, + c.Cliente cliente, + cr.recobro * 100 tarifa, + c.Telefono telefono, + c.movil, + c.POBLACION poblacion, + p.`name` provincia, + ROUND(f.futur, 2) futur, + c.Credito credito, + pm.`name` forma_pago, + ROUND(c365 / 12, 2) consumo_medio365, + ROUND(c365, 2) consumo365, + ROUND(CmLy.peso, 2) peso_mes_año_pasado, + ROUND(CmLy.peso * 1.19, 2) objetivo, + tr.CodigoTrabajador, + ROUND(mes_actual.consumo, 2) consumoMes, + ROUND(IFNULL(mes_actual.consumo, 0) - IFNULL(CmLy.peso * 1.19, 0), 2) como_lo_llevo, + DATE(LastTicket) ultimo_ticket, + dead.muerto, + g.Greuge, + cr.recobro + FROM + vn2008.Clientes c + LEFT JOIN + (SELECT g.clientFk Id_Cliente, CAST( SUM(g.amount) as DECIMAL(12,2)) AS Greuge + FROM vn.greuge g + JOIN vn.`client` c ON c.id = g.clientFk + LEFT JOIN vn.worker w ON c.salesPersonFk = w.id + WHERE (c.salesPersonFk = vWorker OR w.bossFk = vWorker) + GROUP BY Id_Cliente + ) g ON g.Id_Cliente = c.Id_Cliente + LEFT JOIN + vn2008.province p ON p.province_id = c.province_id + JOIN + vn2008.pay_met pm ON pm.id = c.pay_met_id + LEFT JOIN + vn2008.Trabajadores tr ON c.Id_Trabajador = tr.Id_Trabajador + LEFT JOIN + bi.claims_ratio cr on cr.Id_Cliente = c.Id_Cliente + LEFT JOIN + (SELECT v.Id_Cliente, SUM(importe) c365 -- optimizat de 6s /5.3s/ 4.7s a 0.3/0.4/0.3 + FROM bs.ventas v + JOIN vn2008.Clientes c ON c.Id_Cliente = v.Id_Cliente + WHERE v.fecha BETWEEN TIMESTAMPADD(YEAR, - 1, vDate) AND vDate + GROUP BY v.Id_Cliente) c365 ON c365.Id_Cliente = c.Id_Cliente + LEFT JOIN + (SELECT + Id_Cliente, SUM(importe) consumo + FROM + bs.ventas v + INNER JOIN vn2008.Clientes c USING (Id_Cliente) + LEFT JOIN vn2008.Trabajadores tr ON c.Id_Trabajador = tr.Id_Trabajador + WHERE + (c.Id_Trabajador = vWorker OR tr.boss = vWorker) + 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 + 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)) + 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 + 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 + LEFT JOIN + ( + SELECT SUM(importe) peso, c.Id_Cliente + FROM bs.ventas v + JOIN vn2008.Clientes c ON c.Id_Cliente = v.Id_Cliente + LEFT JOIN vn2008.Trabajadores tr ON c.Id_Trabajador = tr.Id_Trabajador + WHERE fecha BETWEEN vAYearAgoStarted and vAYearAgoEnded + AND (c.Id_Trabajador = vWorker OR tr.boss = vWorker) + GROUP BY c.Id_Cliente) CmLy ON CmLy.Id_Cliente = c.Id_Cliente + LEFT JOIN + (SELECT c.Id_Cliente, + IF(MAX(io.issued) < DATE_FORMAT(TIMESTAMPADD(MONTH, - 1, vDate), '%Y- %m-01'), TRUE, FALSE) muerto + FROM vn.invoiceOut io + JOIN vn2008.Clientes c ON c.Id_cliente = io.clientFk + LEFT JOIN vn2008.Trabajadores tr ON c.Id_Trabajador = tr.Id_Trabajador + WHERE (c.Id_Trabajador = vWorker OR tr.boss = vWorker) + GROUP BY Id_Cliente) dead ON dead.Id_Cliente = c.Id_Cliente + JOIN tmp.workerHierarchyList s ON s.workerFk = c.Id_Trabajador; + + DROP TEMPORARY TABLE tmp.workerHierarchyList; +END$$ +DELIMITER ; diff --git a/db/routines/bs/procedures/compradores_evolution_add.sql b/db/routines/bs/procedures/compradores_evolution_add.sql new file mode 100644 index 000000000..e9b073e28 --- /dev/null +++ b/db/routines/bs/procedures/compradores_evolution_add.sql @@ -0,0 +1,66 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`compradores_evolution_add`() +BEGIN +/** + * Inserta en la tabla compradores_evolution las ventas acumuladas en los ultimos 365 dias + * + */ + DECLARE vDated DATE; + DECLARE vCount INT DEFAULT 1; + + SELECT MAX(fecha) + INTERVAL 1 DAY INTO vDated + FROM compradores_evolution; + + IF vDated IS NULL THEN + + SELECT MIN(dated) INTO vDated + FROM sale; + + INSERT INTO compradores_evolution( + Id_Trabajador, + fecha, + importe) + SELECT it.workerFk, + vDated, + SUM(s.amount) + FROM sale s + JOIN vn.itemType it ON it.id = s.typeFk + WHERE s.dated = vDated + GROUP BY it.workerFk; + + SET vDated = vDated + INTERVAL 1 DAY; + END IF; + + WHILE vDated < util.VN_CURDATE() DO + + SET vCount = vCount + 1; + + REPLACE compradores_evolution( + Id_Trabajador, + fecha, + importe) + SELECT Id_Trabajador, + vDated, + SUM(importe) + FROM( + SELECT Id_Trabajador, importe + FROM compradores_evolution + JOIN ( + SELECT DISTINCT it.workerFk + FROM vn.itemType it + )sub2 ON sub2.workerFk = Id_Trabajador + WHERE fecha = vDated - INTERVAL 1 DAY + UNION ALL + SELECT it.workerFk, s.amount * IF(s.dated < vDated, -1, 1) + FROM sale s + JOIN vn.itemType it ON it.id = s.typeFk + JOIN vn.itemCategory ic ON ic.id = it.categoryFk + WHERE s.dated IN (vDated, vDated - INTERVAL 1 YEAR) + AND ic.merchandise + )sub + GROUP BY Id_Trabajador; + + SET vDated = vDated + INTERVAL 1 DAY; + END WHILE; +END$$ +DELIMITER ; diff --git a/db/routines/bs/procedures/fondo_evolution_add.sql b/db/routines/bs/procedures/fondo_evolution_add.sql new file mode 100644 index 000000000..3ca91e647 --- /dev/null +++ b/db/routines/bs/procedures/fondo_evolution_add.sql @@ -0,0 +1,65 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`fondo_evolution_add`() +BEGIN +/** + * Inserta en la tabla fondo_maniobra los saldos acumulados en los ultimos 365 dias + */ + DECLARE datFEC DATE DEFAULT '2015-01-01'; + + SELECT TIMESTAMPADD(DAY,1,MAX(fecha)) + INTO datFEC + FROM bs.fondo_maniobra; + + WHILE datFEC < util.VN_CURDATE() DO + + IF DAY(datFEC) MOD 28 = 0 THEN -- esto solo sirve para no aburrirse mientras esperamos... + SELECT datFEC; + END IF; + + REPLACE bs.fondo_maniobra(Fecha, clientes_facturas, clientes_cobros,proveedores_facturas,proveedores_pagos, fondo) + SELECT datFEC AS Fecha, Facturas, Cobros,Recibidas,Pagos, Facturas + Cobros + Recibidas + Pagos + FROM ( + SELECT SUM(io.amount) AS Facturas + FROM vn.invoiceOut io + JOIN vn.client c ON io.clientFk = c.id + WHERE c.isRelevant + AND io.companyFk <> 1381 + AND io.issued BETWEEN '2011-01-01' AND datFEC + ) fac + JOIN ( + SELECT - SUM(r.amountPaid) AS Cobros + FROM vn.receipt r + JOIN vn.client c ON r.clientFk = c.id + WHERE c.isRelevant + AND r.companyFk <> 1381 + AND r.payed BETWEEN '2011-01-01' AND datFEC + ) cob + JOIN ( + SELECT - SUM(id.amount) AS Recibidas + FROM vn.invoiceIn ii + JOIN vn.invoiceInDueDay id ON ii.id = id.invoiceInFk + WHERE ii.companyFk <> 1381 + AND ii.issued BETWEEN '2015-01-01' AND datFEC + ) rec + JOIN ( + SELECT SUM(p.amount) AS Pagos + FROM vn.payment p + WHERE p.companyFk <>1381 + AND p.received BETWEEN '2015-01-01' AND datFEC + ) pag; + + UPDATE bs.fondo_maniobra + JOIN ( + SELECT AVG(fondo) AS media + FROM bs.fondo_maniobra + WHERE fecha <= datFEC + ) sub + SET fondo_medio = media WHERE fecha = datFEC; + + SET datFEC = TIMESTAMPADD(DAY,1,datFEC); + + END WHILE; + + +END$$ +DELIMITER ; diff --git a/db/routines/bs/procedures/fruitsEvolution.sql b/db/routines/bs/procedures/fruitsEvolution.sql new file mode 100644 index 000000000..c689f4b76 --- /dev/null +++ b/db/routines/bs/procedures/fruitsEvolution.sql @@ -0,0 +1,17 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`fruitsEvolution`() +BEGIN +select Id_Cliente, + Cliente, count(semana) as semanas, (w.code IS NOT NULL) isWorker +from ( +select distinct v.Id_Cliente, c.name as Cliente, week(fecha, 3) as semana +from bs.ventas v +join vn.itemType it ON it.id = v.tipo_id +join vn.client c ON c.id = v.Id_Cliente +where it.categoryFk = 12 +and v.fecha > '2020-01-01') sub +left join vn.worker w ON w.id = sub.Id_Cliente +group by Id_Cliente; + +END$$ +DELIMITER ; diff --git a/db/routines/bs/procedures/indicatorsUpdate.sql b/db/routines/bs/procedures/indicatorsUpdate.sql new file mode 100644 index 000000000..b2a3ee8b3 --- /dev/null +++ b/db/routines/bs/procedures/indicatorsUpdate.sql @@ -0,0 +1,150 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`indicatorsUpdate`(vDated DATE) +BEGIN + + DECLARE oneYearBefore DATE DEFAULT TIMESTAMPADD(YEAR,-1, vDated); + DECLARE twoMonthsBefore DATE DEFAULT TIMESTAMPADD(DAY,-60, vDated); + DECLARE oneMonthBefore DATE DEFAULT TIMESTAMPADD(DAY,-30, vDated); + DECLARE vWeek INT; + + REPLACE indicators(updated) + VALUES(vDated); + + -- Ventas totales del ultimo año + UPDATE indicators + SET lastYearSales = + (SELECT SUM(importe + recargo) + FROM ventas v + JOIN vn2008.empresa e ON e.id = v.empresa_id + JOIN vn2008.empresa_grupo eg ON eg.empresa_grupo_id = e.empresa_grupo + WHERE fecha BETWEEN oneYearBefore AND vDated + AND eg.grupo = 'Verdnatura' + ) + WHERE updated = vDated; + + -- Greuge total acumulado + UPDATE indicators + SET totalGreuge = + (SELECT SUM(amount) + FROM vn.greuge + WHERE shipped <= vDated + ) + WHERE updated = vDated; + + -- Tasa de morosidad con respecto a las ventas del último mes + UPDATE indicators + SET latePaymentRate = + (SELECT SUM(amount) + FROM bi.defaulters + WHERE date = vDated AND amount > 0) + / + (SELECT SUM(importe + recargo) + FROM ventas + WHERE fecha BETWEEN oneMonthBefore AND vDated) + WHERE updated = vDated; + + -- Número de trabajadores activos + UPDATE indicators + SET countEmployee = + (SELECT CAST(SUM(ct.hoursWeek) / 40 AS DECIMAL (10, 2)) + FROM vn.business b + JOIN vn.calendarType ct ON ct.id = b.calendarTypeFk + WHERE vDated BETWEEN b.started AND IFNULL(b.ended, vDated) + AND b.companyCodeFk = 'VNL' + ) + WHERE updated = vDated; + + -- Maná medio acumulado por comercial + UPDATE indicators + SET averageMana = + (SELECT AVG(amount) + FROM vn.workerMana + ) + WHERE updated = vDated; + + -- Número de clientes que han comprado en los últimos 30 dias + UPDATE indicators + SET lastMonthActiveClients = + (SELECT COUNT(DISTINCT t.clientFk) + FROM vn.ticket t + WHERE t.shipped BETWEEN oneMonthBefore AND vDated + ) + WHERE updated = vDated; + + -- Número de clientes que no han comprado en los últimos 30 dias, pero compraron en los 30 anteriores + UPDATE indicators + SET lastMonthLostClients = + (SELECT COUNT(lm.clientFk) + FROM + (SELECT DISTINCT t.clientFk + FROM vn.ticket t + WHERE t.shipped BETWEEN oneMonthBefore AND vDated + ) cm + RIGHT JOIN + (SELECT DISTINCT t.clientFk + FROM vn.ticket t + WHERE t.shipped >= twoMonthsBefore + AND t.shipped < oneMonthBefore + ) lm ON lm.clientFk = cm.clientFk + WHERE cm.clientFk IS NULL + ) + WHERE updated = vDated; + + -- Número de clientes que han comprado en los últimos 30 dias, pero no compraron en los 30 anteriores + UPDATE indicators + SET lastMonthNewClients = + (SELECT COUNT(cm.clientFk) + FROM + (SELECT DISTINCT t.clientFk + FROM vn.ticket t + WHERE t.shipped BETWEEN oneMonthBefore AND vDated + ) cm + LEFT JOIN + (SELECT DISTINCT t.clientFk + FROM vn.ticket t + WHERE t.shipped >= twoMonthsBefore + AND t.shipped < oneMonthBefore + ) lm ON lm.clientFk = cm.clientFk + WHERE lm.clientFk IS NULL + ) + WHERE updated = vDated; + + -- Porcentaje de autopedidos sobre los pedidos totales + UPDATE indicators + SET lastMonthWebBuyingRate = + (SELECT (SUM(source_app != '') - SUM(source_app = 'TPV')) / SUM(source_app != '') + FROM hedera.`order` + WHERE date_send BETWEEN oneMonthBefore AND vDated + ) + WHERE updated = vDated; + + -- Cálculo de las ventas agrupado por semanas + SELECT week INTO vWeek + FROM vn.time + WHERE dated = vDated; + + TRUNCATE salesByWeek; + + INSERT INTO salesByWeek (week, year, sales) + SELECT t.week, t.year, SUM(v.importe + v.recargo) sales + FROM ventas v + LEFT JOIN vn.time t ON t.dated = fecha + GROUP BY t.week, t.year + ORDER BY t.week, t.year; + + -- Indicador Ventas semana actual + UPDATE indicators i + JOIN salesByWeek s ON s.week= vWeek + AND s.year = YEAR(vDated) + SET i.thisWeekSales = s.sales + WHERE updated = vDated; + + -- Indicador ventas semana actual en el año pasado + UPDATE indicators i + JOIN salesByWeek s ON s.week = vWeek + AND s.year = YEAR(vDated)-1 + SET i.lastYearWeekSales = s.sales + WHERE updated = vDated; + +END$$ +DELIMITER ; diff --git a/db/routines/bs/procedures/indicatorsUpdateLauncher.sql b/db/routines/bs/procedures/indicatorsUpdateLauncher.sql new file mode 100644 index 000000000..8ede28ec8 --- /dev/null +++ b/db/routines/bs/procedures/indicatorsUpdateLauncher.sql @@ -0,0 +1,22 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`indicatorsUpdateLauncher`() +BEGIN + + DECLARE vDated DATE; + + SELECT IFNULL(TIMESTAMPADD(DAY,1,MAX(updated)), '2018-04-01') + INTO vDated + FROM bs.indicators; + + WHILE vDated < util.VN_CURDATE() DO + + CALL indicatorsUpdate(vDated); + + SELECT TIMESTAMPADD(DAY,1,MAX(updated)) + INTO vDated + FROM bs.indicators; + + END WHILE; + +END$$ +DELIMITER ; diff --git a/db/routines/bs/procedures/inventoryDiscrepancyDetail_replace.sql b/db/routines/bs/procedures/inventoryDiscrepancyDetail_replace.sql new file mode 100644 index 000000000..863005373 --- /dev/null +++ b/db/routines/bs/procedures/inventoryDiscrepancyDetail_replace.sql @@ -0,0 +1,92 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`inventoryDiscrepancyDetail_replace`() +BEGIN +/** + * Replace all records in table inventoryDiscrepancyDetail and insert new + * records into inventoryDiscrepancy for all inventory warehouses. + */ + DECLARE vDone INT DEFAULT FALSE; + DECLARE vCalc INT; + DECLARE vWarehouseFk INT; + + DECLARE cWarehouses CURSOR FOR + SELECT id + FROM vn.warehouse + WHERE isInventory; + + DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; + + TRUNCATE TABLE inventoryDiscrepancyDetail; + + OPEN cWarehouses; + read_loop: LOOP + SET vDone = FALSE; + FETCH cWarehouses INTO vWarehouseFk; + + IF vDone THEN + LEAVE read_loop; + END IF; + + CALL cache.visible_refresh(vCalc, FALSE, vWarehouseFk); + + CREATE OR REPLACE TEMPORARY TABLE tVisible + SELECT itemFk, SUM(visible) totalVisible + FROM vn.itemShelving ish + JOIN vn.shelving sh ON sh.code = ish.shelvingFk + JOIN vn.parking p ON p.id = sh.parkingFk + JOIN vn.sector sc ON sc.id = p.sectorFk + WHERE sc.warehouseFk = vWarehouseFk + GROUP BY itemFk; + + INSERT INTO inventoryDiscrepancyDetail( + warehouseFk, + itemFk, + theorical, + visible, + notPicked, + alert) + SELECT vWarehouseFk warehouseFk, + v.item_id itemFk, + v.visible, + tv.totalVisible, + s.notPicked, + CASE + WHEN s.notPicked > IFNULL(tv.totalVisible, 0) THEN 0 + WHEN v.visible > IFNULL((tv.totalVisible * 2), 0) THEN 1 + WHEN v.visible > tv.totalVisible THEN 2 + ELSE 3 + END alert + FROM cache.visible v + LEFT JOIN tVisible tv ON tv.itemFk = v.item_id + JOIN ( + SELECT s.itemFk, SUM(s.quantity) notPicked + FROM vn.sale s + JOIN vn.ticket t ON t.id = s.ticketFk + JOIN vn.ticketState ts ON ts.ticketFk = t.id + JOIN vn.alertLevel al ON al.id = ts.alertLevel + WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE()) + AND s.isPicked = FALSE + AND al.code = 'FREE' + AND t.warehouseFk = vWarehouseFk + GROUP BY s.itemFk + HAVING notPicked + ) s ON s.itemFk = v.item_id + WHERE v.calc_id = vCalc + AND NOT v.visible <=> tv.totalVisible; + + END LOOP; + CLOSE cWarehouses; + + INSERT INTO inventoryDiscrepancy( + warehouseFk, + alert, + quantity) + SELECT warehouseFk, + alert, + COUNT(*) + FROM inventoryDiscrepancyDetail + GROUP BY warehouseFk, alert; + + DROP TEMPORARY TABLE IF EXISTS tVisible; +END$$ +DELIMITER ; diff --git a/db/routines/bs/procedures/m3Add.sql b/db/routines/bs/procedures/m3Add.sql new file mode 100644 index 000000000..0ec2c8ce2 --- /dev/null +++ b/db/routines/bs/procedures/m3Add.sql @@ -0,0 +1,32 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`m3Add`() +BEGIN + + DECLARE datSTART DATE; + DECLARE datEND DATE; + + SELECT TIMESTAMPADD(WEEK, -1,MAX(fecha)) INTO datSTART + FROM bs.m3; + + SET datEND = TIMESTAMPADD(DAY,-1,util.VN_CURDATE()); + + DELETE FROM bs.m3 + WHERE fecha >= datSTART; + + INSERT INTO bs.m3 (fecha, provinceFk, warehouseFk, m3, year, month, week, day, dayName, euros) + SELECT v.fecha, a.provinceFk, t.warehouseFk, sum(s.quantity * ic.cm3delivery) / 1000000 AS m3, + tm.year, tm.month, tm.week, tm.day, dayname(v.fecha), sum(importe) + FROM vn.ticket t + JOIN vn.sale s ON s.ticketFk = t.id + JOIN vn.item i ON i.id = s.itemFk + JOIN vn.itemType it ON it.id = i.typeFk + JOIN bs.ventas v ON v.Id_Movimiento = s.id -- Filtra solo por ventas "buenas" + JOIN vn.time tm ON tm.dated = v.fecha + JOIN vn.itemCost ic ON ic.itemFk = s.itemFk AND ic.warehouseFk = t.warehouseFk + JOIN vn.address a ON a.id = t.addressFk + WHERE v.fecha BETWEEN datSTART AND datEND + AND s.quantity > 0 -- evita abonos + AND t.companyFk = 442 -- Verdnatura + GROUP BY t.warehouseFk, v.fecha, a.provinceFk; +END$$ +DELIMITER ; diff --git a/db/routines/bs/procedures/manaCustomerUpdate.sql b/db/routines/bs/procedures/manaCustomerUpdate.sql new file mode 100644 index 000000000..2038f976a --- /dev/null +++ b/db/routines/bs/procedures/manaCustomerUpdate.sql @@ -0,0 +1,101 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`manaCustomerUpdate`() +BEGIN + DECLARE vToDated DATE; + DECLARE vFromDated DATE; + DECLARE vForDeleteDated DATE; + DECLARE vManaId INT; + DECLARE vManaAutoId INT; + DECLARE vClaimManaId INT; + DECLARE vManaBankId INT; + DECLARE vManaGreugeTypeId INT; + DECLARE vManaFromDays INT; + DECLARE vManaToDays INT; + + SELECT id INTO vManaId + FROM vn.component WHERE code = 'mana'; + + SELECT id INTO vManaAutoId + FROM vn.component WHERE code = 'autoMana'; + + SELECT id INTO vClaimManaId + FROM vn.component WHERE code = 'manaClaim'; + + SELECT id INTO vManaBankId + FROM vn.accounting WHERE code = 'mana'; + + SELECT id INTO vManaGreugeTypeId + FROM vn.greugeType WHERE code = 'mana'; + + SELECT manaFromDays, manaToDays + INTO vManaFromDays, vManaToDays + FROM vn.salespersonConfig; + + SELECT MAX(dated) + INTO vFromDated + FROM vn.clientManaCache; + + DELETE + FROM vn.clientManaCache + WHERE dated = vFromDated; + + SELECT MAX(dated) + INTO vFromDated + FROM vn.clientManaCache; + + IF ISNULL(vFromDated) THEN + SELECT manaDateFrom + INTO vFromDated + FROM vn.salespersonConfig; + END IF; + + WHILE vFromDated + INTERVAL vManaToDays DAY < util.VN_CURDATE() DO + SELECT + vFromDated + INTERVAL vManaToDays DAY, + vFromDated - INTERVAL vManaFromDays DAY + INTO + vToDated, + vForDeleteDated; + + DELETE FROM vn.clientManaCache + WHERE dated <= vForDeleteDated; + + INSERT INTO vn.clientManaCache(clientFk, mana, dated) + SELECT + Id_Cliente, + SUM(mana), + vToDated + FROM + ( + SELECT cs.Id_Cliente, Cantidad * Valor as mana + FROM vn2008.Tickets t + JOIN vn2008.Consignatarios cs using(Id_Consigna) + JOIN vn2008.Movimientos m on m.Id_Ticket = t.Id_Ticket + 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 + UNION ALL + SELECT r.Id_Cliente, - Entregado + FROM vn2008.Recibos r + WHERE Id_Banco = vManaBankId + AND Fechacobro > vFromDated + AND Fechacobro <= vToDated + UNION ALL + SELECT clientFk, amount + FROM vn.greuge + WHERE greugeTypeFk = vManaGreugeTypeId + AND shipped > vFromDated + AND shipped <= vToDated + UNION ALL + SELECT clientFk, mana + FROM vn.clientManaCache + WHERE dated = vFromDated + ) sub + GROUP BY Id_Cliente + HAVING Id_Cliente; + + SET vFromDated = vToDated; + END WHILE; +END$$ +DELIMITER ; diff --git a/db/routines/bs/procedures/manaSpellers_actualize.sql b/db/routines/bs/procedures/manaSpellers_actualize.sql new file mode 100644 index 000000000..20b0f84f8 --- /dev/null +++ b/db/routines/bs/procedures/manaSpellers_actualize.sql @@ -0,0 +1,29 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`manaSpellers_actualize`() +BEGIN +/** + * Recalcula el valor del campo con el modificador de precio + * para el componente de maná automático. + */ + UPDATE vn.workerMana wm + JOIN ( + SELECT c.lastSalesPersonFk, + FLOOR(SUM(s.amount) / 12) amount + FROM salesByclientSalesPerson s + JOIN vn.client c ON c.id = s.clientFk + WHERE s.dated BETWEEN util.VN_CURDATE() - INTERVAL 1 YEAR AND util.VN_CURDATE() + GROUP BY c.lastSalesPersonFk + )avgPortfolioWeight ON avgPortfolioWeight.lastSalesPersonFk = wm.workerFk + JOIN vn.salespersonConfig spc + SET wm.pricesModifierRate = + IFNULL( + GREATEST( + spc.manaMinRate, + LEAST( + spc.manaMaxRate, + ROUND( - wm.amount / avgPortfolioWeight.amount, 3) + ) + ) + ,0); +END$$ +DELIMITER ; diff --git a/db/routines/bs/procedures/nightTask_launchAll.sql b/db/routines/bs/procedures/nightTask_launchAll.sql new file mode 100644 index 000000000..59899ee03 --- /dev/null +++ b/db/routines/bs/procedures/nightTask_launchAll.sql @@ -0,0 +1,80 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`nightTask_launchAll`() +BEGIN +/** + * Runs all nightly tasks. + */ + DECLARE vDone BOOL; + DECLARE vError VARCHAR(255); + DECLARE vErrorCode VARCHAR(255); + DECLARE vSchema VARCHAR(255); + DECLARE vProcedure VARCHAR(255); + DECLARE vLogMail VARCHAR(255); + DECLARE vNightTaskFk INT; + + DECLARE vQueue CURSOR FOR + SELECT id, `schema`, `procedure` + FROM nightTask + WHERE finished <= util.VN_CURDATE() + OR finished IS NULL + ORDER BY `order`; + + DECLARE CONTINUE HANDLER FOR NOT FOUND + SET vDone = TRUE; + + SET max_sp_recursion_depth = 3; + + SELECT logMail INTO vLogMail + FROM nightTaskConfig LIMIT 1; + + OPEN vQueue; + l: LOOP + SET vDone = FALSE; + FETCH vQueue INTO vNightTaskFk, vSchema, vProcedure; + + IF vDone THEN + LEAVE l; + END IF; + + UPDATE nightTask + SET `started` = util.VN_NOW(), + `finished` = NULL, + `error` = NULL, + `errorCode` = NULL + WHERE id = vNightTaskFk; + + SET vError = NULL; + CALL nightTask_launchTask( + vSchema, + vProcedure, + vError, + vErrorCode + ); + + IF vError IS NOT NULL THEN + IF vLogMail IS NOT NULL THEN + CALL vn.mail_insert( + vLogMail, + NULL, + CONCAT('Nightly task failed (', vSchema, '.', vProcedure, ')'), + CONCAT( + '[', vErrorCode, '] ', vError, CHAR(13, 10), -- Line break + 'See ', SCHEMA(), '.nightTask table for more info.' + ) + ); + END IF; + + UPDATE nightTask + SET `error` = vError, + `errorCode` = vErrorCode + WHERE id = vNightTaskFk; + ELSE + UPDATE nightTask + SET finished = util.VN_NOW(), + lastFinished = util.VN_NOW() + WHERE id = vNightTaskFk; + END IF; + END LOOP; + CLOSE vQueue; +END$$ +DELIMITER ; diff --git a/db/routines/bs/procedures/nightTask_launchTask.sql b/db/routines/bs/procedures/nightTask_launchTask.sql new file mode 100644 index 000000000..aa4c540e8 --- /dev/null +++ b/db/routines/bs/procedures/nightTask_launchTask.sql @@ -0,0 +1,26 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`nightTask_launchTask`( + vSchema VARCHAR(255), + vProcedure VARCHAR(255), + OUT vError VARCHAR(255), + OUT vErrorCode VARCHAR(255) +) +BEGIN +/** + * Runs an specific procedure from nightly tasks, if an error + * occurs, instead of throw it, #vError and #vErrorCode variables + * are setted. + * + * @param vSchema The procedure schema + * @param vProcedure The procedure name + * @param vError The error message, if any + * @param vErrorCode The error code, if any + */ + DECLARE EXIT HANDLER FOR SQLEXCEPTION + GET DIAGNOSTICS CONDITION 1 + vError = MESSAGE_TEXT, + vErrorCode = RETURNED_SQLSTATE; + + CALL util.exec(CONCAT('CALL `', vSchema ,'`.`', vProcedure ,'`')); +END$$ +DELIMITER ; diff --git a/db/routines/bs/procedures/payMethodClientAdd.sql b/db/routines/bs/procedures/payMethodClientAdd.sql new file mode 100644 index 000000000..0c19f453a --- /dev/null +++ b/db/routines/bs/procedures/payMethodClientAdd.sql @@ -0,0 +1,21 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`payMethodClientAdd`() +BEGIN + INSERT IGNORE INTO `bs`.`payMethodClient` (dated, payMethodFk, clientFk) + SELECT util.VN_CURDATE(), c.payMethodFk, c.id + FROM vn.client c + JOIN vn.payMethod p ON c.payMethodFk = p.id; + + TRUNCATE `bs`.`payMethodClientEvolution` ; + + INSERT INTO `bs`.`payMethodClientEvolution` (dated, payMethodName, amountClient, amount, equalizationTax) + SELECT p.dated, pm.name, COUNT(p.clientFk), SUM(sub.importe) , SUM(sub.recargo) + FROM bs.payMethodClient p + JOIN (SELECT SUM(v.importe) AS importe, SUM(v.recargo) as recargo, v.fecha, v.Id_cliente + FROM bs.ventas v + WHERE v.fecha>= (SELECT MIN(dated) FROM bs. payMethodClient) + GROUP BY v.Id_cliente, v.fecha) sub ON sub.fecha = p.dated AND sub.Id_cliente = p.ClientFk + JOIN vn.payMethod pm ON p.payMethodFk = pm.id + GROUP BY dated,payMethodFk; +END$$ +DELIMITER ; diff --git a/db/routines/bs/procedures/saleGraphic.sql b/db/routines/bs/procedures/saleGraphic.sql new file mode 100644 index 000000000..e1e387980 --- /dev/null +++ b/db/routines/bs/procedures/saleGraphic.sql @@ -0,0 +1,39 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`saleGraphic`(IN vItemFk INT, IN vTypeFk INT, IN vCategoryFk INT, IN vFromDate DATE, + IN vToDate DATE, IN vProducerFk INT) +BEGIN + + DECLARE vFromDateLastYear DATE; + DECLARE vToDateLastYear DATE; + DECLARE vFromDateTwoYearsAgo DATE; + DECLARE vToDateTwoYearsAgo DATE; + + SET vItemFk = IFNULL(vItemFk,0); + SET vTypeFk = IFNULL(vTypeFk, 0); + SET vCategoryFk = IFNULL(vCategoryFk,0); + SET vFromDate = IFNULL(vFromDate,util.VN_CURDATE()); + SET vToDate = IFNULL(vToDate,util.VN_CURDATE()); + SET vProducerFk = IFNULL(vProducerFk,0); + + SET vFromDateLastYear = TIMESTAMPADD(YEAR,-1,vFromDate); + SET vToDateLastYear = TIMESTAMPADD(YEAR,-1,vToDate); + SET vFromDateTwoYearsAgo = TIMESTAMPADD(YEAR,-2,vFromDate); + SET vToDateTwoYearsAgo = TIMESTAMPADD(YEAR,-2,vToDate); + + SELECT s.quantity, CAST(v.importe AS DECIMAL(10,0)) importe, v.fecha + FROM bs.ventas v + JOIN vn.sale s ON s.id = v.Id_Movimiento + JOIN vn.item i ON i.id = s.itemFk + JOIN vn.itemType it ON it.id = i.typeFk + JOIN vn.itemCategory ic ON ic.id = it.categoryFk + WHERE vItemFk IN (i.id, 0) + AND vTypeFk IN (i.typeFk, 0) + AND vCategoryFk IN (it.categoryFk, 0) + AND vProducerFk IN (i.producerFk, 0) + AND (v.fecha BETWEEN vFromDate AND vToDate + OR v.fecha BETWEEN vFromDateLastYear AND vToDateLastYear + OR v.fecha BETWEEN vFromDateTwoYearsAgo AND vToDateTwoYearsAgo + ); + +END$$ +DELIMITER ; diff --git a/db/routines/bs/procedures/salePersonEvolutionAdd.sql b/db/routines/bs/procedures/salePersonEvolutionAdd.sql new file mode 100644 index 000000000..33e31b699 --- /dev/null +++ b/db/routines/bs/procedures/salePersonEvolutionAdd.sql @@ -0,0 +1,20 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`salePersonEvolutionAdd`(IN vDateStart DATETIME) +BEGIN + DELETE FROM bs.salePersonEvolution + WHERE dated <= DATE_SUB(util.VN_CURDATE(), INTERVAL 1 YEAR); + + + INSERT INTO bs.salePersonEvolution (dated, amount, equalizationTax, salesPersonFk) + SELECT fecha dated, + CAST(SUM(importe) AS DECIMAL(10,2) ) amount, + CAST(SUM(recargo) AS DECIMAL(10,2) ) equalizationTax , + IFNULL(salesPersonFk,0) salesPersonFk + FROM bs.ventas v + JOIN vn.client c ON v.Id_Cliente = c.id + JOIN vn.company co ON co.id = v.empresa_id + WHERE co.code = "VNL" AND fecha >= vDateStart + GROUP BY v.fecha,c.salesPersonFk + ORDER BY salesPersonFk,dated ASC; +END$$ +DELIMITER ; diff --git a/db/routines/bs/procedures/salesByItemTypeDay_add.sql b/db/routines/bs/procedures/salesByItemTypeDay_add.sql new file mode 100644 index 000000000..5c12081a0 --- /dev/null +++ b/db/routines/bs/procedures/salesByItemTypeDay_add.sql @@ -0,0 +1,132 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`salesByItemTypeDay_add`( + vDateStart DATE, + vDateEnd DATE +) +BEGIN +/** + * Almacena datos relativos a las ventas de artículos + * agrupados por reino, familia y día + * + * @param vDateStart + * @param vDateEnd + */ + DELETE FROM salesByItemTypeDay + WHERE dated BETWEEN vDateStart AND vDateEnd; + + INSERT INTO salesByItemTypeDay (itemTypeFk, dated, `references`, stems) + SELECT it.id itemTypeFk, + bs.dated, + COUNT(DISTINCT(i.id)) `references`, + SUM(i.stems * s.quantity) stems + FROM sale bs + JOIN vn.itemType it ON it.id = bs.typeFk + JOIN vn.itemCategory ic ON ic.id = it.categoryFk + JOIN vn.sale s ON s.id = bs.saleFk + JOIN vn.item i ON i.id = s.itemFk + JOIN vn.ticket t ON t.id = s.ticketFk + WHERE ic.merchandise + AND t.shipped BETWEEN vDateStart AND util.dayEnd(vDateEnd) + GROUP BY it.id, bs.dated; + + INSERT INTO salesByItemTypeDay (itemTypeFk, dated, trash, faults) + SELECT it.id itemTypeFk, + DATE(t.shipped) dated, + SUM(IF(c.name = 'FALTAS', i.stems * s.quantity, 0)) trash, + SUM(IF(c.name = 'BASURA', IFNULL(i.stems, 1) * s.quantity, 0)) faults + FROM vn.sale s + JOIN vn.ticket t ON t.id = s.ticketFk + JOIN vn.item i ON i.id = s.itemFk + JOIN vn.itemType it ON it.id = i.typeFk + JOIN vn.itemCategory ic ON ic.id = it.categoryFk + JOIN vn.client c ON c.id = t.clientFk + WHERE c.name IN ('BASURA', 'FALTAS') + AND t.shipped BETWEEN vDateStart AND util.dayEnd(vDateEnd) + GROUP BY it.id, dated + ON DUPLICATE KEY UPDATE + trash = VALUES(trash), + faults = VALUES(faults); + + INSERT INTO salesByItemTypeDay (itemTypeFk, dated, accepted, claimed) + SELECT it.id itemTypeFk, + DATE(t.shipped) dated, + SUM( + (cb.quantity * s.price * (100 - s.discount) / 100) * + ((cc.maxResponsibility - c.responsibility ) / 4 ) + ) accepted, + SUM(cb.quantity * s.price * (100 - s.discount) / 100) claimed + FROM vn.claim c + JOIN vn.claimBeginning cb ON cb.claimFk = c.id + JOIN vn.sale s ON s.id = cb.saleFk + JOIN vn.ticket t ON t.id = s.ticketFk + JOIN vn.item i ON i.id = s.itemFk + JOIN vn.itemType it ON it.id = i.typeFk + JOIN vn.itemCategory ic ON ic.id = it.categoryFk + JOIN vn.claimConfig cc + WHERE ic.merchandise + AND t.shipped BETWEEN vDateStart AND util.dayEnd(vDateEnd) + GROUP BY it.id, dated + ON DUPLICATE KEY UPDATE + accepted = VALUES(accepted), + claimed = VALUES(claimed); + + INSERT INTO salesByItemTypeDay (itemTypeFk, dated, sale, buy) + SELECT itemTypeFk, + dated, + CAST(SUM(sale) AS DECIMAL(10,2)) sale, + CAST(SUM(buy) AS DECIMAL(10,2)) buy + FROM ( + SELECT it.id itemTypeFk, + bs.dated, + SUM(amount) sale, + 0 buy + FROM sale bs + JOIN vn.itemType it ON it.id = bs.typeFk + JOIN vn.itemCategory ic ON ic.id = it.categoryFk + JOIN vn.client c ON c.id = bs.clientFk + JOIN vn.sale s ON s.id = bs.saleFk + JOIN vn.ticket t ON t.id = s.ticketFk + JOIN vn.item i ON i.id = s.itemFk + WHERE ic.merchandise + AND t.shipped BETWEEN vDateStart AND vDateEnd + GROUP BY it.id, bs.dated + UNION ALL + SELECT it.id, + t.landed, + 0, + SUM(b.buyingValue * b.quantity) + FROM vn.entry e + JOIN vn.travel t ON t.id = e.travelFk + JOIN vn.buy b ON b.entryFk = e.id + JOIN vn.item i ON i.id = b.itemFk + JOIN vn.itemType it ON it.id = i.typeFk + JOIN vn.itemCategory ic ON ic.id = it.categoryFk + WHERE ic.merchandise + AND t.landed BETWEEN vDateStart AND vDateEnd + GROUP BY it.id, t.landed + ) sub + GROUP BY itemTypeFk, dated + ON DUPLICATE KEY UPDATE + sale = VALUES(sale), + buy = VALUES(buy); + + INSERT INTO salesByItemTypeDay (itemTypeFk, dated, costComponent, marginComponent) + SELECT it.id itemTypeFk, + DATE(t.shipped) dated, + SUM(s.quantity * IF(c.code = 'purchaseValue', sc.value, 0)) costComponent, + SUM(s.quantity * IF(ct.isMargin, sc.value, 0)) marginComponent + FROM vn.ticket t + JOIN vn.sale s ON t.id = s.ticketFk + JOIN vn.item i ON i.id = s.itemFk + JOIN vn.itemType it ON it.id = i.typeFk + JOIN vn.itemCategory ic ON ic.id = it.categoryFk + JOIN vn.saleComponent sc ON sc.saleFk = s.id + STRAIGHT_JOIN vn.component c ON c.id = sc.componentFk + JOIN vn.componentType ct ON ct.id = c.typeFk + WHERE t.shipped BETWEEN vDateStart AND util.dayEnd(vDateEnd) + GROUP BY it.id, dated + ON DUPLICATE KEY UPDATE + costComponent = VALUES(costComponent), + marginComponent = VALUES(marginComponent); +END$$ +DELIMITER ; diff --git a/db/routines/bs/procedures/salesByItemTypeDay_addLauncher.sql b/db/routines/bs/procedures/salesByItemTypeDay_addLauncher.sql new file mode 100644 index 000000000..3424bac74 --- /dev/null +++ b/db/routines/bs/procedures/salesByItemTypeDay_addLauncher.sql @@ -0,0 +1,6 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`salesByItemTypeDay_addLauncher`() +BEGIN + CALL bs.salesByItemTypeDay_add(util.VN_CURDATE() - INTERVAL 30 DAY, util.VN_CURDATE()); +END$$ +DELIMITER ; diff --git a/db/routines/bs/procedures/salesByclientSalesPerson_add.sql b/db/routines/bs/procedures/salesByclientSalesPerson_add.sql new file mode 100644 index 000000000..eb441c07b --- /dev/null +++ b/db/routines/bs/procedures/salesByclientSalesPerson_add.sql @@ -0,0 +1,46 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`salesByclientSalesPerson_add`(vDatedFrom DATE) +BEGIN +/** + * Agrupa las ventas por cliente/comercial/fecha en la tabla bs.salesByclientSalesPerson + * El asociación cliente/comercial/fecha, se mantiene correcta en el tiempo + * + * @param vDatedFrom el cálculo se realizará desde la fecha introducida hasta ayer + */ + + IF vDatedFrom IS NULL THEN + SET vDatedFrom = util.VN_CURDATE() - INTERVAL 1 MONTH; + END IF; + + UPDATE salesByclientSalesPerson + SET amount = 0, + equalizationTax = 0, + amountNewBorn = 0 + WHERE dated BETWEEN vDatedFrom AND util.yesterday(); + + INSERT INTO salesByclientSalesPerson( + dated, + salesPersonFk, + clientFk, + amount, + equalizationTax) + SELECT s.dated, + c.salesPersonFk, + s.clientFk, + SUM(s.amount), + SUM(s.surcharge) + FROM sale s + JOIN vn.client c on s.clientFk = c.id + WHERE s.dated BETWEEN vDatedFrom AND util.yesterday() + GROUP BY s.dated, c.salesPersonFk, s.clientFk + ON DUPLICATE KEY UPDATE amount= VALUES(amount), + equalizationTax= VALUES(equalizationTax); + + UPDATE salesByclientSalesPerson s + JOIN vn.newBornSales n ON n.dated = s.dated AND + n.clientFk = s.clientFk + SET s.amountNewBorn = n.amount + WHERE n.dated BETWEEN vDatedFrom AND util.yesterday(); + +END$$ +DELIMITER ; diff --git a/db/routines/bs/procedures/salesPersonEvolution_add.sql b/db/routines/bs/procedures/salesPersonEvolution_add.sql new file mode 100644 index 000000000..ea150e182 --- /dev/null +++ b/db/routines/bs/procedures/salesPersonEvolution_add.sql @@ -0,0 +1,65 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`salesPersonEvolution_add`() +BEGIN +/** + * Calcula los datos para los gráficos de evolución agrupado por salesPersonFk y día. + * Recalcula automáticamente los 3 últimos meses para comprobar si hay algún cambio. + */ + DECLARE vDated DATE; + DECLARE vCont INT DEFAULT 1; + + SELECT MAX(dated) - INTERVAL 3 MONTH INTO vDated + FROM salesPersonEvolution; + + DELETE FROM salesPersonEvolution + WHERE dated >= vDated; + + IF ISNULL(vDated) THEN + SELECT MIN(dated) INTO vDated + FROM salesByclientSalesPerson; + + INSERT INTO salesPersonEvolution( + salesPersonFk, + dated, + amount, + equalizationTax, + amountNewBorn + ) + SELECT salesPersonFk, + dated, + amount, + equalizationTax, + amountNewBorn + FROM salesByclientSalesPerson + WHERE dated = vDated + GROUP BY salesPersonFk; + + SET vDated = vDated + INTERVAL 1 DAY; + END IF; + + WHILE vDated < util.VN_CURDATE() DO + + SET vCont = vCont + 1; + REPLACE salesPersonEvolution(salesPersonFk, dated, amount) + SELECT salesPersonFk, vDated, amount + FROM(SELECT salesPersonFk, SUM(amount) amount + FROM(SELECT salesPersonFk, amount + FROM salesPersonEvolution + WHERE dated = vDated - INTERVAL 1 DAY + UNION ALL + SELECT salesPersonFk, amount + FROM salesByclientSalesPerson + WHERE dated = vDated + UNION ALL + SELECT salesPersonFk, - amount + FROM salesByclientSalesPerson + WHERE dated = vDated - INTERVAL 1 YEAR + )sub + GROUP BY salesPersonFk + )sub + GROUP BY salesPersonFk; + + SET vDated = vDated + INTERVAL 1 DAY; + END WHILE; +END$$ +DELIMITER ; diff --git a/db/routines/bs/procedures/vendedores_add_launcher.sql b/db/routines/bs/procedures/vendedores_add_launcher.sql new file mode 100644 index 000000000..c0718a659 --- /dev/null +++ b/db/routines/bs/procedures/vendedores_add_launcher.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`vendedores_add_launcher`() +BEGIN + + CALL bs.salesByclientSalesPerson_add(util.VN_CURDATE()- INTERVAL 45 DAY); + +END$$ +DELIMITER ; diff --git a/db/routines/bs/procedures/ventas_add.sql b/db/routines/bs/procedures/ventas_add.sql new file mode 100644 index 000000000..fcb00e092 --- /dev/null +++ b/db/routines/bs/procedures/ventas_add.sql @@ -0,0 +1,78 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`ventas_add`( + IN vStarted DATETIME, + IN vEnded DATETIME) +BEGIN +/** +* Añade las ventas que se realizaron entre +* vStarted y vEnded +* +* @param vStarted Fecha de inicio +* @param vEnded Fecha de finalizacion +* +**/ + DECLARE vStartingDate DATETIME; + DECLARE vEndingDate DATETIME; + + IF vStarted < TIMESTAMPADD(YEAR,-5,util.VN_CURDATE()) + OR vEnded < TIMESTAMPADD(YEAR,-5,util.VN_CURDATE()) THEN + CALL util.throw('fechaDemasiadoAntigua'); + END IF; + + SET vEnded = util.dayEnd(vEnded); + SET vStartingDate = vStarted ; + SET vEndingDate = util.dayEnd(vStartingDate); + + DELETE + FROM sale + WHERE dated BETWEEN vStartingDate AND vEnded; + + WHILE vEndingDate <= vEnded DO + + REPLACE ventas(Id_Movimiento, importe, recargo, fecha, tipo_id, Id_Cliente, empresa_id) + SELECT saleFk, + SUM(IF(ct.isBase, s.quantity * sc.value, 0)) importe, + SUM(IF(ct.isBase, 0, s.quantity * sc.value)) recargo, + vStartingDate, + i.typeFk, + a.clientFk, + t.companyFk + FROM vn.saleComponent sc + JOIN vn.component c ON c.id = sc.componentFk + JOIN vn.componentType ct ON ct.id = c.typeFk + JOIN vn.sale s ON s.id = sc.saleFk + JOIN vn.item i ON i.id = s.itemFk + JOIN vn.itemType it ON it.id = i.typeFk + JOIN vn.itemCategory ic ON ic.id = it.categoryFk + JOIN vn.ticket t ON t.id = s.ticketFk + JOIN vn.address a ON a.id = t.addressFk + JOIN vn.client cl ON cl.id = a.clientFk + WHERE t.shipped BETWEEN vStartingDate AND vEndingDate + AND s.quantity <> 0 + AND s.discount <> 100 + AND ic.merchandise + GROUP BY sc.saleFk + HAVING IFNULL(importe,0) <> 0 OR IFNULL(recargo,0) <> 0; + + UPDATE sale s + JOIN ( + SELECT s.id, + SUM(s.quantity * sc.value ) margen, + s.quantity * s.price * (100 - s.discount ) / 100 pvp + FROM vn.sale s + JOIN vn.ticket t ON t.id = s.ticketFk + JOIN vn.saleComponent sc ON sc.saleFk = s.id + JOIN vn.component c ON c.id = sc.componentFk + JOIN vn.componentType ct ON ct.id = c.typeFk + WHERE t.shipped BETWEEN vStartingDate AND vEndingDate + AND ct.isMargin = TRUE + GROUP BY s.id) sub ON sub.id = s.saleFk + SET s.margin = sub.margen + s.amount + s.surcharge - sub.pvp; + + SET vStartingDate = TIMESTAMPADD(DAY,1, vStartingDate); + SET vEndingDate = util.dayEnd(vStartingDate); + + END WHILE; + +END$$ +DELIMITER ; diff --git a/db/routines/bs/procedures/ventas_add_launcher.sql b/db/routines/bs/procedures/ventas_add_launcher.sql new file mode 100644 index 000000000..0d9e89a89 --- /dev/null +++ b/db/routines/bs/procedures/ventas_add_launcher.sql @@ -0,0 +1,13 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`ventas_add_launcher`() +BEGIN +/** + * Añade las ventas a la tabla bs.sale que se realizaron desde hace un mes hasta hoy + * + */ + + DECLARE vCurDate DATE DEFAULT util.VN_CURDATE(); + CALL ventas_add(vCurDate - INTERVAL 1 MONTH, vCurDate); + +END$$ +DELIMITER ; diff --git a/db/routines/bs/procedures/ventas_contables_add.sql b/db/routines/bs/procedures/ventas_contables_add.sql new file mode 100644 index 000000000..66c012a19 --- /dev/null +++ b/db/routines/bs/procedures/ventas_contables_add.sql @@ -0,0 +1,102 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`ventas_contables_add`(IN vYear INT, IN vMonth INT) +BEGIN + + /** + * Reemplaza las ventas contables del último año. + * Es el origen de datos para el balance de Entradas + * + * @param vYear Año a reemplazar + * @param vMonth Mes a reemplazar + * + **/ + + DECLARE TIPO_PATRIMONIAL INT DEFAULT 188; + + DELETE FROM bs.ventas_contables + WHERE year = vYear + AND month = vMonth; + + DROP TEMPORARY TABLE IF EXISTS tmp.ticket_list; + CREATE TEMPORARY TABLE tmp.ticket_list + (PRIMARY KEY (Id_Ticket)) + ENGINE = MEMORY + SELECT Id_Ticket + FROM vn2008.Tickets t + JOIN vn.invoiceOut io ON io.`ref` = t.Factura + WHERE year(io.issued) = vYear + AND month(io.issued) = vMonth; + + INSERT INTO bs.ventas_contables(year + , month + , venta + , grupo + , reino_id + , tipo_id + , empresa_id + , gasto) + + SELECT vYear + , vMonth + , round(sum(Cantidad * Preu * (100 - m.Descuento)/100)) + , IF( + e.empresa_grupo = e2.empresa_grupo + ,1 + ,IF(e2.empresa_grupo,2,0) + ) as grupo + , 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 + 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 vn2008.Clientes c on c.Id_Cliente = cs.Id_Cliente + JOIN tmp.ticket_list tt on tt.Id_Ticket = t.Id_Ticket + JOIN vn2008.Articles a on m.Id_Article = a.Id_Article + JOIN vn2008.empresa e on e.id = t.empresa_id + 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 != TIPO_PATRIMONIAL + GROUP BY grupo, reino_id, tipo_id, empresa_id, Gasto; + + INSERT INTO bs.ventas_contables(year + , month + , venta + , grupo + , reino_id + , tipo_id + , empresa_id + , gasto) + SELECT vYear + , vMonth + , sum(ts.quantity * ts.price) + , IF( + c.companyGroupFk = c2.companyGroupFk + ,1 + ,IF(c2.companyGroupFk, 2, 0) + ) as grupo + , NULL + , NULL + , t.companyFk + , 7050000000 + FROM vn.ticketService ts + 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 vn.company c on c.id = t.companyFk + LEFT JOIN vn.company c2 on c2.clientFk = cl.id + GROUP BY grupo, t.companyFk ; + + DROP TEMPORARY TABLE tmp.ticket_list; +END$$ +DELIMITER ; diff --git a/db/routines/bs/procedures/ventas_contables_add_launcher.sql b/db/routines/bs/procedures/ventas_contables_add_launcher.sql new file mode 100644 index 000000000..ac74c47bf --- /dev/null +++ b/db/routines/bs/procedures/ventas_contables_add_launcher.sql @@ -0,0 +1,14 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`ventas_contables_add_launcher`() +BEGIN + + /** + * Reemplaza las ventas contables del último año. + * Es el origen de datos para el balance de Entradas + * + **/ + + CALL bs.ventas_contables_add(YEAR(TIMESTAMPADD(MONTH,-1,util.VN_CURDATE())), MONTH(TIMESTAMPADD(MONTH,-1,util.VN_CURDATE()))); + +END$$ +DELIMITER ; diff --git a/db/routines/bs/procedures/ventas_contables_por_cliente.sql b/db/routines/bs/procedures/ventas_contables_por_cliente.sql new file mode 100644 index 000000000..931653e6e --- /dev/null +++ b/db/routines/bs/procedures/ventas_contables_por_cliente.sql @@ -0,0 +1,47 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`ventas_contables_por_cliente`(IN vYear INT, IN vMonth INT) +BEGIN + + /** + * Muestra las ventas (€) de cada cliente + * dependiendo del año + */ + + 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 vn.invoiceOut io ON io.id = t.Factura + WHERE year(io.issued) = vYear + AND month(io.issued) = vMonth; + + SELECT vYear Año, + vMonth Mes, + t.Id_Cliente, + 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 + 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 vn2008.Clientes c ON c.Id_Cliente = cs.Id_Cliente + JOIN tmp.ticket_list tt ON tt.Id_Ticket = t.Id_Ticket + JOIN vn2008.Articles a ON m.Id_Article = a.Id_Article + JOIN vn2008.empresa e ON e.id = t.empresa_id + 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; + + DROP TEMPORARY TABLE tmp.ticket_list; + +END$$ +DELIMITER ; diff --git a/db/routines/bs/procedures/vivosMuertos.sql b/db/routines/bs/procedures/vivosMuertos.sql new file mode 100644 index 000000000..c07570603 --- /dev/null +++ b/db/routines/bs/procedures/vivosMuertos.sql @@ -0,0 +1,63 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`vivosMuertos`() +BEGIN + + /** + * Devuelve el número de clientes nuevos y muertos, + * dependiendo de la fecha actual. + * + * @param @datSTART Fecha de inicio a buscar + * @param @datEND Fecha de finalización a buscar + */ + + SET @datSTART = TIMESTAMPADD(YEAR,-2,util.VN_CURDATE()); + SET @datEND = TIMESTAMPADD(DAY,-DAY(util.VN_CURDATE()),util.VN_CURDATE()); + + DROP TEMPORARY TABLE IF EXISTS tmp.VivosMuertos; + + CREATE TEMPORARY TABLE tmp.VivosMuertos + SELECT c.Id_Cliente, tm.yearMonth, f.Compra, 0 as Nuevo, 0 as Muerto + FROM vn2008.Clientes c + JOIN + (SELECT DISTINCT yearMonth + FROM vn2008.time + WHERE date BETWEEN @datSTART + AND @datEND ) tm + LEFT JOIN + (SELECT DISTINCT tm.yearMonth, io.clientFk Id_Cliente , 1 as Compra + FROM vn.invoiceOut io + JOIN vn2008.time tm ON tm.date = io.issued + WHERE io.issued BETWEEN @datSTART + AND @datEND) f ON f.yearMonth = tm.yearMonth + AND f.Id_Cliente = c.Id_Cliente; + + UPDATE tmp.VivosMuertos vm + JOIN + (SELECT MIN(tm.yearMonth) firstMonth, io.clientFk Id_Cliente + FROM vn.invoiceOut io + JOIN vn2008.time tm ON tm.date = io.issued + WHERE io.issued BETWEEN @datSTART AND @datEND + GROUP BY io.clientFk) fm ON fm.firstMonth = vm.yearMonth + AND fm.Id_Cliente = vm.Id_Cliente + + SET Nuevo = 1; + + SELECT max(yearMonth) INTO @lastYearMonth FROM tmp.VivosMuertos; + + UPDATE tmp.VivosMuertos vm + JOIN ( + SELECT MAX(tm.yearMonth) firstMonth, io.clientFk Id_Cliente + FROM vn.invoiceOut io + JOIN vn2008.time tm ON tm.date = io.issued + WHERE io.issued BETWEEN @datSTART AND @datEND + GROUP BY io.clientFk) fm ON fm.firstMonth = vm.yearMonth + AND fm.Id_Cliente = vm.Id_Cliente + + SET Muerto = 1 + + WHERE yearMonth < @lastYearMonth; + + SELECT * FROM tmp.VivosMuertos; + +END$$ +DELIMITER ; diff --git a/db/routines/bs/procedures/waste_addSales.sql b/db/routines/bs/procedures/waste_addSales.sql new file mode 100644 index 000000000..0ab328b49 --- /dev/null +++ b/db/routines/bs/procedures/waste_addSales.sql @@ -0,0 +1,31 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`waste_addSales`() +BEGIN + DECLARE vWeek INT; + DECLARE vYear INT; + + SELECT week, year + INTO vWeek, vYear + FROM vn.time + WHERE dated = util.VN_CURDATE(); + + REPLACE bs.waste + SELECT *, 100 * mermas / total as porcentaje + FROM ( + SELECT buyer, + year, + week, + family, + itemFk, + itemTypeFk, + floor(sum(value)) as total, + floor(sum(IF(typeFk = 'loses', value, 0))) as mermas + FROM vn.saleValue + where year = vYear and week = vWeek + + GROUP BY family, itemFk + + ) sub + ORDER BY mermas DESC; +END$$ +DELIMITER ; diff --git a/db/routines/bs/procedures/workerLabour_getData.sql b/db/routines/bs/procedures/workerLabour_getData.sql new file mode 100644 index 000000000..1f5a39fe0 --- /dev/null +++ b/db/routines/bs/procedures/workerLabour_getData.sql @@ -0,0 +1,106 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`workerLabour_getData`() +BEGIN +/** + * Carga los datos de la plantilla de trabajadores, altas y bajas en la tabla workerLabourDataByMonth para facilitar el cálculo del gráfico en grafana. + * Se carga el día 21 de cada mes, elimina los registros del último año y los vuelve a calcular + */ + DECLARE vFristDay DATE; + DECLARE vLastDay DATE; + DECLARE vDone BOOL DEFAULT FALSE; + DECLARE vDateStarted DATE; + DECLARE vDateEnded DATE; + + DECLARE vCursor CURSOR FOR + SELECT util.firstDayOfMonth(t.dated), LAST_DAY(t.dated) + FROM vn.time t + WHERE t.dated BETWEEN vDateStarted AND vDateEnded + GROUP BY year,month; + + DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; + + IF DAY(util.VN_CURDATE()) = 21 THEN + + SELECT util.firstDayOfMonth(DATE_SUB(util.VN_CURDATE(), INTERVAL 12 MONTH)), + LAST_DAY(DATE_SUB(util.VN_CURDATE(), INTERVAL 1 MONTH)) + INTO vDateStarted, + vDateEnded; + + DELETE FROM workerLabourDataByMonth + WHERE CONCAT(`year`, '-',`month`, '-01') BETWEEN vDateStarted AND vDateEnded; + + OPEN vCursor; + + l: LOOP + SET vDone = FALSE; + + FETCH vCursor INTO vFristDay, vLastDay; + + IF vDone THEN + LEAVE l; + END IF; + + -- Altas periodo + INSERT INTO workerLabourDataByMonth (code, month, year, total, permanent) + SELECT 'hiring', MONTH(vFristDay), YEAR(vFristDay), COUNT(*), SUM(wbt.isPermanent) + FROM vn.business b + JOIN vn.workCenter wc ON wc.id = b.workCenterFk + JOIN vn.worker w ON w.id = b.workerFk + LEFT JOIN vn.workerBusinessType wbt ON wbt.id = b.workerBusinessTypeFk + LEFT JOIN (SELECT b.id, b.workerFk + FROM vn.business b + LEFT JOIN (SELECT ended, workerFk FROM vn.business) wl + ON wl.ended = DATE_SUB(b.started, INTERVAL 1 DAY) AND wl.workerFk = b.workerFk + WHERE b.started BETWEEN vFristDay AND vLastDay AND wl.ended + )sub ON sub.workerFk = b.workerFk + WHERE wc.payrollCenterFk IS NOT NULL + AND b.workCenterFk IS NOT NULL + AND b.started BETWEEN vFristDay AND vLastDay + AND sub.workerFk IS NULL + AND NOT w.isFreelance; + + -- Bajas periodo + INSERT INTO workerLabourDataByMonth (code, month, year, total, permanent) + SELECT 'layoffs', MONTH(vFristDay), YEAR(vFristDay), COUNT(*), SUM(wbt.isPermanent) + FROM vn.business b + JOIN vn.worker w ON w.id = b.workerFk + JOIN vn.workCenter wc ON wc.id = b.workCenterFk + LEFT JOIN vn.workerBusinessType wbt ON wbt.id = b.workerBusinessTypeFk + LEFT JOIN (SELECT started, workerFk FROM vn.business) wl ON wl.started >= b.ended + AND wl.workerFk = b.workerFk + WHERE wc.payrollCenterFk IS NOT NULL + AND b.ended BETWEEN vFristDay AND vLastDay + AND wl.started IS NULL + AND NOT w.isFreelance; + + -- Anterior al periodo + SET vLastDay = LAST_DAY(DATE_SUB(vFristDay, INTERVAL 1 DAY)); + + INSERT INTO workerLabourDataByMonth (code, month, year, total, permanent) + SELECT 'staff', MONTH(vFristDay), YEAR(vFristDay), COUNT(*), SUM(wbt.isPermanent) + FROM vn.business b + JOIN vn.worker w ON w.id = b.workerFk + JOIN vn.workCenter wc ON wc.id = b.workCenterFk + LEFT JOIN vn.workerBusinessType wbt ON wbt.id = b.workerBusinessTypeFk + WHERE wc.payrollCenterFk IS NOT NULL + AND vLastDay BETWEEN started AND IFNULL(ended, vLastDay) + AND NOT w.isFreelance; + + -- Discapacidad + INSERT INTO workerLabourDataByMonth (code, month, year, total, permanent) + SELECT 'disabled', MONTH(vFristDay), YEAR(vFristDay), COUNT(*), SUM(wbt.isPermanent) + FROM vn.business b + JOIN vn.worker w ON w.id = b.workerFk + JOIN vn.workCenter wc ON wc.id = b.workCenterFk + LEFT JOIN vn.workerBusinessType wbt ON wbt.id = b.workerBusinessTypeFk + WHERE wc.payrollCenterFk IS NOT NULL + AND vLastDay BETWEEN started AND IFNULL(ended, vLastDay) + AND w.isDisable + AND NOT w.isFreelance; + + END LOOP; + CLOSE vCursor; + + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/bs/procedures/workerProductivity_add.sql b/db/routines/bs/procedures/workerProductivity_add.sql new file mode 100644 index 000000000..3d7dbdca9 --- /dev/null +++ b/db/routines/bs/procedures/workerProductivity_add.sql @@ -0,0 +1,99 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`workerProductivity_add`() +BEGIN + DECLARE vDateFrom DATE; + SELECT DATE_SUB(util.VN_CURDATE(),INTERVAL 30 DAY) INTO vDateFrom; + + DELETE FROM workerProductivity + WHERE dated >= vDateFrom; + + -- SACADORES Y ARTIFICIAL + INSERT INTO workerProductivity(dated, wareHouseFk, workerFk, volume, seconds, stateFk) + SELECT sub.dated, + sub.warehouseFk, + sub.workerFk, + SUM(sub.volume), + SUM(sub.seconds), + sub.stateFk + FROM(SELECT t.warehouseFk warehouseFk, + st.workerFk, + DATE(t.shipped) dated, + SUM((ic.cm3delivery * s.quantity)/1000000) volume, + TIME_TO_SEC(TIMEDIFF( MAX(st.created),MIN(st.created))) + wc.minSeconsItemPicker seconds, + s2.id stateFk + FROM vn.saleTracking st + LEFT JOIN vn.salesPreviousPreparated sp ON sp.saleFk = st.saleFk + JOIN vn.sale s ON s.id = st.saleFk + JOIN vn.ticket t ON t.id = s.ticketFk + JOIN vn.itemCost ic ON ic.warehouseFk = t.warehouseFk AND ic.itemFk = s.itemFk + JOIN vn.worker w ON w.id = st.workerFk + JOIN vn.state s2 ON s2.id = st.stateFk + LEFT JOIN vn.workerDepartment wd ON wd.workerFk = st.workerFk + JOIN workerProductivityConfig wc ON TRUE + WHERE t.shipped >= vDateFrom + AND ISNULL(sp.saleFk) + AND (s2.code IN ('OK PREVIOUS', 'PREVIOUS_PREPARATION', 'PREPARED', 'OK')) + GROUP BY t.id, t.warehouseFk, st.workerFk + ) sub + GROUP BY sub.warehouseFk, sub.workerFk, sub.dated; + + -- ENCAJADORES + INSERT INTO workerProductivity(dated, wareHouseFk, workerFk, volume, seconds, stateFk) + SELECT sub2.shipped, + sub2.warehouseFk, + sub2.workerFK, + SUM(sub2.volume), + SUM(sub2.seconds), + s2.id stateFk + FROM (SELECT t.warehouseFk, + SUM(s.volume) volume, + sub.workerFk, + DATE(t.shipped) shipped, + sub.seconds + w.minSeconsPackager seconds, + s.saleFk + FROM vn.saleVolume s + JOIN vn.ticket t ON t.id = s.ticketFk + JOIN(SELECT e.workerFk, e.ticketFk,TIME_TO_SEC(TIMEDIFF( MAX(e.created), MIN(e.created))) seconds + FROM vn.expedition e + JOIN vn.ticket t ON t.id = e.ticketFk + WHERE e.workerFk IS NOT NULL AND + t.shipped >= vDateFrom + GROUP BY e.ticketFk + )sub ON sub.ticketFk = t.id + JOIN workerProductivityConfig w ON TRUE + GROUP BY s.ticketFk, t.warehouseFk + )sub2 + JOIN vn.state s2 ON s2.code IN ('PACKING','PACKED') + GROUP BY sub2.warehouseFk,sub2.workerFk, sub2.shipped; + + -- REVISADORES + INSERT INTO workerProductivity(dated, wareHouseFk, workerFk, volume, seconds, stateFk) + SELECT sub2.shipped, + sub2.warehouseFk, + sub2.workerFK, + SUM(sub2.volume), + SUM(sub2.seconds), + sub2.stateFk + FROM (SELECT t.warehouseFk, + SUM(s.volume) volume, + sub.workerFk, + DATE(t.shipped) shipped, + sub.seconds + w.minSeconsPackager seconds, + sub.stateFk + FROM vn.saleVolume s + JOIN vn.ticket t ON t.id = s.ticketFk + JOIN(SELECT st.workerFk, t.id ticketFk,TIME_TO_SEC(TIMEDIFF( MAX(st.created), MIN(st.created))) seconds, s2.id stateFk + FROM vn.saleTracking st + JOIN vn.state s2 ON s2.id = st.stateFk + JOIN vn.sale s ON s.id = st.saleFk + JOIN vn.ticket t ON s.ticketFk = t.id + WHERE s2.code = 'CHECKED' + AND t.shipped >= vDateFrom + GROUP BY t.id + )sub ON sub.ticketFk = t.id + JOIN workerProductivityConfig w ON TRUE + GROUP BY s.ticketFk, t.warehouseFk + )sub2 + GROUP BY sub2.warehouseFk,sub2.workerFk, sub2.shipped; +END$$ +DELIMITER ; diff --git a/db/routines/bs/triggers/clientNewBorn_beforeUpdate.sql b/db/routines/bs/triggers/clientNewBorn_beforeUpdate.sql new file mode 100644 index 000000000..a88567a21 --- /dev/null +++ b/db/routines/bs/triggers/clientNewBorn_beforeUpdate.sql @@ -0,0 +1,11 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `bs`.`clientNewBorn_beforeUpdate` + BEFORE UPDATE ON `clientNewBorn` + FOR EACH ROW +BEGIN + -- Si ha pasado un año o mas + IF TIMESTAMPDIFF(YEAR,NEW.lastShipped, OLD.lastShipped) THEN + SET NEW.firstShipped = NEW.lastShipped; + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/bs/triggers/nightTask_beforeInsert.sql b/db/routines/bs/triggers/nightTask_beforeInsert.sql new file mode 100644 index 000000000..96f2b5291 --- /dev/null +++ b/db/routines/bs/triggers/nightTask_beforeInsert.sql @@ -0,0 +1,14 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `bs`.`nightTask_beforeInsert` + BEFORE INSERT ON `nightTask` + FOR EACH ROW +BEGIN + + IF NOT (NEW.`schema`REGEXP '^[0-9a-zA-Z_]+$') OR NOT (NEW.`procedure`REGEXP '^[0-9a-zA-Z_]+$') THEN + + CALL util.throw('ONLY_ALPHANUMERICS_ALLOWED'); + + END IF; + +END$$ +DELIMITER ; diff --git a/db/routines/bs/triggers/nightTask_beforeUpdate.sql b/db/routines/bs/triggers/nightTask_beforeUpdate.sql new file mode 100644 index 000000000..1da1da8c3 --- /dev/null +++ b/db/routines/bs/triggers/nightTask_beforeUpdate.sql @@ -0,0 +1,14 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `bs`.`nightTask_beforeUpdate` + BEFORE UPDATE ON `nightTask` + FOR EACH ROW +BEGIN + + IF NOT (NEW.`schema`REGEXP '^[0-9a-zA-Z_]+$') OR NOT (NEW.`procedure`REGEXP '^[0-9a-zA-Z_]+$') THEN + + CALL util.throw('ONLY_ALPHANUMERICS_ALLOWED'); + + END IF; + +END$$ +DELIMITER ; diff --git a/db/routines/bs/views/VentasPorCliente.sql b/db/routines/bs/views/VentasPorCliente.sql new file mode 100644 index 000000000..579d3b955 --- /dev/null +++ b/db/routines/bs/views/VentasPorCliente.sql @@ -0,0 +1,14 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `bs`.`VentasPorCliente` +AS SELECT `v`.`Id_Cliente` AS `Id_Cliente`, + round(sum(`v`.`importe`), 0) AS `VentaBasica`, + `t`.`year` AS `year`, + `t`.`month` AS `month` +FROM ( + `vn2008`.`time` `t` + JOIN `bs`.`ventas` `v` ON(`v`.`fecha` = `t`.`date`) + ) +GROUP BY `v`.`Id_Cliente`, + `t`.`year`, + `t`.`month` diff --git a/db/routines/bs/views/bajasLaborales.sql b/db/routines/bs/views/bajasLaborales.sql new file mode 100644 index 000000000..31f870d06 --- /dev/null +++ b/db/routines/bs/views/bajasLaborales.sql @@ -0,0 +1,31 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `bs`.`bajasLaborales` +AS SELECT `w`.`firstName` AS `firstname`, + `w`.`lastName` AS `name`, + `b`.`id` AS `businessFk`, + max(`c`.`dated`) AS `lastDate`, + max(IFNULL(`b`.`ended`, `util`.`VN_CURDATE`())) AS `endContract`, + `at`.`name` AS `type`, + cast(COUNT(0) AS decimal(10, 0)) AS `dias`, + `w`.`id` AS `userFk` +FROM ( + ( + ( + `vn`.`calendar` `c` + JOIN `vn`.`business` `b` ON(`b`.`id` = `c`.`businessFk`) + ) + JOIN `vn`.`worker` `w` ON(`w`.`id` = `b`.`workerFk`) + ) + JOIN `vn`.`absenceType` `at` ON(`at`.`id` = `c`.`dayOffTypeFk`) + ) +WHERE `c`.`dated` >= `util`.`VN_CURDATE`() + INTERVAL -1 year + AND `at`.`name` NOT IN ( + 'Vacaciones', + 'Vacaciones 1/2 día', + 'Compensar', + 'Festivo' + ) +GROUP BY `w`.`id`, + `at`.`id` +HAVING `endContract` >= `util`.`VN_CURDATE`() diff --git a/db/routines/bs/views/horasSilla.sql b/db/routines/bs/views/horasSilla.sql new file mode 100644 index 000000000..973108e8a --- /dev/null +++ b/db/routines/bs/views/horasSilla.sql @@ -0,0 +1,27 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `bs`.`horasSilla` +AS SELECT `wj`.`dated` AS `Fecha`, + `d`.`name` AS `Departamento`, + cast(sum(`wj`.`total`) AS decimal(10, 2)) AS `Horas`, + cast( + sum( + (`wj`.`total` + `wj`.`lunch`) * `wj`.`priceOrdinaryHour` + ) AS decimal(10, 2) + ) AS `Salarios` +FROM ( + ( + `vn`.`workerJourney` `wj` + JOIN `vn`.`business` `b` ON(`b`.`id` = `wj`.`businessFk`) + ) + JOIN `vn`.`department` `d` ON(`d`.`id` = `b`.`departmentFk`) + ) +WHERE `d`.`name` IN ( + 'CAMARA', + 'ENCAJADO', + 'PALETIZADORES', + 'PRODUCCION', + 'SACADORES' + ) +GROUP BY `wj`.`dated`, + `d`.`name` diff --git a/db/routines/bs/views/lastIndicators.sql b/db/routines/bs/views/lastIndicators.sql new file mode 100644 index 000000000..3fa04abd3 --- /dev/null +++ b/db/routines/bs/views/lastIndicators.sql @@ -0,0 +1,39 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `bs`.`lastIndicators` +AS SELECT `i`.`updated` AS `updated`, + `i`.`lastYearSales` AS `lastYearSales`, + `i`.`lastYearSales` - `yi`.`lastYearSales` AS `incLastYearSales`, + `i`.`totalGreuge` AS `totalGreuge`, + `i`.`totalGreuge` - `yi`.`totalGreuge` AS `incTotalGreuge`, + `i`.`latePaymentRate` AS `latePaymentRate`, + `i`.`latePaymentRate` - `yi`.`latePaymentRate` AS `incLatePaymentRate`, + `i`.`countEmployee` AS `countEmployee`, + `i`.`countEmployee` - `yi`.`countEmployee` AS `incCountEmployee`, + `i`.`averageMana` AS `averageMana`, + `i`.`averageMana` - `yi`.`averageMana` AS `incAverageMana`, + `i`.`bankingPool` AS `bankingPool`, + `i`.`bankingPool` - `yi`.`bankingPool` AS `incbankingPool`, + `i`.`lastMonthActiveClients` AS `lastMonthActiveClients`, + `i`.`lastMonthActiveClients` - `yi`.`lastMonthActiveClients` AS `incLastMonthActiveClients`, + `i`.`lastMonthLostClients` AS `lastMonthLostClients`, + `i`.`lastMonthLostClients` - `yi`.`lastMonthLostClients` AS `incLastMonthLostClients`, + `i`.`lastMonthNewClients` AS `lastMonthNewClients`, + `i`.`lastMonthNewClients` - `yi`.`lastMonthNewClients` AS `incLastMonthNewClients`, + `i`.`lastMonthWebBuyingRate` AS `lastMonthWebBuyingRate`, + `i`.`lastMonthWebBuyingRate` - `yi`.`lastMonthWebBuyingRate` AS `incLastMonthWebBuyingRate`, + `i`.`thisWeekSales` AS `thisWeekSales`, + `i`.`lastYearWeekSales` AS `lastYearWeekSales` +FROM ( + `bs`.`indicators` `i` + JOIN `bs`.`indicators` `yi` ON( + `yi`.`updated` = ( + SELECT max(`bs`.`indicators`.`updated`) + INTERVAL -1 DAY + FROM `bs`.`indicators` + ) + ) + ) +WHERE `i`.`updated` = ( + SELECT max(`bs`.`indicators`.`updated`) + FROM `bs`.`indicators` + ) diff --git a/db/routines/bs/views/packingSpeed.sql b/db/routines/bs/views/packingSpeed.sql new file mode 100644 index 000000000..517706b15 --- /dev/null +++ b/db/routines/bs/views/packingSpeed.sql @@ -0,0 +1,19 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `bs`.`packingSpeed` +AS SELECT HOUR(`e`.`created`) AS `hora`, + MINUTE(`e`.`created`) AS `minuto`, + IFNULL( + `p`.`volume`, + `p`.`width` * `p`.`height` * `p`.`depth` + ) AS `cm3`, + `t`.`warehouseFk` AS `warehouse_id`, + `e`.`created` AS `odbc_date` +FROM ( + ( + `vn`.`expedition` `e` + JOIN `vn`.`packaging` `p` ON(`p`.`id` = `e`.`packagingFk`) + ) + JOIN `vn`.`ticket` `t` ON(`t`.`id` = `e`.`ticketFk`) + ) +WHERE `e`.`created` BETWEEN `util`.`VN_CURDATE`() AND `util`.`dayend`(`util`.`VN_CURDATE`()) diff --git a/db/routines/bs/views/s1_ticketDetail.sql b/db/routines/bs/views/s1_ticketDetail.sql new file mode 100644 index 000000000..77fbcdcd9 --- /dev/null +++ b/db/routines/bs/views/s1_ticketDetail.sql @@ -0,0 +1,19 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `bs`.`s1_ticketDetail` +AS SELECT `s`.`ticketFk` AS `ticketFk`, + cast( + sum(`s`.`price` * `s`.`quantity`) AS decimal(10, 2) + ) AS `ticketAmount`, + COUNT(`s`.`id`) AS `ticketLines`, + cast(sum(`sv`.`volume`) AS decimal(10, 2)) AS `ticketM3`, + cast(`t`.`shipped` AS date) AS `shipped` +FROM ( + ( + `vn`.`ticket` `t` + JOIN `vn`.`sale` `s` ON(`s`.`ticketFk` = `t`.`id`) + ) + JOIN `vn`.`saleVolume` `sv` ON(`sv`.`saleFk` = `s`.`id`) + ) +WHERE `t`.`shipped` BETWEEN '2021-09-01' AND '2021-10-31 23:59' +GROUP BY `s`.`ticketFk` diff --git a/db/routines/bs/views/s21_saleDetail.sql b/db/routines/bs/views/s21_saleDetail.sql new file mode 100644 index 000000000..778994bfb --- /dev/null +++ b/db/routines/bs/views/s21_saleDetail.sql @@ -0,0 +1,42 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `bs`.`s21_saleDetail` +AS SELECT dayofmonth(`t`.`shipped`) AS `dia`, + year(`t`.`shipped`) AS `año`, + MONTH(`t`.`shipped`) AS `mes`, + `s`.`concept` AS `concepto`, + `s`.`quantity` AS `unidades`, + `s`.`price` AS `precio`, + `s`.`quantity` * `s`.`price` AS `venta`, + `it`.`name` AS `familia`, + `w`.`code` AS `comprador`, + `s`.`itemFk` AS `itemFk`, + `s`.`ticketFk` AS `ticketFk`, + `sv`.`volume` AS `volume` +FROM ( + ( + ( + ( + ( + ( + `vn`.`sale` `s` + JOIN `vn`.`item` `i` ON(`i`.`id` = `s`.`itemFk`) + ) + JOIN `vn`.`itemType` `it` ON(`it`.`id` = `i`.`typeFk`) + ) + JOIN `vn`.`worker` `w` ON(`w`.`id` = `it`.`workerFk`) + ) + JOIN `vn`.`ticket` `t` ON(`t`.`id` = `s`.`ticketFk`) + ) + JOIN `vn`.`client` `c` ON(`c`.`id` = `t`.`clientFk`) + ) + JOIN `vn`.`saleVolume` `sv` ON(`sv`.`saleFk` = `s`.`id`) + ) +WHERE ( + `t`.`shipped` BETWEEN '2020-10-21' AND '2020-10-28' + OR `t`.`shipped` BETWEEN '2019-10-21' AND '2019-10-28' + OR `t`.`shipped` BETWEEN '2021-09-1' AND '2021-10-28' + ) + AND `t`.`warehouseFk` IN (1, 60) + AND `c`.`isRelevant` <> 0 + AND `s`.`quantity` > 0 diff --git a/db/routines/bs/views/ventas.sql b/db/routines/bs/views/ventas.sql new file mode 100644 index 000000000..1fab2e91b --- /dev/null +++ b/db/routines/bs/views/ventas.sql @@ -0,0 +1,12 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `bs`.`ventas` +AS SELECT `s`.`saleFk` AS `Id_Movimiento`, + `s`.`amount` AS `importe`, + `s`.`surcharge` AS `recargo`, + `s`.`dated` AS `fecha`, + `s`.`typeFk` AS `tipo_id`, + `s`.`clientFk` AS `Id_Cliente`, + `s`.`companyFk` AS `empresa_id`, + `s`.`margin` AS `margen` +FROM `bs`.`sale` `s` diff --git a/db/routines/cache/events/cacheCalc_clean.sql b/db/routines/cache/events/cacheCalc_clean.sql new file mode 100644 index 000000000..e13bae98b --- /dev/null +++ b/db/routines/cache/events/cacheCalc_clean.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `cache`.`cacheCalc_clean` + ON SCHEDULE EVERY 30 MINUTE + STARTS '2022-01-28 09:29:18.000' + ON COMPLETION NOT PRESERVE + ENABLE +DO CALL cacheCalc_clean$$ +DELIMITER ; diff --git a/db/routines/cache/events/cache_clean.sql b/db/routines/cache/events/cache_clean.sql new file mode 100644 index 000000000..c5e247bd4 --- /dev/null +++ b/db/routines/cache/events/cache_clean.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `cache`.`cache_clean` + ON SCHEDULE EVERY 5 MINUTE + STARTS '2022-01-28 09:29:18.000' + ON COMPLETION NOT PRESERVE + ENABLE +DO CALL cache_clean$$ +DELIMITER ; diff --git a/db/routines/cache/procedures/addressFriendship_Update.sql b/db/routines/cache/procedures/addressFriendship_Update.sql new file mode 100644 index 000000000..f7fab8b9b --- /dev/null +++ b/db/routines/cache/procedures/addressFriendship_Update.sql @@ -0,0 +1,27 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `cache`.`addressFriendship_Update`() +BEGIN + + REPLACE cache.addressFriendship + SELECT addressFk1, addressFk2, count(*) friendship + FROM + ( + SELECT t.routeFk, t.zoneFk, t.addressFk addressFk1, t2.addressFk addressFk2 + FROM vn.ticket t + JOIN vn.ticket t2 USING(routeFk, zoneFk) + WHERE t.shipped >= TIMESTAMPADD(MONTH,-3,util.VN_CURDATE()) + AND t2.shipped >= TIMESTAMPADD(MONTH,-3,util.VN_CURDATE()) + AND t.addressFk != t2.addressFk) sub + GROUP BY addressFk1, addressFk2; + + REPLACE cache.zoneAgencyFriendship + SELECT r.agencyModeFk, t.zoneFk, count(*) friendship + FROM vn.route r + JOIN vn.ticket t ON t.routeFk = r.id + WHERE t.shipped >= TIMESTAMPADD(MONTH,-3,util.VN_CURDATE()) + AND r.agencyModeFk + AND t.routeFk + AND t.zoneFk + GROUP BY agencyModeFk, zoneFk; +END$$ +DELIMITER ; diff --git a/db/routines/cache/procedures/availableNoRaids_refresh.sql b/db/routines/cache/procedures/availableNoRaids_refresh.sql new file mode 100644 index 000000000..383e35436 --- /dev/null +++ b/db/routines/cache/procedures/availableNoRaids_refresh.sql @@ -0,0 +1,123 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `cache`.`availableNoRaids_refresh`(OUT `vCalc` INT, IN `vRefresh` INT, IN `vWarehouse` INT, IN `vDated` DATE) +proc: BEGIN + DECLARE vStartDate DATE; + DECLARE vEndDate DATETIME; + DECLARE vReserveDate DATETIME; + DECLARE vParams CHAR(100); + DECLARE vInventoryDate DATE; + + DECLARE EXIT HANDLER FOR SQLEXCEPTION + BEGIN + CALL cache_calc_unlock (vCalc); + RESIGNAL; + END; + + IF vDated < util.VN_CURDATE() THEN + LEAVE proc; + END IF; + + SET vParams = CONCAT_WS('/', vWarehouse, vDated); + CALL vn.item_getStock (vWarehouse, vDated, NULL); + CALL cache_calc_start (vCalc, vRefresh, 'availableNoRaids', vParams); + + IF !vRefresh THEN + LEAVE proc; + END IF; + + -- Calcula algunos parametros necesarios + + SET vStartDate = TIMESTAMP(vDated, '00:00:00'); + SET vEndDate = TIMESTAMP(TIMESTAMPADD(DAY, 4, vDated), '23:59:59'); + + SELECT inventoried INTO vInventoryDate FROM vn.config; + + SELECT SUBTIME(util.VN_NOW(), reserveTime) INTO vReserveDate + FROM hedera.orderConfig; + + -- Calcula el ultimo dia de vida para cada producto + + DROP TEMPORARY TABLE IF EXISTS tItemRange; + CREATE TEMPORARY TABLE tItemRange + (PRIMARY KEY (itemFk)) + ENGINE = MEMORY + SELECT c.itemFk, IF(it.life IS NULL, NULL, + TIMESTAMP(TIMESTAMPADD(DAY, it.life, c.landing), '23:59:59')) AS ended + FROM ( + SELECT b.itemFk, MAX(t.landed) landing + FROM vn.buy b + JOIN vn.entry e ON b.entryFk = e.id + JOIN vn.travel t ON t.id = e.travelFk + JOIN vn.warehouse w ON w.id = t.warehouseInFk + JOIN vn.supplier s ON s.id = e.supplierFk + WHERE t.landed BETWEEN vInventoryDate AND vStartDate + AND t.warehouseInFk = vWarehouse + AND s.name != 'INVENTARIO' + AND NOT e.isRaid + GROUP BY b.itemFk + ) c + JOIN vn.item i ON i.id = c.itemFk + JOIN vn.itemType it ON it.id = i.typeFk + HAVING ended >= vStartDate OR ended IS NULL; + + -- Calcula el ATP + + DELETE FROM availableNoRaids WHERE calc_id = vCalc; + + DROP TEMPORARY TABLE IF EXISTS tmp.itemCalc; + CREATE TEMPORARY TABLE tmp.itemCalc + (INDEX (itemFk, warehouseFk)) + SELECT itemFk, vWarehouse warehouseFk, DATE(dated) dated, SUM(quantity) quantity + FROM ( + SELECT i.itemFk, i.shipped dated, i.quantity + FROM vn.itemTicketOut i + JOIN tItemRange ir ON ir.itemFk = i.itemFk + WHERE i.shipped >= vStartDate + AND (ir.ended IS NULL OR i.shipped <= ir.ended) + AND i.warehouseFk = vWarehouse + UNION ALL + SELECT i.itemFk, i.landed, i.quantity + FROM vn.itemEntryIn i + JOIN tItemRange ir ON ir.itemFk = i.itemFk + WHERE i.landed >= vStartDate + AND (ir.ended IS NULL OR i.landed <= ir.ended) + AND i.warehouseInFk = vWarehouse + AND i.isVirtualStock = FALSE + UNION ALL + SELECT i.itemFk, i.shipped, i.quantity + FROM vn.itemEntryOut i + JOIN tItemRange ir ON ir.itemFk = i.itemFk + WHERE i.shipped >= vStartDate + AND (ir.ended IS NULL OR i.shipped <= ir.ended) + AND i.warehouseOutFk = vWarehouse + UNION ALL + SELECT r.item_id, r.shipment, -r.amount + FROM hedera.order_row r + JOIN hedera.`order` o ON o.id = r.order_id + JOIN tItemRange ir ON ir.itemFk = r.item_id + WHERE r.shipment >= vStartDate + AND (ir.ended IS NULL OR r.shipment <= ir.ended) + AND r.warehouse_id = vWarehouse + AND r.created >= vReserveDate + AND NOT o.confirmed + ) t + GROUP BY itemFk, dated; + + CALL vn.item_getAtp(vDated); + + INSERT INTO availableNoRaids (calc_id, item_id, available) + SELECT vCalc, sub.itemFk, SUM(sub.quantity) + FROM ( + SELECT il.itemFk, stock quantity + FROM tmp.itemList il + JOIN tItemRange ir ON ir.itemFk = il.itemFk + UNION ALL + SELECT itemFk, quantity + FROM tmp.itemAtp + )sub + GROUP BY sub.itemFk; + + DROP TEMPORARY TABLE tmp.itemCalc, tItemRange; + CALL cache_calc_end (vCalc); +END$$ +DELIMITER ; diff --git a/db/routines/cache/procedures/available_clean.sql b/db/routines/cache/procedures/available_clean.sql new file mode 100644 index 000000000..bb1f7302c --- /dev/null +++ b/db/routines/cache/procedures/available_clean.sql @@ -0,0 +1,22 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `cache`.`available_clean`() +BEGIN + DROP TEMPORARY TABLE IF EXISTS tCalc; + CREATE TEMPORARY TABLE tCalc + (INDEX (id)) + ENGINE = MEMORY + SELECT id FROM cache_calc; + + DELETE a + FROM available a + LEFT JOIN tCalc c ON c.id = a.calc_id + WHERE c.id IS NULL; + + DELETE a + FROM availableNoRaids a + LEFT JOIN tCalc c ON c.id = a.calc_id + WHERE c.id IS NULL; + + DROP TEMPORARY TABLE tCalc; +END$$ +DELIMITER ; diff --git a/db/routines/cache/procedures/available_refresh.sql b/db/routines/cache/procedures/available_refresh.sql new file mode 100644 index 000000000..d0939e568 --- /dev/null +++ b/db/routines/cache/procedures/available_refresh.sql @@ -0,0 +1,127 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `cache`.`available_refresh`(OUT `vCalc` INT, IN `vRefresh` INT, IN `vWarehouse` INT, IN `vDated` DATE) +proc: BEGIN + DECLARE vStartDate DATE; + DECLARE vReserveDate DATETIME; + DECLARE vParams CHAR(100); + DECLARE vInventoryDate DATE; + DECLARE vLifeScope DATE; + DECLARE vWarehouseFkInventory INT; + + DECLARE EXIT HANDLER FOR SQLEXCEPTION + BEGIN + CALL cache_calc_unlock (vCalc); + RESIGNAL; + END; + + IF vDated < util.VN_CURDATE() THEN + LEAVE proc; + END IF; + + CALL vn.item_getStock(vWarehouse, vDated, NULL); + + SET vParams = CONCAT_WS('/', vWarehouse, vDated); + CALL cache_calc_start (vCalc, vRefresh, 'available', vParams); + + IF !vRefresh THEN + LEAVE proc; + END IF; + + -- Calcula algunos parámetros necesarios + SET vStartDate = TIMESTAMP(vDated, '00:00:00'); + SELECT inventoried INTO vInventoryDate FROM vn.config; + SELECT DATE_SUB(vStartDate, INTERVAL MAX(life) DAY) INTO vLifeScope FROM vn.itemType; + SELECT SUBTIME(util.VN_NOW(), reserveTime) INTO vReserveDate + FROM hedera.orderConfig; + + SELECT w.id INTO vWarehouseFkInventory + FROM vn.warehouse w + WHERE w.code = 'inv'; + + -- Calcula el ultimo dia de vida para cada producto + DROP TEMPORARY TABLE IF EXISTS itemRange; + CREATE TEMPORARY TABLE itemRange + (PRIMARY KEY (itemFk)) + ENGINE = MEMORY + SELECT i.id itemFk, + util.dayEnd(DATE_ADD(c.maxLanded, INTERVAL it.life DAY)) ended, it.life + FROM vn.item i + LEFT JOIN ( + SELECT b.itemFk, MAX(t.landed) maxLanded + FROM vn.buy b + JOIN vn.entry e ON b.entryFk = e.id + JOIN vn.travel t ON t.id = e.travelFk + JOIN vn.warehouse w ON w.id = t.warehouseInFk + JOIN vn.item i ON i.id = b.itemFk + JOIN vn.itemType it ON it.id = i.typeFk + WHERE t.landed BETWEEN vLifeScope AND vStartDate + AND t.warehouseInFk = vWarehouse + AND t.warehouseOutFk <> vWarehouseFkInventory + AND it.life + AND NOT e.isExcludedFromAvailable + GROUP BY b.itemFk + ) c ON i.id = c.itemFk + JOIN vn.itemType it ON it.id = i.typeFk + HAVING ended >= vStartDate OR life IS NULL; + + -- Calcula el ATP + DELETE FROM available WHERE calc_id = vCalc; + + DROP TEMPORARY TABLE IF EXISTS tmp.itemCalc; + CREATE TEMPORARY TABLE tmp.itemCalc + (INDEX (itemFk,warehouseFk)) + ENGINE = MEMORY + SELECT itemFk, vWarehouse warehouseFk, DATE(dated) dated, SUM(quantity) quantity + FROM (SELECT i.itemFk, i.shipped dated, i.quantity + FROM vn.itemTicketOut i + JOIN itemRange ir ON ir.itemFk = i.itemFk + WHERE i.shipped >= vStartDate + AND (ir.ended IS NULL OR i.shipped <= ir.ended) + AND i.warehouseFk = vWarehouse + UNION ALL + SELECT i.itemFk, i.landed, i.quantity + FROM vn.itemEntryIn i + JOIN itemRange ir ON ir.itemFk = i.itemFk + LEFT JOIN edi.warehouseFloramondo wf ON wf.entryFk = i.entryFk + WHERE i.landed >= vStartDate + AND (ir.ended IS NULL OR i.landed <= ir.ended) + AND i.warehouseInFk = vWarehouse + AND ISNULL(wf.entryFk) + UNION ALL + SELECT i.itemFk, i.shipped, i.quantity + FROM vn.itemEntryOut i + JOIN itemRange ir ON ir.itemFk = i.itemFk + WHERE i.shipped >= vStartDate + AND (ir.ended IS NULL OR i.shipped <= ir.ended) + AND i.warehouseOutFk = vWarehouse + UNION ALL + SELECT r.item_id, r.shipment, -r.amount + FROM hedera.order_row r + JOIN hedera.`order` o ON o.id = r.order_id + JOIN itemRange ir ON ir.itemFk = r.item_id + WHERE r.shipment >= vStartDate + AND (ir.ended IS NULL OR r.shipment <= ir.ended) + AND r.warehouse_id = vWarehouse + AND r.created >= vReserveDate + AND NOT o.confirmed + ) t + GROUP BY itemFk, dated; + + CALL vn.item_getAtp(vDated); + + INSERT INTO available (calc_id, item_id, available) + SELECT vCalc, sub.itemFk, SUM(sub.quantity) + FROM ( + SELECT ir.itemFk, stock quantity + FROM tmp.itemList il + JOIN itemRange ir ON ir.itemFk = il.itemFk + UNION ALL + SELECT itemFk, quantity + FROM tmp.itemAtp + )sub + GROUP BY sub.itemFk; + + DROP TEMPORARY TABLE tmp.itemCalc, itemRange; + CALL cache_calc_end (vCalc); +END$$ +DELIMITER ; diff --git a/db/routines/cache/procedures/cacheCalc_clean.sql b/db/routines/cache/procedures/cacheCalc_clean.sql new file mode 100644 index 000000000..5c588687e --- /dev/null +++ b/db/routines/cache/procedures/cacheCalc_clean.sql @@ -0,0 +1,7 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `cache`.`cacheCalc_clean`() +BEGIN + DECLARE vCleanTime DATETIME DEFAULT TIMESTAMPADD(MINUTE, -5, NOW()); + DELETE FROM cache_calc WHERE expires < vCleanTime; +END$$ +DELIMITER ; diff --git a/db/routines/cache/procedures/cache_calc_end.sql b/db/routines/cache/procedures/cache_calc_end.sql new file mode 100644 index 000000000..b3a25532b --- /dev/null +++ b/db/routines/cache/procedures/cache_calc_end.sql @@ -0,0 +1,25 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `cache`.`cache_calc_end`(IN `v_calc` INT) +BEGIN + DECLARE v_cache_name VARCHAR(255); + DECLARE v_params VARCHAR(255); + + -- Libera el bloqueo y actualiza la fecha de ultimo refresco. + + UPDATE cache_calc cc JOIN cache c ON c.id = cc.cache_id + SET + cc.last_refresh = NOW(), + cc.expires = ADDTIME(NOW(), c.lifetime), + cc.connection_id = NULL + WHERE cc.id = v_calc; + + SELECT c.name, ca.params INTO v_cache_name, v_params + FROM cache c + JOIN cache_calc ca ON c.id = ca.cache_id + WHERE ca.id = v_calc; + + IF v_cache_name IS NOT NULL THEN + DO RELEASE_LOCK(CONCAT_WS('/', v_cache_name, IFNULL(v_params, ''))); + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/cache/procedures/cache_calc_start.sql b/db/routines/cache/procedures/cache_calc_start.sql new file mode 100644 index 000000000..701bb1a68 --- /dev/null +++ b/db/routines/cache/procedures/cache_calc_start.sql @@ -0,0 +1,87 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `cache`.`cache_calc_start`(OUT `v_calc` INT, INOUT `v_refresh` INT, IN `v_cache_name` VARCHAR(50), IN `v_params` VARCHAR(100)) +proc: BEGIN + DECLARE v_valid BOOL; + DECLARE v_lock_id VARCHAR(100); + DECLARE v_cache_id INT; + DECLARE v_expires DATETIME; + DECLARE v_clean_time DATETIME; + DECLARE vLastRefresh DATETIME; + + DECLARE EXIT HANDLER FOR SQLEXCEPTION + BEGIN + IF v_lock_id IS NOT NULL THEN + DO RELEASE_LOCK(v_lock_id); + END IF; + + RESIGNAL; + END; + + SET v_params = IFNULL(v_params, ''); + + -- Si el servidor se ha reiniciado invalida todos los calculos. + + SELECT COUNT(*) > 0 INTO v_valid FROM cache_valid; + + IF !v_valid + THEN + DELETE FROM cache_calc; + INSERT INTO cache_valid (valid) VALUES (TRUE); + END IF; + + -- Obtiene un bloqueo exclusivo para que no haya problemas de concurrencia. + + SET v_lock_id = CONCAT_WS('/', v_cache_name, v_params); + + IF !GET_LOCK(v_lock_id, 30) + THEN + SET v_calc = NULL; + SET v_refresh = FALSE; + LEAVE proc; + END IF; + + -- Comprueba si el calculo solicitado existe y esta actualizado. + + SELECT c.id, ca.id, ca.expires, ca.last_refresh + INTO v_cache_id, v_calc, v_expires, vLastRefresh + FROM cache c + LEFT JOIN cache_calc ca + ON ca.cache_id = c.id AND ca.params = v_params COLLATE 'utf8_general_ci' + WHERE c.name = v_cache_name COLLATE 'utf8_general_ci'; + + -- Si existe una calculo valido libera el bloqueo y devuelve su identificador. + + IF !v_refresh AND NOW() < v_expires AND vLastRefresh >= CURDATE() + THEN + DO RELEASE_LOCK(v_lock_id); + SET v_refresh = FALSE; + LEAVE proc; + END IF; + + -- Si el calculo no existe le crea una entrada en la tabla de calculos. + + IF v_calc IS NULL + THEN + INSERT INTO cache_calc SET + cache_id = v_cache_id, + cacheName = v_cache_name, + params = v_params, + last_refresh = NULL, + expires = NULL, + connection_id = CONNECTION_ID(); + + SET v_calc = LAST_INSERT_ID(); + ELSE + UPDATE cache_calc + SET + last_refresh = NULL, + expires = NULL, + connection_id = CONNECTION_ID() + WHERE id = v_calc; + END IF; + + -- Si se debe recalcular mantiene el bloqueo y devuelve su identificador. + + SET v_refresh = TRUE; +END$$ +DELIMITER ; diff --git a/db/routines/cache/procedures/cache_calc_unlock.sql b/db/routines/cache/procedures/cache_calc_unlock.sql new file mode 100644 index 000000000..5dc46d925 --- /dev/null +++ b/db/routines/cache/procedures/cache_calc_unlock.sql @@ -0,0 +1,22 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `cache`.`cache_calc_unlock`(IN `v_calc` INT) +proc: BEGIN + DECLARE v_cache_name VARCHAR(50); + DECLARE v_params VARCHAR(100); + + IF v_calc IS NULL THEN + LEAVE proc; + END IF; + + SELECT c.name, ca.params INTO v_cache_name, v_params + FROM cache c + JOIN cache_calc ca ON c.id = ca.cache_id + WHERE ca.id = v_calc; + + DELETE FROM cache_calc WHERE id = v_calc; + + IF v_cache_name IS NOT NULL THEN + DO RELEASE_LOCK(CONCAT_WS('/', v_cache_name, IFNULL(v_params, ''))); + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/cache/procedures/cache_clean.sql b/db/routines/cache/procedures/cache_clean.sql new file mode 100644 index 000000000..0fca75e63 --- /dev/null +++ b/db/routines/cache/procedures/cache_clean.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `cache`.`cache_clean`() + NO SQL +BEGIN + CALL available_clean; + CALL visible_clean; +END$$ +DELIMITER ; diff --git a/db/routines/cache/procedures/clean.sql b/db/routines/cache/procedures/clean.sql new file mode 100644 index 000000000..5e6628689 --- /dev/null +++ b/db/routines/cache/procedures/clean.sql @@ -0,0 +1,6 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `cache`.`clean`() +BEGIN + DELETE FROM cache.departure_limit WHERE Fecha < util.VN_CURDATE() - INTERVAL 1 MONTH; +END$$ +DELIMITER ; diff --git a/db/routines/cache/procedures/departure_timing.sql b/db/routines/cache/procedures/departure_timing.sql new file mode 100644 index 000000000..778c2cd74 --- /dev/null +++ b/db/routines/cache/procedures/departure_timing.sql @@ -0,0 +1,74 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `cache`.`departure_timing`(vWarehouseId INT) +BEGIN + +DECLARE done BOOL DEFAULT FALSE; +DECLARE rsDeparture INT; +DECLARE rsHoras DECIMAL(5,2); +DECLARE rsInicio DECIMAL(5,2); +DECLARE resto DECIMAL(5,2); +DECLARE horasProd DECIMAL(5,2); +DECLARE inicioProd DECIMAL(5,2) DEFAULT 24.00; +DECLARE myTime DECIMAL(5,2); +DECLARE departureLimit INT; +DECLARE myMinSpeed DECIMAL(10,2); +DECLARE vLoadingDelay DECIMAL(5) DEFAULT 2; + +DECLARE rs CURSOR FOR + SELECT Departure + , Sum(pb.m3)/(GREATEST(IFNULL(lhp.m3,0),IFNULL(dp.minSpeed,0))) AS Horas + , util.VN_CURDATE()+(Departure + vLoadingDelay -(Sum(pb.m3)/(GREATEST(IFNULL(lhp.m3,0),IFNULL(minSpeed,0))))/24) AS InicioPreparacion + FROM tmp.production_buffer pb + LEFT JOIN vn.lastHourProduction lhp ON lhp.warehouseFk = pb.warehouse_id + LEFT JOIN cache.departure_limit dp ON dp.warehouse_id = pb.warehouse_id AND dp.fecha = util.VN_CURDATE() + WHERE pb.Fecha = util.VN_CURDATE() + AND pb.graphCategory > 1 + AND IFNULL(Departure,0) > 0 + GROUP BY Departure + ORDER BY Departure DESC; + + DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE; + + SET myTime = HOUR(util.VN_NOW()) + MINUTE(util.VN_NOW()) / 60; + + OPEN rs; + + FETCH rs INTO rsDeparture, rsHoras , rsInicio; + + WHILE NOT done DO + + SET resto = IF(inicioProd < rsDeparture, rsDeparture - inicioProd,0); + + SET inicioProd = rsDeparture - rsHoras; + + IF inicioProd - resto < myTime THEN + + SET done = TRUE; + + ELSE + + SET departureLimit = rsDeparture; + + FETCH rs INTO rsDeparture, rsHoras , rsInicio; + + -- SELECT rsDeparture, rsHoras , rsInicio; + + END IF; + + END WHILE; + + SET departureLimit = IFNULL(departureLimit,24); + SET departureLimit = IF(departureLimit = 0, 24, departureLimit); + + SELECT minSpeed INTO myMinSpeed + FROM cache.departure_limit + WHERE warehouse_id = vWarehouseId + AND fecha = util.VN_CURDATE(); + + REPLACE cache.departure_limit(warehouse_id, fecha, hora, minSpeed) + VALUES (vWarehouseId, util.VN_CURDATE(), departureLimit, IFNULL(myMinSpeed,0)); + + CLOSE rs; + +END$$ +DELIMITER ; diff --git a/db/routines/cache/procedures/last_buy_refresh.sql b/db/routines/cache/procedures/last_buy_refresh.sql new file mode 100644 index 000000000..49ef4ee5e --- /dev/null +++ b/db/routines/cache/procedures/last_buy_refresh.sql @@ -0,0 +1,45 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `cache`.`last_buy_refresh`(vRefresh BOOL) +proc: BEGIN +/** + * Crea o actualiza la cache con la última compra y fecha de cada + * artículo hasta ayer. Para obtener la última compra hasta una fecha + * determinada utilizar el procedimiento vn.buyUltimate(). + * + * @param vRefresh %TRUE para forzar el recálculo de la cache + */ + DECLARE vCalc INT; + DECLARE started DATE; + DECLARE ended DATE; + DECLARE vLastRefresh DATE; + + DECLARE EXIT HANDLER FOR SQLEXCEPTION + BEGIN + CALL cache_calc_unlock (vCalc); + RESIGNAL; + END; + + CALL cache_calc_start (vCalc, vRefresh, 'last_buy', NULL); + + IF !vRefresh + THEN + LEAVE proc; + END IF; + + -- TODO: ¿Se puede usar la fecha del ultimo inventario? + SELECT inventoried INTO started FROM vn.config LIMIT 1; + SET ended = util.VN_CURDATE(); -- TIMESTAMPADD(DAY, -1, util.VN_CURDATE()); + + CALL vn.buyUltimateFromInterval(NULL, started, ended); + + DELETE FROM last_buy; + + INSERT INTO last_buy (item_id, warehouse_id, buy_id, landing) + SELECT itemFk, warehouseFk, buyFk, landed + FROM tmp.buyUltimateFromInterval; + + DROP TEMPORARY TABLE tmp.buyUltimateFromInterval; + + CALL cache_calc_end (vCalc); +END$$ +DELIMITER ; diff --git a/db/routines/cache/procedures/prod_graphic_refresh.sql b/db/routines/cache/procedures/prod_graphic_refresh.sql new file mode 100644 index 000000000..edeeba436 --- /dev/null +++ b/db/routines/cache/procedures/prod_graphic_refresh.sql @@ -0,0 +1,36 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `cache`.`prod_graphic_refresh`(v_refresh BOOL, wh_id INT) +proc: BEGIN + DECLARE datEQ DATETIME; + DECLARE timDIF TIME; + DECLARE v_calc INT; + + CALL cache_calc_start (v_calc, v_refresh, 'prod_graphic', wh_id); + + IF !v_refresh + THEN + LEAVE proc; + END IF; + + CALL vn2008.production_control_source(wh_id, 0); + + DELETE FROM prod_graphic_source; + + INSERT INTO prod_graphic_source (warehouse_id, graphCategory, m3, hora, `order`, Agencia) + SELECT + wh_id, + st.graphCategory, + CAST(SUM(m3) AS DECIMAL(10,0)) as m3, + pb.Hora, + pb.state_order, + pb.Agencia + FROM tmp.production_buffer pb + JOIN vn.state st ON st.id = pb.state + WHERE Fecha = util.VN_CURDATE() + GROUP BY wh_id, graphCategory + ; + + + CALL cache_calc_end (v_calc); +END$$ +DELIMITER ; diff --git a/db/routines/cache/procedures/stock_refresh.sql b/db/routines/cache/procedures/stock_refresh.sql new file mode 100644 index 000000000..5ddc6c20e --- /dev/null +++ b/db/routines/cache/procedures/stock_refresh.sql @@ -0,0 +1,53 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `cache`.`stock_refresh`(v_refresh BOOL) +proc: BEGIN +/** + * Crea o actualiza la cache con el disponible hasta el día de + * ayer. Esta cache es usada como base para otros procedimientos + * como el cálculo del visible o del ATP. + * + * @param v_refresh %TRUE para forzar el recálculo de la cache + **/ + DECLARE v_calc INT; + DECLARE v_date_inv DATE; + DECLARE vCURDATE DATE; + DECLARE v_last_refresh DATETIME; + + DECLARE EXIT HANDLER FOR SQLEXCEPTION + BEGIN + CALL cache_calc_unlock (v_calc); + RESIGNAL; + END; + + CALL cache_calc_start (v_calc, v_refresh, 'stock', NULL); + + IF !v_refresh + THEN + LEAVE proc; + END IF; + + SET v_date_inv = vn.getInventoryDate(); + SET vCURDATE = util.VN_CURDATE(); + + DELETE FROM stock; + + INSERT INTO stock (item_id, warehouse_id, amount) + SELECT item_id, warehouse_id, SUM(amount) amount FROM + ( + SELECT itemFk AS item_id, warehouseFk AS warehouse_id, quantity AS amount + FROM vn.itemTicketOut + WHERE shipped >= v_date_inv AND shipped < vCURDATE + UNION ALL + SELECT itemFk ASitem_id, warehouseInFk AS warehouse_id, quantity AS amount + FROM vn.itemEntryIn + WHERE landed >= v_date_inv AND landed < vCURDATE AND isVirtualStock is FALSE + UNION ALL + SELECT itemFk AS item_id ,warehouseOutFk AS warehouse_id, quantity AS amount + FROM vn.itemEntryOut + WHERE shipped >= v_date_inv AND shipped < vCURDATE + ) t + GROUP BY item_id, warehouse_id HAVING amount != 0; + + CALL cache_calc_end (v_calc); +END$$ +DELIMITER ; diff --git a/db/routines/cache/procedures/visible_clean.sql b/db/routines/cache/procedures/visible_clean.sql new file mode 100644 index 000000000..b6f03c563 --- /dev/null +++ b/db/routines/cache/procedures/visible_clean.sql @@ -0,0 +1,17 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `cache`.`visible_clean`() +BEGIN + DROP TEMPORARY TABLE IF EXISTS tCalc; + CREATE TEMPORARY TABLE tCalc + (INDEX (id)) + ENGINE = MEMORY + SELECT id FROM cache_calc; + + DELETE v + FROM visible v + LEFT JOIN tCalc c ON c.id = v.calc_id + WHERE c.id IS NULL; + + DROP TEMPORARY TABLE tCalc; +END$$ +DELIMITER ; diff --git a/db/routines/cache/procedures/visible_refresh.sql b/db/routines/cache/procedures/visible_refresh.sql new file mode 100644 index 000000000..63b42dfd9 --- /dev/null +++ b/db/routines/cache/procedures/visible_refresh.sql @@ -0,0 +1,37 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `cache`.`visible_refresh`(OUT v_calc INT, v_refresh BOOL, v_warehouse INT) +proc: BEGIN + DECLARE EXIT HANDLER FOR SQLEXCEPTION + BEGIN + CALL cache_calc_unlock (v_calc); + RESIGNAL; + END; + + CALL cache_calc_start (v_calc, v_refresh, 'visible', v_warehouse); + + IF !v_refresh THEN + LEAVE proc; + END IF; + + -- Calculamos el stock hasta ayer + + CALL `cache`.stock_refresh(false); + + CREATE OR REPLACE TEMPORARY TABLE tmp.itemVisible + (PRIMARY KEY (item_id)) + ENGINE = MEMORY + SELECT item_id, amount stock, amount visible FROM `cache`.stock + WHERE warehouse_id = v_warehouse; + + -- Calculamos los movimientos confirmados de hoy + CALL vn.item_GetVisible(v_warehouse, NULL); + DELETE FROM visible WHERE calc_id = v_calc; + + INSERT INTO visible (calc_id, item_id,visible) + SELECT v_calc, item_id, visible FROM tmp.itemVisible; + + CALL cache_calc_end (v_calc); + + DROP TEMPORARY TABLE tmp.itemVisible; +END$$ +DELIMITER ; diff --git a/db/routines/dipole/procedures/clean.sql b/db/routines/dipole/procedures/clean.sql new file mode 100644 index 000000000..a9af64e15 --- /dev/null +++ b/db/routines/dipole/procedures/clean.sql @@ -0,0 +1,14 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `dipole`.`clean`() +BEGIN + DECLARE vFromDated DATE; + + SET vFromDated = TIMESTAMPADD(WEEK, -2, util.VN_CURDATE()); + + DELETE FROM dipole.expedition_PrintOut + WHERE created < vFromDated; + + DELETE FROM dipole.expedition_Read + WHERE created < vFromDated; +END$$ +DELIMITER ; diff --git a/db/routines/dipole/procedures/expedition_add.sql b/db/routines/dipole/procedures/expedition_add.sql new file mode 100644 index 000000000..a88c4d25a --- /dev/null +++ b/db/routines/dipole/procedures/expedition_add.sql @@ -0,0 +1,74 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `dipole`.`expedition_add`(vExpeditionFk INT, vPrinterFk INT, vIsPrinted BOOLEAN) +BEGIN +/** Insert records to print agency stickers and to inform sorter with new box + * + * param vExpeditionFk Id for vn.expedition + * param vPrinterFk Id for dipole.printer + * param vIsPrinted Value for field dipole.expedition_PrintOut.isPrinted + */ + INSERT INTO dipole.expedition_PrintOut(expeditionFk, + ticketFk, + addressFk, + street, + postalCode, + city, + shopName, + printerFk, + routeFk, + parkingCode, + truckName, + clientFk, + phone, + province, + agency, + workerCode, + isPrinted) + SELECT e.id, + e.ticketFk, + t.addressFk , + LEFT(a.street, 100), + a.postalCode , + LEFT (CONCAT(IFNULL(rm.beachFk,''),' ',a.city), 13), + a.nickname, + vPrinterFk, + IFNULL(right(`t`.`routeFk`, 3),0), + if (@vVolume := vn.ticketTotalVolume(t.id) > 1.5, @vVolume, IFNULL( rm.beachFk, 0)), + LEFT(IFNULL(et.description ,replace(`z`.`name`, 'ZONA ', 'Z')),14) truckName, + t.clientFk , + ifnull(c.mobile, ifnull(a.mobile, ifnull(c.phone, a.phone))), + LEFT(p.name, 20), + NULL, + w.code, + vIsPrinted + FROM vn.expedition e + JOIN vn.ticket t ON t.id = e.ticketFk + JOIN vn.address a ON a.id = t.addressFk + JOIN vn.province p ON p.id = a.provinceFk + LEFT JOIN vn.routesMonitor rm ON rm.routeFk = t.routeFk + LEFT JOIN vn.expeditionTruck et ON et.id = rm.expeditionTruckFk + LEFT JOIN vn.beach b ON b.code = rm.beachFk + LEFT JOIN vn.`zone`z ON z.id = t.zoneFk + JOIN vn.agencyMode am ON t.agencyModeFk = am.id + JOIN vn.client c ON t.clientFk = c.id + JOIN vn.agency ag ON ag.id = am.agencyFk + JOIN vn.printer pr ON pr.id = vPrinterFk + JOIN vn.worker w ON w.id = e.workerFk + WHERE e.id = vExpeditionFk; + + INSERT INTO srt.expedition (id, + width, + `length`, + height, + stateFk) + SELECT e.id, + p.width * 10, + p.`depth` * 10, + p.height * 10, + es.id + FROM vn.expedition e + LEFT JOIN vn.packaging p ON p.id = e.packagingFk + JOIN srt.expeditionState es ON es.description = 'PRINTED' + WHERE e.id = vExpeditionFk; -- En esa tabla las medidas van en milímetros +END$$ +DELIMITER ; diff --git a/db/routines/dipole/views/expeditionControl.sql b/db/routines/dipole/views/expeditionControl.sql new file mode 100644 index 000000000..e26e83440 --- /dev/null +++ b/db/routines/dipole/views/expeditionControl.sql @@ -0,0 +1,11 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `dipole`.`expeditionControl` +AS SELECT cast(`epo`.`created` AS date) AS `fecha`, + COUNT(0) AS `total`, + COUNT(`er`.`expeditionFk`) AS `leidas` +FROM ( + `dipole`.`expedition_PrintOut` `epo` + LEFT JOIN `dipole`.`expedition_Read` `er` ON(`er`.`expeditionFk` = `epo`.`expeditionFk`) + ) +GROUP BY cast(`epo`.`created` AS date) diff --git a/db/routines/edi/events/floramondo.sql b/db/routines/edi/events/floramondo.sql new file mode 100644 index 000000000..0a38f3537 --- /dev/null +++ b/db/routines/edi/events/floramondo.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `edi`.`floramondo` + ON SCHEDULE EVERY 6 MINUTE + STARTS '2022-01-28 09:52:45.000' + ON COMPLETION NOT PRESERVE + DISABLE +DO CALL edi.floramondo_offerRefresh()$$ +DELIMITER ; diff --git a/db/routines/edi/functions/imageName.sql b/db/routines/edi/functions/imageName.sql new file mode 100644 index 000000000..f2e52558f --- /dev/null +++ b/db/routines/edi/functions/imageName.sql @@ -0,0 +1,22 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `edi`.`imageName`(vPictureReference VARCHAR(255)) + RETURNS varchar(255) CHARSET utf8mb3 COLLATE utf8mb3_unicode_ci + DETERMINISTIC +BEGIN + + SET vPictureReference = REPLACE(vPictureReference,'.',''); + + SET vPictureReference = REPLACE(vPictureReference,'/',''); + + SET vPictureReference = REPLACE(vPictureReference,'%',''); + + SET vPictureReference = REPLACE(vPictureReference,':',''); + + SET vPictureReference = REPLACE(vPictureReference,'?',''); + + SET vPictureReference = REPLACE(vPictureReference,'=',''); + + RETURN vPictureReference; + +END$$ +DELIMITER ; diff --git a/db/routines/edi/procedures/clean.sql b/db/routines/edi/procedures/clean.sql new file mode 100644 index 000000000..71dd576e9 --- /dev/null +++ b/db/routines/edi/procedures/clean.sql @@ -0,0 +1,22 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `edi`.`clean`() +BEGIN + DECLARE CONTINUE HANDLER FOR SQLEXCEPTION + BEGIN + ROLLBACK; + RESIGNAL; + END; + + DELETE FROM ekt + WHERE fec < (util.VN_CURDATE() - INTERVAL 4 YEAR); + + DELETE IGNORE sr.* + FROM supplyResponse sr + LEFT JOIN deliveryInformation di ON sr.ID = di.supplyResponseID + WHERE di.LatestOrderDateTime < (util.VN_CURDATE() - INTERVAL 1 WEEK) + OR di.ID IS NULL; + + DELETE FROM putOrder + WHERE created < (util.VN_CURDATE() - INTERVAL 1 MONTH); +END$$ +DELIMITER ; diff --git a/db/routines/edi/procedures/deliveryInformation_Delete.sql b/db/routines/edi/procedures/deliveryInformation_Delete.sql new file mode 100644 index 000000000..b4f51515a --- /dev/null +++ b/db/routines/edi/procedures/deliveryInformation_Delete.sql @@ -0,0 +1,26 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `edi`.`deliveryInformation_Delete`() +BEGIN + + DECLARE vID INT; + DECLARE vGap INT DEFAULT 100; + DECLARE vTope INT; + + SELECT MIN(ID), MAX(ID) + INTO vID, vTope + FROM edi.deliveryInformation; + + WHILE vID <= vTope DO + + SET vID = vID + vGap; + + DELETE + FROM edi.deliveryInformation + WHERE ID < vID + AND EarliestDespatchDateTime IS NULL; + + END WHILE; + + +END$$ +DELIMITER ; diff --git a/db/routines/edi/procedures/ekt_add.sql b/db/routines/edi/procedures/ekt_add.sql new file mode 100644 index 000000000..1cc67bb93 --- /dev/null +++ b/db/routines/edi/procedures/ekt_add.sql @@ -0,0 +1,64 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `edi`.`ekt_add`(vPutOrderFk INT) +BEGIN + +/** + * Añade ekt para las ordenes de compra de proveedores que no envian el ekt por email + * + * @param vPutOrderFk PutOrderId de donde coger los datos + **/ + + INSERT INTO edi.ekt(entryYear, + deliveryNumber, + fec, + hor, + item, + pac, + qty, + ori, + cat, + pro, + pri, + package, + s1, + s2, + s3, + s4, + s5, + s6, + putOrderFk, + `ref`, + kop) + SELECT year(util.VN_CURDATE()) entryYear, + p.id deliveryNumber , + DATE(di.LatestDeliveryDateTime) fec, + HOUR(di.LatestDeliveryDateTime) hor, + i.longName item, + sr.NumberOfItemsPerCask pac, + p.quantity qty, + o.code ori, + i.category cat, + mp.supplierFk pro, + sr.Price pri, + sr.EmbalageCode package, + i.value5 s1, + i.value6 s2, + i.value7 s3, + i.value8 s4, + i.value9 s5, + i.value10 s6, + p.id putOrderFk, + sr.Item_ArticleCode, + sr.vmpID + FROM edi.putOrder p + JOIN edi.supplyResponse sr ON sr.ID = p.supplyResponseID + JOIN edi.deliveryInformation di ON di.id = p.deliveryInformationID + JOIN edi.marketPlace mp ON mp.id = sr.MarketPlaceID + JOIN vn.item i ON i.supplyResponseFk = sr.ID + JOIN vn.origin o ON o.id = i.originFk + WHERE p.id = vPutOrderFk; + + CALL edi.ekt_load(LAST_INSERT_ID()); + +END$$ +DELIMITER ; diff --git a/db/routines/edi/procedures/ekt_load.sql b/db/routines/edi/procedures/ekt_load.sql new file mode 100644 index 000000000..ccdcd1999 --- /dev/null +++ b/db/routines/edi/procedures/ekt_load.sql @@ -0,0 +1,258 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `edi`.`ekt_load`(IN `vSelf` INT) +proc:BEGIN +/** + * Carga los datos esenciales para el sistema EKT. + * Inserta compras y ventas si es necesario. + * + * @param vSelf Id de ekt + */ + DECLARE vRef INT; + DECLARE vBuy INT; + DECLARE vItem INT; + DECLARE vQty INT; + DECLARE vPackage INT; + DECLARE vPutOrderFk INT; + DECLARE vIsLot BOOLEAN; + DECLARE vForceToPacking INT DEFAULT 2; + DECLARE vEntryFk INT; + DECLARE vHasToChangePackagingFk BOOLEAN; + DECLARE vIsFloramondoDirect BOOLEAN; + DECLARE vTicketFk INT; + DECLARE vHasItemGroup BOOL; + DECLARE vDescription VARCHAR(255); + DECLARE vSaleFk INT; + DECLARE vDefaultEntry INT; + + -- Carga los datos necesarios del EKT + SELECT e.ref, qty, package, putOrderFk MOD 1000000, i2.id , NOT ISNULL(eea.addressFk), NOT ISNULL(igto.group_code), + CONCAT(e.`ref`, ' ', e.item, ' ', e.sub, ' EktFk:', e.id) + INTO vRef, vQty, vPackage, vPutOrderFk, vItem, vIsFloramondoDirect, vHasItemGroup, vDescription + FROM ekt e + LEFT JOIN item i ON e.ref = i.id + LEFT JOIN putOrder po ON po.id = e.putOrderFk + LEFT JOIN vn.item i2 ON i2.supplyResponseFk = po.supplyResponseID + LEFT JOIN vn.ektEntryAssign eea ON eea.sub = e.sub + LEFT JOIN item_groupToOffer igto ON igto.group_code = i.group_id + WHERE e.id = vSelf + LIMIT 1; + + IF NOT vHasItemGroup THEN + CALL vn.mail_insert('logistica@verdnatura.es', 'nocontestar@verdnatura.es', 'Nuevo grupo en Floramondo', vDescription); + CALL vn.mail_insert('pako@verdnatura.es', 'nocontestar@verdnatura.es', CONCAT('Nuevo grupo en Floramondo: ', vDescription), vDescription); + LEAVE proc; + END IF; + + SELECT defaultEntry INTO vDefaultEntry + FROM vn.entryConfig; + + -- Asigna la entrada + SELECT vn.ekt_getEntry(vSelf) INTO vEntryFk; + + -- Inserta el cubo si no existe + + IF vPackage = 800 THEN + + SET vHasToChangePackagingFk = TRUE; + + IF vItem THEN + + SELECT vn.item_getPackage(vItem) INTO vPackage ; + + ELSE + + SET vPackage = 8000 + vQty; + + INSERT IGNORE INTO vn.packaging(id, width, `depth`) + SELECT vPackage, vc.ccLength / vQty, vc.ccWidth + FROM vn.volumeConfig vc; + + END IF; + + ELSE + + INSERT IGNORE INTO vn2008.Cubos (Id_Cubo, X, Y, Z) + SELECT bucket_id, ROUND(x_size/10), ROUND(y_size/10), ROUND(z_size/10) + FROM bucket WHERE bucket_id = vPackage; + + IF ROW_COUNT() > 0 + THEN + INSERT INTO vn2008.mail SET + `subject` = 'Cubo añadido', + `text` = CONCAT('Se ha añadido el cubo: ', vPackage), + `to` = 'ekt@verdnatura.es'; + END IF; + END IF; + + -- Si es una compra de Logiflora obtiene el articulo + IF vPutOrderFk THEN + SELECT i.id INTO vItem + FROM putOrder po + JOIN vn.item i ON i.supplyResponseFk = po.supplyResponseID + WHERE po.id = vPutOrderFk + LIMIT 1; + END IF; + + INSERT IGNORE INTO item_track + SET item_id = vRef; + + IF vItem IS NULL THEN + -- Intenta obtener el artículo en base a los atributos holandeses + SELECT b.id, IFNULL(b.itemOriginalFk ,b.itemFk) INTO vBuy, vItem + FROM ekt e + JOIN item_track t ON t.item_id = e.ref + LEFT JOIN ekt l ON l.ref = e.ref + LEFT JOIN vn.buy b ON b.ektFk = l.id + LEFT JOIN vn.item i ON i.id = b.itemFk + WHERE e.id = vSelf + AND l.id != vSelf + AND b.itemFk != vDefaultEntry + AND IF(t.s1, l.s1 = e.s1, TRUE) + AND IF(t.s2, l.s2 = e.s2, TRUE) + AND IF(t.s3, l.s3 = e.s3, TRUE) + AND IF(t.s4, l.s4 = e.s4, TRUE) + AND IF(t.s5, l.s5 = e.s5, TRUE) + AND IF(t.s6, l.s6 = e.s6, TRUE) + AND IF(t.pac, l.pac = e.pac, TRUE) + AND IF(t.cat, l.cat = e.cat, TRUE) + AND IF(t.ori, l.ori = e.ori, TRUE) + AND IF(t.pro, l.pro = e.pro, TRUE) + AND IF(t.package, l.package = e.package, TRUE) + AND IF(t.item, l.item = e.item, TRUE) + AND i.isFloramondo = vIsFloramondoDirect + ORDER BY l.now DESC, b.id ASC + LIMIT 1; + + END IF; + + -- Si no encuentra el articulo lo crea en el caso de las compras directas en Floramondo + IF vItem IS NULL AND vIsFloramondoDirect THEN + CALL item_getNewByEkt(vSelf, vItem); + END IF; + + INSERT INTO vn.buy ( + entryFk, + ektFk, + buyingValue, + itemFk, + stickers, + packing, + `grouping`, + quantity, + groupingMode, + packagingFk, + weight) + SELECT vEntryFk, + vSelf, + (@t := IF(i.stems, i.stems, 1)) * e.pri / IFNULL(i.stemMultiplier, 1) buyingValue, + IFNULL(vItem, vDefaultEntry) itemFk, + e.qty stickers, + @pac := IFNULL(i.stemMultiplier, 1) * e.pac / @t packing, + IFNULL(b.`grouping`, e.pac), + @pac * e.qty, + vForceToPacking, + IF(vHasToChangePackagingFk OR b.packagingFk IS NULL, vPackage, b.packagingFk), + (IFNULL(i.weightByPiece, 0) * @pac) / 1000 + FROM ekt e + LEFT JOIN vn.buy b ON b.id = vBuy + LEFT JOIN vn.item i ON i.id = b.itemFk + LEFT JOIN vn.supplier s ON e.pro = s.id + WHERE e.id = vSelf + LIMIT 1; + + CREATE OR REPLACE TEMPORARY TABLE tmp.buyRecalc + SELECT buy.id + FROM vn.buy + WHERE ektFk = vSelf; + + CALL vn.buy_recalcPrices(); + + -- Si es una compra de Logiflora hay que informar la tabla vn.saleBuy + IF vPutOrderFk THEN + REPLACE vn.saleBuy(saleFk, buyFk, workerFk) + SELECT po.saleFk, b.id, account.myUser_getId() + FROM putOrder po + JOIN vn.buy b ON b.ektFk = vSelf + WHERE po.id = vPutOrderFk; + END IF; + + -- Si es una compra directa en Floramondo hay que añadirlo al ticket + IF vIsFloramondoDirect THEN + SELECT t.id INTO vTicketFk + FROM vn.ticket t + JOIN vn.ektEntryAssign eea ON eea.addressFk = t.addressFk + AND t.warehouseFk = eea.warehouseInFk + JOIN ekt e ON e.sub = eea.sub + AND e.id = vSelf + WHERE e.fec = t.shipped + LIMIT 1; + + IF vTicketFk IS NULL THEN + SET @clientFk = NULL; + INSERT INTO vn.ticket ( + clientFk, + shipped, + addressFk, + agencyModeFk, + nickname, + warehouseFk, + companyFk, + landed, + zoneFk, + zonePrice, + zoneBonus) + SELECT @clientFk := a.clientFk, + e.fec, + a.id, + a.agencyModeFk, + a.nickname, + eea.warehouseInFk, + c.id, + e.fec, + z.id, + z.price, + z.bonus + FROM ekt e + JOIN vn.ektEntryAssign eea ON eea.sub = e.sub + JOIN vn.address a ON a.id = eea.addressFk + JOIN vn.company c ON c.code = 'VNL' + JOIN vn.`zone` z ON z.code = 'FLORAMONDO' + WHERE e.id = vSelf + LIMIT 1; + + SET vTicketFk = LAST_INSERT_ID(); + + IF @clientFk IS NULL THEN + CALL util.throw(CONCAT("Ticket creation failed: ", vSelf)); + END IF; + END IF; + + INSERT INTO vn.sale (itemFk, ticketFk, concept, quantity, price) + SELECT vItem, vTicketFk, e.item, e.qty * e.pac, e.pri * ( 1 + fhc.floramondoMargin ) + FROM ekt e + JOIN floraHollandConfig fhc + WHERE e.id = vSelf; + + SELECT LAST_INSERT_ID() INTO vSaleFk; + + REPLACE vn.saleBuy(saleFk, buyFk, workerFk) + SELECT vSaleFk, b.id, account.myUser_getId() + FROM vn.buy b + WHERE b.ektFk = vSelf; + + INSERT INTO vn.saleComponent(saleFk, componentFk, value) + SELECT vSaleFk, c.id, e.pri + FROM ekt e + JOIN vn.component c ON c.code = 'purchaseValue' + WHERE e.id = vSelf; + + INSERT INTO vn.saleComponent(saleFk, componentFk, value) + SELECT vSaleFk, c.id, e.pri * fhc.floramondoMargin + FROM ekt e + JOIN floraHollandConfig fhc + JOIN vn.component c ON c.code = 'margin' + WHERE e.id = vSelf; + END IF; + DROP TEMPORARY TABLE tmp.buyRecalc; +END$$ +DELIMITER ; diff --git a/db/routines/edi/procedures/ekt_loadNotBuy.sql b/db/routines/edi/procedures/ekt_loadNotBuy.sql new file mode 100644 index 000000000..52697adc0 --- /dev/null +++ b/db/routines/edi/procedures/ekt_loadNotBuy.sql @@ -0,0 +1,33 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `edi`.`ekt_loadNotBuy`() +BEGIN +/** + * Ejecuta ekt_load para aquellos ekt de hoy que no tienen vn.buy + */ + DECLARE vEktFk INTEGER; + DECLARE done BOOL; + + DECLARE cursor1 CURSOR FOR + SELECT e.id + FROM edi.ekt e + LEFT JOIN vn.buy b ON b.ektFk = e.id + WHERE e.fec >= util.VN_CURDATE() + AND ISNULL(b.ektFk); + + DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = 1; + + OPEN cursor1; + bucle: LOOP + + FETCH cursor1 INTO vEktFk; + + IF done THEN + LEAVE bucle; + END IF; + + CALL edi.ekt_load(vEktFk); + + END LOOP bucle; + CLOSE cursor1; +END$$ +DELIMITER ; diff --git a/db/routines/edi/procedures/ekt_refresh.sql b/db/routines/edi/procedures/ekt_refresh.sql new file mode 100644 index 000000000..0e9ed7d3c --- /dev/null +++ b/db/routines/edi/procedures/ekt_refresh.sql @@ -0,0 +1,55 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `edi`.`ekt_refresh`( + `vSelf` INT, vMailFk INT) +BEGIN +/** + * Updates a transaction, generates it's barcode. + */ + DECLARE vRewriteKop INT DEFAULT NULL; + DECLARE vTruncatePutOrder INT DEFAULT NULL; + DECLARE vBarcode CHAR(15) DEFAULT NULL; + DECLARE vKop INT; + DECLARE vPutOrderFk BIGINT; + + SELECT kop, putOrderFk + INTO vKop, vPutOrderFk + FROM ekt + WHERE id = vSelf; + + -- Generates the barcode + + SELECT CONCAT( + LPAD(IFNULL(auction,0), 3, 0), + LPAD(IFNULL(klo, 99), 2, 0), + LPAD(DAYOFYEAR(fec), 3, 0), + COALESCE(agj, RIGHT(batchNumber,7), id)) + INTO vBarcode + FROM ekt + WHERE id = vSelf; + + -- Rewrites the kop parameter + + IF vKop IS NULL THEN + SELECT defaultKop INTO vKop FROM exchangeConfig; + END IF; + + SELECT e.kop INTO vRewriteKop + FROM mailSender e + JOIN mail m ON m.senderFk = e.id + WHERE m.id = vMailFk; + + SET vKop = IFNULL(vRewriteKop, vKop); + + -- Format order id + + SET vTruncatePutOrder = vPutOrderFk MOD 1000000; + + -- Refresh EKT + + UPDATE ekt SET + barcode = vBarcode + ,kop = vKop + ,putOrderFk = vTruncatePutOrder + WHERE id = vSelf; +END$$ +DELIMITER ; diff --git a/db/routines/edi/procedures/ekt_scan.sql b/db/routines/edi/procedures/ekt_scan.sql new file mode 100644 index 000000000..b0b75a6a7 --- /dev/null +++ b/db/routines/edi/procedures/ekt_scan.sql @@ -0,0 +1,131 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `edi`.`ekt_scan`(vBarcode VARCHAR(512)) +BEGIN +/** + * Busca transaciones a partir de un codigo de barras, las marca como escaneadas + * y las devuelve. + * Ver https://wiki.verdnatura.es/index.php/Ekt#Algoritmos_de_lectura + * + * @param vBarcode Código de compra de una etiqueta de subasta + * @param vLabels Cantidad escaneada + * @table tmp.ekt(ektFk) Transacciones escaneadas + */ + DECLARE vIsFound BOOL; + DECLARE vUsefulAuctionLeftSegmentLength INT; + DECLARE vStandardBarcodeLength INT; + DECLARE vFloridayBarcodeLength INT; + DECLARE vFloramondoBarcodeLength INT; + DECLARE vAuction INT; + DECLARE vKlo INT; + DECLARE vFec DATE; + DECLARE vShortAgj INT; + DECLARE vLongAgj INT; + DECLARE vXtraLongAgj INT; + DECLARE vDefaultKlo INT; + + SELECT + ec.usefulAuctionLeftSegmentLength, + ec.standardBarcodeLength, + ec.floridayBarcodeLength, + ec.floramondoBarcodeLength, + ec.defaultKlo + INTO + vUsefulAuctionLeftSegmentLength, + vStandardBarcodeLength, + vFloridayBarcodeLength, + vFloramondoBarcodeLength, + vDefaultKlo + FROM edi.ektConfig ec; + + DROP TEMPORARY TABLE IF EXISTS tmp.ekt; + CREATE TEMPORARY TABLE tmp.ekt + ENGINE = MEMORY + SELECT id ektFk FROM ekt LIMIT 0; + + CASE + WHEN LENGTH(vBarcode) <= vFloridayBarcodeLength THEN + INSERT INTO tmp.ekt + SELECT id + FROM edi.ektRecent e + WHERE e.cps = vBarcode + OR e.batchNumber = vBarcode; + + WHEN LENGTH(vBarcode) = vFloramondoBarcodeLength THEN + INSERT INTO tmp.ekt + SELECT e.id + FROM edi.ektRecent e + WHERE e.pro = MID(vBarcode,2,6) + AND CAST(e.ptd AS SIGNED) = MID(vBarcode,8,5); + + ELSE + SET vBarcode = LPAD(vBarcode,vStandardBarcodeLength,'0'); + SET vAuction = MID(vBarcode, 1, 3); + SET vKlo = MID(vBarcode, 4, 2); + SET vFec = MAKEDATE(YEAR(util.VN_CURDATE()), MID(vBarcode, 6, 3)); + SET vShortAgj = MID(vBarcode, 9, 5); + SET vLongAgj = MID(vBarcode, 9, 7); + SET vXtraLongAgj = MID(vBarcode, 9, 8); + + -- Clásico de subasta + -- Trade standard + -- Trade que construye como la subasta + -- Trade como el anterior pero sin trade code + INSERT INTO tmp.ekt + SELECT id + FROM ekt + WHERE fec >= vFec - INTERVAL 1 DAY + AND (( + vKlo = vDefaultKlo + AND (klo = vKlo OR klo IS NULL OR klo = 0) + AND agj IN (vShortAgj, vLongAgj, vXtraLongAgj)) + OR (klo = vKlo + AND auction = vAuction + AND agj = vShortAgj) + ) + ORDER BY agj DESC, fec DESC + LIMIT 1; + + SELECT COUNT(*) FROM tmp.ekt INTO vIsFound; + + -- BatchNumber largo + IF NOT vIsFound THEN + INSERT INTO tmp.ekt + SELECT id + FROM edi.ektRecent e + WHERE e.batchNumber + = LEFT(vBarcode,vUsefulAuctionLeftSegmentLength) + AND e.batchNumber > 0; + + SELECT COUNT(*) FROM tmp.ekt INTO vIsFound; + END IF; + + -- Order Number + IF NOT vIsFound THEN + INSERT INTO tmp.ekt + SELECT id + FROM edi.ektRecent e + WHERE e.putOrderFk = vBarcode; + + SELECT COUNT(*) FROM tmp.ekt INTO vIsFound; + END IF; + + -- deliveryNumber incrustado + IF NOT vIsFound THEN + INSERT INTO tmp.ekt + SELECT id + FROM edi.ektRecent e + WHERE e.deliveryNumber + = MID(vBarcode, 4, 13) + AND e.deliveryNumber > 0; + + SELECT COUNT(*) FROM tmp.ekt INTO vIsFound; + END IF; + END CASE; + + IF vIsFound THEN + UPDATE ekt e + JOIN tmp.ekt t ON t.ektFk = e.id + SET e.scanned = TRUE; + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/edi/procedures/floramondo_offerRefresh.sql b/db/routines/edi/procedures/floramondo_offerRefresh.sql new file mode 100644 index 000000000..26e09ebaf --- /dev/null +++ b/db/routines/edi/procedures/floramondo_offerRefresh.sql @@ -0,0 +1,522 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `edi`.`floramondo_offerRefresh`() +proc: BEGIN + DECLARE vLanded DATETIME; + DECLARE vDone INT DEFAULT FALSE; + DECLARE vFreeId INT; + DECLARE vSupplyResponseFk INT; + DECLARE vLastInserted DATETIME; + DECLARE vIsAuctionDay BOOLEAN; + DECLARE vMaxNewItems INT DEFAULT 10000; + DECLARE vStartingTime DATETIME; + DECLARE vAalsmeerMarketPlaceID VARCHAR(13) DEFAULT '8713783439043'; + DECLARE vDayRange INT; + + DECLARE cur1 CURSOR FOR + SELECT id + FROM edi.item_free; + + DECLARE cur2 CURSOR FOR + SELECT srId + FROM itemToInsert; + + DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; + DECLARE EXIT HANDLER FOR SQLSTATE '45000' + BEGIN + ROLLBACK; + RESIGNAL; + END; + + DECLARE CONTINUE HANDLER FOR SQLEXCEPTION + BEGIN + DO RELEASE_LOCK('edi.floramondo_offerRefresh'); + SET @isTriggerDisabled = FALSE; + RESIGNAL; + END; + + IF 'test' = (SELECT environment FROM util.config) THEN + LEAVE proc; + END IF; + + IF !GET_LOCK('edi.floramondo_offerRefresh', 0) THEN + LEAVE proc; + END IF; + + SELECT dayRange INTO vDayRange + FROM offerRefreshConfig; + + IF vDayRange IS NULL THEN + CALL util.throw("Variable vDayRange not declared"); + END IF; + + SET vStartingTime = util.VN_NOW(); + + TRUNCATE edi.offerList; + + INSERT INTO edi.offerList(supplier, total) + SELECT v.name, COUNT(DISTINCT sr.ID) total + FROM edi.supplyResponse sr + JOIN edi.VMPSettings v ON v.VMPID = sr.vmpID + WHERE sr.NumberOfUnits > 0 + AND sr.EmbalageCode != 999 + GROUP BY sr.vmpID; + + UPDATE edi.offerList o + JOIN (SELECT v.name, COUNT(*) total + FROM edi.supplyOffer sr + JOIN edi.VMPSettings v ON v.VMPID = sr.vmpID + GROUP BY sr.vmpID) sub ON o.supplier = sub.name + SET o.`filter` = sub.total; + + -- Elimina de la lista de items libres aquellos que ya existen + DELETE itf.* + FROM edi.item_free itf + JOIN vn.item i ON i.id = itf.id; + + CREATE OR REPLACE TEMPORARY TABLE tmp + (INDEX (`Item_ArticleCode`)) + ENGINE = MEMORY + SELECT t.* + FROM ( + SELECT * + FROM edi.supplyOffer + ORDER BY (MarketPlaceID = vAalsmeerMarketPlaceID) DESC, + NumberOfUnits DESC LIMIT 10000000000000000000) t + GROUP BY t.srId; + + CREATE OR REPLACE TEMPORARY TABLE edi.offer (INDEX (`srID`), INDEX (`EmbalageCode`), + INDEX (`ef1`), INDEX (`ef2`), INDEX (`ef3`), INDEX (`ef4`),INDEX (`ef5`), INDEX (`ef6`), + INDEX (`s1Value`), INDEX (`s2Value`), INDEX (`s3Value`), INDEX (`s4Value`),INDEX (`s5Value`), INDEX (`s6Value`)) + ENGINE = MEMORY + SELECT so.*, + ev1.type_description s1Value, + ev2.type_description s2Value, + ev3.type_description s3Value, + ev4.type_description s4Value, + ev5.type_description s5Value, + ev6.type_description s6Value, + eif1.feature ef1, + eif2.feature ef2, + eif3.feature ef3, + eif4.feature ef4, + eif5.feature ef5, + eif6.feature ef6 + FROM tmp so + LEFT JOIN edi.item_feature eif1 ON eif1.item_id = so.Item_ArticleCode + AND eif1.presentation_order = 1 + AND eif1.expiry_date IS NULL + LEFT JOIN edi.item_feature eif2 ON eif2.item_id = so.Item_ArticleCode + AND eif2.presentation_order = 2 + AND eif2.expiry_date IS NULL + LEFT JOIN edi.item_feature eif3 ON eif3.item_id = so.Item_ArticleCode + AND eif3.presentation_order = 3 + AND eif3.expiry_date IS NULL + LEFT JOIN edi.item_feature eif4 ON eif4.item_id = so.Item_ArticleCode + AND eif4.presentation_order = 4 + AND eif4.expiry_date IS NULL + LEFT JOIN edi.item_feature eif5 ON eif5.item_id = so.Item_ArticleCode + AND eif5.presentation_order = 5 + AND eif5.expiry_date IS NULL + LEFT JOIN edi.item_feature eif6 ON eif6.item_id = so.Item_ArticleCode + AND eif6.presentation_order = 6 + AND eif6.expiry_date IS NULL + LEFT JOIN edi.`value` ev1 ON ev1.type_id = eif1.feature + AND so.s1 = ev1.type_value + LEFT JOIN edi.`value` ev2 ON ev2.type_id = eif2.feature + AND so.s2 = ev2.type_value + LEFT JOIN edi.`value` ev3 ON ev3.type_id = eif3.feature + AND so.s3 = ev3.type_value + LEFT JOIN edi.`value` ev4 ON ev4.type_id = eif4.feature + AND so.s4 = ev4.type_value + LEFT JOIN edi.`value` ev5 ON ev5.type_id = eif5.feature + AND so.s5 = ev5.type_value + LEFT JOIN edi.`value` ev6 ON ev6.type_id = eif6.feature + AND so.s6 = ev6.type_value + ORDER BY Price; + + DROP TEMPORARY TABLE tmp; + + DELETE o + FROM edi.offer o + LEFT JOIN vn.tag t1 ON t1.ediTypeFk = o.ef1 AND t1.overwrite = 'size' + LEFT JOIN vn.tag t2 ON t2.ediTypeFk = o.ef2 AND t2.overwrite = 'size' + LEFT JOIN vn.tag t3 ON t3.ediTypeFk = o.ef3 AND t3.overwrite = 'size' + LEFT JOIN vn.tag t4 ON t4.ediTypeFk = o.ef4 AND t4.overwrite = 'size' + LEFT JOIN vn.tag t5 ON t5.ediTypeFk = o.ef5 AND t5.overwrite = 'size' + LEFT JOIN vn.tag t6 ON t6.ediTypeFk = o.ef6 AND t6.overwrite = 'size' + JOIN vn.floramondoConfig fc ON TRUE + WHERE (t1.id IS NOT NULL AND CONVERT(s1Value, UNSIGNED) > fc.itemMaxSize) + OR (t2.id IS NOT NULL AND CONVERT(s2Value, UNSIGNED) > fc.itemMaxSize) + OR (t3.id IS NOT NULL AND CONVERT(s3Value, UNSIGNED) > fc.itemMaxSize) + OR (t4.id IS NOT NULL AND CONVERT(s4Value, UNSIGNED) > fc.itemMaxSize) + OR (t5.id IS NOT NULL AND CONVERT(s5Value, UNSIGNED) > fc.itemMaxSize) + OR (t6.id IS NOT NULL AND CONVERT(s6Value, UNSIGNED) > fc.itemMaxSize); + + START TRANSACTION; + + -- Actualizamos el campo supplyResponseFk para aquellos articulos que ya estan creados y reutilizamos + UPDATE IGNORE edi.offer o + JOIN vn.item i + ON i.name = o.product_name + AND i.subname <=> o.company_name + AND i.value5 <=> o.s1Value + AND i.value6 <=> o.s2Value + AND i.value7 <=> o.s3Value + AND i.value8 <=> o.s4Value + AND i.value9 <=> o.s5Value + AND i.value10 <=> o.s6Value + AND i.NumberOfItemsPerCask <=> o.NumberOfItemsPerCask + AND i.EmbalageCode <=> o.EmbalageCode + AND i.quality <=> o.Quality + JOIN vn.itemType it ON it.id = i.typeFk + LEFT JOIN vn.sale s ON s.itemFk = i.id + LEFT JOIN vn.ticket t ON t.id = s.ticketFk + AND t.shipped > (util.VN_CURDATE() - INTERVAL 1 WEEK) + LEFT JOIN edi.supplyResponse sr ON sr.ID = i.supplyResponseFk + LEFT JOIN edi.deliveryInformation di ON di.supplyResponseID = sr.ID + LEFT JOIN edi.putOrder po ON po.supplyResponseID = i.supplyResponseFk + AND po.OrderTradeLineDateTime > (util.VN_CURDATE() - INTERVAL 1 WEEK) + SET i.supplyResponseFk = o.srID + WHERE (sr.ID IS NULL + OR sr.NumberOfUnits = 0 + OR di.LatestOrderDateTime < util.VN_NOW() + OR di.ID IS NULL) + AND it.isInventory + AND t.id IS NULL + AND po.id IS NULL; + + CREATE OR REPLACE TEMPORARY TABLE itemToInsert + ENGINE = MEMORY + SELECT o.*, CAST(NULL AS DECIMAL(6,0)) itemFk + FROM edi.offer o + LEFT JOIN vn.item i ON i.supplyResponseFk = o.srId + WHERE i.id IS NULL + LIMIT vMaxNewItems; + + -- Reciclado de nº de item + OPEN cur1; + OPEN cur2; + + read_loop: LOOP + + FETCH cur2 INTO vSupplyResponseFk; + FETCH cur1 INTO vFreeId; + + IF vDone THEN + LEAVE read_loop; + END IF; + + UPDATE itemToInsert + SET itemFk = vFreeId + WHERE srId = vSupplyResponseFk; + + END LOOP; + + CLOSE cur1; + CLOSE cur2; + + -- Insertamos todos los items en Articles de la oferta + INSERT INTO vn.item(id, + `name`, + longName, + subName, + expenseFk, + typeFk, + intrastatFk, + originFk, + supplyResponseFk, + numberOfItemsPerCask, + embalageCode, + quality, + isFloramondo) + SELECT iti.itemFk, + iti.product_name, + iti.product_name, + iti.company_name, + iti.expenseFk, + iti.itemTypeFk, + iti.intrastatFk, + iti.originFk, + iti.`srId`, + iti.NumberOfItemsPerCask, + iti.EmbalageCode, + iti.Quality, + TRUE + FROM itemToInsert iti; + + -- Inserta la foto de los articulos nuevos (prioridad alta) + INSERT IGNORE INTO vn.itemImageQueue(itemFk, url) + SELECT i.id, PictureReference + FROM itemToInsert ii + JOIN vn.item i ON i.supplyResponseFk = ii.srId + WHERE PictureReference IS NOT NULL + AND i.image IS NULL; + + INSERT INTO edi.`log`(tableName, fieldName,fieldValue) + SELECT 'itemImageQueue','NumImagenesPtes', COUNT(*) + FROM vn.itemImageQueue + WHERE attempts = 0; + + -- Inserta si se añadiesen tags nuevos + INSERT IGNORE INTO vn.tag (name, ediTypeFk) + SELECT description, type_id FROM edi.type; + + -- Desabilita el trigger para recalcular los tags al final + SET @isTriggerDisabled = TRUE; + + -- Inserta los tags sólo en los articulos nuevos + INSERT INTO vn.itemTag(itemFk, tagFk, value, priority) + SELECT i.id, t.id , ii.product_name, 1 + FROM itemToInsert ii + JOIN vn.tag t ON t.`name` = 'Producto' + JOIN vn.item i ON i.supplyResponseFk = ii.`srId` + WHERE NOT ii.product_name IS NULL; + + INSERT INTO vn.itemTag(itemFk, tagFk, value, priority) + SELECT i.id, t.id , ii.Quality, 3 + FROM itemToInsert ii + JOIN vn.tag t ON t.`name` = 'Calidad' + JOIN vn.item i ON i.supplyResponseFk = ii.`srId` + WHERE NOT ii.Quality IS NULL; + + INSERT INTO vn.itemTag(itemFk, tagFk, value, priority) + SELECT i.id, t.id , ii.company_name, 4 + FROM itemToInsert ii + JOIN vn.tag t ON t.`name` = 'Productor' + JOIN vn.item i ON i.supplyResponseFk = ii.`srId` + WHERE NOT ii.company_name IS NULL; + + INSERT INTO vn.itemTag(itemFk, tagFk, value, priority) + SELECT i.id, t.id , s1Value, 5 + FROM itemToInsert ii + JOIN vn.tag t ON t.ediTypeFk = ii.ef1 + JOIN vn.item i ON i.supplyResponseFk = ii.`srId` + WHERE NOT s1Value IS NULL; + + INSERT INTO vn.itemTag(itemFk, tagFk, value, priority) + SELECT i.id, t.id , s2Value, 6 + FROM itemToInsert ii + JOIN vn.tag t ON t.ediTypeFk = ii.ef2 + JOIN vn.item i ON i.supplyResponseFk = ii.`srId` + WHERE NOT s2Value IS NULL; + + INSERT INTO vn.itemTag(itemFk, tagFk, value, priority) + SELECT i.id, t.id , s3Value, 7 + FROM itemToInsert ii + JOIN vn.tag t ON t.ediTypeFk = ii.ef3 + JOIN vn.item i ON i.supplyResponseFk = ii.`srId` + WHERE NOT s3Value IS NULL; + + INSERT INTO vn.itemTag(itemFk, tagFk, value, priority) + SELECT i.id, t.id , s4Value, 8 + FROM itemToInsert ii + JOIN vn.tag t ON t.ediTypeFk = ii.ef4 + JOIN vn.item i ON i.supplyResponseFk = ii.`srId` + WHERE NOT s4Value IS NULL; + + INSERT INTO vn.itemTag(itemFk, tagFk, value, priority) + SELECT i.id, t.id , s5Value, 9 + FROM itemToInsert ii + JOIN vn.tag t ON t.ediTypeFk = ii.ef5 + JOIN vn.item i ON i.supplyResponseFk = ii.`srId` + WHERE NOT s5Value IS NULL; + + INSERT INTO vn.itemTag(itemFk, tagFk, value, priority) + SELECT i.id, t.id , s6Value, 10 + FROM itemToInsert ii + JOIN vn.tag t ON t.ediTypeFk = ii.ef6 + JOIN vn.item i ON i.supplyResponseFk = ii.`srId` + WHERE NOT s6Value IS NULL; + + INSERT IGNORE INTO vn.itemTag(itemFk, tagFk, value, priority) + SELECT i.id, t.id, IFNULL(ink.name, ik.color), 11 + FROM itemToInsert ii + JOIN vn.item i ON i.supplyResponseFk = ii.`srId` + JOIN vn.tag t ON t.`name` = 'Color' + LEFT JOIN edi.feature f ON f.item_id = ii.Item_ArticleCode + LEFT JOIN edi.`type` tp ON tp.type_id = f.feature_type_id + AND tp.`description` = 'Hoofdkleur 1' + LEFT JOIN vn.ink ON ink.dutchCode = f.feature_value + LEFT JOIN vn.itemInk ik ON ik.longName = i.longName + WHERE ink.name IS NOT NULL + OR ik.color IS NOT NULL; + + CREATE OR REPLACE TABLE tmp.item + (PRIMARY KEY (id)) + SELECT i.id FROM vn.item i + JOIN itemToInsert ii ON i.supplyResponseFk = ii.`srId`; + + CALL vn.item_refreshTags(); + + DROP TABLE tmp.item; + + SELECT MIN(LatestDeliveryDateTime) INTO vLanded + FROM edi.supplyResponse sr + JOIN edi.deliveryInformation di ON di.supplyResponseID = sr.ID + JOIN edi.marketPlace mp ON mp.id = sr.MarketPlaceID + JOIN vn.floramondoConfig fc + WHERE mp.isLatestOrderDateTimeRelevant + AND di.LatestOrderDateTime > IF( + fc.MaxLatestOrderHour > HOUR(util.VN_NOW()), + util.VN_CURDATE(), + util.VN_CURDATE() + INTERVAL 1 DAY); + + UPDATE vn.floramondoConfig + SET nextLanded = vLanded + WHERE vLanded IS NOT NULL; + + -- Elimina la oferta obsoleta + UPDATE vn.buy b + JOIN vn.entry e ON e.id = b.entryFk + JOIN vn.travel tr ON tr.id = e.travelFk + JOIN vn.agencyMode am ON am.id = tr.agencyModeFk + JOIN vn.item i ON i.id = b.itemFk + LEFT JOIN edi.supplyResponse sr ON i.supplyResponseFk = sr.ID + LEFT JOIN edi.deliveryInformation di ON di.ID = b.deliveryFk + SET b.quantity = 0 + WHERE (IFNULL(di.LatestOrderDateTime,util.VN_NOW()) <= util.VN_NOW() + OR i.supplyResponseFk IS NULL + OR sr.NumberOfUnits = 0) + AND am.name = 'LOGIFLORA' + AND e.isRaid; + + -- Localiza las entradas de cada almacen + UPDATE edi.warehouseFloramondo + SET entryFk = vn.entry_getForLogiflora(vLanded + INTERVAL travellingDays DAY, warehouseFk); + + IF vLanded IS NOT NULL THEN + -- Actualiza la oferta existente + UPDATE vn.buy b + JOIN edi.warehouseFloramondo wf ON wf.entryFk = b.entryFk + JOIN vn.item i ON i.id = b.itemFk + JOIN edi.offer o ON i.supplyResponseFk = o.`srId` + SET b.quantity = o.NumberOfUnits * o.NumberOfItemsPerCask, + b.buyingValue = o.price + WHERE (b.quantity <> o.NumberOfUnits * o.NumberOfItemsPerCask + OR b.buyingValue <> o.price); + + -- Inserta el resto + SET vLastInserted := util.VN_NOW(); + + -- Inserta la oferta + INSERT INTO vn.buy ( + entryFk, + itemFk, + quantity, + buyingValue, + stickers, + packing, + `grouping`, + groupingMode, + packagingFk, + deliveryFk) + SELECT wf.entryFk, + i.id, + o.NumberOfUnits * o.NumberOfItemsPerCask quantity, + o.Price, + o.NumberOfUnits etiquetas, + o.NumberOfItemsPerCask packing, + GREATEST(1, IFNULL(o.MinimumQuantity,0)) * o.NumberOfItemsPerCask `grouping`, + 2, -- Obliga al Packing + o.embalageCode, + o.diId + FROM edi.offer o + JOIN vn.item i ON i.supplyResponseFk = o.srId + JOIN edi.warehouseFloramondo wf + JOIN vn.packaging p ON p.id + LIKE o.embalageCode + LEFT JOIN vn.buy b ON b.itemFk = i.id + AND b.entryFk = wf.entryFk + WHERE b.id IS NULL; -- Quitar esta linea y mirar de crear los packages a tiempo REAL + + INSERT INTO vn.itemCost( + itemFk, + warehouseFk, + cm3, + cm3delivery) + SELECT b.itemFk, + wf.warehouseFk, + @cm3 := vn.buy_getUnitVolume(b.id), + IFNULL((vc.standardFlowerBox * 1000) / i.packingOut, @cm3) + FROM warehouseFloramondo wf + JOIN vn.volumeConfig vc + JOIN vn.buy b ON b.entryFk = wf.entryFk + JOIN vn.item i ON i.id = b.itemFk + LEFT JOIN vn.itemCost ic ON ic.itemFk = b.itemFk + AND ic.warehouseFk = wf.warehouseFk + WHERE (ic.cm3 IS NULL OR ic.cm3 = 0) + ON DUPLICATE KEY UPDATE cm3 = @cm3, cm3delivery = IFNULL((vc.standardFlowerBox * 1000) / i.packingOut, @cm3); + + CREATE OR REPLACE TEMPORARY TABLE tmp.buyRecalc + SELECT b.id + FROM vn.buy b + JOIN warehouseFloramondo wf ON wf.entryFk = b.entryFk + WHERE b.created >= vLastInserted; + + CALL vn.buy_recalcPrices(); + + UPDATE edi.offerList o + JOIN (SELECT v.name, COUNT(DISTINCT b.itemFk) total + FROM vn.buy b + JOIN vn.item i ON i.id = b.itemFk + JOIN edi.supplyResponse sr ON sr.ID = i.supplyResponseFk + JOIN edi.VMPSettings v ON v.VMPID = sr.vmpID + JOIN edi.warehouseFloramondo wf ON wf.entryFk = b.entryFk + JOIN vn.warehouse w ON w.id = wf.warehouseFk + WHERE w.name = 'VNH' + AND b.quantity > 0 + GROUP BY sr.vmpID) sub ON o.supplier = sub.name + SET o.vnh = sub.total; + + UPDATE edi.offerList o + JOIN (SELECT v.name, COUNT(DISTINCT b.itemFk) total + FROM vn.buy b + JOIN vn.item i ON i.id = b.itemFk + JOIN edi.supplyResponse sr ON sr.ID = i.supplyResponseFk + JOIN edi.VMPSettings v ON v.VMPID = sr.vmpID + JOIN edi.warehouseFloramondo wf ON wf.entryFk = b.entryFk + JOIN vn.warehouse w ON w.id = wf.warehouseFk + WHERE w.name = 'ALGEMESI' + AND b.quantity > 0 + GROUP BY sr.vmpID) sub ON o.supplier = sub.name + SET o.algemesi = sub.total; + END IF; + + DROP TEMPORARY TABLE + edi.offer, + itemToInsert; + + SET @isTriggerDisabled = FALSE; + + COMMIT; + + -- Esto habria que pasarlo a procesos programados o trabajar con tags y dejar las familias + UPDATE vn.item i + SET typeFk = 121 + WHERE i.longName LIKE 'Rosa Garden %' + AND typeFk = 17; + + UPDATE vn.item i + SET typeFk = 156 + WHERE i.longName LIKE 'Rosa ec %' + AND typeFk = 17; + + -- Refresca las fotos de los items existentes que mostramos (prioridad baja) + INSERT IGNORE INTO vn.itemImageQueue(itemFk, url, priority) + SELECT i.id, sr.PictureReference, 100 + FROM edi.supplyResponse sr + JOIN vn.item i ON i.supplyResponseFk = sr.ID + JOIN edi.supplyOffer so ON so.srId = sr.ID + JOIN hedera.image i2 ON i2.name = i.image + AND i2.collectionFk = 'catalog' + WHERE i2.updated <= (UNIX_TIMESTAMP(util.VN_NOW()) - vDayRange) + AND sr.NumberOfUnits; + + INSERT INTO edi.`log` + SET tableName = 'floramondo_offerRefresh', + fieldName = 'Tiempo de proceso', + fieldValue = TIMEDIFF(util.VN_NOW(), vStartingTime); + + DO RELEASE_LOCK('edi.floramondo_offerRefresh'); +END$$ +DELIMITER ; diff --git a/db/routines/edi/procedures/item_freeAdd.sql b/db/routines/edi/procedures/item_freeAdd.sql new file mode 100644 index 000000000..cb572e1b1 --- /dev/null +++ b/db/routines/edi/procedures/item_freeAdd.sql @@ -0,0 +1,32 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `edi`.`item_freeAdd`() +BEGIN +/** + * Rellena la tabla item_free con los id ausentes en vn.item + * + */ + DECLARE vMaxItem INT; + + SELECT MAX(id) + INTO vMaxItem + FROM vn.item; + + DROP TEMPORARY TABLE IF EXISTS tmp.itemBusy; + CREATE TEMPORARY TABLE tmp.itemBusy + (id INT PRIMARY KEY) + SELECT i.id + FROM vn.item i + WHERE i.isFloramondo + UNION ALL + SELECT ifr.id + FROM edi.item_free ifr; + + INSERT INTO edi.item_free(id) + SELECT i.id + FROM vn.item i + LEFT JOIN tmp.itemBusy ib ON ib.id = i.id + WHERE i.isFloramondo AND ib.id is null; + + DROP TEMPORARY TABLE IF EXISTS tmp.itemBusy; +END$$ +DELIMITER ; diff --git a/db/routines/edi/procedures/item_getNewByEkt.sql b/db/routines/edi/procedures/item_getNewByEkt.sql new file mode 100644 index 000000000..a80d04817 --- /dev/null +++ b/db/routines/edi/procedures/item_getNewByEkt.sql @@ -0,0 +1,186 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `edi`.`item_getNewByEkt`(vEktFk INT, OUT vItemFk INT) +BEGIN + +/** + * Devuelve un número nuevo de item a partir de un registro de la tabla edi.ekt + * + * @param vEktFk Identificador de la tabla edi.ekt + */ + + START TRANSACTION; + + SELECT MIN(id) id INTO vItemFk + FROM edi.item_free; + + DELETE FROM edi.item_free + WHERE id = vItemFk; + + COMMIT; + + IF ISNULL(vItemFk) THEN + SELECT MAX(i.id) + 1 + INTO vItemFk + FROM vn.item i; + END IF; + + INSERT INTO vn.item(id, + `name`, + longName, + subName, + expenseFk, + typeFk, + intrastatFk, + originFk, + numberOfItemsPerCask, + embalageCode, + quality, + isFloramondo + ) + SELECT vItemFk, + e.item, + e.item, + e.item, + igto.expenseFk, + igto.itemTypeFk, + igto.intrastatFk, + igto.originFk, + e.pac, + least(IF((e.package = 800),((e.package * 10) + e.pac), e.package), IFNULL(idt.bucket_id, '999')) packageFk, + e.cat, + TRUE + FROM edi.ekt e + JOIN edi.item i ON i.id = e.`ref` + JOIN edi.item_groupToOffer igto ON igto.group_code = i.group_id + LEFT JOIN edi.item_defaultType idt ON idt.item_id = e.`ref` + WHERE e.id = vEktFk; + + SET @isTriggerDisabled = TRUE; + + INSERT INTO vn.itemTag(itemFk, tagFk, value, priority) + SELECT vItemFk, t.id , e.item , 1 + FROM edi.ekt e + JOIN vn.tag t ON t.`name` = 'Producto' + WHERE e.id = vEktFk + AND NOT ISNULL(e.item); + + INSERT INTO vn.itemTag(itemFk, tagFk, value, priority) + SELECT vItemFk, t.id , e.cat , 3 + FROM edi.ekt e + JOIN vn.tag t ON t.`name` = 'Calidad' + WHERE e.id = vEktFk + AND NOT ISNULL(e.cat); + + INSERT INTO vn.itemTag(itemFk, tagFk, value, priority) + SELECT vItemFk, t.id , s.company_name , 4 + FROM edi.ekt e + JOIN edi.supplier s ON s.supplier_id = e.pro + JOIN vn.tag t ON t.`name` = 'Productor' + WHERE e.id = vEktFk + AND NOT ISNULL(s.company_name); + + INSERT INTO vn.itemTag(itemFk, tagFk, value, priority) + SELECT vItemFk, t.id , e.s1, 5 + FROM edi.ekt e + LEFT JOIN edi.item_feature eif ON eif.item_id = e.`ref` + AND eif.presentation_order = 1 + AND eif.expiry_date IS NULL + LEFT JOIN edi.`value` ev ON ev.type_id = eif.feature + AND e.s1 = ev.type_value + JOIN vn.tag t ON t.ediTypeFk = eif.feature + WHERE e.id = vEktFk + AND NOT ISNULL(e.s1); + + INSERT INTO vn.itemTag(itemFk, tagFk, value, priority) + SELECT vItemFk, t.id , e.s2, 6 + FROM edi.ekt e + LEFT JOIN edi.item_feature eif ON eif.item_id = e.`ref` + AND eif.presentation_order = 2 + AND eif.expiry_date IS NULL + LEFT JOIN edi.`value` ev ON ev.type_id = eif.feature + AND e.s2 = ev.type_value + JOIN vn.tag t ON t.ediTypeFk = eif.feature + WHERE e.id = vEktFk + AND NOT ISNULL(e.s2); + + INSERT INTO vn.itemTag(itemFk, tagFk, value, priority) + SELECT vItemFk, t.id , e.s3, 7 + FROM edi.ekt e + LEFT JOIN edi.item_feature eif ON eif.item_id = e.`ref` + AND eif.presentation_order = 3 + AND eif.expiry_date IS NULL + LEFT JOIN edi.`value` ev ON ev.type_id = eif.feature + AND e.s3 = ev.type_value + JOIN vn.tag t ON t.ediTypeFk = eif.feature + WHERE e.id = vEktFk + AND NOT ISNULL(e.s3); + + INSERT INTO vn.itemTag(itemFk, tagFk, value, priority) + SELECT vItemFk, t.id , e.s4, 8 + FROM edi.ekt e + LEFT JOIN edi.item_feature eif ON eif.item_id = e.`ref` + AND eif.presentation_order = 4 + AND eif.expiry_date IS NULL + LEFT JOIN edi.`value` ev ON ev.type_id = eif.feature + AND e.s4 = ev.type_value + JOIN vn.tag t ON t.ediTypeFk = eif.feature + WHERE e.id = vEktFk + AND NOT ISNULL(e.s4); + + INSERT INTO vn.itemTag(itemFk, tagFk, value, priority) + SELECT vItemFk, t.id , e.s5, 9 + FROM edi.ekt e + LEFT JOIN edi.item_feature eif ON eif.item_id = e.`ref` + AND eif.presentation_order = 5 + AND eif.expiry_date IS NULL + LEFT JOIN edi.`value` ev ON ev.type_id = eif.feature + AND e.s5 = ev.type_value + JOIN vn.tag t ON t.ediTypeFk = eif.feature + WHERE e.id = vEktFk + AND NOT ISNULL(e.s5); + + INSERT INTO vn.itemTag(itemFk, tagFk, value, priority) + SELECT vItemFk, t.id , e.s6, 10 + FROM edi.ekt e + LEFT JOIN edi.item_feature eif ON eif.item_id = e.`ref` + AND eif.presentation_order = 6 + AND eif.expiry_date IS NULL + LEFT JOIN edi.`value` ev ON ev.type_id = eif.feature + AND e.s6 = ev.type_value + JOIN vn.tag t ON t.ediTypeFk = eif.feature + WHERE e.id = vEktFk + AND NOT ISNULL(e.s6); + + INSERT INTO vn.itemTag(itemFk, tagFk, value, priority) + SELECT vItemFk, t.id, IFNULL(ink.name, ik.color), 11 + FROM edi.ekt e + JOIN vn.tag t ON t.`name` = 'Color' + LEFT JOIN edi.feature f ON f.item_id = e.`ref` + LEFT JOIN edi.`type` tp ON tp.type_id = f.feature_type_id AND tp.`description` = 'Hoofdkleur 1' + LEFT JOIN vn.ink ON ink.dutchCode = f.feature_value + LEFT JOIN vn.itemInk ik ON ik.longName = e.item + WHERE e.id = vEktFk + AND ( ink.name IS NOT NULL + OR ik.color IS NOT NULL) + LIMIT 1; + + DROP TABLE IF EXISTS tmp.item; + + CREATE TABLE tmp.item + (PRIMARY KEY (id)) + SELECT vItemFk id ; + + CALL vn.item_refreshTags(); + + SET @isTriggerDisabled = FALSE; + + INSERT IGNORE INTO vn.itemImageQueue(itemFk, url) + SELECT vItemFk, sr.PictureReference + FROM edi.ekt e + JOIN edi.supplyResponse sr ON e.ref = sr.Item_ArticleCode + WHERE e.id = vEktFk + AND NOT sr.PictureReference IS NULL + ORDER BY sr.created DESC + LIMIT 1; +END$$ +DELIMITER ; diff --git a/db/routines/edi/procedures/mail_new.sql b/db/routines/edi/procedures/mail_new.sql new file mode 100644 index 000000000..7bbf3f5cf --- /dev/null +++ b/db/routines/edi/procedures/mail_new.sql @@ -0,0 +1,40 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `edi`.`mail_new`( + vMessageId VARCHAR(100) + ,vSender VARCHAR(150) + ,OUT vSelf INT +) +BEGIN +/** + * Registers a mail message. + * + * @param vMessageId Message-ID of email + * @param vSender Id of mail sender + * @param vSelf The created message id + */ + DECLARE vSenderId INT; + DECLARE vIsDuplicated BOOL; + DECLARE duplicateKey CONDITION FOR 1062; + + DECLARE CONTINUE HANDLER FOR duplicateKey + SET vIsDuplicated = TRUE; + + SELECT id INTO vSenderId + FROM mailSender + WHERE mail = vSender; + + SET vIsDuplicated = FALSE; + INSERT INTO mail SET + sender = vSender, + senderFk = vSenderId, + messageId = vMessageId; + + IF vIsDuplicated THEN + SELECT id INTO vSelf + FROM mail + WHERE messageId = vMessageId; + ELSE + SET vSelf = LAST_INSERT_ID(); + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/edi/triggers/item_feature_beforeInsert.sql b/db/routines/edi/triggers/item_feature_beforeInsert.sql new file mode 100644 index 000000000..4e3e9cc0e --- /dev/null +++ b/db/routines/edi/triggers/item_feature_beforeInsert.sql @@ -0,0 +1,10 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `edi`.`item_feature_beforeInsert` + BEFORE INSERT ON `item_feature` + FOR EACH ROW +BEGIN + IF NEW.expiry_date = '0000-00-00' THEN + SET NEW.expiry_date = NULL; + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/edi/triggers/putOrder_afterUpdate.sql b/db/routines/edi/triggers/putOrder_afterUpdate.sql new file mode 100644 index 000000000..b56ae4c66 --- /dev/null +++ b/db/routines/edi/triggers/putOrder_afterUpdate.sql @@ -0,0 +1,75 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `edi`.`putOrder_afterUpdate` + AFTER UPDATE ON `putOrder` + FOR EACH ROW +BEGIN + DECLARE vSaleFk INT; + DECLARE vOrderStatusDenied INT DEFAULT 3; + DECLARE vOrderStatusOK INT DEFAULT 2; + DECLARE vIsEktSender BOOLEAN; + + IF NEW.OrderStatus = vOrderStatusDenied AND NOT (NEW.OrderStatus <=> OLD.OrderStatus) THEN + + SELECT s.id INTO vSaleFk + FROM vn.sale s + JOIN vn.ticket t ON s.ticketFk = t.id + JOIN vn.item i ON i.id = s.itemFk + JOIN deliveryInformation di ON di.ID = NEW.deliveryInformationID + WHERE t.clientFk = NEW.EndUserPartyGLN AND t.shipped >= util.VN_CURDATE() + AND i.supplyResponseFk = NEW.supplyResponseID + LIMIT 1; + + UPDATE vn.sale s + JOIN vn.ticket t ON s.ticketFk = t.id + JOIN vn.item i ON i.id = s.itemFk + JOIN deliveryInformation di ON di.ID = NEW.deliveryInformationID + SET s.quantity = 0 + WHERE t.clientFk = NEW.EndUserPartyGLN AND t.shipped >= util.VN_CURDATE() + AND i.supplyResponseFk = NEW.supplyResponseID; + + INSERT INTO vn.mail (sender, `subject`, body) + SELECT IF(u.id IS NOT NULL AND c.email IS NOT NULL, + c.email, + CONCAT(account.user_getNameFromId(c.salesPersonFk), '@verdnatura.es') + ), + 'Producto no disponible en Floramondo', + CONCAT('El artículo ', s.concept, ' del ticket ', t.id , ' ha sido cancelado por Floramondo. ', + ' Se ha actualizado la cantidad de ', OLD.quantity,' a 0. ', + IF (u.id IS NOT NULL AND c.email IS NOT NULL , + CONCAT('https://shop.verdnatura.es/#!form=ecomerce%2Fticket&ticket=', t.id ), + CONCAT('https://salix.verdnatura.es/#!/ticket/', t.id ,'/summary'))) + FROM vn.sale s + JOIN vn.ticket t ON t.id = s.ticketFk + JOIN vn.`client` c ON c.id = t.clientFk + LEFT JOIN account.user u ON u.id= c.salesPersonFk AND u.name IN ('ruben', 'ismaelalcolea') + WHERE s.id = vSaleFk; + + END IF; + + + IF NEW.OrderStatus = vOrderStatusOK AND NOT (NEW.OrderStatus <=> OLD.OrderStatus) THEN + + SELECT v.isEktSender INTO vIsEktSender + FROM edi.VMPSettings v + JOIN edi.supplyResponse sr ON sr.vmpID = v.VMPID + WHERE sr.id = NEW.supplyResponseID; + + IF NOT vIsEktSender THEN + + CALL edi.ekt_add(NEW.id); + + END IF; + + IF NEW.barcode THEN + + INSERT IGNORE INTO vn.itemBarcode(itemFk, code) + SELECT i.id, NEW.barcode + FROM vn.item i + WHERE i.supplyResponseFk = NEW.supplyResponseID; + + END IF; + + END IF; + +END$$ +DELIMITER ; diff --git a/db/routines/edi/triggers/putOrder_beforeInsert.sql b/db/routines/edi/triggers/putOrder_beforeInsert.sql new file mode 100644 index 000000000..beddd191c --- /dev/null +++ b/db/routines/edi/triggers/putOrder_beforeInsert.sql @@ -0,0 +1,14 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `edi`.`putOrder_beforeInsert` + BEFORE INSERT ON `putOrder` + FOR EACH ROW +BEGIN + + DECLARE nextID INT; + + SELECT 1 + MAX(id) INTO nextID FROM putOrder ; + + SET NEW.orderTradelineItemID = nextID; + +END$$ +DELIMITER ; diff --git a/db/routines/edi/triggers/putOrder_beforeUpdate.sql b/db/routines/edi/triggers/putOrder_beforeUpdate.sql new file mode 100644 index 000000000..f18b77a0c --- /dev/null +++ b/db/routines/edi/triggers/putOrder_beforeUpdate.sql @@ -0,0 +1,38 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `edi`.`putOrder_beforeUpdate` + BEFORE UPDATE ON `putOrder` + FOR EACH ROW +BEGIN + + DECLARE vError VARCHAR(100) DEFAULT 'Orderregel niet meer teruggevonden op basis van de orderps'; + DECLARE vVmpIdError INT DEFAULT 7; + DECLARE vVmpFk INT; + DECLARE vSupplyResponseNumberOfUnits INT; + + SELECT sr.vmpID INTO vVmpFk + FROM edi.supplyResponse sr + WHERE sr.id = NEW.supplyResponseID; + + IF NEW.OrderStatus = 3 + AND NOT (NEW.OrderStatus <=> OLD.OrderStatus) + AND NEW.error = vError + AND vVmpFk = vVmpIdError + + THEN + + SET NEW.OrderStatus = 2; + + END IF; + + -- Error de disponible menor de lo solicitado + IF NEW.error LIKE 'error2602%' THEN + + SELECT NumberOfUnits INTO vSupplyResponseNumberOfUnits + FROM edi.supplyResponse sr + WHERE sr.ID = NEW.supplyResponseID; + + SET NEW.error = CONCAT('(',vSupplyResponseNumberOfUnits,') ', NEW.error); + + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/edi/triggers/supplyResponse_afterUpdate.sql b/db/routines/edi/triggers/supplyResponse_afterUpdate.sql new file mode 100644 index 000000000..389ef9f1c --- /dev/null +++ b/db/routines/edi/triggers/supplyResponse_afterUpdate.sql @@ -0,0 +1,21 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `edi`.`supplyResponse_afterUpdate` + AFTER UPDATE ON `supplyResponse` + FOR EACH ROW +BEGIN + + UPDATE vn.buy b + JOIN vn.entry e ON e.id = b.entryFk + JOIN vn.travel tr ON tr.id = e.travelFk + JOIN vn.agencyMode am ON am.id = tr.agencyModeFk + JOIN vn.item i ON i.id = b.itemFk + JOIN edi.supplyResponse sr ON i.supplyResponseFk = sr.ID + SET b.quantity = NEW.NumberOfItemsPerCask * NEW.NumberOfUnits, + b.stickers = NEW.NumberOfUnits + WHERE i.supplyResponseFk = NEW.ID + AND am.name = 'LOGIFLORA' + AND e.isRaid + AND tr.landed >= util.VN_CURDATE(); + +END$$ +DELIMITER ; diff --git a/db/routines/edi/views/ektK2.sql b/db/routines/edi/views/ektK2.sql new file mode 100644 index 000000000..299d26b01 --- /dev/null +++ b/db/routines/edi/views/ektK2.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `edi`.`ektK2` +AS SELECT `eek`.`id` AS `id`, + `eek`.`description` AS `description` +FROM `edi`.`ektK1` `eek` diff --git a/db/routines/edi/views/ektRecent.sql b/db/routines/edi/views/ektRecent.sql new file mode 100644 index 000000000..3e41490ab --- /dev/null +++ b/db/routines/edi/views/ektRecent.sql @@ -0,0 +1,57 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `edi`.`ektRecent` +AS SELECT `e`.`id` AS `id`, + `e`.`barcode` AS `barcode`, + `e`.`entryYear` AS `entryYear`, + `e`.`batchNumber` AS `batchNumber`, + `e`.`deliveryNumber` AS `deliveryNumber`, + `e`.`vendorOrderNumber` AS `vendorOrderNumber`, + `e`.`fec` AS `fec`, + `e`.`hor` AS `hor`, + `e`.`now` AS `now`, + `e`.`ptj` AS `ptj`, + `e`.`ref` AS `ref`, + `e`.`item` AS `item`, + `e`.`pac` AS `pac`, + `e`.`qty` AS `qty`, + `e`.`ori` AS `ori`, + `e`.`cat` AS `cat`, + `e`.`agj` AS `agj`, + `e`.`kop` AS `kop`, + `e`.`ptd` AS `ptd`, + `e`.`sub` AS `sub`, + `e`.`pro` AS `pro`, + `e`.`pri` AS `pri`, + `e`.`package` AS `package`, + `e`.`auction` AS `auction`, + `e`.`klo` AS `klo`, + `e`.`k1` AS `k1`, + `e`.`k2` AS `k2`, + `e`.`k3` AS `k3`, + `e`.`k4` AS `k4`, + `e`.`s1` AS `s1`, + `e`.`s2` AS `s2`, + `e`.`s3` AS `s3`, + `e`.`s4` AS `s4`, + `e`.`s5` AS `s5`, + `e`.`s6` AS `s6`, + `e`.`ok` AS `ok`, + `e`.`trolleyFk` AS `trolleyFk`, + `e`.`putOrderFk` AS `putOrderFk`, + `e`.`scanned` AS `scanned`, + `e`.`cps` AS `cps`, + `e`.`dp` AS `dp`, + `e`.`sender` AS `sender`, + `ec`.`usefulAuctionLeftSegmentLength` AS `usefulAuctionLeftSegmentLength`, + `ec`.`standardBarcodeLength` AS `standardBarcodeLength`, + `ec`.`floridayBarcodeLength` AS `floridayBarcodeLength`, + `ec`.`floramondoBarcodeLength` AS `floramondoBarcodeLength`, + `ec`.`defaultKlo` AS `defaultKlo`, + `ec`.`ektRecentScopeDays` AS `ektRecentScopeDays` +FROM ( + `edi`.`ekt` `e` + JOIN `edi`.`ektConfig` `ec` + ) +WHERE `e`.`entryYear` = year(`util`.`VN_CURDATE`()) + AND `e`.`fec` >= `util`.`VN_CURDATE`() + INTERVAL - `ec`.`ektRecentScopeDays` DAY diff --git a/db/routines/edi/views/errorList.sql b/db/routines/edi/views/errorList.sql new file mode 100644 index 000000000..4e7cbc840 --- /dev/null +++ b/db/routines/edi/views/errorList.sql @@ -0,0 +1,23 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `edi`.`errorList` +AS SELECT `po`.`id` AS `id`, + `c`.`name` AS `name`, + `i`.`longName` AS `longName`, + `po`.`quantity` AS `quantity`, + left(`po`.`error`, 4) AS `stock`, + `po`.`error` AS `error`, + `po`.`deliveryInformationID` AS `deliveryInformationID`, + `po`.`supplyResponseID` AS `supplyResponseID`, + `po`.`OrderTradeLineDateTime` AS `OrderTradeLineDateTime`, + `po`.`EndUserPartyGLN` AS `EndUserPartyGLN` +FROM ( + ( + `edi`.`putOrder` `po` + LEFT JOIN `vn`.`client` `c` ON(`c`.`id` = `po`.`EndUserPartyGLN`) + ) + LEFT JOIN `vn`.`item` `i` ON(`i`.`supplyResponseFk` = `po`.`supplyResponseID`) + ) +WHERE `po`.`OrderTradeLineDateTime` > `util`.`VN_CURDATE`() + INTERVAL -12 HOUR + AND `po`.`OrderStatus` = 3 + AND left(`po`.`error`, 4) <> '(0) ' diff --git a/db/routines/edi/views/supplyOffer.sql b/db/routines/edi/views/supplyOffer.sql new file mode 100644 index 000000000..c4a8582a1 --- /dev/null +++ b/db/routines/edi/views/supplyOffer.sql @@ -0,0 +1,113 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `edi`.`supplyOffer` +AS SELECT `sr`.`vmpID` AS `vmpID`, + `di`.`ID` AS `diId`, + `sr`.`ID` AS `srId`, + `sr`.`Item_ArticleCode` AS `Item_ArticleCode`, + `sr`.`VBNOmschrijving` AS `product_name`, + `s`.`company_name` AS `company_name`, + cast(`sr`.`Price` AS decimal(10, 3)) AS `Price`, + `sr`.`Quality` AS `Quality`, + `sr`.`s1` AS `s1`, + `sr`.`s2` AS `s2`, + `sr`.`s3` AS `s3`, + `sr`.`s4` AS `s4`, + `sr`.`s5` AS `s5`, + `sr`.`s6` AS `s6`, + `sr`.`NumberOfUnits` AS `NumberOfUnits`, + least( + IF( + `sr`.`EmbalageCode` = 800, + `sr`.`EmbalageCode` * 10 + `sr`.`NumberOfItemsPerCask`, + `sr`.`EmbalageCode` + ), + IFNULL(`idt`.`bucket_id`, '999') + ) AS `EmbalageCode`, + `di`.`LatestDeliveryDateTime` AS `LatestDeliveryDateTime`, + `di`.`EarliestDespatchDateTime` AS `EarliestDespatchDateTime`, + `di`.`FirstOrderDateTime` AS `FirstOrderDateTime`, + `di`.`LatestOrderDateTime` AS `LatestOrderDateTime`, + `sr`.`NumberOfItemsPerCask` AS `NumberOfItemsPerCask`, + `sr`.`NumberOfLayersPerTrolley` AS `NumberOfLayersPerTrolley`, + `sr`.`MinimumNumberToOrder` AS `MinimumNumberToOrder`, + `sr`.`MaximumNumberToOrder` AS `MaximumNumberToOrder`, + `sr`.`IncrementalOrderableQuantity` AS `IncrementalOrderableQuantity`, + `sr`.`PackingPrice` AS `PackingPrice`, + `sr`.`MarketPlaceID` AS `MarketPlaceID`, + `sr`.`PictureReference` AS `PictureReference`, + `sr`.`updated` AS `supplyResponseUpdated`, + `i`.`group_id` AS `group_id`, + `mp`.`name` AS `marketPlace`, + `di`.`DeliveryPrice` AS `DeliveryPrice`, + `di`.`ChargeAmount` AS `ChargeAmount`, + `di`.`MinimumQuantity` AS `MinimumQuantity`, + `di`.`MaximumQuantity Integer` AS `MaximumQuantity`, + cast( + `sr`.`MinimumNumberToOrder` * CASE + `sr`.`MinimumOrderUnitType` + WHEN 1 THEN 1 + WHEN 2 THEN `sr`.`NumberOfItemsPerCask` / `sr`.`NumberBunchesPerCask` + WHEN 3 THEN `sr`.`NumberOfItemsPerCask` + WHEN 4 THEN floor(128 * 56 / (`b`.`x_size` * `b`.`y_size`)) * `sr`.`NumberOfItemsPerCask` + WHEN 5 THEN floor(128 * 56 / (`b`.`x_size` * `b`.`y_size`)) * `sr`.`NumberOfItemsPerCask` * `sr`.`NumberOfLayersPerTrolley` + END AS decimal(10, 0) + ) AS `OrderUnit`, + cast( + `sr`.`IncrementalOrderableQuantity` * CASE + `sr`.`IncrementalOrderableQuantityType` + WHEN 1 THEN 1 + WHEN 2 THEN `sr`.`NumberOfItemsPerCask` / `sr`.`NumberBunchesPerCask` + WHEN 3 THEN `sr`.`NumberOfItemsPerCask` + WHEN 4 THEN floor(128 * 56 / (`b`.`x_size` * `b`.`y_size`)) * `sr`.`NumberOfItemsPerCask` + WHEN 5 THEN floor(128 * 56 / (`b`.`x_size` * `b`.`y_size`)) * `sr`.`NumberOfItemsPerCask` * `sr`.`NumberOfLayersPerTrolley` + END AS decimal(10, 0) + ) AS `IncrementalOrderUnit`, + `mp`.`isEarlyBird` AS `isEarlyBird`, + `v`.`isVNHSupplier` AS `isVNHSupplier`, + `igo`.`expenseFk` AS `expenseFk`, + `igo`.`intrastatFk` AS `intrastatFk`, + `igo`.`originFk` AS `originFk`, + IFNULL(`idt`.`itemTypeFk`, `igo`.`itemTypeFk`) AS `itemTypeFk` +FROM ( + ( + ( + ( + ( + ( + ( + ( + ( + `edi`.`deliveryInformation` `di` + JOIN `edi`.`supplyResponse` `sr` ON(`sr`.`ID` = `di`.`supplyResponseID`) + ) + LEFT JOIN `edi`.`supplier` `s` ON(`s`.`glnAddressCode` = `sr`.`SupplierGLN`) + ) + JOIN `edi`.`bucket` `b` ON(`b`.`bucket_id` = `sr`.`EmbalageCode`) + ) + JOIN `edi`.`item` `i` ON(`i`.`id` = `sr`.`Item_ArticleCode`) + ) + JOIN `edi`.`marketPlace` `mp` ON(`mp`.`id` = `sr`.`MarketPlaceID`) + ) + JOIN `vn`.`floramondoConfig` `fm` + ) + LEFT JOIN `edi`.`item_defaultType` `idt` ON(`idt`.`item_id` = `i`.`id`) + ) + JOIN `edi`.`VMPSettings` `v` ON(`v`.`VMPID` = `sr`.`vmpID`) + ) + JOIN `edi`.`item_groupToOffer` `igo` ON(`igo`.`group_code` = `i`.`group_id`) + ) +WHERE `v`.`isBlocked` = 0 + AND `s`.`isBanned` = 0 + AND `sr`.`NumberOfUnits` > 0 + AND CURRENT_TIMESTAMP() BETWEEN `di`.`FirstOrderDateTime` AND `di`.`LatestOrderDateTime` + AND `mp`.`isOffered` = 1 + AND `di`.`LatestDeliveryDateTime` BETWEEN cast(`fm`.`nextLanded` AS date) + AND concat( + cast(`fm`.`nextLanded` AS date), + ' ', + `fm`.`MaxLatestDeliveryHour` + ) + AND `sr`.`NumberOfItemsPerCask` > 1 +GROUP BY `sr`.`ID` +HAVING `EmbalageCode` <> 999 diff --git a/db/routines/floranet/events/clean.sql b/db/routines/floranet/events/clean.sql new file mode 100644 index 000000000..4477112fd --- /dev/null +++ b/db/routines/floranet/events/clean.sql @@ -0,0 +1,22 @@ +DELIMITER $$ +CREATE OR REPLACE + DEFINER=`root`@`localhost` + EVENT `floranet`.`clean` + ON SCHEDULE EVERY 1 DAY + STARTS '2024-01-01 23:00:00.000' + ON COMPLETION PRESERVE + ENABLE +DO +BEGIN + DELETE + FROM `order` + WHERE created < CURDATE() + AND isPaid = FALSE; + + DELETE c.* + FROM catalogue c + LEFT JOIN `order` o ON o.catalogueFk = c.id + WHERE c.created < CURDATE() + AND o.id IS NULL; +END$$ +DELIMITER ; \ No newline at end of file diff --git a/db/routines/floranet/procedures/catalogue_get.sql b/db/routines/floranet/procedures/catalogue_get.sql new file mode 100644 index 000000000..b6ec61522 --- /dev/null +++ b/db/routines/floranet/procedures/catalogue_get.sql @@ -0,0 +1,52 @@ +DROP PROCEDURE IF EXISTS floranet.catalogue_get; + +DELIMITER $$ +$$ +CREATE DEFINER=`root`@`localhost` PROCEDURE floranet.catalogue_get(vLanded DATE, vPostalCode VARCHAR(15)) +READS SQL DATA +BEGIN +/** + * Returns list, price and all the stuff regarding the floranet items + * + * @param vLanded Delivery date + * @param vPostalCode Delivery address postal code + */ + DECLARE vLastCatalogueFk INT; + + START TRANSACTION; + + SELECT * FROM catalogue FOR UPDATE; + + SELECT MAX(id) INTO vLastCatalogueFk + FROM catalogue; + + INSERT INTO catalogue( + name, + price, + itemFk, + dated, + postalCode, + `type`, + image, + description + ) + SELECT i.name, + i.`size`, + i.id, + vLanded, + vPostalCode, + it.name, + CONCAT('https://cdn.verdnatura.es/image/catalog/1600x900/', i.image), + i.description + FROM vn.item i + JOIN vn.itemType it ON it.id = i.typeFk + WHERE it.code IN ('FNR','FNP'); + + SELECT * + FROM catalogue + WHERE id > IFNULL(vLastCatalogueFk,0); + + COMMIT; + +END$$ +DELIMITER ; diff --git a/db/routines/floranet/procedures/contact_request.sql b/db/routines/floranet/procedures/contact_request.sql new file mode 100644 index 000000000..044c22c6f --- /dev/null +++ b/db/routines/floranet/procedures/contact_request.sql @@ -0,0 +1,20 @@ +DROP PROCEDURE IF EXISTS floranet.contact_request; + +DELIMITER $$ +$$ +CREATE DEFINER=`root`@`localhost` +PROCEDURE floranet.contact_request( + vName VARCHAR(100), + vPhone VARCHAR(15), + vEmail VARCHAR(100), + vMessage TEXT) +READS SQL DATA +BEGIN +/** + * Set actions for contact request. + * + * @param vPostalCode Delivery address postal code + */ + +END$$ +DELIMITER ; \ No newline at end of file diff --git a/db/routines/floranet/procedures/deliveryDate_get.sql b/db/routines/floranet/procedures/deliveryDate_get.sql new file mode 100644 index 000000000..29751ebe4 --- /dev/null +++ b/db/routines/floranet/procedures/deliveryDate_get.sql @@ -0,0 +1,29 @@ +DROP PROCEDURE IF EXISTS floranet.deliveryDate_get; + +DELIMITER $$ +$$ +CREATE DEFINER=`root`@`localhost` PROCEDURE `floranet`.`deliveryDate_get`(vPostalCode VARCHAR(15)) + READS SQL DATA +BEGIN +/** + * Returns available dates for this postalCode, in the next seven days + * + * @param vPostalCode Delivery address postal code + */ + DECLARE vCurrentDayOfWeek INT; + + SET vCurrentDayOfWeek = DAYOFWEEK(NOW()); + + SELECT DISTINCT nextDay + FROM ( + SELECT CURDATE() + INTERVAL IF( + apc.dayOfWeek >= vCurrentDayOfWeek, + apc.dayOfWeek - vCurrentDayOfWeek, + 7 - apc.dayOfWeek + ) DAY nextDay, + NOW() + INTERVAL apc.hoursInAdvance - 12 HOUR minDeliveryTime + FROM addressPostCode apc + WHERE apc.postCode = vPostalCode + HAVING nextDay > minDeliveryTime) sub; +END$$ +DELIMITER ; \ No newline at end of file diff --git a/db/routines/floranet/procedures/order_confirm.sql b/db/routines/floranet/procedures/order_confirm.sql new file mode 100644 index 000000000..fed123663 --- /dev/null +++ b/db/routines/floranet/procedures/order_confirm.sql @@ -0,0 +1,25 @@ +DROP PROCEDURE IF EXISTS floranet.order_confirm; + +DELIMITER $$ +$$ + +CREATE DEFINER=`root`@`localhost`PROCEDURE floranet.order_confirm(vCatalogueFk INT) +READS SQL DATA + +BEGIN +/** Update order.isPaid field + * + * @param vCatalogueFk floranet.catalogue.id + * + * @returns floranet.order.isPaid + */ + UPDATE `order` + SET isPaid = TRUE, + payed = NOW() + WHERE catalogueFk = vCatalogueFk; + + SELECT isPaid + FROM `order` + WHERE catalogueFk = vCatalogueFk; +END$$ +DELIMITER ; \ No newline at end of file diff --git a/db/routines/floranet/procedures/order_put.sql b/db/routines/floranet/procedures/order_put.sql new file mode 100644 index 000000000..c26cef19a --- /dev/null +++ b/db/routines/floranet/procedures/order_put.sql @@ -0,0 +1,42 @@ +DROP PROCEDURE IF EXISTS floranet.order_put; + +DELIMITER $$ +$$ +CREATE DEFINER=`root`@`localhost` PROCEDURE floranet.order_put(vOrder JSON) +READS SQL DATA +BEGIN +/** + * Get and process an order + * + * @param vOrder Data of the order + * + * Customer data:
| type | +', REPLACE(vFields, ',', ' | ') ,' + |
|---|
| Id Cola | \n\t\t\t\t\t\tRuta Impresora | \n\t\t\t\t\t\tInforme | \n\t\t\t\t\t\tEstado | \n\t\t\t\t\t\tTrabajador | \n\t\t\t\t\t\tError | \n\t\t\t\t\t
+
+
+
+
+
+ ')
+ FROM tmp.reportHours rh
+ JOIN account.emailUser eu ON rh.id = eu.userFk
+ GROUP BY rh.id;
+
+ DROP TEMPORARY TABLE tmp.timeControlCalculate;
+ DROP TEMPORARY TABLE tmp.timeBusinessCalculate;
+ DROP TEMPORARY TABLE tmp.reportHours;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/workerTimeControl_sendMailByDepartmentLauncher.sql b/db/routines/vn/procedures/workerTimeControl_sendMailByDepartmentLauncher.sql
new file mode 100644
index 000000000..406bb8d8d
--- /dev/null
+++ b/db/routines/vn/procedures/workerTimeControl_sendMailByDepartmentLauncher.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`workerTimeControl_sendMailByDepartmentLauncher`()
+BEGIN
+ DECLARE vDatedFrom, vDatedTo DATETIME;
+
+ IF (DAYNAME(util.VN_CURDATE()) = 'miércoles') THEN
+ SELECT DATE_SUB(util.VN_CURDATE(), INTERVAL 9 DAY), CONCAT(DATE_SUB(util.VN_CURDATE(), INTERVAL 3 DAY), ' 23:59:59') INTO vDatedFrom, vDatedTo;
+
+ CALL vn.workerTimeControl_sendMailByDepartment(vDatedFrom, vDatedTo, NULL);
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/workerTimeControl_weekCheckBreak.sql b/db/routines/vn/procedures/workerTimeControl_weekCheckBreak.sql
new file mode 100644
index 000000000..70ef3da07
--- /dev/null
+++ b/db/routines/vn/procedures/workerTimeControl_weekCheckBreak.sql
@@ -0,0 +1,36 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`workerTimeControl_weekCheckBreak`(vStarted DATE, vEnded DATE)
+BEGIN
+/**
+ * Retorna los trabajadores que no han respetado el descanso semanal de 36/72 horas
+ * El sistema verificará el descanso corto en la siguiente semana
+ * o el largo en las 2 siguientes semanas a partir de las fechas dadas
+ * @param vStarted día inicio para verificar
+ * @param vEnded día final para verificar
+ * @return tmp.workerWithoutWeekBreak (workerFk)
+ */
+ DECLARE vDone INT DEFAULT FALSE;
+
+ IF(vStarted > vEnded) then
+ CALL util.throw ('Date end can not be greater then start');
+ END IF;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.workerWithoutWeekBreakInWeek;
+ CREATE TEMPORARY TABLE tmp.workerWithoutWeekBreakInWeek
+ (workerFk INT,
+ PRIMARY KEY(workerFk))
+ ENGINE = MEMORY;
+
+
+ WHILE vStarted <= vEnded DO
+
+ CALL workerTimeControl_checkBreak(vStarted);
+ INSERT IGNORE INTO tmp.workerWithoutWeekBreakInWeek
+ SELECT workerFk
+ FROM tmp.workerWithoutWeekBreak;
+ DROP TEMPORARY TABLE IF EXISTS tmp.workerWithoutWeekBreak;
+ SET vStarted = DATE_ADD(vStarted, INTERVAL 1 DAY);
+
+ END WHILE;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/workerWeekControl.sql b/db/routines/vn/procedures/workerWeekControl.sql
new file mode 100644
index 000000000..8001d8d3a
--- /dev/null
+++ b/db/routines/vn/procedures/workerWeekControl.sql
@@ -0,0 +1,133 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`workerWeekControl`(vUserFk INT, vDated DATE, vTabletFk VARCHAR(100))
+BEGIN
+/*
+* Devuelve la cantidad de descansos de 12h y de 36 horas que ha disfrutado el trabajador
+* en la semana inmediatamente anterior a la fecha que pasa como parámetro.
+* UPDATED PAK 2019/09/02
+* PENDING REVIEW
+*/
+ DECLARE vDescansos12h INT;
+ DECLARE vDescansos36h INT;
+ DECLARE vJornadas INT;
+ DECLARE vImpares INT;
+ DECLARE vHasSignedToday BOOLEAN;
+ DECLARE v12hoursInMinutes INT DEFAULT 719;
+ DECLARE v36hoursInMinutes INT DEFAULT 2159;
+ DECLARE vCantWork VARCHAR(50) DEFAULT '';
+ DECLARE vDepartmentFk INT;
+ DECLARE isEnabled BOOLEAN DEFAULT TRUE;
+
+ SELECT COUNT(*) INTO vHasSignedToday
+ FROM workerTimeControl WHERE timed >= vDated AND userFk = vUserFk;
+
+ SET @day := 0;
+ SET @lastTimed := util.VN_NOW();
+
+ SELECT SUM(IF(interval_in_minutes >= v12hoursInMinutes,1,0)), SUM(FLOOR(interval_in_minutes/ v36hoursInMinutes)) , SUM(jornadas)
+ INTO vDescansos12h, vDescansos36h, vJornadas
+ FROM
+ (
+ SELECT fichada_anterior, fichada_actual, interval_in_minutes, jornadas
+ FROM
+ (
+ SELECT @lastTimed fichada_anterior,
+ timed,
+ CAST(time_to_sec(timediff(timed,@lastTimed )) / 60 AS UNSIGNED) as interval_in_minutes,
+ IF(day(timed) != @day, 1, 0) as jornadas,
+ @day := day(timed) dia_del_mes,
+ @lastTimed := timed fichada_actual
+ FROM
+ (
+ SELECT day(timed) as dayNumber, dayname(timed) as dayName, timed
+ FROM
+ (SELECT TIMESTAMPADD(DAY, -11, util.VN_NOW()) as timed, vUserFk as userFk -- Fichada virtual para los en los que no se ha trabajado la semana anterior
+ UNION ALL
+ SELECT timed, userFk
+ FROM vn.workerTimeControl wtc
+ WHERE userFk = vUserFk
+ AND timed >= TIMESTAMPADD(DAY, -10,vDated)
+ UNION ALL
+ SELECT IF(vHasSignedToday, '2000-01-01 00:00', util.VN_NOW()) as timed, vUserFk
+ ) sub4
+ ORDER BY timed
+ ) sub
+
+ ) sub2
+ WHERE fichada_actual >= TIMESTAMPADD(WEEK, -1, vDated)
+ ) sub3 ;
+
+ SELECT IFNULL(SUM(impar),0) into vImpares
+ FROM (
+ SELECT day(timed) as dayNumber,
+ count(*) mod 2 as impar
+ FROM vn.workerTimeControl wtc
+ WHERE userFk = vUserFk
+ AND timed >= TIMESTAMPADD(WEEK, -1,vDated) AND timed < vDated
+ GROUP BY dayNumber
+ ) sub;
+
+ -- Vacaciones
+ SELECT at2.name INTO vCantWork
+ FROM calendar c
+ JOIN business b ON b.id = c.businessFk
+ JOIN absenceType at2 ON at2.id = c.dayOffTypeFk
+ WHERE c.dated = util.VN_CURDATE()
+ AND at2.isAllowedToWork = FALSE
+ AND b.workerFk = vUserFk
+ LIMIT 1;
+
+ -- Contrato en vigor
+ SELECT IF(COUNT(*),vCantWork,'Sin contrato') INTO vCantWork
+ FROM business b
+ WHERE b.workerFk = vUserFk
+ AND b.started <= vDated
+ AND IFNULL(b.ended, vDated) >= vDated;
+
+ -- Departamento si vTabletFk es 0 no hacemos comprobacion (Madrid y Vilassar)
+ IF vTabletFk <> '0' THEN
+ -- 1 Obtener el departamento del usuario
+ SELECT wtcu.departmentFk INTO vDepartmentFk
+ FROM workerTimeControlUserInfo wtcu
+ WHERE wtcu.userFk = vUserFk;
+ -- 2 Comprobar si la tablet pertenece al departamento
+ SELECT COUNT(td.tabletFk) INTO isEnabled
+ FROM tabletDepartment td
+ WHERE td.tabletFk = vTabletFk AND td.departmentFk = vDepartmentFk;
+
+ END IF;
+
+ IF vJornadas IS NOT NULL THEN
+
+ SELECT 'Jornadas' as Item, vJornadas as Cantidad, 'Correcto' AS Análisis
+ UNION ALL
+ SELECT 'Descansos 12 h' as Item, vDescansos12h as Cantidad, IF(vDescansos12h >= vJornadas, 'Correcto','Error: 1 por jornada') as Análisis
+ UNION ALL
+ SELECT 'Descansos 36 h' as Item, vDescansos36h as Cantidad, IF(vDescansos36h / 2 >= FLOOR(vJornadas/10), 'Correcto','Error: mínimo 2 cada 14 dias') as Análisis
+ UNION ALL
+ SELECT 'Dias con fichadas impares' as Item, vImpares as Cantidad, IF(vImpares = 0, 'Correcto','Error') as Análisis
+ UNION ALL
+ SELECT IF (LENGTH(vCantWork),CONCAT('Dia no laborable: ', vCantWork),'Dia laborable') as Item,
+ '' as Cantidad,
+ IF(LENGTH(vCantWork),'Error', 'Correcto') as Análisis
+ UNION ALL
+ SELECT 'El fichador no pertenece a tu departamento.' as Item, '' as Cantidad, IF(isEnabled, 'Correcto','Error') as Análisis;
+
+ ELSE
+
+ SELECT 'Jornadas' as Item, vJornadas as Cantidad, 'Correcto' AS Análisis
+ UNION ALL
+ SELECT 'Descansos 12 h' as Item, vDescansos12h as Cantidad, 'Correcto' as Análisis
+ UNION ALL
+ SELECT 'Descansos 36 h' as Item, vDescansos36h as Cantidad, 'Correcto' as Análisis
+ UNION ALL
+ SELECT 'Dias con fichadas impares' as Item, vImpares as Cantidad, 'Correcto' as Análisis
+ UNION ALL
+ SELECT IF (LENGTH(vCantWork),CONCAT('Dia no laborable: ', vCantWork),'Dia laborable') as Item,
+ '' as Cantidad, IF(LENGTH(vCantWork),'Error', 'Correcto') as Análisis
+ UNION ALL
+ SELECT 'El fichador no pertenece a tu departamento.' as Item, '' as Cantidad, IF(isEnabled, 'Correcto','Error') as Análisis;
+
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/worker_getFromHasMistake.sql b/db/routines/vn/procedures/worker_getFromHasMistake.sql
new file mode 100644
index 000000000..052097e79
--- /dev/null
+++ b/db/routines/vn/procedures/worker_getFromHasMistake.sql
@@ -0,0 +1,19 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`worker_getFromHasMistake`(vDepartmentFk INT)
+BEGIN
+
+/**
+ * Obtiene los trabajadores de los departamentos que se les puede poner error
+ * @param vDepartmentFk id del departamento
+ *
+ */
+
+ SELECT w.id,w.firstName, w.lastName,d.name
+ FROM worker w
+ JOIN workerDepartment wd ON wd.workerFk = w.id
+ JOIN department d ON d.id = wd.departmentFk
+ WHERE d.id = vDepartmentFk
+ ORDER BY firstName;
+
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/worker_getHierarchy.sql b/db/routines/vn/procedures/worker_getHierarchy.sql
new file mode 100644
index 000000000..de6956898
--- /dev/null
+++ b/db/routines/vn/procedures/worker_getHierarchy.sql
@@ -0,0 +1,27 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`worker_getHierarchy`(vUserFk INT)
+BEGIN
+/**
+ * Retorna una tabla temporal con los trabajadores que tiene
+ * el usuario por debajo en la jerarquía de la empresa.
+ *
+ * @param vUserFk Id de usuario.
+ * @return tmp.workerHierarchyList
+ */
+ CREATE OR REPLACE TEMPORARY TABLE tmp.workerHierarchyList
+ (PRIMARY KEY (workerFk))
+ ENGINE = MEMORY
+ WITH RECURSIVE workerHierarchy AS (
+ SELECT id workerFk, bossFk, 0 depth
+ FROM vn.worker
+ WHERE id = vUserFk
+ UNION ALL
+ SELECT w.id, w.bossFk, wh.depth + 1
+ FROM vn.worker w
+ JOIN workerHierarchy wh ON w.bossFk = wh.workerFk
+ )
+ SELECT *
+ FROM workerHierarchy
+ ORDER BY depth, workerFk;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/worker_getSector.sql b/db/routines/vn/procedures/worker_getSector.sql
new file mode 100644
index 000000000..759bb839b
--- /dev/null
+++ b/db/routines/vn/procedures/worker_getSector.sql
@@ -0,0 +1,15 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`worker_getSector`()
+BEGIN
+
+/**
+ * Obtiene el sector del usuario conectado
+*/
+
+ SELECT s.id,s.description,s.warehouseFk
+ FROM sector s
+ JOIN operator o ON o.sectorFk = s.id
+ WHERE o.workerFk = account.myUser_getId();
+
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/worker_updateBalance.sql b/db/routines/vn/procedures/worker_updateBalance.sql
new file mode 100644
index 000000000..c1fd0adf7
--- /dev/null
+++ b/db/routines/vn/procedures/worker_updateBalance.sql
@@ -0,0 +1,13 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`worker_updateBalance`(vSelfFk INT(11), vCredit DECIMAL(10,2), vDebit DECIMAL(10,2))
+BEGIN
+/**
+ * Actualiza la columna balance de worker.
+ *
+ * @param selfFk, credit, debit
+ */
+ UPDATE worker
+ SET balance = IFNULL(balance, 0) + IFNULL(vCredit, 0) - IFNULL(vDebit, 0)
+ WHERE id = vSelfFk;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/worker_updateBusiness.sql b/db/routines/vn/procedures/worker_updateBusiness.sql
new file mode 100644
index 000000000..76c8c9cbb
--- /dev/null
+++ b/db/routines/vn/procedures/worker_updateBusiness.sql
@@ -0,0 +1,34 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`worker_updateBusiness`(vSelf INT)
+BEGIN
+/**
+ * Activates an account and configures its email settings.
+ *
+ * @param vSelf account id.
+ */
+ DECLARE vOldBusinessFk INT;
+ DECLARE vNewBusinessFk INT;
+
+ SELECT businessFk INTO vOldBusinessFk FROM worker WHERE id = vSelf;
+
+ SELECT id INTO vNewBusinessFk
+ FROM business
+ WHERE workerFk = vSelf
+ AND util.VN_CURDATE() BETWEEN started AND IFNULL(ended, util.VN_CURDATE())
+ LIMIT 1;
+
+ UPDATE worker
+ SET businessFk = vNewBusinessFk
+ WHERE id = vSelf;
+
+ IF vOldBusinessFk IS NULL THEN
+ CALL account.account_enable(vSelf);
+
+ UPDATE client c
+ JOIN payMethod pm ON pm.code = 'bankDraft'
+ SET c.payMethodFk = pm.id
+ WHERE c.id = vSelf
+ AND c.iban;
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/worker_updateChangedBusiness.sql b/db/routines/vn/procedures/worker_updateChangedBusiness.sql
new file mode 100644
index 000000000..05e68b099
--- /dev/null
+++ b/db/routines/vn/procedures/worker_updateChangedBusiness.sql
@@ -0,0 +1,40 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`worker_updateChangedBusiness`()
+BEGIN
+/**
+ * Actualiza el contrato actual de todos los trabajadores cuyo contracto ha
+ * empezado/vencido.
+ */
+ DECLARE vBusinessUpdated DATE;
+ DECLARE vCurdate DATE DEFAULT util.VN_CURDATE();
+ DECLARE vWorkerFk INT;
+ DECLARE vDone BOOL;
+
+ DECLARE vCursor CURSOR FOR
+ SELECT DISTINCT b.workerFk
+ FROM business b
+ WHERE b.started > vBusinessUpdated AND b.started <= vCurdate
+ OR b.ended >= vBusinessUpdated AND b.ended < vCurdate;
+
+ DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
+
+ SELECT businessUpdated INTO vBusinessUpdated
+ FROM workerConfig;
+
+ OPEN vCursor;
+
+ l: LOOP
+ SET vDone = FALSE;
+
+ FETCH vCursor INTO vWorkerFk;
+
+ IF vDone THEN
+ LEAVE l;
+ END IF;
+
+ CALL worker_updateBusiness(vWorkerFk);
+ END LOOP;
+
+ UPDATE workerConfig SET businessUpdated = vCurdate;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/workingHours.sql b/db/routines/vn/procedures/workingHours.sql
new file mode 100644
index 000000000..c08226db7
--- /dev/null
+++ b/db/routines/vn/procedures/workingHours.sql
@@ -0,0 +1,16 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`workingHours`(username varchar(255), logon boolean)
+BEGIN
+ DECLARE userid int(11);
+
+ SELECT vn.getUserId(username) INTO userid;
+ SELECT username, userid;
+ IF userid IS NOT NULL THEN
+ IF (logon) THEN
+ CALL vn.workingHoursTimeIn(userid);
+ ELSE
+ CALL vn.workingHoursTimeOut(userid);
+ END IF;
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/workingHoursTimeIn.sql b/db/routines/vn/procedures/workingHoursTimeIn.sql
new file mode 100644
index 000000000..8a4268c54
--- /dev/null
+++ b/db/routines/vn/procedures/workingHoursTimeIn.sql
@@ -0,0 +1,7 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`workingHoursTimeIn`(vUserId INT(11))
+BEGIN
+ INSERT INTO vn.workingHours (timeIn, userId)
+ VALUES (util.VN_NOW(),vUserId);
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/workingHoursTimeOut.sql b/db/routines/vn/procedures/workingHoursTimeOut.sql
new file mode 100644
index 000000000..f6ce2886c
--- /dev/null
+++ b/db/routines/vn/procedures/workingHoursTimeOut.sql
@@ -0,0 +1,9 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`workingHoursTimeOut`(vUserId INT(11))
+BEGIN
+ UPDATE vn.workingHours
+ SET timeOut = util.VN_NOW()
+ WHERE userId = vUserId
+ AND DATE(timeIn) = util.VN_CURDATE();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/wrongEqualizatedClient.sql b/db/routines/vn/procedures/wrongEqualizatedClient.sql
new file mode 100644
index 000000000..47a6a608d
--- /dev/null
+++ b/db/routines/vn/procedures/wrongEqualizatedClient.sql
@@ -0,0 +1,27 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`wrongEqualizatedClient`()
+BEGIN
+ SELECT clientFk, c.name, c.isActive, c.isTaxDataChecked, count(ie) as num
+ FROM vn.client c
+ JOIN
+ (
+ SELECT DISTINCT
+ `a`.`clientFk` ,
+ a.isEqualizated = 0 as ie
+
+ FROM
+ `vn`.`address` `a`
+ ) sub ON sub.clientFk = c.id
+ WHERE c.hasToInvoiceByAddress = FALSE
+
+ GROUP BY clientFk
+ HAVING num > 1
+ UNION ALL
+ SELECT DISTINCT c.id, c.name, c.isActive, c.isTaxDataChecked,1
+ FROM
+ `vn`.`address` `a`
+ JOIN `vn`.`client` `c` ON `c`.`id` = `a`.`clientFk`
+ WHERE ABS(a.isEqualizated) <> ABS(c.isEqualizated)
+ AND c.hasToInvoiceByAddress = FALSE;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/zoneClosure_recalc.sql b/db/routines/vn/procedures/zoneClosure_recalc.sql
new file mode 100644
index 000000000..9e51c007d
--- /dev/null
+++ b/db/routines/vn/procedures/zoneClosure_recalc.sql
@@ -0,0 +1,47 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`zoneClosure_recalc`()
+proc: BEGIN
+/**
+ * Recalculates the delivery time (hour) for every zone in days + scope in future
+ */
+ DECLARE vScope INT;
+ DECLARE vCounter INT DEFAULT 0;
+ DECLARE vShipped DATE DEFAULT util.VN_CURDATE();
+
+ DECLARE CONTINUE HANDLER FOR SQLEXCEPTION
+ BEGIN
+ DO RELEASE_LOCK('vn.zoneClosure_recalc');
+ RESIGNAL;
+ END;
+
+ IF NOT GET_LOCK('vn.zoneClosure_recalc', 0) THEN
+ LEAVE proc;
+ END IF;
+
+ SELECT scope INTO vScope
+ FROM zoneConfig;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.zone;
+ CREATE TEMPORARY TABLE tmp.zone
+ (INDEX (id))
+ ENGINE = MEMORY
+ SELECT id FROM zone;
+
+ TRUNCATE TABLE zoneClosure;
+
+ WHILE vCounter <= vScope DO
+
+ CALL zone_getOptionsForShipment(vShipped, TRUE);
+
+ REPLACE zoneClosure(zoneFk, dated, `hour`)
+ SELECT zoneFk, vShipped, `hour`
+ FROM tmp.zoneOption;
+
+ SET vCounter = vCounter + 1;
+ SET vShipped = TIMESTAMPADD(DAY, 1, vShipped);
+ END WHILE;
+
+ -- DROP TEMPORARY TABLE tmp.zone;
+ DO RELEASE_LOCK('vn.zoneClosure_recalc');
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/zoneGeo_calcTree.sql b/db/routines/vn/procedures/zoneGeo_calcTree.sql
new file mode 100644
index 000000000..34e1d8241
--- /dev/null
+++ b/db/routines/vn/procedures/zoneGeo_calcTree.sql
@@ -0,0 +1,31 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`zoneGeo_calcTree`()
+BEGIN
+/**
+ * Calculates the #path, #lft, #rgt, #sons and #depth columns of
+ * the #zoneGeo table. To build the tree, it uses the #parentFk
+ * column.
+ */
+ DECLARE vIndex INT DEFAULT 0;
+ DECLARE vSons INT;
+
+ DROP TEMPORARY TABLE IF EXISTS tNestedTree;
+ CREATE TEMPORARY TABLE tNestedTree
+ SELECT id, path, lft, rgt, depth, sons
+ FROM zoneGeo LIMIT 0;
+
+ SET max_sp_recursion_depth = 5;
+ CALL zoneGeo_calcTreeRec(NULL, '/', 0, vIndex, vSons);
+ SET max_sp_recursion_depth = 0;
+
+ UPDATE zoneGeo z
+ JOIN tNestedTree t ON t.id = z.id
+ SET z.path = t.path,
+ z.lft = t.lft,
+ z.rgt = t.rgt,
+ z.depth = t.depth,
+ z.sons = t.sons;
+
+ DROP TEMPORARY TABLE tNestedTree;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/zoneGeo_calcTreeRec.sql b/db/routines/vn/procedures/zoneGeo_calcTreeRec.sql
new file mode 100644
index 000000000..da499ede3
--- /dev/null
+++ b/db/routines/vn/procedures/zoneGeo_calcTreeRec.sql
@@ -0,0 +1,69 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`zoneGeo_calcTreeRec`(
+ vSelf INT,
+ vPath VARCHAR(255),
+ vDepth INT,
+ INOUT vIndex INT,
+ OUT vSons INT
+)
+BEGIN
+/**
+ * Calculates and sets the #path, #lft, #rgt, #sons and #depth
+ * columns for all children of the passed node. Once calculated
+ * the last node rgt index and the number of sons are returned.
+ * To update it's children, this procedure calls itself recursively
+ * for each one.
+ *
+ * @vSelf The node identifier
+ * @vPath The initial path
+ * @vDepth The initial depth
+ * @vIndex The initial lft index
+ * @vSons The number of direct sons
+ */
+ DECLARE vChildFk INT;
+ DECLARE vLft INT;
+ DECLARE vMySons INT;
+ DECLARE vDone BOOL;
+ DECLARE vChildren CURSOR FOR
+ SELECT id FROM zoneGeo
+ WHERE (vSelf IS NULL AND parentFk IS NULL)
+ OR (vSelf IS NOT NULL AND parentFk = vSelf);
+
+ DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
+
+ SET vSons = 0;
+
+ OPEN vChildren;
+ myLoop: LOOP
+ SET vDone = FALSE;
+ FETCH vChildren INTO vChildFk;
+
+ IF vDone THEN
+ LEAVE myLoop;
+ END IF;
+
+ SET vIndex = vIndex + 1;
+ SET vLft = vIndex;
+ SET vSons = vSons + 1;
+
+ CALL zoneGeo_calcTreeRec(
+ vChildFk,
+ CONCAT(vPath, vChildFk, '/'),
+ vDepth + 1,
+ vIndex,
+ vMySons
+ );
+
+ SET vIndex = vIndex + 1;
+
+ INSERT INTO tNestedTree
+ SET id = vChildFk,
+ path = vPath,
+ lft = vLft,
+ rgt = vIndex,
+ depth = vDepth,
+ sons = vMySons;
+ END LOOP;
+ CLOSE vChildren;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/zoneGeo_checkName.sql b/db/routines/vn/procedures/zoneGeo_checkName.sql
new file mode 100644
index 000000000..5933f4be2
--- /dev/null
+++ b/db/routines/vn/procedures/zoneGeo_checkName.sql
@@ -0,0 +1,9 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`zoneGeo_checkName`(vName VARCHAR(255))
+BEGIN
+ IF vName = '' THEN
+ SIGNAL SQLSTATE '45000'
+ SET MESSAGE_TEXT = 'Column `name` cannot be empty';
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/zoneGeo_delete.sql b/db/routines/vn/procedures/zoneGeo_delete.sql
new file mode 100644
index 000000000..5bf0c5120
--- /dev/null
+++ b/db/routines/vn/procedures/zoneGeo_delete.sql
@@ -0,0 +1,13 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`zoneGeo_delete`(vSelf INT)
+BEGIN
+/**
+ * Deletes a node from the #zoneGeo table. Also sets a mark
+ * to force the tree recalculation.
+ *
+ * @vSelf The node identifier
+ */
+ DELETE FROM zoneGeo WHERE id = vSelf;
+ UPDATE zoneGeoRecalc SET isChanged = TRUE;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/zoneGeo_doCalc.sql b/db/routines/vn/procedures/zoneGeo_doCalc.sql
new file mode 100644
index 000000000..ce32357ec
--- /dev/null
+++ b/db/routines/vn/procedures/zoneGeo_doCalc.sql
@@ -0,0 +1,29 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`zoneGeo_doCalc`()
+proc: BEGIN
+/**
+ * Recalculates the zones tree.
+ */
+ DECLARE vIsChanged BOOL;
+
+ DECLARE CONTINUE HANDLER FOR SQLEXCEPTION
+ BEGIN
+ DO RELEASE_LOCK('vn.zoneGeo_doCalc');
+ RESIGNAL;
+ END;
+
+ IF !GET_LOCK('vn.zoneGeo_doCalc', 0) THEN
+ LEAVE proc;
+ END IF;
+
+ SELECT isChanged INTO vIsChanged
+ FROM zoneGeoRecalc;
+
+ IF vIsChanged THEN
+ UPDATE zoneGeoRecalc SET isChanged = FALSE;
+ CALL vn.zoneGeo_calcTree;
+ END IF;
+
+ DO RELEASE_LOCK('vn.zoneGeo_doCalc');
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/zoneGeo_setParent.sql b/db/routines/vn/procedures/zoneGeo_setParent.sql
new file mode 100644
index 000000000..3f8f051a2
--- /dev/null
+++ b/db/routines/vn/procedures/zoneGeo_setParent.sql
@@ -0,0 +1,16 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`zoneGeo_setParent`(vSelf INT, vParentFk INT)
+BEGIN
+/**
+ * Updates the parent of a node. Also sets a mark
+ * to force the tree recalculation.
+ *
+ * @vSelf The node identifier
+ * @vParentFk The new parent identifier
+ */
+ UPDATE zoneGeo SET parentFk = vParentFk
+ WHERE id = vSelf;
+
+ UPDATE zoneGeoRecalc SET isChanged = TRUE;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/zoneGeo_throwNotEditable.sql b/db/routines/vn/procedures/zoneGeo_throwNotEditable.sql
new file mode 100644
index 000000000..0b5c8aecf
--- /dev/null
+++ b/db/routines/vn/procedures/zoneGeo_throwNotEditable.sql
@@ -0,0 +1,7 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`zoneGeo_throwNotEditable`()
+BEGIN
+ SIGNAL SQLSTATE '45000'
+ SET MESSAGE_TEXT = 'Column `geoFk` cannot be modified';
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/zone_excludeFromGeo.sql b/db/routines/vn/procedures/zone_excludeFromGeo.sql
new file mode 100644
index 000000000..6f0556bd7
--- /dev/null
+++ b/db/routines/vn/procedures/zone_excludeFromGeo.sql
@@ -0,0 +1,20 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`zone_excludeFromGeo`(vZoneGeo INT)
+BEGIN
+/**
+ * Excluye zonas a partir un geoFk.
+ *
+ * @table tmp.zoneOption(zoneFk, hour, travelingDays, price, bonus, landed, shipped) The computed options
+ * @param vZoneGeo The zone geo
+ * @return tmp.zoneOption The computed options
+ */
+ DELETE t
+ FROM tmp.zoneOption t
+ JOIN zoneExclusion e ON e.zoneFk = t.zoneFk AND e.`dated` = t.landed
+ LEFT JOIN zoneExclusionGeo eg ON eg.zoneExclusionFk = e.id
+ JOIN zoneGeo zg1 ON zg1.id = eg.geoFk
+ JOIN zoneGeo zg2 ON zg2.id = vZoneGeo
+ WHERE zg2.`path` LIKE CONCAT(zg1.`path`, zg1.id,'/%')
+ OR zg2.id = zg1.id;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/zone_getAddresses.sql b/db/routines/vn/procedures/zone_getAddresses.sql
new file mode 100644
index 000000000..1412c7ab3
--- /dev/null
+++ b/db/routines/vn/procedures/zone_getAddresses.sql
@@ -0,0 +1,55 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`zone_getAddresses`(
+ vSelf INT,
+ vLanded DATE
+)
+BEGIN
+/**
+ * Devuelve un listado de todos los clientes activos
+ * con consignatarios a los que se les puede
+ * vender producto para esa zona y no tiene un ticket
+ * para ese día.
+ *
+ * @param vSelf Id de zona
+ * @param vDated Fecha de entrega
+ * @return Un select
+ */
+ CALL zone_getPostalCode(vSelf);
+
+ WITH notHasTicket AS (
+ SELECT id
+ FROM vn.client
+ WHERE id NOT IN (
+ SELECT clientFk
+ FROM vn.ticket
+ WHERE landed BETWEEN vLanded AND util.dayEnd(vLanded)
+ )
+ )
+ SELECT c.id clientFk,
+ c.name,
+ c.phone,
+ c.mobile,
+ c.salesPersonFk,
+ u.name username,
+ aai.invoiced,
+ cnb.lastShipped
+ FROM vn.client c
+ JOIN notHasTicket ON notHasTicket.id = c.id
+ LEFT JOIN account.`user` u ON u.id = c.salesPersonFk
+ JOIN vn.`address` a ON a.clientFk = c.id
+ JOIN vn.postCode pc ON pc.code = a.postalCode
+ JOIN vn.town t ON t.id = pc.townFk AND t.provinceFk = a.provinceFk
+ JOIN vn.zoneGeo zg ON zg.name = a.postalCode
+ JOIN tmp.zoneNodes zn ON zn.geoFk = pc.geoFk
+ LEFT JOIN bs.clientNewBorn cnb ON cnb.clientFk = c.id
+ LEFT JOIN vn.annualAverageInvoiced aai ON aai.clientFk = c.id
+ JOIN vn.clientType ct ON ct.code = c.typeFk
+ WHERE a.isActive
+ AND c.isActive
+ AND ct.code = 'normal'
+ AND c.businessTypeFk <> 'worker'
+ GROUP BY c.id;
+
+ DROP TEMPORARY TABLE tmp.zoneNodes;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/zone_getAgency.sql b/db/routines/vn/procedures/zone_getAgency.sql
new file mode 100644
index 000000000..8b66b110b
--- /dev/null
+++ b/db/routines/vn/procedures/zone_getAgency.sql
@@ -0,0 +1,36 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`zone_getAgency`(vAddress INT, vLanded DATE)
+BEGIN
+/**
+ * Devuelve el listado de agencias disponibles para la fecha
+ * y dirección pasadas.
+ *
+ * @param vAddress Id de dirección de envío, %NULL si es recogida
+ * @param vLanded Fecha de recogida
+ * @return tmp.zoneGetAgency Listado de agencias disponibles
+ */
+ CALL zone_getFromGeo(address_getGeo(vAddress));
+ CALL zone_getOptionsForLanding(vLanded, FALSE);
+ CALL vn.zone_excludeFromGeo(address_getGeo(vAddress));
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.zoneGetAgency;
+ CREATE TEMPORARY TABLE tmp.zoneGetAgency
+ (INDEX (agencyModeFk)) ENGINE = MEMORY
+ SELECT am.name agencyMode,
+ am.description,
+ z.agencyModeFk,
+ am.deliveryMethodFk,
+ TIMESTAMPADD(DAY,-zo.travelingDays, vLanded) shipped,
+ TRUE isIncluded,
+ zo.zoneFk,
+ am.web AS isVisible
+ FROM tmp.zoneOption zo
+ JOIN zone z ON z.id = zo.zoneFk
+ JOIN agencyMode am ON am.id = z.agencyModeFk
+ GROUP BY agencyModeFk;
+
+ DROP TEMPORARY TABLE
+ tmp.zone,
+ tmp.zoneOption;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/zone_getAvailable.sql b/db/routines/vn/procedures/zone_getAvailable.sql
new file mode 100644
index 000000000..4fd3d1b34
--- /dev/null
+++ b/db/routines/vn/procedures/zone_getAvailable.sql
@@ -0,0 +1,13 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`zone_getAvailable`(vAddress INT, vLanded DATE)
+BEGIN
+ CALL zone_getFromGeo(address_getGeo(vAddress));
+ CALL zone_getOptionsForLanding(vLanded, FALSE);
+
+ SELECT * FROM tmp.zoneOption;
+
+ DROP TEMPORARY TABLE
+ tmp.zone,
+ tmp.zoneOption;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/zone_getClosed.sql b/db/routines/vn/procedures/zone_getClosed.sql
new file mode 100644
index 000000000..f48e6ff44
--- /dev/null
+++ b/db/routines/vn/procedures/zone_getClosed.sql
@@ -0,0 +1,34 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`zone_getClosed`()
+proc:BEGIN
+/**
+ * Devuelve una tabla con las zonas cerradas para hoy
+ *
+ * @table tmp.closedZones(zoneFk, warehouseFk);
+ */
+ DROP TEMPORARY TABLE IF EXISTS tmp.closedZones;
+
+ CREATE TEMPORARY TABLE tmp.closedZones (
+ `zoneFk` int(11) NOT NULL,
+ `warehouseFk` smallint(6) unsigned NOT NULL,
+ PRIMARY KEY `zoneFk` (`zoneFk`,`warehouseFk`),
+ KEY `warehouseFk` (`warehouseFk`))
+ ENGINE=MEMORY DEFAULT CHARSET=utf8;
+
+ INSERT INTO tmp.closedZones(zoneFk, warehouseFk)
+ SELECT zoneFk, warehouseFk
+ FROM (
+ SELECT t.zoneFk, t.warehouseFk, count(DISTINCT t.id) numTickets, pc.minTicketsToCloseZone
+ FROM vn.ticket t
+ JOIN vn.expedition e ON e.ticketFk = t.id
+ JOIN vn.`zone`z on z.id = t.zoneFk
+ JOIN vn.agencyMode am ON am.id = z.agencyModeFk
+ JOIN vn.agency a ON a.id = am.agencyFk
+ JOIN vn.productionConfig pc
+ WHERE a.isOwn
+ AND pc.isZoneClosedByExpeditionActivated
+ AND e.created >= util.VN_CURDATE()
+ GROUP BY t.zoneFk, t.warehouseFk
+ HAVING numTickets >= minTicketsToCloseZone) sub;
+ END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/zone_getCollisions.sql b/db/routines/vn/procedures/zone_getCollisions.sql
new file mode 100644
index 000000000..023b9aac2
--- /dev/null
+++ b/db/routines/vn/procedures/zone_getCollisions.sql
@@ -0,0 +1,108 @@
+DELIMITER $$
+
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`zone_getCollisions`()
+BEGIN
+/**
+ * Calcula si para un mismo codigo postal y dia
+ * hay mas de una zona configurada y manda correo
+ *
+ */
+ DECLARE vGeoFk INT DEFAULT NULL;
+ DECLARE vZoneFk INT;
+ DECLARE vIsDone INT DEFAULT FALSE;
+ DECLARE vTableCollisions TEXT;
+ DECLARE json_data JSON;
+ DECLARE cur1 CURSOR FOR SELECT zoneFk from tmp.zoneOption;
+
+ DECLARE CONTINUE HANDLER FOR NOT FOUND SET vIsDone = TRUE;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.zone;
+ CREATE TEMPORARY TABLE tmp.zone
+ SELECT z.id
+ FROM zone z
+ JOIN agencyMode am ON am.id = z.agencyModeFk
+ JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
+ WHERE dm.code IN ('AGENCY','DELIVERY');
+
+ CALL zone_getOptionsForShipment(util.VN_CURDATE(),FALSE);
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.zoneNodes;
+ CREATE TEMPORARY TABLE tmp.zoneNodes (
+ geoFk INT,
+ name VARCHAR(100),
+ parentFk INT,
+ sons INT,
+ isChecked BOOL DEFAULT 0,
+ zoneFk INT,
+ PRIMARY KEY zoneFkk (zoneFk, geoFk),
+ INDEX(geoFk))
+ ENGINE = MyISAM;
+
+ OPEN cur1;
+ cur1Loop: LOOP
+ SET vIsDone = FALSE;
+ FETCH cur1 INTO vZoneFk;
+ IF vIsDone THEN
+ LEAVE cur1Loop;
+ END IF;
+
+ CALL zone_getLeaves(vZoneFk, NULL, NULL, TRUE);
+
+ myLoop: LOOP
+ SET vGeoFk = NULL;
+ SELECT geoFk INTO vGeoFk
+ FROM tmp.zoneNodes zn
+ WHERE NOT isChecked
+ LIMIT 1;
+
+ IF vGeoFk IS NULL THEN
+ LEAVE myLoop;
+ END IF;
+
+ CALL zone_getLeaves(vZoneFk, vGeoFk, NULL, TRUE);
+ UPDATE tmp.zoneNodes
+ SET isChecked = TRUE
+ WHERE geoFk = vGeoFk;
+ END LOOP;
+
+ END LOOP;
+ CLOSE cur1;
+ DELETE FROM tmp.zoneNodes
+ WHERE sons > 0;
+
+ DROP TEMPORARY TABLE IF EXISTS geoCollision;
+ CREATE TEMPORARY TABLE geoCollision
+ SELECT z.agencyModeFk, zn.geoFk, zw.warehouseFk
+ FROM tmp.zoneNodes zn
+ JOIN zone z ON z.id = zn.zoneFk
+ JOIN zoneWarehouse zw ON z.id = zw.zoneFk
+ GROUP BY z.agencyModeFk, zn.geoFk, zw.warehouseFk
+ HAVING count(*) > 1;
+
+ -- Recojo los datos de la zona que ha dado conflicto
+ SELECT JSON_ARRAYAGG(
+ JSON_OBJECT(
+ 'zoneFk', zoneFk,
+ 'zn', JSON_OBJECT('name', zn.name),
+ 'z', JSON_OBJECT('name', z.name,'price', z.price),
+ 'w', JSON_OBJECT('name', w.name)
+ )
+ ) FROM tmp.zoneNodes zn
+ JOIN zone z ON z.id = zn.zoneFk
+ JOIN geoCollision gc ON gc.agencyModeFk = z.agencyModeFk AND zn.geoFk = gc.geoFk
+ JOIN warehouse w ON w.id = gc.warehouseFk
+ INTO json_data;
+
+ -- Creo un registro de la notificacion 'zone-included' para reportar via email
+ SELECT util.notification_send(
+ 'zone-included',
+ JSON_OBJECT('zoneCollisions',json_data),
+ account.myUser_getId()
+ );
+
+ DROP TEMPORARY TABLE
+ geoCollision,
+ tmp.zone,
+ tmp.zoneNodes;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/zone_getEvents.sql b/db/routines/vn/procedures/zone_getEvents.sql
new file mode 100644
index 000000000..53e065083
--- /dev/null
+++ b/db/routines/vn/procedures/zone_getEvents.sql
@@ -0,0 +1,64 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`zone_getEvents`(
+ vGeoFk INT,
+ vAgencyModeFk INT)
+BEGIN
+/**
+ * Returns available events for the passed province/postcode and agency.
+ *
+ * @param vGeoFk The geo id
+ * @param vAgencyModeFk The agency mode id
+ */
+ DECLARE vDeliveryMethodFk VARCHAR(255);
+
+ DROP TEMPORARY TABLE IF EXISTS tZone;
+ CREATE TEMPORARY TABLE tZone
+ (id INT PRIMARY KEY)
+ ENGINE = MEMORY;
+
+ SELECT dm.`code` INTO vDeliveryMethodFk
+ FROM agencyMode am
+ JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
+ WHERE am.id = vAgencyModeFk;
+
+ IF vDeliveryMethodFk = 'PICKUP' THEN
+ INSERT INTO tZone
+ SELECT id
+ FROM zone
+ WHERE agencyModeFk = vAgencyModeFk;
+ ELSE
+ CALL zone_getFromGeo(vGeoFk);
+
+ IF vAgencyModeFk IS NOT NULL THEN
+ INSERT INTO tZone
+ SELECT t.id
+ FROM tmp.zone t
+ JOIN zone z ON z.id = t.id
+ WHERE z.agencyModeFk = vAgencyModeFk;
+ ELSE
+ INSERT INTO tZone
+ SELECT t.id
+ FROM tmp.zone t
+ JOIN zone z ON z.id = t.id
+ JOIN agencyMode am ON am.id = z.agencyModeFk
+ JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
+ WHERE dm.`code` IN ('AGENCY', 'DELIVERY');
+ END IF;
+ DROP TEMPORARY TABLE tmp.zone;
+ END IF;
+
+ SELECT e.zoneFk, e.`type`, e.dated, e.`started`, e.`ended`, e.weekDays
+ FROM tZone t
+ JOIN zoneEvent e ON e.zoneFk = t.id;
+
+ SELECT e.zoneFk, e.dated
+ FROM tZone t
+ JOIN zoneExclusion e ON e.zoneFk = t.id
+ LEFT JOIN zoneExclusionGeo eg ON eg.zoneExclusionFk = e.id
+ LEFT JOIN zoneGeo zg1 ON zg1.id = eg.geoFk
+ JOIN zoneGeo zg2 ON zg2.id = vGeoFk
+ WHERE eg.zoneExclusionFk IS NULL OR zg2.`path` LIKE CONCAT(zg1.`path`,'%');
+
+ DROP TEMPORARY TABLE tZone;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/zone_getFromGeo.sql b/db/routines/vn/procedures/zone_getFromGeo.sql
new file mode 100644
index 000000000..fe6be86a7
--- /dev/null
+++ b/db/routines/vn/procedures/zone_getFromGeo.sql
@@ -0,0 +1,56 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`zone_getFromGeo`(vGeoFk INT)
+BEGIN
+/**
+ * Returns all zones which have the passed geo included.
+ *
+ * @param vGeoFk The geo id
+ * @return tmp.zone(id) The list of zones
+ */
+ DECLARE vChildFk INT DEFAULT vGeoFk;
+ DECLARE vParentFk INT;
+ DECLARE vLevel INT DEFAULT 1;
+
+ DROP TEMPORARY TABLE IF EXISTS tNodes;
+ CREATE TEMPORARY TABLE tNodes
+ (PRIMARY KEY (id))
+ ENGINE = MEMORY
+ SELECT vGeoFk id, vLevel `level`;
+
+ myLoop: LOOP
+ SELECT parentFk INTO vParentFk
+ FROM zoneGeo
+ WHERE id = vChildFk;
+
+ SET vChildFk = vParentFk;
+ SET vLevel = vLevel + 1;
+
+ INSERT IGNORE INTO tNodes
+ SELECT vChildFk, vLevel
+ FROM DUAL
+ WHERE vChildFk IS NOT NULL;
+
+ IF ROW_COUNT() = 0 THEN
+ LEAVE myLoop;
+ END IF;
+ END LOOP;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.zone;
+ CREATE TEMPORARY TABLE tmp.zone
+ (INDEX (id))
+ ENGINE = MEMORY
+ SELECT id FROM (
+ SELECT zoneFk id, isIncluded
+ FROM (
+ SELECT i.zoneFk, i.isIncluded
+ FROM tNodes n
+ JOIN zoneIncluded i ON i.geoFk = n.id
+ ORDER BY zoneFk, n.`level`
+ LIMIT 10000000000000000000
+ ) t
+ GROUP BY id HAVING isIncluded
+ ) t;
+
+ DROP TEMPORARY TABLE tNodes;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/zone_getLanded.sql b/db/routines/vn/procedures/zone_getLanded.sql
new file mode 100644
index 000000000..b75f409b9
--- /dev/null
+++ b/db/routines/vn/procedures/zone_getLanded.sql
@@ -0,0 +1,47 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`zone_getLanded`(vShipped DATE, vAddressFk INT, vAgencyModeFk INT, vWarehouseFk INT, vShowExpiredZones BOOLEAN)
+BEGIN
+/**
+ * Devuelve una tabla temporal con el dia de recepcion para vShipped.
+ * Excluye las que tengan cajas preparadas
+ *
+ * @param vShipped Fecha de preparacion de mercancia
+ * @param vAddressFk Id de consignatario, %NULL para recogida
+ * @param vAgencyModeFk Id agencia
+ * @param vWarehouseFk vWarehouseFk
+ * @table tmp.zoneGetLanded Datos de recepción
+ */
+ DECLARE vZoneGeo INT;
+
+ SELECT address_getGeo(vAddressFk) INTO vZoneGeo;
+
+ CALL vn.zone_getFromGeo(vZoneGeo);
+ CALL vn.zone_getOptionsForShipment(vShipped, vShowExpiredZones);
+ CALL vn.zone_excludeFromGeo(vZoneGeo);
+ CALL vn.zone_getClosed();
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.zoneGetLanded;
+ CREATE TEMPORARY TABLE tmp.zoneGetLanded
+ ENGINE = MEMORY
+ SELECT vWarehouseFk warehouseFk,
+ TIMESTAMPADD(DAY,zo.travelingDays, vShipped) landed,
+ zo.zoneFk
+ FROM tmp.zoneOption zo
+ JOIN vn.`zone` z ON z.id = zo.zoneFk
+ JOIN vn.zoneWarehouse zw ON zw.zoneFk = z.id
+ LEFT JOIN tmp.closedZones cz
+ ON cz.warehouseFk = zw.warehouseFk
+ AND cz.zoneFk = zw.zoneFk
+ AND zo.shipped = util.VN_CURDATE()
+ WHERE z.agencyModeFk = vAgencyModeFk
+ AND zw.warehouseFk = vWarehouseFk
+ AND (ISNULL(cz.zoneFk) OR vShowExpiredZones)
+ ORDER BY z.price DESC, zo.zoneFk
+ LIMIT 1;
+
+ DROP TEMPORARY TABLE
+ tmp.`zone`,
+ tmp.zoneOption,
+ tmp.closedZones;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/zone_getLeaves.sql b/db/routines/vn/procedures/zone_getLeaves.sql
new file mode 100644
index 000000000..d1e66267e
--- /dev/null
+++ b/db/routines/vn/procedures/zone_getLeaves.sql
@@ -0,0 +1,123 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`zone_getLeaves`(
+ vSelf INT,
+ vParentFk INT,
+ vSearch VARCHAR(255),
+ vHasInsert BOOL
+)
+BEGIN
+/**
+ * Devuelve las ubicaciones incluidas en la ruta y que sean hijos de parentFk.
+ * @param vSelf Id de la zona
+ * @param vParentFk Id del geo a calcular
+ * @param vSearch Cadena a buscar
+ * @param vHasInsert Indica si inserta en tmp.zoneNodes
+ * Optional @table tmp.zoneNodes(geoFk, name, parentFk, sons, isChecked, zoneFk)
+ */
+ DECLARE vIsNumber BOOL;
+ DECLARE vIsSearch BOOL DEFAULT vSearch IS NOT NULL AND vSearch <> '';
+
+ CREATE OR REPLACE TEMPORARY TABLE tNodes
+ (UNIQUE (id))
+ ENGINE = MEMORY
+ SELECT id
+ FROM zoneGeo
+ LIMIT 0;
+
+ IF vIsSearch THEN
+ SET vIsNumber = vSearch REGEXP '^[0-9]+$';
+
+ INSERT INTO tNodes
+ SELECT id
+ FROM zoneGeo
+ WHERE (vIsNumber AND `name` = vSearch)
+ OR (!vIsNumber AND `name` LIKE CONCAT('%', vSearch, '%'))
+ LIMIT 1000;
+
+ ELSEIF vParentFk IS NULL THEN
+ INSERT INTO tNodes
+ SELECT geoFk
+ FROM zoneIncluded
+ WHERE zoneFk = vSelf;
+ END IF;
+
+ IF vParentFk IS NULL THEN
+ CREATE OR REPLACE TEMPORARY TABLE tChilds
+ (INDEX(id))
+ ENGINE = MEMORY
+ SELECT id FROM tNodes;
+
+ CREATE OR REPLACE TEMPORARY TABLE tParents
+ (INDEX(id))
+ ENGINE = MEMORY
+ SELECT id FROM zoneGeo LIMIT 0;
+
+ myLoop: LOOP
+ DELETE FROM tParents;
+ INSERT INTO tParents
+ SELECT parentFk id
+ FROM zoneGeo g
+ JOIN tChilds c ON c.id = g.id
+ WHERE g.parentFk IS NOT NULL;
+
+ INSERT IGNORE INTO tNodes
+ SELECT id FROM tParents;
+
+ IF NOT ROW_COUNT() THEN
+ LEAVE myLoop;
+ END IF;
+
+ DELETE FROM tChilds;
+ INSERT INTO tChilds
+ SELECT id FROM tParents;
+ END LOOP;
+
+ DROP TEMPORARY TABLE tChilds, tParents;
+ END IF;
+
+ IF NOT vIsSearch THEN
+ INSERT IGNORE INTO tNodes
+ SELECT id
+ FROM zoneGeo
+ WHERE parentFk <=> vParentFk;
+ END IF;
+
+ CREATE OR REPLACE TEMPORARY TABLE tZones
+ SELECT g.id,
+ g.name,
+ g.parentFk,
+ g.sons,
+ NOT g.sons OR `type` = 'country' isChecked,
+ i.isIncluded selected,
+ g.`depth`,
+ vSelf
+ FROM zoneGeo g
+ JOIN tNodes n ON n.id = g.id
+ LEFT JOIN zoneIncluded i ON i.geoFk = g.id
+ AND i.zoneFk = vSelf
+ ORDER BY g.`depth`, selected DESC, g.name;
+
+ IF vHasInsert THEN
+ INSERT IGNORE INTO tmp.zoneNodes(geoFk, name, parentFk, sons, isChecked, zoneFk)
+ SELECT id,
+ name,
+ parentFk,
+ sons,
+ isChecked,
+ vSelf
+ FROM tZones
+ WHERE selected
+ OR (selected IS NULL AND vParentFk IS NOT NULL);
+ ELSE
+ SELECT id,
+ name,
+ parentFk,
+ sons,
+ selected
+ FROM tZones
+ ORDER BY `depth`, selected DESC, name;
+ END IF;
+
+ DROP TEMPORARY TABLE tNodes, tZones;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/zone_getOptionsForLanding.sql b/db/routines/vn/procedures/zone_getOptionsForLanding.sql
new file mode 100644
index 000000000..1c12e8c88
--- /dev/null
+++ b/db/routines/vn/procedures/zone_getOptionsForLanding.sql
@@ -0,0 +1,64 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`zone_getOptionsForLanding`(vLanded DATE, vShowExpiredZones BOOLEAN)
+BEGIN
+/**
+ * Gets computed options for the passed zones and delivery date.
+ *
+ * @table tmp.zone(id) The zones ids
+ * @param vLanded The delivery date
+ * @return tmp.zoneOption The computed options
+ */
+ DROP TEMPORARY TABLE IF EXISTS tmp.zoneOption;
+ CREATE TEMPORARY TABLE tmp.zoneOption
+ ENGINE = MEMORY
+ SELECT
+ zoneFk,
+ `hour`,
+ travelingDays,
+ price,
+ bonus,
+ vLanded landed,
+ TIMESTAMPADD(DAY, -travelingDays, vLanded) shipped
+ FROM (
+ SELECT t.id zoneFk,
+ TIME(IFNULL(e.`hour`, z.`hour`)) `hour`,
+ IFNULL(e.travelingDays, z.travelingDays) travelingDays,
+ IFNULL(e.price, z.price) price,
+ IFNULL(e.bonus, z.bonus) bonus
+ FROM tmp.zone t
+ JOIN zone z ON z.id = t.id
+ JOIN zoneEvent e ON e.zoneFk = t.id
+ WHERE (
+ e.`type` = 'day'
+ AND e.dated = vLanded
+ ) OR (
+ e.`type` != 'day'
+ AND e.weekDays & (1 << WEEKDAY(vLanded))
+ AND (e.`started` IS NULL OR vLanded >= e.`started`)
+ AND (e.`ended` IS NULL OR vLanded <= e.`ended`)
+ )
+ ORDER BY
+ zoneFk,
+ CASE
+ WHEN e.`type` = 'day'
+ THEN 1
+ WHEN e.`type` = 'range'
+ THEN 2
+ ELSE 3
+ END
+ LIMIT 10000000000000000000
+ ) t
+ GROUP BY zoneFk;
+
+ DELETE t FROM tmp.zoneOption t
+ JOIN zoneExclusion e ON e.zoneFk = t.zoneFk AND e.`dated` = t.landed
+ LEFT JOIN zoneExclusionGeo eg ON eg.zoneExclusionFk = e.id
+ WHERE eg.zoneExclusionFk IS NULL;
+
+ IF NOT vShowExpiredZones THEN
+ DELETE FROM tmp.zoneOption
+ WHERE shipped < util.VN_CURDATE()
+ OR (shipped = util.VN_CURDATE() AND util.VN_CURTIME() > `hour`);
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/zone_getOptionsForShipment.sql b/db/routines/vn/procedures/zone_getOptionsForShipment.sql
new file mode 100644
index 000000000..ec7824303
--- /dev/null
+++ b/db/routines/vn/procedures/zone_getOptionsForShipment.sql
@@ -0,0 +1,75 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`zone_getOptionsForShipment`(vShipped DATE, vShowExpiredZones BOOLEAN)
+BEGIN
+/**
+ * Gets computed options for the passed zones and shipping date.
+ *
+ * @table tmp.zones(id) The zones ids
+ * @param vShipped The shipping date
+ * @return tmp.zoneOption(zoneFk, hour, travelingDays, price, bonus, specificity) The computed options
+ */
+ DECLARE vHour TIME DEFAULT TIME(util.VN_NOW());
+
+ DROP TEMPORARY TABLE IF EXISTS tLandings;
+ CREATE TEMPORARY TABLE tLandings
+ (INDEX (eventFk))
+ ENGINE = MEMORY
+ SELECT e.id eventFk,
+ @travelingDays := IFNULL(e.travelingDays, z.travelingDays) travelingDays,
+ TIMESTAMPADD(DAY, @travelingDays, vShipped) landed
+ FROM tmp.zone t
+ JOIN zone z ON z.id = t.id
+ JOIN zoneEvent e ON e.zoneFk = t.id;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.zoneOption;
+ CREATE TEMPORARY TABLE tmp.zoneOption
+ ENGINE = MEMORY
+ SELECT *
+ FROM (
+ SELECT t.id zoneFk,
+ TIME(IFNULL(e.`hour`, z.`hour`)) `hour`,
+ l.travelingDays,
+ IFNULL(e.price, z.price) price,
+ IFNULL(e.bonus, z.bonus) bonus,
+ l.landed,
+ vShipped shipped
+ FROM tmp.zone t
+ JOIN zone z ON z.id = t.id
+ JOIN zoneEvent e ON e.zoneFk = t.id
+ JOIN tLandings l ON l.eventFk = e.id
+ WHERE (
+ e.`type` = 'day'
+ AND e.`dated` = l.landed
+ ) OR (
+ e.`type` != 'day'
+ AND e.weekDays & (1 << WEEKDAY(l.landed))
+ AND (e.`started` IS NULL OR l.landed >= e.`started`)
+ AND (e.`ended` IS NULL OR l.landed <= e.`ended`)
+ )
+ ORDER BY
+ zoneFk,
+ CASE
+ WHEN e.`type` = 'day'
+ THEN 1
+ WHEN e.`type` = 'range'
+ THEN 2
+ ELSE 3
+ END
+ LIMIT 10000000000000000000
+ ) t
+ GROUP BY zoneFk;
+
+ DROP TEMPORARY TABLE tLandings;
+
+ DELETE t FROM tmp.zoneOption t
+ JOIN zoneExclusion e ON e.zoneFk = t.zoneFk AND e.`dated` = t.landed
+ LEFT JOIN zoneExclusionGeo eg ON eg.zoneExclusionFk = e.id
+ WHERE eg.zoneExclusionFk IS NULL;
+
+ IF NOT vShowExpiredZones THEN
+ DELETE FROM tmp.zoneOption
+ WHERE vShipped < util.VN_CURDATE()
+ OR (vShipped = util.VN_CURDATE() AND util.VN_CURTIME() > `hour`);
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/zone_getPostalCode.sql b/db/routines/vn/procedures/zone_getPostalCode.sql
new file mode 100644
index 000000000..920ad3171
--- /dev/null
+++ b/db/routines/vn/procedures/zone_getPostalCode.sql
@@ -0,0 +1,46 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`zone_getPostalCode`(vSelf INT)
+BEGIN
+/**
+ * Devuelve los códigos postales incluidos en una zona
+ */
+ DECLARE vGeoFk INT DEFAULT NULL;
+
+ CREATE OR REPLACE TEMPORARY TABLE tmp.zoneNodes (
+ geoFk INT,
+ name VARCHAR(100),
+ parentFk INT,
+ sons INT,
+ isChecked BOOL DEFAULT 0,
+ zoneFk INT,
+ PRIMARY KEY zoneNodesPk (zoneFk, geoFk),
+ INDEX(geoFk))
+ ENGINE = MEMORY;
+
+ CALL zone_getLeaves(vSelf, NULL , NULL, TRUE);
+
+ UPDATE tmp.zoneNodes
+ SET isChecked = 0
+ WHERE parentFk IS NULL;
+
+ myLoop: LOOP
+ SET vGeoFk = NULL;
+ SELECT geoFk INTO vGeoFk
+ FROM tmp.zoneNodes
+ WHERE NOT isChecked
+ LIMIT 1;
+
+ CALL zone_getLeaves(vSelf, vGeoFk, NULL, TRUE);
+ UPDATE tmp.zoneNodes
+ SET isChecked = TRUE
+ WHERE geoFk = vGeoFk;
+
+ IF vGeoFk IS NULL THEN
+ LEAVE myLoop;
+ END IF;
+ END LOOP;
+
+ DELETE FROM tmp.zoneNodes
+ WHERE sons > 0;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/zone_getShipped.sql b/db/routines/vn/procedures/zone_getShipped.sql
new file mode 100644
index 000000000..8d28c9062
--- /dev/null
+++ b/db/routines/vn/procedures/zone_getShipped.sql
@@ -0,0 +1,51 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`zone_getShipped`(vLanded DATE, vAddressFk INT, vAgencyModeFk INT, vShowExpiredZones BOOLEAN)
+BEGIN
+/**
+ * Devuelve la mínima fecha de envío para cada warehouse
+ * Excluye aquellas zonas que ya tienen cajas preparadas en ese almacén
+ *
+ * @param vLanded La fecha de recepcion
+ * @param vAddressFk Id del consignatario
+ * @param vAgencyModeFk Id de la agencia
+ * @return tmp.zoneGetShipped
+ */
+ DECLARE vZoneGeo INT;
+
+ SELECT address_getGeo(vAddressFk) INTO vZoneGeo;
+
+ CALL vn.zone_getFromGeo(vZoneGeo);
+ CALL vn.zone_getOptionsForLanding(vLanded, vShowExpiredZones);
+ CALL vn.zone_excludeFromGeo(vZoneGeo);
+ CALL vn.zone_getClosed();
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.zoneGetShipped;
+ CREATE TEMPORARY TABLE tmp.zoneGetShipped
+ ENGINE = MEMORY
+ SELECT * FROM (
+ SELECT zo.zoneFk,
+ zo.shipped,
+ zo.`hour`,
+ zw.warehouseFk,
+ z.agencyModeFk,
+ zo.price,
+ zo.bonus
+ FROM tmp.zoneOption zo
+ JOIN vn.zoneWarehouse zw ON zw.zoneFk = zo.zoneFk
+ JOIN vn.`zone` z ON z.id = zo.zoneFk
+ LEFT JOIN tmp.closedZones cz
+ ON cz.warehouseFk = zw.warehouseFk
+ AND cz.zoneFk = zw.zoneFk
+ AND zo.shipped = util.VN_CURDATE()
+ WHERE z.agencyModeFk = vAgencyModeFk
+ AND (ISNULL(cz.zoneFk) OR vShowExpiredZones)
+ ORDER BY shipped
+ LIMIT 10000000000000000000) t
+ GROUP BY warehouseFk;
+
+ DROP TEMPORARY TABLE
+ tmp.`zone`,
+ tmp.zoneOption,
+ tmp.closedZones;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/zone_getState.sql b/db/routines/vn/procedures/zone_getState.sql
new file mode 100644
index 000000000..aa61d08a2
--- /dev/null
+++ b/db/routines/vn/procedures/zone_getState.sql
@@ -0,0 +1,42 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`zone_getState`(vDated DATE)
+BEGIN
+/**
+ * Devuelve las zonas y el estado para la fecha solicitada
+ *
+ * @param vDated Fecha en cuestión
+ */
+ DROP TEMPORARY TABLE IF EXISTS tmp.zone;
+
+ CREATE TEMPORARY TABLE tmp.zone (
+ id INT PRIMARY KEY)
+ ENGINE=MEMORY;
+
+ INSERT INTO tmp.zone(id)
+ SELECT id
+ FROM vn.zone;
+
+ CALL vn.zone_getOptionsForShipment(vDated, TRUE);
+
+ CALL vn.zone_getClosed();
+
+ SELECT zo.zoneFk,
+ zo.`hour`etd,
+ (zo.`hour` <= TIME(util.VN_NOW())) isLate,
+ !ISNULL(cz.zoneFk) isFull,
+ zw.warehouseFk,
+ zo.landed
+ FROM tmp.zoneOption zo
+ JOIN vn.zone z ON z.id = zo.zoneFk
+ JOIN vn.zoneWarehouse zw ON zw.zoneFk = z.id
+ LEFT JOIN tmp.closedZones cz
+ ON cz.warehouseFk = zw.warehouseFk
+ AND cz.zoneFk = zo.zoneFk;
+
+ DROP TEMPORARY TABLE
+ tmp.closedZones,
+ tmp.zoneOption,
+ tmp.zone;
+
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/zone_getWarehouse.sql b/db/routines/vn/procedures/zone_getWarehouse.sql
new file mode 100644
index 000000000..b6915a302
--- /dev/null
+++ b/db/routines/vn/procedures/zone_getWarehouse.sql
@@ -0,0 +1,37 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`zone_getWarehouse`(vAddress INT, vLanded DATE, vWarehouse INT)
+BEGIN
+/**
+ * Devuelve el listado de agencias disponibles para la fecha,
+ * dirección y almacén pasados.
+ *
+ * @param vAddress
+ * @param vWarehouse warehouse
+ * @param vLanded Fecha de recogida
+ * @select Listado de agencias disponibles
+ */
+
+ CALL zone_getFromGeo(address_getGeo(vAddress));
+ CALL zone_getOptionsForLanding(vLanded, FALSE);
+
+ SELECT am.id agencyModeFk,
+ am.name agencyMode,
+ am.description,
+ am.deliveryMethodFk,
+ TIMESTAMPADD(DAY, -zo.travelingDays, vLanded) shipped,
+ zw.warehouseFk,
+ z.id zoneFk
+ FROM tmp.zoneOption zo
+ JOIN zone z ON z.id = zo.zoneFk
+ JOIN agencyMode am ON am.id = z.agencyModeFk
+ JOIN zoneWarehouse zw ON zw.zoneFk = zo.zoneFk
+ WHERE zw.warehouseFk = vWarehouse
+ GROUP BY z.agencyModeFk
+ ORDER BY agencyMode;
+
+ DROP TEMPORARY TABLE
+ tmp.zone,
+ tmp.zoneOption;
+
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/zone_upcomingDeliveries.sql b/db/routines/vn/procedures/zone_upcomingDeliveries.sql
new file mode 100644
index 000000000..96c4136ae
--- /dev/null
+++ b/db/routines/vn/procedures/zone_upcomingDeliveries.sql
@@ -0,0 +1,77 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`zone_upcomingDeliveries`()
+BEGIN
+
+ DECLARE vForwardDays INT;
+
+ SELECT forwardDays INTO vForwardDays FROM zoneConfig;
+ CALL util.time_generate(util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL vForwardDays DAY));
+
+ DROP TEMPORARY TABLE IF EXISTS tLandings;
+ CREATE TEMPORARY TABLE tLandings
+ (INDEX (eventFk))
+ ENGINE = MEMORY
+ SELECT e.id eventFk,
+ @travelingDays := IFNULL(e.travelingDays, z.travelingDays) travelingDays,
+ TIMESTAMPADD(DAY, @travelingDays, ti.dated) landed,
+ ti.dated shipped
+ FROM zone z
+ JOIN zoneEvent e ON e.zoneFk = z.id
+ JOIN tmp.time ti ON ti.dated BETWEEN util.VN_CURDATE() AND TIMESTAMPADD(DAY, vForwardDays, util.VN_CURDATE());
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.zoneOption;
+ CREATE TEMPORARY TABLE tmp.zoneOption
+ ENGINE = MEMORY
+ SELECT *
+ FROM (
+ SELECT z.id zoneFk,
+ TIME(IFNULL(e.`hour`, z.`hour`)) `hour`,
+ l.travelingDays,
+ IFNULL(e.price, z.price) price,
+ IFNULL(e.bonus, z.bonus) bonus,
+ l.landed,
+ l.shipped
+ FROM zone z
+ JOIN zoneEvent e ON e.zoneFk = z.id
+ JOIN tLandings l ON l.eventFk = e.id
+ WHERE (
+ e.`type` = 'day'
+ AND e.`dated` = l.landed
+ ) OR (
+ e.`type` != 'day'
+ AND e.weekDays & (1 << WEEKDAY(l.landed))
+ AND (e.`started` IS NULL OR l.landed >= e.`started`)
+ AND (e.`ended` IS NULL OR l.landed <= e.`ended`)
+ )
+ ORDER BY
+ zoneFk,
+ CASE
+ WHEN e.`type` = 'day'
+ THEN 1
+ WHEN e.`type` = 'range'
+ THEN 2
+ ELSE 3
+ END
+ LIMIT 10000000000000000000
+ ) t
+ GROUP BY zoneFk, landed;
+
+ DELETE t FROM tmp.zoneOption t
+ JOIN zoneExclusion e ON e.zoneFk = t.zoneFk AND e.`dated` = t.landed
+ LEFT JOIN zoneExclusionGeo eg ON eg.zoneExclusionFk = e.id
+ WHERE eg.zoneExclusionFk IS NULL;
+
+ SELECT MAX(zo.`hour`) `hour`, zg.`name`, zo.shipped, zo.zoneFk
+ FROM tmp.zoneOption zo
+ JOIN `zone` z ON z.id = zo.zoneFk
+ JOIN agencyMode am ON am.id = z.agencyModeFk
+ JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
+ JOIN zoneIncluded zi ON zi.zoneFk = z.id
+ JOIN zoneGeo zg ON zg.id = zi.geoFk AND zg.type = 'province'
+ WHERE dm.code = 'DELIVERY'
+ GROUP BY shipped, zg.`name`
+ ORDER BY shipped, zg.`name`;
+
+ DROP TEMPORARY TABLE tmp.time, tLandings;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/XDiario_beforeInsert.sql b/db/routines/vn/triggers/XDiario_beforeInsert.sql
new file mode 100644
index 000000000..bc89e221f
--- /dev/null
+++ b/db/routines/vn/triggers/XDiario_beforeInsert.sql
@@ -0,0 +1,24 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`XDiario_beforeInsert`
+ BEFORE INSERT ON `XDiario`
+ FOR EACH ROW
+BEGIN
+ IF NEW.SUBCTA <=> '' THEN
+ SET NEW.SUBCTA = NULL;
+ END IF;
+ IF NEW.SUBCTA IS NOT NULL AND NOT LENGTH(NEW.SUBCTA) <=> 10 THEN
+ CALL util.throw('INVALID_STRING_LENGTH');
+ END IF;
+ IF NEW.CONTRA <=> '' THEN
+ SET NEW.CONTRA = NULL;
+ END IF;
+ IF NEW.CONTRA IS NOT NULL AND NOT LENGTH(NEW.CONTRA) <=> 10 THEN
+ CALL util.throw('INVALID_STRING_LENGTH');
+ END IF;
+ CALL XDiario_checkDate(NEW.FECHA);
+ CALL XDiario_checkDate(NEW.FECHA_EX);
+ CALL XDiario_checkDate(NEW.FECHA_OP);
+ CALL XDiario_checkDate(NEW.FECHA_RT);
+ CALL XDiario_checkDate(NEW.FECREGCON);
+END$$
+DELIMITER ;
diff --git a/db/.archive/230201/00-triggersXDiario.sql b/db/routines/vn/triggers/XDiario_beforeUpdate.sql
similarity index 54%
rename from db/.archive/230201/00-triggersXDiario.sql
rename to db/routines/vn/triggers/XDiario_beforeUpdate.sql
index 5cf0b6253..33787c8f1 100644
--- a/db/.archive/230201/00-triggersXDiario.sql
+++ b/db/routines/vn/triggers/XDiario_beforeUpdate.sql
@@ -1,9 +1,5 @@
-DROP TRIGGER IF EXISTS vn.XDiario_beforeUpdate;
-USE vn;
-
DELIMITER $$
-$$
-CREATE DEFINER=`root`@`localhost` TRIGGER `vn`.`XDiario_beforeUpdate`
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`XDiario_beforeUpdate`
BEFORE UPDATE ON `XDiario`
FOR EACH ROW
BEGIN
@@ -40,34 +36,3 @@ BEGIN
END IF;
END$$
DELIMITER ;
-
-
-DROP TRIGGER IF EXISTS vn.XDiario_beforeInsert;
-USE vn;
-
-DELIMITER $$
-$$
-CREATE DEFINER=`root`@`localhost` TRIGGER `vn`.`XDiario_beforeInsert`
- BEFORE INSERT ON `XDiario`
- FOR EACH ROW
-BEGIN
- IF NEW.SUBCTA <=> '' THEN
- SET NEW.SUBCTA = NULL;
- END IF;
- IF NEW.SUBCTA IS NOT NULL AND NOT LENGTH(NEW.SUBCTA) <=> 10 THEN
- CALL util.throw('INVALID_STRING_LENGTH');
- END IF;
- IF NEW.CONTRA <=> '' THEN
- SET NEW.CONTRA = NULL;
- END IF;
- IF NEW.CONTRA IS NOT NULL AND NOT LENGTH(NEW.CONTRA) <=> 10 THEN
- CALL util.throw('INVALID_STRING_LENGTH');
- END IF;
- CALL XDiario_checkDate(NEW.FECHA);
- CALL XDiario_checkDate(NEW.FECHA_EX);
- CALL XDiario_checkDate(NEW.FECHA_OP);
- CALL XDiario_checkDate(NEW.FECHA_RT);
- CALL XDiario_checkDate(NEW.FECREGCON);
-END$$
-DELIMITER ;
-
diff --git a/db/routines/vn/triggers/accountReconciliation_beforeInsert.sql b/db/routines/vn/triggers/accountReconciliation_beforeInsert.sql
new file mode 100644
index 000000000..c586dc57e
--- /dev/null
+++ b/db/routines/vn/triggers/accountReconciliation_beforeInsert.sql
@@ -0,0 +1,15 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`accountReconciliation_beforeInsert`
+ BEFORE INSERT ON `accountReconciliation`
+ FOR EACH ROW
+
+ SET NEW.calculatedCode = REPLACE(
+ REPLACE(
+ REPLACE(
+ REPLACE(
+ CONCAT(NEW.supplierAccountFk,NEW.operationDated,NEW.amount,NEW.concept,NEW.debitCredit)
+ ,' ','')
+ ,":",'')
+ ,'-','')
+ ,'.','')$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/address_afterDelete.sql b/db/routines/vn/triggers/address_afterDelete.sql
new file mode 100644
index 000000000..d4195d48d
--- /dev/null
+++ b/db/routines/vn/triggers/address_afterDelete.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`address_afterDelete`
+ AFTER DELETE ON `address`
+ FOR EACH ROW
+BEGIN
+ INSERT INTO clientLog
+ SET `action` = 'delete',
+ `changedModel` = 'Address',
+ `changedModelId` = OLD.id,
+ `userFk` = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/address_afterInsert.sql b/db/routines/vn/triggers/address_afterInsert.sql
new file mode 100644
index 000000000..318fd3958
--- /dev/null
+++ b/db/routines/vn/triggers/address_afterInsert.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`address_afterInsert`
+ BEFORE INSERT ON `address`
+ FOR EACH ROW
+BEGIN
+ IF (SELECT client_hasDifferentCountries(NEW.clientFk)) THEN
+ UPDATE client
+ SET hasToInvoiceByAddress = TRUE
+ WHERE id = NEW.clientFk;
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/address_afterUpdate.sql b/db/routines/vn/triggers/address_afterUpdate.sql
new file mode 100644
index 000000000..6160aa2a5
--- /dev/null
+++ b/db/routines/vn/triggers/address_afterUpdate.sql
@@ -0,0 +1,40 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`address_afterUpdate`
+ AFTER UPDATE ON `address`
+ FOR EACH ROW
+BEGIN
+ -- Recargos de equivalencia distintos implican facturacion por consignatario
+ IF NEW.isEqualizated != OLD.isEqualizated THEN
+ IF
+ (SELECT COUNT(*) FROM
+ (
+ SELECT DISTINCT (isEqualizated = FALSE) as Equ
+ FROM address
+ WHERE clientFk = NEW.clientFk
+ ) t1
+ ) > 1
+ THEN
+ UPDATE client
+ SET hasToInvoiceByAddress = TRUE
+ WHERE id = NEW.clientFk;
+ END IF;
+ END IF;
+ IF NEW.isDefaultAddress AND NEW.isActive = FALSE THEN
+ CALL util.throw ('Cannot desactivate the default address');
+ END IF;
+
+ IF NOT (NEW.isEqualizated <=> OLD.isEqualizated) THEN
+ INSERT IGNORE INTO ticketRecalc (ticketFk)
+ SELECT id FROM ticket t
+ WHERE t.addressFk = NEW.id
+ AND t.refFk IS NULL;
+ END IF;
+
+ IF (NEW.clientFk <> OLD.clientFk OR NEW.isActive <> OLD.isActive OR NOT (NEW.provinceFk <=> OLD.provinceFk))
+ AND (SELECT client_hasDifferentCountries(NEW.clientFk)) THEN
+ UPDATE client
+ SET hasToInvoiceByAddress = TRUE
+ WHERE id = NEW.clientFk;
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/address_beforeInsert.sql b/db/routines/vn/triggers/address_beforeInsert.sql
new file mode 100644
index 000000000..2ef582499
--- /dev/null
+++ b/db/routines/vn/triggers/address_beforeInsert.sql
@@ -0,0 +1,27 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`address_beforeInsert`
+ BEFORE INSERT ON `address`
+ FOR EACH ROW
+BEGIN
+ DECLARE vIsEqualizated BOOL;
+
+ SET NEW.editorFk = account.myUser_getId();
+
+ IF (NEW.phone <> '') THEN
+ CALL pbx.phone_isValid(NEW.phone);
+ END IF;
+
+ IF (NEW.mobile <> '') THEN
+ CALL pbx.phone_isValid(NEW.mobile);
+ END IF;
+
+ IF NEW.isEqualizated IS NULL THEN
+ SELECT isEqualizated
+ INTO vIsEqualizated
+ FROM client
+ WHERE id = NEW.clientFk;
+
+ SET NEW.isEqualizated = vIsEqualizated;
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/address_beforeUpdate.sql b/db/routines/vn/triggers/address_beforeUpdate.sql
new file mode 100644
index 000000000..8922105e7
--- /dev/null
+++ b/db/routines/vn/triggers/address_beforeUpdate.sql
@@ -0,0 +1,18 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`address_beforeUpdate`
+ BEFORE UPDATE ON `address`
+ FOR EACH ROW
+BEGIN
+
+ SET NEW.editorFk = account.myUser_getId();
+
+ IF !(NEW.phone <=> OLD.phone) AND (NEW.phone <> '') THEN
+ CALL pbx.phone_isValid(NEW.phone);
+ END IF;
+
+ IF !(NEW.mobile <=> OLD.mobile) AND (NEW.mobile <> '')THEN
+ CALL pbx.phone_isValid(NEW.mobile);
+ END IF;
+
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/agency_afterInsert.sql b/db/routines/vn/triggers/agency_afterInsert.sql
new file mode 100644
index 000000000..35670538b
--- /dev/null
+++ b/db/routines/vn/triggers/agency_afterInsert.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`agency_afterInsert`
+ AFTER INSERT ON `agency`
+ FOR EACH ROW
+BEGIN
+ INSERT INTO agencyMode(name,agencyFk) VALUES(NEW.name,NEW.id);
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/autonomy_afterDelete.sql b/db/routines/vn/triggers/autonomy_afterDelete.sql
new file mode 100644
index 000000000..f278ccdea
--- /dev/null
+++ b/db/routines/vn/triggers/autonomy_afterDelete.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`autonomy_afterDelete`
+ AFTER DELETE ON `autonomy`
+ FOR EACH ROW
+BEGIN
+ CALL zoneGeo_delete(OLD.geoFk);
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/autonomy_beforeInsert.sql b/db/routines/vn/triggers/autonomy_beforeInsert.sql
new file mode 100644
index 000000000..3a6448b81
--- /dev/null
+++ b/db/routines/vn/triggers/autonomy_beforeInsert.sql
@@ -0,0 +1,10 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`autonomy_beforeInsert`
+ BEFORE INSERT ON `autonomy`
+ FOR EACH ROW
+BEGIN
+
+ SET NEW.geoFk = zoneGeo_new('autonomy', NEW.`name`, (SELECT geoFk FROM country WHERE id = NEW.countryFk));
+
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/autonomy_beforeUpdate.sql b/db/routines/vn/triggers/autonomy_beforeUpdate.sql
new file mode 100644
index 000000000..a2c9a2a11
--- /dev/null
+++ b/db/routines/vn/triggers/autonomy_beforeUpdate.sql
@@ -0,0 +1,16 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`autonomy_beforeUpdate`
+ BEFORE UPDATE ON `autonomy`
+ FOR EACH ROW
+BEGIN
+ IF !(OLD.countryFk <=> NEW.countryFk) THEN
+ CALL zoneGeo_setParent(NEW.geoFk,
+ (SELECT geoFk FROM country WHERE id = NEW.countryFk));
+ END IF;
+
+ IF !(OLD.`name` <=> NEW.`name`) THEN
+ UPDATE zoneGeo SET `name` = NEW.`name`
+ WHERE id = NEW.geoFk;
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/awbInvoiceIn_afterDelete.sql b/db/routines/vn/triggers/awbInvoiceIn_afterDelete.sql
new file mode 100644
index 000000000..fd7f4c6e7
--- /dev/null
+++ b/db/routines/vn/triggers/awbInvoiceIn_afterDelete.sql
@@ -0,0 +1,15 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`awbInvoiceIn_afterDelete`
+ AFTER DELETE ON `awbInvoiceIn`
+ FOR EACH ROW
+BEGIN
+ IF (NOT(SELECT COUNT(*) FROM invoiceInTax where invoiceInFk = OLD.invoiceInFk))
+ AND
+ (NOT(SELECT COUNT(*) FROM invoiceInDueDay where invoiceInFk = OLD.invoiceInFk))
+ AND
+ (NOT(SELECT isBooked FROM invoiceIn WHERE id = OLD.invoiceInFk) )
+ THEN
+ DELETE FROM invoiceIn WHERE id = OLD.invoiceInFk;
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/awb_beforeInsert.sql b/db/routines/vn/triggers/awb_beforeInsert.sql
new file mode 100644
index 000000000..8dc216024
--- /dev/null
+++ b/db/routines/vn/triggers/awb_beforeInsert.sql
@@ -0,0 +1,11 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`awb_beforeInsert`
+ BEFORE INSERT ON `awb`
+ FOR EACH ROW
+BEGIN
+
+ SET NEW.year= year(util.VN_CURDATE());
+
+
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/bankEntity_beforeInsert.sql b/db/routines/vn/triggers/bankEntity_beforeInsert.sql
new file mode 100644
index 000000000..6c1ce78a7
--- /dev/null
+++ b/db/routines/vn/triggers/bankEntity_beforeInsert.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`bankEntity_beforeInsert`
+ BEFORE INSERT ON `bankEntity`
+ FOR EACH ROW
+BEGIN
+ CALL bankEntity_checkBic(NEW.bic);
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/bankEntity_beforeUpdate.sql b/db/routines/vn/triggers/bankEntity_beforeUpdate.sql
new file mode 100644
index 000000000..5bea154a2
--- /dev/null
+++ b/db/routines/vn/triggers/bankEntity_beforeUpdate.sql
@@ -0,0 +1,10 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`bankEntity_beforeUpdate`
+ BEFORE UPDATE ON `bankEntity`
+ FOR EACH ROW
+BEGIN
+ IF NOT (NEW.bic <=> OLD.bic) THEN
+ CALL bankEntity_checkBic(NEW.bic);
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/budgetNotes_beforeInsert.sql b/db/routines/vn/triggers/budgetNotes_beforeInsert.sql
new file mode 100644
index 000000000..6ea5ad5eb
--- /dev/null
+++ b/db/routines/vn/triggers/budgetNotes_beforeInsert.sql
@@ -0,0 +1,14 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`budgetNotes_beforeInsert`
+ BEFORE INSERT ON `budgetNotes`
+ FOR EACH ROW
+BEGIN
+
+ IF ISNULL(NEW.userFk) THEN
+
+ SET NEW.userFk = account.myUser_getId();
+
+ END IF;
+
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/business_afterDelete.sql b/db/routines/vn/triggers/business_afterDelete.sql
new file mode 100644
index 000000000..9b897b4e9
--- /dev/null
+++ b/db/routines/vn/triggers/business_afterDelete.sql
@@ -0,0 +1,14 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`business_afterDelete`
+ AFTER DELETE ON `business`
+ FOR EACH ROW
+BEGIN
+ INSERT INTO workerLog
+ SET `action` = 'delete',
+ `changedModel` = 'Business',
+ `changedModelId` = OLD.id,
+ `userFk` = account.myUser_getId();
+
+ CALL worker_updateBusiness(OLD.workerFk);
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/business_afterInsert.sql b/db/routines/vn/triggers/business_afterInsert.sql
new file mode 100644
index 000000000..2949eede8
--- /dev/null
+++ b/db/routines/vn/triggers/business_afterInsert.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`business_afterInsert`
+ AFTER INSERT ON `business`
+ FOR EACH ROW
+BEGIN
+ CALL worker_updateBusiness(NEW.workerFk);
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/business_afterUpdate.sql b/db/routines/vn/triggers/business_afterUpdate.sql
new file mode 100644
index 000000000..95746a30d
--- /dev/null
+++ b/db/routines/vn/triggers/business_afterUpdate.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`business_afterUpdate`
+ AFTER UPDATE ON `business`
+ FOR EACH ROW
+BEGIN
+ CALL worker_updateBusiness(NEW.workerFk);
+
+ IF NOT (OLD.workerFk <=> NEW.workerFk) THEN
+ CALL worker_updateBusiness(OLD.workerFk);
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/business_beforeInsert.sql b/db/routines/vn/triggers/business_beforeInsert.sql
new file mode 100644
index 000000000..1f136c1e8
--- /dev/null
+++ b/db/routines/vn/triggers/business_beforeInsert.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`business_beforeInsert`
+ BEFORE INSERT ON `business`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+
+ IF NEW.ended IS NULL THEN
+ SET NEW.payedHolidays = 0;
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/business_beforeUpdate.sql b/db/routines/vn/triggers/business_beforeUpdate.sql
new file mode 100644
index 000000000..4b7a10041
--- /dev/null
+++ b/db/routines/vn/triggers/business_beforeUpdate.sql
@@ -0,0 +1,34 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`business_beforeUpdate`
+ BEFORE UPDATE ON `business`
+ FOR EACH ROW
+BEGIN
+ DECLARE isOverlapping BOOL;
+
+ SET NEW.editorFk = account.myUser_getId();
+
+ IF NEW.ended IS NULL THEN
+ SET NEW.payedHolidays = 0;
+ END IF;
+
+ IF !(OLD.started <=> NEW.started AND OLD.ended <=> NEW.ended) THEN
+
+ SELECT COUNT(*) > 0 INTO isOverlapping
+ FROM business b
+ WHERE (util.hasDateOverlapped(
+ NEW.started,
+ IFNULL(NEW.ended, b.started),
+ b.started,
+ IFNULL(b.ended, NEW.started))
+ OR (NEW.ended <=> NULL AND b.ended <=> NULL))
+ AND b.id <> OLD.id
+ AND workerFk = OLD.workerFk;
+
+ IF isOverlapping THEN
+ CALL util.throw ('IS_OVERLAPPING');
+ END IF;
+
+ END IF;
+
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/buy_afterDelete.sql b/db/routines/vn/triggers/buy_afterDelete.sql
new file mode 100644
index 000000000..2fcb0852d
--- /dev/null
+++ b/db/routines/vn/triggers/buy_afterDelete.sql
@@ -0,0 +1,21 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`buy_afterDelete`
+ AFTER DELETE ON `buy`
+ FOR EACH ROW
+trig: BEGIN
+ DECLARE vValues VARCHAR(255);
+
+ IF @isModeInventory OR @isTriggerDisabled THEN
+ LEAVE trig;
+ END IF;
+
+ CALL stock.log_add('buy', NULL, OLD.id);
+
+ INSERT INTO entryLog
+ SET `action` = 'delete',
+ `changedModel` = 'Buy',
+ `changedModelId` = OLD.id,
+ `userFk` = account.myUser_getId();
+
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/buy_afterInsert.sql b/db/routines/vn/triggers/buy_afterInsert.sql
new file mode 100644
index 000000000..25682f1bb
--- /dev/null
+++ b/db/routines/vn/triggers/buy_afterInsert.sql
@@ -0,0 +1,14 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`buy_afterInsert`
+ AFTER INSERT ON `buy`
+ FOR EACH ROW
+trig: BEGIN
+ IF @isModeInventory OR @isTriggerDisabled THEN
+ LEAVE trig;
+ END IF;
+
+ CALL stock.log_add('buy', NEW.id, NULL);
+
+ CALL buy_afterUpsert(NEW.id);
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/buy_afterUpdate.sql b/db/routines/vn/triggers/buy_afterUpdate.sql
new file mode 100644
index 000000000..9866f5bb8
--- /dev/null
+++ b/db/routines/vn/triggers/buy_afterUpdate.sql
@@ -0,0 +1,57 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`buy_afterUpdate`
+ AFTER UPDATE ON `buy`
+ FOR EACH ROW
+trig: BEGIN
+ DECLARE vLanded DATE;
+ DECLARE vBuyerFk INT;
+ DECLARE vIsBuyerToBeEmailed BOOL;
+ DECLARE vItemName VARCHAR(50);
+
+ IF @isModeInventory OR @isTriggerDisabled THEN
+ LEAVE trig;
+ END IF;
+
+ IF !(NEW.id <=> OLD.id)
+ OR !(NEW.entryFk <=> OLD.entryFk)
+ OR !(NEW.itemFk <=> OLD.itemFk)
+ OR !(NEW.quantity <=> OLD.quantity)
+ OR !(NEW.created <=> OLD.created) THEN
+ CALL stock.log_add('buy', NEW.id, OLD.id);
+ END IF;
+
+ CALL buy_afterUpsert(NEW.id);
+
+ SELECT w.isBuyerToBeEmailed, t.landed
+ INTO vIsBuyerToBeEmailed, vLanded
+ FROM entry e
+ JOIN travel t ON t.id = e.travelFk
+ JOIN warehouse w ON w.id = t.warehouseInFk
+ WHERE e.id = NEW.entryFk;
+
+ SELECT it.workerFk, i.longName
+ INTO vBuyerFk, vItemName
+ FROM itemCategory k
+ JOIN itemType it ON it.categoryFk = k.id
+ JOIN item i ON i.typeFk = it.id
+ WHERE i.id = OLD.itemFk;
+
+ IF vIsBuyerToBeEmailed AND
+ vBuyerFk != account.myUser_getId() AND
+ vLanded = util.VN_CURDATE() THEN
+ IF !(NEW.itemFk <=> OLD.itemFk) OR
+ !(NEW.quantity <=> OLD.quantity) OR
+ !(NEW.packing <=> OLD.packing) OR
+ !(NEW.grouping <=> OLD.grouping) OR
+ !(NEW.packagingFk <=> OLD.packagingFk) OR
+ !(NEW.weight <=> OLD.weight) THEN
+ CALL vn.mail_insert(
+ CONCAT(account.user_getNameFromId(vBuyerFk),'@verdnatura.es'),
+ CONCAT(account.myUser_getName(),'@verdnatura.es'),
+ CONCAT('E ', NEW.entryFk ,' Se ha modificado item ', NEW.itemFk, ' ', vItemName),
+ 'Este email se ha generado automáticamente'
+ );
+ END IF;
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/buy_beforeDelete.sql b/db/routines/vn/triggers/buy_beforeDelete.sql
new file mode 100644
index 000000000..85f1cf298
--- /dev/null
+++ b/db/routines/vn/triggers/buy_beforeDelete.sql
@@ -0,0 +1,11 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`buy_beforeDelete`
+ BEFORE DELETE ON `buy`
+ FOR EACH ROW
+BEGIN
+ CALL entry_checkBooked(OLD.entryFk);
+ IF OLD.printedStickers <> 0 THEN
+ CALL util.throw("it is not possible to delete buys with printed labels ");
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/buy_beforeInsert.sql b/db/routines/vn/triggers/buy_beforeInsert.sql
new file mode 100644
index 000000000..bc51ac852
--- /dev/null
+++ b/db/routines/vn/triggers/buy_beforeInsert.sql
@@ -0,0 +1,93 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`buy_beforeInsert`
+ BEFORE INSERT ON `buy`
+ FOR EACH ROW
+trig: BEGIN
+ DECLARE vWarehouse INT;
+ DECLARE vLanding DATE;
+ DECLARE vGrouping INT;
+ DECLARE vGroupingMode TINYINT;
+ DECLARE vGenericFk INT;
+ DECLARE vGenericInDate BOOL;
+ DECLARE vBuyerFk INT;
+
+ IF @isModeInventory THEN
+ LEAVE trig;
+ END IF;
+
+ CALL entry_checkBooked(NEW.entryFk);
+ IF NEW.printedStickers <> 0 THEN
+ CALL util.throw('it is not possible to create buy lines with printedstickers other than 0');
+ END IF;
+
+ SET NEW.editorFk = account.myUser_getId();
+
+ SELECT it.workerFk INTO vBuyerFk
+ FROM item i
+ JOIN itemType it ON it.id = i.typeFk
+ WHERE i.id = NEW.itemFk;
+
+ SET NEW.buyerFk = vBuyerFk;
+
+ CALL buy_checkGrouping(NEW.`grouping`);
+
+ SELECT t.warehouseInFk, t.landed
+ INTO vWarehouse, vLanding
+ FROM entry e
+ JOIN travel t ON t.id = e.travelFk
+ WHERE e.id = NEW.entryFk;
+
+ SELECT b.`grouping`, b.groupingMode
+ INTO vGrouping, vGroupingMode
+ FROM buy b
+ JOIN entry e ON e.id = b.entryFk
+ JOIN travel t ON t.id = e.travelFk
+ WHERE t.landed <= vLanding
+ AND b.itemFk = NEW.itemFk
+ AND !b.isIgnored
+ ORDER BY t.warehouseInFk = vWarehouse DESC,
+ t.landed DESC,
+ b.id DESC
+ LIMIT 1;
+
+ IF NEW.`grouping` IS NULL THEN
+ SET NEW.`grouping` = vGrouping;
+ END IF;
+
+ IF NEW.groupingMode IS NULL THEN
+ SET NEW.groupingMode = vGroupingMode;
+ END IF;
+
+ -- Generics
+ SELECT i.genericFk INTO vGenericFk
+ FROM item i
+ WHERE i.id = NEW.itemFk;
+
+ IF vGenericFk THEN
+ SELECT COUNT(*) INTO vGenericInDate
+ FROM genericAllocation ga
+ JOIN entry e ON e.id = NEW.entryFk
+ JOIN travel tr on tr.id = e.travelFk
+ WHERE ga.itemFk = vGenericFk
+ AND tr.landed BETWEEN ga.startDated AND ga.endDated;
+
+ IF vGenericInDate THEN
+ SET NEW.itemOriginalFk = NEW.itemFk;
+ SET NEW.itemFk = vGenericFk;
+ END IF;
+ END IF;
+
+ IF NEW.quantity < 0 THEN
+ SET NEW.isIgnored = TRUE;
+ END IF;
+
+ IF NEW.weight AND NEW.packing
+ AND (SELECT weightByPiece FROM item WHERE id = NEW.itemFk) IS NULL THEN
+
+ UPDATE item
+ SET weightByPiece = (NEW.weight * 1000) / NEW.packing
+ WHERE id = NEW.itemFk;
+ END IF;
+
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/buy_beforeUpdate.sql b/db/routines/vn/triggers/buy_beforeUpdate.sql
new file mode 100644
index 000000000..2403091c6
--- /dev/null
+++ b/db/routines/vn/triggers/buy_beforeUpdate.sql
@@ -0,0 +1,86 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`buy_beforeUpdate`
+ BEFORE UPDATE ON `buy`
+ FOR EACH ROW
+trig:BEGIN
+ DECLARE vGenericFk INT;
+ DECLARE vGenericInDate BOOL;
+ DECLARE vIsInventory BOOL;
+ DECLARE vDefaultEntry INT;
+ DECLARE vBuyerFk INT;
+
+ IF @isTriggerDisabled THEN
+ LEAVE trig;
+ END IF;
+
+ CALL entry_checkBooked(OLD.entryFk);
+ SET NEW.editorFk = account.myUser_getId();
+
+ SELECT defaultEntry INTO vDefaultEntry
+ FROM entryConfig;
+
+ IF (NOT OLD.entryFk <=> NEW.entryFk OR NOT OLD.printedStickers <=> NEW.printedStickers)
+ AND NEW.printedStickers <> 0 THEN
+ SELECT defaultEntry INTO vDefaultEntry
+ FROM entryConfig;
+
+ IF NEW.entryFk = vDefaultEntry THEN
+ CALL util.throw('There can be no lines with printed labels on the default entry');
+ END IF;
+ END IF;
+
+ IF NOT NEW.`grouping` <=> OLD.`grouping` THEN
+ CALL buy_checkGrouping(NEW.`grouping`);
+ END IF;
+
+ -- Generics
+ SELECT i.genericFk INTO vGenericFk
+ FROM item i
+ WHERE i.id = NEW.itemFk;
+
+ IF vGenericFk THEN
+ SELECT COUNT(*) INTO vGenericInDate
+ FROM genericAllocation ga
+ JOIN entry e ON e.id = NEW.entryFk
+ JOIN travel tr on tr.id = e.travelFk
+ WHERE ga.itemFk = vGenericFk
+ AND tr.landed BETWEEN ga.startDated AND ga.endDated;
+ IF vGenericInDate THEN
+ SET NEW.itemOriginalFk = NEW.itemFk;
+ SET NEW.itemFk = vGenericFk;
+ END IF;
+ END IF;
+
+ SELECT COUNT(*) INTO vIsInventory
+ FROM entry e
+ JOIN supplier s ON s.id = e.supplierFk
+ JOIN entryConfig ec ON ec.inventorySupplierFk = e.supplierFk
+ WHERE e.id = NEW.entryFk;
+
+ IF vIsInventory THEN
+ IF NOT NEW.printedStickers <=> OLD.printedStickers THEN
+ CALL util.throw("Stickers cannot be modified if they are inventory");
+ END IF;
+ END IF;
+
+ IF NEW.quantity < 0 THEN
+ SET NEW.isIgnored = TRUE;
+ END IF;
+
+ IF NOT (NEW.itemFk <=> OLD.itemFk) THEN
+ SELECT it.workerFk INTO vBuyerFk
+ FROM item i
+ JOIN itemType it ON it.id = i.typeFk
+ WHERE i.id = NEW.itemFk;
+
+ SET NEW.buyerFk = vBuyerFk;
+ END IF;
+
+ IF NOT (NEW.itemFk <=> OLD.itemFk) OR
+ NOT (OLD.entryFk <=> NEW.entryFk) THEN
+ CREATE OR REPLACE TEMPORARY TABLE tmp.buysToCheck
+ SELECT NEW.id;
+ CALL buy_checkItem();
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/calendar_afterDelete.sql b/db/routines/vn/triggers/calendar_afterDelete.sql
new file mode 100644
index 000000000..5d0114ea8
--- /dev/null
+++ b/db/routines/vn/triggers/calendar_afterDelete.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`calendar_afterDelete`
+ AFTER DELETE ON `calendar`
+ FOR EACH ROW
+BEGIN
+ INSERT INTO workerLog
+ SET `action` = 'delete',
+ `changedModel` = 'Calendar',
+ `changedModelId` = OLD.id,
+ `userFk` = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/calendar_beforeInsert.sql b/db/routines/vn/triggers/calendar_beforeInsert.sql
new file mode 100644
index 000000000..3e265a099
--- /dev/null
+++ b/db/routines/vn/triggers/calendar_beforeInsert.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`calendar_beforeInsert`
+ BEFORE INSERT ON `calendar`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/calendar_beforeUpdate.sql b/db/routines/vn/triggers/calendar_beforeUpdate.sql
new file mode 100644
index 000000000..f015dc29a
--- /dev/null
+++ b/db/routines/vn/triggers/calendar_beforeUpdate.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`calendar_beforeUpdate`
+ BEFORE UPDATE ON `calendar`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/claimBeginning_afterDelete.sql b/db/routines/vn/triggers/claimBeginning_afterDelete.sql
new file mode 100644
index 000000000..5e12d9feb
--- /dev/null
+++ b/db/routines/vn/triggers/claimBeginning_afterDelete.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`claimBeginning_afterDelete`
+ AFTER DELETE ON `claimBeginning`
+ FOR EACH ROW
+BEGIN
+ INSERT INTO claimLog
+ SET `action` = 'delete',
+ `changedModel` = 'ClaimBeginning',
+ `changedModelId` = OLD.id,
+ `userFk` = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/claimBeginning_beforeInsert.sql b/db/routines/vn/triggers/claimBeginning_beforeInsert.sql
new file mode 100644
index 000000000..f6ad1672b
--- /dev/null
+++ b/db/routines/vn/triggers/claimBeginning_beforeInsert.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`claimBeginning_beforeInsert`
+ BEFORE INSERT ON `claimBeginning`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/claimBeginning_beforeUpdate.sql b/db/routines/vn/triggers/claimBeginning_beforeUpdate.sql
new file mode 100644
index 000000000..500d08cb6
--- /dev/null
+++ b/db/routines/vn/triggers/claimBeginning_beforeUpdate.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`claimBeginning_beforeUpdate`
+ BEFORE UPDATE ON `claimBeginning`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/claimDevelopment_afterDelete.sql b/db/routines/vn/triggers/claimDevelopment_afterDelete.sql
new file mode 100644
index 000000000..90b1e89eb
--- /dev/null
+++ b/db/routines/vn/triggers/claimDevelopment_afterDelete.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`claimDevelopment_afterDelete`
+ AFTER DELETE ON `claimDevelopment`
+ FOR EACH ROW
+BEGIN
+ INSERT INTO claimLog
+ SET `action` = 'delete',
+ `changedModel` = 'ClaimDevelopment',
+ `changedModelId` = OLD.id,
+ `userFk` = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/claimDevelopment_beforeInsert.sql b/db/routines/vn/triggers/claimDevelopment_beforeInsert.sql
new file mode 100644
index 000000000..15ec36138
--- /dev/null
+++ b/db/routines/vn/triggers/claimDevelopment_beforeInsert.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`claimDevelopment_beforeInsert`
+ BEFORE INSERT ON `claimDevelopment`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/claimDevelopment_beforeUpdate.sql b/db/routines/vn/triggers/claimDevelopment_beforeUpdate.sql
new file mode 100644
index 000000000..b0727adb3
--- /dev/null
+++ b/db/routines/vn/triggers/claimDevelopment_beforeUpdate.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`claimDevelopment_beforeUpdate`
+ BEFORE UPDATE ON `claimDevelopment`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/claimDms_afterDelete.sql b/db/routines/vn/triggers/claimDms_afterDelete.sql
new file mode 100644
index 000000000..53bf819e2
--- /dev/null
+++ b/db/routines/vn/triggers/claimDms_afterDelete.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`claimDms_afterDelete`
+ AFTER DELETE ON `claimDms`
+ FOR EACH ROW
+BEGIN
+ INSERT INTO claimLog
+ SET `action` = 'delete',
+ `changedModel` = 'ClaimDms',
+ `changedModelId` = OLD.claimFk,
+ `userFk` = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/claimDms_beforeInsert.sql b/db/routines/vn/triggers/claimDms_beforeInsert.sql
new file mode 100644
index 000000000..bb84e7a81
--- /dev/null
+++ b/db/routines/vn/triggers/claimDms_beforeInsert.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`claimDms_beforeInsert`
+ BEFORE INSERT ON `claimDms`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/claimDms_beforeUpdate.sql b/db/routines/vn/triggers/claimDms_beforeUpdate.sql
new file mode 100644
index 000000000..8ffab268e
--- /dev/null
+++ b/db/routines/vn/triggers/claimDms_beforeUpdate.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`claimDms_beforeUpdate`
+ BEFORE UPDATE ON `claimDms`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/claimEnd_afterDelete.sql b/db/routines/vn/triggers/claimEnd_afterDelete.sql
new file mode 100644
index 000000000..dee80fc77
--- /dev/null
+++ b/db/routines/vn/triggers/claimEnd_afterDelete.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`claimEnd_afterDelete`
+ AFTER DELETE ON `claimEnd`
+ FOR EACH ROW
+BEGIN
+ INSERT INTO claimLog
+ SET `action` = 'delete',
+ `changedModel` = 'ClaimEnd',
+ `changedModelId` = OLD.id,
+ `userFk` = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/claimEnd_beforeInsert.sql b/db/routines/vn/triggers/claimEnd_beforeInsert.sql
new file mode 100644
index 000000000..beb66c297
--- /dev/null
+++ b/db/routines/vn/triggers/claimEnd_beforeInsert.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`claimEnd_beforeInsert`
+ BEFORE INSERT ON `claimEnd`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/claimEnd_beforeUpdate.sql b/db/routines/vn/triggers/claimEnd_beforeUpdate.sql
new file mode 100644
index 000000000..7e91996dd
--- /dev/null
+++ b/db/routines/vn/triggers/claimEnd_beforeUpdate.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`claimEnd_beforeUpdate`
+ BEFORE UPDATE ON `claimEnd`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/claimObservation_afterDelete.sql b/db/routines/vn/triggers/claimObservation_afterDelete.sql
new file mode 100644
index 000000000..b61368310
--- /dev/null
+++ b/db/routines/vn/triggers/claimObservation_afterDelete.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`claimObservation_afterDelete`
+ AFTER DELETE ON `claimObservation`
+ FOR EACH ROW
+BEGIN
+ INSERT INTO claimLog
+ SET `action` = 'delete',
+ `changedModel` = 'ClaimObservation',
+ `changedModelId` = OLD.id,
+ `userFk` = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/claimObservation_beforeInsert.sql b/db/routines/vn/triggers/claimObservation_beforeInsert.sql
new file mode 100644
index 000000000..e6cf4a42a
--- /dev/null
+++ b/db/routines/vn/triggers/claimObservation_beforeInsert.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`claimObservation_beforeInsert`
+ BEFORE INSERT ON `claimObservation`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/claimObservation_beforeUpdate.sql b/db/routines/vn/triggers/claimObservation_beforeUpdate.sql
new file mode 100644
index 000000000..79008eb1b
--- /dev/null
+++ b/db/routines/vn/triggers/claimObservation_beforeUpdate.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`claimObservation_beforeUpdate`
+ BEFORE UPDATE ON `claimObservation`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/claimState_afterDelete.sql b/db/routines/vn/triggers/claimState_afterDelete.sql
new file mode 100644
index 000000000..00c0a203d
--- /dev/null
+++ b/db/routines/vn/triggers/claimState_afterDelete.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`claimState_afterDelete`
+ AFTER DELETE ON `claimState`
+ FOR EACH ROW
+BEGIN
+ INSERT INTO claimLog
+ SET `action` = 'delete',
+ `changedModel` = 'ClaimState',
+ `changedModelId` = OLD.id,
+ `userFk` = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/claimState_beforeInsert.sql b/db/routines/vn/triggers/claimState_beforeInsert.sql
new file mode 100644
index 000000000..e289e8067
--- /dev/null
+++ b/db/routines/vn/triggers/claimState_beforeInsert.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`claimState_beforeInsert`
+ BEFORE INSERT ON `claimState`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/claimState_beforeUpdate.sql b/db/routines/vn/triggers/claimState_beforeUpdate.sql
new file mode 100644
index 000000000..53c8c254b
--- /dev/null
+++ b/db/routines/vn/triggers/claimState_beforeUpdate.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`claimState_beforeUpdate`
+ BEFORE UPDATE ON `claimState`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/claim_afterDelete.sql b/db/routines/vn/triggers/claim_afterDelete.sql
new file mode 100644
index 000000000..bd01ad80f
--- /dev/null
+++ b/db/routines/vn/triggers/claim_afterDelete.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`claim_afterDelete`
+ AFTER DELETE ON `claim`
+ FOR EACH ROW
+BEGIN
+ INSERT INTO claimLog
+ SET `action` = 'delete',
+ `changedModel` = 'Claim',
+ `changedModelId` = OLD.id,
+ `userFk` = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/claim_beforeInsert.sql b/db/routines/vn/triggers/claim_beforeInsert.sql
new file mode 100644
index 000000000..36f73902b
--- /dev/null
+++ b/db/routines/vn/triggers/claim_beforeInsert.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`claim_beforeInsert`
+ BEFORE INSERT ON `claim`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/claim_beforeUpdate.sql b/db/routines/vn/triggers/claim_beforeUpdate.sql
new file mode 100644
index 000000000..9dec746ad
--- /dev/null
+++ b/db/routines/vn/triggers/claim_beforeUpdate.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`claim_beforeUpdate`
+ BEFORE UPDATE ON `claim`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/clientContact_afterDelete.sql b/db/routines/vn/triggers/clientContact_afterDelete.sql
new file mode 100644
index 000000000..b138a0957
--- /dev/null
+++ b/db/routines/vn/triggers/clientContact_afterDelete.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`clientContact_afterDelete`
+ AFTER DELETE ON `clientContact`
+ FOR EACH ROW
+BEGIN
+ INSERT INTO clientLog
+ SET `action` = 'delete',
+ `changedModel` = 'ClientContact',
+ `changedModelId` = OLD.id,
+ `userFk` = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/clientContact_beforeInsert.sql b/db/routines/vn/triggers/clientContact_beforeInsert.sql
new file mode 100644
index 000000000..7ddf4d7dd
--- /dev/null
+++ b/db/routines/vn/triggers/clientContact_beforeInsert.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`clientContact_beforeInsert`
+ BEFORE INSERT ON `clientContact`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/clientCredit_afterInsert.sql b/db/routines/vn/triggers/clientCredit_afterInsert.sql
new file mode 100644
index 000000000..440f24865
--- /dev/null
+++ b/db/routines/vn/triggers/clientCredit_afterInsert.sql
@@ -0,0 +1,23 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`clientCredit_afterInsert`
+ AFTER INSERT ON `clientCredit`
+ FOR EACH ROW
+BEGIN
+
+ DECLARE vSender VARCHAR(50);
+
+ SELECT u.name INTO vSender
+ FROM account.`user` u
+ WHERE u.id = NEW.workerFk;
+
+ IF vSender IN ('juanvi','pepe') THEN
+
+ CALL `vn`.`mail_insert`('pako@verdnatura.es',
+ NULL,
+ CONCAT('ClientCredit ',vSender, ' ', NEW.clientFk, ' ' , NEW.amount, ' €'),
+ CONCAT('ClientCredit ',vSender, ' ', NEW.clientFk, ' ' , NEW.amount, ' €'));
+
+ END IF;
+
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/clientDms_afterDelete.sql b/db/routines/vn/triggers/clientDms_afterDelete.sql
new file mode 100644
index 000000000..9b6fb4876
--- /dev/null
+++ b/db/routines/vn/triggers/clientDms_afterDelete.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`clientDms_afterDelete`
+ AFTER DELETE ON `clientDms`
+ FOR EACH ROW
+BEGIN
+ INSERT INTO clientLog
+ SET `action` = 'delete',
+ `changedModel` = 'ClientDms',
+ `changedModelId` = OLD.dmsFk,
+ `userFk` = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/clientDms_beforeInsert.sql b/db/routines/vn/triggers/clientDms_beforeInsert.sql
new file mode 100644
index 000000000..011cc6e96
--- /dev/null
+++ b/db/routines/vn/triggers/clientDms_beforeInsert.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`clientDms_beforeInsert`
+ BEFORE INSERT ON `clientDms`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/clientDms_beforeUpdate.sql b/db/routines/vn/triggers/clientDms_beforeUpdate.sql
new file mode 100644
index 000000000..56eaec7eb
--- /dev/null
+++ b/db/routines/vn/triggers/clientDms_beforeUpdate.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`clientDms_beforeUpdate`
+ BEFORE UPDATE ON `clientDms`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/clientObservation_afterDelete.sql b/db/routines/vn/triggers/clientObservation_afterDelete.sql
new file mode 100644
index 000000000..c93564aa5
--- /dev/null
+++ b/db/routines/vn/triggers/clientObservation_afterDelete.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`clientObservation_afterDelete`
+ AFTER DELETE ON `clientObservation`
+ FOR EACH ROW
+BEGIN
+ INSERT INTO clientLog
+ SET `action` = 'delete',
+ `changedModel` = 'ClientObservation',
+ `changedModelId` = OLD.id,
+ `userFk` = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/clientObservation_beforeInsert.sql b/db/routines/vn/triggers/clientObservation_beforeInsert.sql
new file mode 100644
index 000000000..684873031
--- /dev/null
+++ b/db/routines/vn/triggers/clientObservation_beforeInsert.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`clientObservation_beforeInsert`
+ BEFORE INSERT ON `clientObservation`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/clientObservation_beforeUpdate.sql b/db/routines/vn/triggers/clientObservation_beforeUpdate.sql
new file mode 100644
index 000000000..6e0b63794
--- /dev/null
+++ b/db/routines/vn/triggers/clientObservation_beforeUpdate.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`clientObservation_beforeUpdate`
+ BEFORE UPDATE ON `clientObservation`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/clientSample_afterDelete.sql b/db/routines/vn/triggers/clientSample_afterDelete.sql
new file mode 100644
index 000000000..1ac9e77be
--- /dev/null
+++ b/db/routines/vn/triggers/clientSample_afterDelete.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`clientSample_afterDelete`
+ AFTER DELETE ON `clientSample`
+ FOR EACH ROW
+BEGIN
+ INSERT INTO clientLog
+ SET `action` = 'delete',
+ `changedModel` = 'ClientSample',
+ `changedModelId` = OLD.id,
+ `userFk` = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/clientSample_beforeInsert.sql b/db/routines/vn/triggers/clientSample_beforeInsert.sql
new file mode 100644
index 000000000..c7fe43c9b
--- /dev/null
+++ b/db/routines/vn/triggers/clientSample_beforeInsert.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`clientSample_beforeInsert`
+ BEFORE INSERT ON `clientSample`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/clientSample_beforeUpdate.sql b/db/routines/vn/triggers/clientSample_beforeUpdate.sql
new file mode 100644
index 000000000..5c16950b5
--- /dev/null
+++ b/db/routines/vn/triggers/clientSample_beforeUpdate.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`clientSample_beforeUpdate`
+ BEFORE UPDATE ON `clientSample`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/client_afterDelete.sql b/db/routines/vn/triggers/client_afterDelete.sql
new file mode 100644
index 000000000..e6849ef49
--- /dev/null
+++ b/db/routines/vn/triggers/client_afterDelete.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`client_afterDelete`
+ AFTER DELETE ON `client`
+ FOR EACH ROW
+BEGIN
+ INSERT INTO clientLog
+ SET `action` = 'delete',
+ `changedModel` = 'Client',
+ `changedModelId` = OLD.id,
+ `userFk` = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/client_afterInsert.sql b/db/routines/vn/triggers/client_afterInsert.sql
new file mode 100644
index 000000000..764d8f067
--- /dev/null
+++ b/db/routines/vn/triggers/client_afterInsert.sql
@@ -0,0 +1,13 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`client_afterInsert`
+ AFTER INSERT ON `client`
+ FOR EACH ROW
+BEGIN
+ IF NEW.credit IS NOT NULL AND NEW.credit THEN
+ INSERT INTO clientCredit
+ SET clientFk = NEW.id,
+ workerFk = NEW.editorFk,
+ amount = NEW.credit;
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/client_afterUpdate.sql b/db/routines/vn/triggers/client_afterUpdate.sql
new file mode 100644
index 000000000..481b00007
--- /dev/null
+++ b/db/routines/vn/triggers/client_afterUpdate.sql
@@ -0,0 +1,27 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`client_afterUpdate`
+ AFTER UPDATE ON `client`
+ FOR EACH ROW
+BEGIN
+ IF !(NEW.defaultAddressFk <=> OLD.defaultAddressFk) THEN
+ UPDATE `address` SET isDefaultAddress = 0
+ WHERE clientFk = NEW.id;
+
+ UPDATE `address` SET isDefaultAddress = 1
+ WHERE id = NEW.defaultAddressFk;
+ END IF;
+
+ IF NOT (NEW.provinceFk <=> OLD.provinceFk) OR NOT (NEW.isVies <=> OLD.isVies) THEN
+ INSERT IGNORE INTO ticketRecalc (ticketFk)
+ SELECT id FROM ticket t
+ WHERE t.clientFk = NEW.id
+ AND t.refFk IS NULL;
+ END IF;
+
+ IF NOT NEW.isActive THEN
+ UPDATE account.`user`
+ SET active = FALSE
+ WHERE id = NEW.id;
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/client_beforeInsert.sql b/db/routines/vn/triggers/client_beforeInsert.sql
new file mode 100644
index 000000000..75b69c7dd
--- /dev/null
+++ b/db/routines/vn/triggers/client_beforeInsert.sql
@@ -0,0 +1,21 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`client_beforeInsert`
+ BEFORE INSERT ON `client`
+ FOR EACH ROW
+BEGIN
+
+ SET NEW.editorFk = account.myUser_getId();
+
+ IF (NEW.phone <> '') THEN
+ CALL pbx.phone_isValid(NEW.phone);
+ END IF;
+
+ IF (NEW.mobile <> '') THEN
+ CALL pbx.phone_isValid(NEW.mobile);
+ END IF;
+
+ SET NEW.accountingAccount = 4300000000 + NEW.id;
+
+ SET NEW.lastSalesPersonFk = NEW.salesPersonFk;
+END$$
+DELIMITER ;
diff --git a/db/changes/231401/00-clientBeforeUpdate.sql b/db/routines/vn/triggers/client_beforeUpdate.sql
similarity index 73%
rename from db/changes/231401/00-clientBeforeUpdate.sql
rename to db/routines/vn/triggers/client_beforeUpdate.sql
index 6bae98f61..2f384c535 100644
--- a/db/changes/231401/00-clientBeforeUpdate.sql
+++ b/db/routines/vn/triggers/client_beforeUpdate.sql
@@ -1,21 +1,26 @@
-DROP TRIGGER IF EXISTS `vn`.`client_beforeUpdate`;
-USE `vn`;
-
DELIMITER $$
-$$
-CREATE DEFINER=`root`@`localhost` TRIGGER `vn`.`client_beforeUpdate`
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`client_beforeUpdate`
BEFORE UPDATE ON `client`
FOR EACH ROW
BEGIN
DECLARE vText VARCHAR(255) DEFAULT NULL;
- DECLARE vPayMethodFk INT;
+ DECLARE vPayMethodFk INT;
+
+ SET NEW.editorFk = account.myUser_getId();
+
+ IF NOT(NEW.credit <=> OLD.credit) THEN
+ INSERT INTO clientCredit
+ SET clientFk = NEW.id,
+ amount = NEW.credit,
+ workerFk = NEW.editorFk;
+ END IF;
-- Comprueba que el formato de los teléfonos es válido
IF !(NEW.phone <=> OLD.phone) AND (NEW.phone <> '') THEN
CALL pbx.phone_isValid(NEW.phone);
END IF;
- IF !(NEW.mobile <=> OLD.mobile) AND (NEW.mobile <> '')THEN
+ IF !(NEW.mobile <=> OLD.mobile) AND (NEW.mobile <> '')THEN
CALL pbx.phone_isValid(NEW.mobile);
END IF;
@@ -25,7 +30,7 @@ BEGIN
IF NEW.payMethodFk = vPayMethodFk AND NEW.dueDay = 0 THEN
SET NEW.dueDay = 5;
- END IF;
+ END IF;
-- Avisar al comercial si ha llegado la documentación sepa/core
@@ -38,12 +43,12 @@ BEGIN
END IF;
IF vText IS NOT NULL
- THEN
+ THEN
INSERT INTO mail(receiver, replyTo, `subject`, body)
SELECT
CONCAT(IF(ac.id,u.name, 'jgallego'), '@verdnatura.es'),
- 'administracion@verdnatura.es',
- CONCAT('Cliente ', NEW.id),
+ 'administracion@verdnatura.es',
+ CONCAT('Cliente ', NEW.id),
CONCAT('Recibida la documentación: ', vText)
FROM worker w
LEFT JOIN account.user u ON w.id = u.id AND u.active
@@ -51,10 +56,10 @@ BEGIN
WHERE w.id = NEW.salesPersonFk;
END IF;
- IF NEW.salespersonFk IS NULL AND OLD.salespersonFk IS NOT NULL THEN
+ IF NEW.salespersonFk IS NULL AND OLD.salespersonFk IS NOT NULL THEN
IF (SELECT COUNT(clientFk)
FROM clientProtected
- WHERE clientFk = NEW.id
+ WHERE clientFk = NEW.id
) > 0 THEN
CALL util.throw("HAS_CLIENT_PROTECTED");
END IF;
@@ -67,6 +72,5 @@ BEGIN
IF !(NEW.businessTypeFk <=> OLD.businessTypeFk) AND (NEW.businessTypeFk = 'individual' OR OLD.businessTypeFk = 'individual') THEN
SET NEW.isTaxDataChecked = 0;
END IF;
-
END$$
DELIMITER ;
diff --git a/db/routines/vn/triggers/cmr_beforeDelete.sql b/db/routines/vn/triggers/cmr_beforeDelete.sql
new file mode 100644
index 000000000..2cb789244
--- /dev/null
+++ b/db/routines/vn/triggers/cmr_beforeDelete.sql
@@ -0,0 +1,10 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`cmr_beforeDelete`
+ BEFORE DELETE ON `cmr`
+ FOR EACH ROW
+BEGIN
+ IF NOT (OLD.companyFk <=> NULL AND OLD.addressFromFk <=> NULL AND OLD.packagesList <=> NULL) THEN
+ CALL util.throw("Can not delete cmr, fields required not empty");
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/collectionColors_beforeInsert.sql b/db/routines/vn/triggers/collectionColors_beforeInsert.sql
new file mode 100644
index 000000000..254529932
--- /dev/null
+++ b/db/routines/vn/triggers/collectionColors_beforeInsert.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`collectionColors_beforeInsert`
+ BEFORE INSERT ON `collectionColors`
+ FOR EACH ROW
+BEGIN
+ CALL util.checkHex(NEW.rgb);
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/collectionColors_beforeUpdate.sql b/db/routines/vn/triggers/collectionColors_beforeUpdate.sql
new file mode 100644
index 000000000..1ee83ab74
--- /dev/null
+++ b/db/routines/vn/triggers/collectionColors_beforeUpdate.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`collectionColors_beforeUpdate`
+ BEFORE UPDATE ON `collectionColors`
+ FOR EACH ROW
+BEGIN
+ CALL util.checkHex(NEW.rgb);
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/collectionVolumetry_afterDelete.sql b/db/routines/vn/triggers/collectionVolumetry_afterDelete.sql
new file mode 100644
index 000000000..53c6340ee
--- /dev/null
+++ b/db/routines/vn/triggers/collectionVolumetry_afterDelete.sql
@@ -0,0 +1,26 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`collectionVolumetry_afterDelete`
+ AFTER DELETE ON `collectionVolumetry`
+ FOR EACH ROW
+BEGIN
+ DECLARE vJSON JSON DEFAULT JSON_OBJECT();
+ DECLARE vUserFk INT DEFAULT account.myUser_getId();
+
+ SET vJSON = JSON_MERGE(JSON_OBJECT('id', OLD.id), vJSON);
+ SET vJSON = JSON_MERGE(JSON_OBJECT('level', OLD.level), vJSON);
+ SET vJSON = JSON_MERGE(JSON_OBJECT('lines', OLD.lines), vJSON);
+ SET vJSON = JSON_MERGE(JSON_OBJECT('liters', OLD.liters), vJSON);
+ SET vJSON = JSON_MERGE(JSON_OBJECT('height', OLD.height), vJSON);
+ SET vJSON = JSON_MERGE(JSON_OBJECT('itemPackingTypeFk', OLD.itemPackingTypeFk), vJSON);
+ SET vJSON = JSON_MERGE(JSON_OBJECT('trainFk', OLD.trainFk), vJSON);
+
+ SET vJSON = JSON_MERGE(JSON_OBJECT('userFk', vUserFk), vJSON);
+ SET vJSON = JSON_MERGE(JSON_OBJECT('action', 'delete'), vJSON);
+
+ SET vJSON = util.notification_send(
+ 'modified-collection-volumetry',
+ JSON_OBJECT('data', JSON_EXTRACT(vJSON, '$')),
+ vUserFk
+ );
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/collectionVolumetry_afterInsert.sql b/db/routines/vn/triggers/collectionVolumetry_afterInsert.sql
new file mode 100644
index 000000000..9f061742c
--- /dev/null
+++ b/db/routines/vn/triggers/collectionVolumetry_afterInsert.sql
@@ -0,0 +1,26 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`collectionVolumetry_afterInsert`
+ AFTER INSERT ON `collectionVolumetry`
+ FOR EACH ROW
+BEGIN
+ DECLARE vJSON JSON DEFAULT JSON_OBJECT();
+ DECLARE vUserFk INT DEFAULT account.myUser_getId();
+
+ SET vJSON = JSON_MERGE(JSON_OBJECT('id', NEW.id), vJSON);
+ SET vJSON = JSON_MERGE(JSON_OBJECT('level', NEW.level), vJSON);
+ SET vJSON = JSON_MERGE(JSON_OBJECT('lines', NEW.lines), vJSON);
+ SET vJSON = JSON_MERGE(JSON_OBJECT('liters', NEW.liters), vJSON);
+ SET vJSON = JSON_MERGE(JSON_OBJECT('height', NEW.height), vJSON);
+ SET vJSON = JSON_MERGE(JSON_OBJECT('itemPackingTypeFk', NEW.itemPackingTypeFk), vJSON);
+ SET vJSON = JSON_MERGE(JSON_OBJECT('trainFk', NEW.trainFk), vJSON);
+
+ SET vJSON = JSON_MERGE(JSON_OBJECT('userFk', vUserFk), vJSON);
+ SET vJSON = JSON_MERGE(JSON_OBJECT('action', 'insert'), vJSON);
+
+ SET vJSON = util.notification_send(
+ 'modified-collection-volumetry',
+ JSON_OBJECT('data', JSON_EXTRACT(vJSON, '$')),
+ vUserFk
+ );
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/collectionVolumetry_afterUpdate.sql b/db/routines/vn/triggers/collectionVolumetry_afterUpdate.sql
new file mode 100644
index 000000000..6dc4311c5
--- /dev/null
+++ b/db/routines/vn/triggers/collectionVolumetry_afterUpdate.sql
@@ -0,0 +1,46 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`collectionVolumetry_afterUpdate`
+ AFTER UPDATE ON `collectionVolumetry`
+ FOR EACH ROW
+BEGIN
+ DECLARE vJSON JSON DEFAULT JSON_OBJECT();
+ DECLARE vUserFk INT DEFAULT account.myUser_getId();
+
+ IF NOT (NEW.id <=> OLD.id) THEN
+ SET vJSON = JSON_MERGE(JSON_OBJECT('id', NEW.id), vJSON);
+ END IF;
+
+ IF NOT (NEW.`level` <=> OLD.`level`) THEN
+ SET vJSON = JSON_MERGE(JSON_OBJECT('level', NEW.`level`), vJSON);
+ END IF;
+
+ IF NOT (NEW.`lines` <=> OLD.`lines`) THEN
+ SET vJSON = JSON_MERGE(JSON_OBJECT('lines', NEW.`lines`), vJSON);
+ END IF;
+
+ IF NOT (NEW.liters <=> OLD.liters) THEN
+ SET vJSON = JSON_MERGE(JSON_OBJECT('liters', NEW.liters), vJSON);
+ END IF;
+
+ IF NOT (NEW.height <=> OLD.height) THEN
+ SET vJSON = JSON_MERGE(JSON_OBJECT('height', NEW.height), vJSON);
+ END IF;
+
+ IF NOT (NEW.itemPackingTypeFk <=> OLD.itemPackingTypeFk) THEN
+ SET vJSON = JSON_MERGE(JSON_OBJECT('itemPackingTypeFk', NEW.itemPackingTypeFk), vJSON);
+ END IF;
+
+ IF NOT (NEW.trainFk <=> OLD.trainFk) THEN
+ SET vJSON = JSON_MERGE(JSON_OBJECT('trainFk', NEW.trainFk), vJSON);
+ END IF;
+
+ SET vJSON = JSON_MERGE(JSON_OBJECT('userFk', vUserFk), vJSON);
+ SET vJSON = JSON_MERGE(JSON_OBJECT('action', 'update'), vJSON);
+
+ SET vJSON = util.notification_send(
+ 'modified-collection-volumetry',
+ JSON_OBJECT('data', JSON_EXTRACT(vJSON, '$')),
+ vUserFk
+ );
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/collection_beforeUpdate.sql b/db/routines/vn/triggers/collection_beforeUpdate.sql
new file mode 100644
index 000000000..40a0b7bed
--- /dev/null
+++ b/db/routines/vn/triggers/collection_beforeUpdate.sql
@@ -0,0 +1,36 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`collection_beforeUpdate`
+ BEFORE UPDATE ON `collection`
+ FOR EACH ROW
+BEGIN
+
+ DECLARE vStateFk INT;
+ DECLARE vTotalLines INT;
+ DECLARE vPickedLines INT;
+
+ IF NEW.saleTotalCount <= NEW.salePickedCount
+ AND (NEW.saleTotalCount != OLD.saleTotalCount
+ OR NEW.salePickedCount != OLD.salePickedCount)
+ THEN
+
+ SELECT id INTO vStateFk
+ FROM vn.state
+ WHERE code = 'PREPARED';
+
+ SET NEW.stateFk = vStateFk;
+
+ END IF;
+
+ IF NEW.saleTotalCount > NEW.salePickedCount
+ AND (NEW.saleTotalCount != OLD.saleTotalCount OR NEW.salePickedCount != OLD.salePickedCount) THEN
+
+ SELECT id INTO vStateFk
+ FROM vn.state
+ WHERE code = 'ON_PREPARATION';
+
+ SET NEW.stateFk = vStateFk;
+
+ END IF;
+
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/country_afterDelete.sql b/db/routines/vn/triggers/country_afterDelete.sql
new file mode 100644
index 000000000..30fbfc817
--- /dev/null
+++ b/db/routines/vn/triggers/country_afterDelete.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`country_afterDelete`
+ AFTER DELETE ON `country`
+ FOR EACH ROW
+BEGIN
+ CALL zoneGeo_delete(OLD.geoFk);
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/country_afterInsert.sql b/db/routines/vn/triggers/country_afterInsert.sql
new file mode 100644
index 000000000..0a7e5dc00
--- /dev/null
+++ b/db/routines/vn/triggers/country_afterInsert.sql
@@ -0,0 +1,19 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`country_afterInsert`
+ AFTER INSERT ON `country`
+ FOR EACH ROW
+BEGIN
+ UPDATE sage.Naciones
+ SET countryFk = NEW.id
+ WHERE Nacion = NEW.country;
+
+ IF ROW_COUNT() = 0 THEN
+ CALL mail_insert(
+ 'cau@verdnatura.es',
+ NULL,
+ 'Actualizar tabla sage.Naciones',
+ CONCAT('Se ha insertado un nuevo país en la tabla vn.conuntry. Para el correcto funcionamiento del sistema \n\t\t\t\tde contabilidad es necesario actualizar la columna sage.Naciones.countryFk con el valor del nuevo país. \n\t\t\t Hay que buscar el nuevo país: ', NEW.country, ' en la tabla sage.Naciones y actualizar el campo sage.Naciones.countryFk con el valor ', NEW.id)
+ );
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/country_afterUpdate.sql b/db/routines/vn/triggers/country_afterUpdate.sql
new file mode 100644
index 000000000..6afa2fd48
--- /dev/null
+++ b/db/routines/vn/triggers/country_afterUpdate.sql
@@ -0,0 +1,11 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`country_afterUpdate`
+ AFTER UPDATE ON `country`
+ FOR EACH ROW
+BEGIN
+ IF !(OLD.country <=> NEW.country) THEN
+ UPDATE zoneGeo SET `name` = NEW.country
+ WHERE id = NEW.geoFk;
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/country_beforeInsert.sql b/db/routines/vn/triggers/country_beforeInsert.sql
new file mode 100644
index 000000000..26e0235ce
--- /dev/null
+++ b/db/routines/vn/triggers/country_beforeInsert.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`country_beforeInsert`
+ BEFORE INSERT ON `country`
+ FOR EACH ROW
+BEGIN
+ SET NEW.geoFk = zoneGeo_new('country', NEW.country, NULL);
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/country_beforeUpdate.sql b/db/routines/vn/triggers/country_beforeUpdate.sql
new file mode 100644
index 000000000..31de99f34
--- /dev/null
+++ b/db/routines/vn/triggers/country_beforeUpdate.sql
@@ -0,0 +1,10 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`country_beforeUpdate`
+ BEFORE UPDATE ON `country`
+ FOR EACH ROW
+BEGIN
+ -- IF !(OLD.geoFk <=> NEW.geoFk) THEN
+ -- CALL zoneGeo_throwNotEditable;
+ -- END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/creditClassification_beforeUpdate.sql b/db/routines/vn/triggers/creditClassification_beforeUpdate.sql
new file mode 100644
index 000000000..410ce2bc4
--- /dev/null
+++ b/db/routines/vn/triggers/creditClassification_beforeUpdate.sql
@@ -0,0 +1,14 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`creditClassification_beforeUpdate`
+ BEFORE UPDATE ON `creditClassification`
+ FOR EACH ROW
+BEGIN
+ IF NEW.client <> OLD.client THEN
+ CALL util.throw('NOT_ALLOWED_CHANGE_CLIENT');
+ END IF;
+ IF NEW.dateEnd IS NOT NULL AND OLD.dateEnd IS NULL THEN
+ UPDATE `client` c
+ SET creditInsurance = NULL WHERE c.id = NEW.client;
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/creditInsurance_afterInsert.sql b/db/routines/vn/triggers/creditInsurance_afterInsert.sql
new file mode 100644
index 000000000..22f94854b
--- /dev/null
+++ b/db/routines/vn/triggers/creditInsurance_afterInsert.sql
@@ -0,0 +1,11 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`creditInsurance_afterInsert`
+ AFTER INSERT ON `creditInsurance`
+ FOR EACH ROW
+BEGIN
+ UPDATE `client` c
+ JOIN vn.creditClassification cc ON cc.client = c.id
+ SET creditInsurance = NEW.credit WHERE cc.id = NEW.creditClassification;
+
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/creditInsurance_beforeInsert.sql b/db/routines/vn/triggers/creditInsurance_beforeInsert.sql
new file mode 100644
index 000000000..51ab223b1
--- /dev/null
+++ b/db/routines/vn/triggers/creditInsurance_beforeInsert.sql
@@ -0,0 +1,10 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`creditInsurance_beforeInsert`
+ BEFORE INSERT ON `creditInsurance`
+ FOR EACH ROW
+BEGIN
+ IF NEW.creditClassificationFk THEN
+ SET NEW.creditClassification = NEW.creditClassificationFk;
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/delivery_beforeInsert.sql b/db/routines/vn/triggers/delivery_beforeInsert.sql
new file mode 100644
index 000000000..89431c30f
--- /dev/null
+++ b/db/routines/vn/triggers/delivery_beforeInsert.sql
@@ -0,0 +1,20 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`delivery_beforeInsert`
+ BEFORE INSERT ON `delivery`
+ FOR EACH ROW
+BEGIN
+
+ IF (NEW.longitude IS NOT NULL AND NEW.latitude IS NOT NULL AND NEW.ticketFK IS NOT NULL)
+ THEN
+ UPDATE address
+ SET longitude = NEW.longitude,
+ latitude = NEW.latitude
+ WHERE id IN (
+ SELECT addressFK
+ FROM ticket
+ WHERE id = NEW.ticketFk
+ );
+ END IF;
+
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/delivery_beforeUpdate.sql b/db/routines/vn/triggers/delivery_beforeUpdate.sql
new file mode 100644
index 000000000..7e6aa7d4c
--- /dev/null
+++ b/db/routines/vn/triggers/delivery_beforeUpdate.sql
@@ -0,0 +1,20 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`delivery_beforeUpdate`
+ BEFORE UPDATE ON `delivery`
+ FOR EACH ROW
+BEGIN
+
+IF (NEW.longitude IS NOT NULL AND NEW.latitude IS NOT NULL AND NEW.ticketFK IS NOT NULL)
+ THEN
+ UPDATE address
+ SET longitude = NEW.longitude,
+ latitude = NEW.latitude
+ WHERE id IN (
+ SELECT addressFK
+ FROM ticket
+ WHERE id = NEW.ticketFk
+ );
+ END IF;
+
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/department_afterDelete.sql b/db/routines/vn/triggers/department_afterDelete.sql
new file mode 100644
index 000000000..311847556
--- /dev/null
+++ b/db/routines/vn/triggers/department_afterDelete.sql
@@ -0,0 +1,14 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`department_afterDelete`
+ AFTER DELETE ON `department`
+ FOR EACH ROW
+BEGIN
+
+ UPDATE vn.department_recalc SET isChanged = TRUE;
+
+ UPDATE vn.business b
+ JOIN vn.department d ON d.id = b.departmentFk
+ SET b.departmentFk = d.parentFk
+ WHERE b.departmentFk = OLD.id;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/department_afterUpdate.sql b/db/routines/vn/triggers/department_afterUpdate.sql
new file mode 100644
index 000000000..a425e1809
--- /dev/null
+++ b/db/routines/vn/triggers/department_afterUpdate.sql
@@ -0,0 +1,17 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`department_afterUpdate`
+ AFTER UPDATE ON `department`
+ FOR EACH ROW
+BEGIN
+ IF !(OLD.parentFk <=> NEW.parentFk) THEN
+ UPDATE vn.department_recalc SET isChanged = TRUE;
+ END IF;
+
+ IF !(OLD.twoFactor <=> NEW.twoFactor) THEN
+ UPDATE account.user u
+ JOIN vn.workerDepartment wd ON wd.workerFk = u.id
+ SET u.twoFactor = NEW.twoFactor
+ WHERE wd.departmentFk = NEW.id;
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/department_beforeDelete.sql b/db/routines/vn/triggers/department_beforeDelete.sql
new file mode 100644
index 000000000..6eaa5b42e
--- /dev/null
+++ b/db/routines/vn/triggers/department_beforeDelete.sql
@@ -0,0 +1,13 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`department_beforeDelete`
+ BEFORE DELETE ON `department`
+ FOR EACH ROW
+BEGIN
+
+ UPDATE vn.business b
+ JOIN vn.department d ON d.id = b.departmentFk
+ SET b.departmentFk = d.parentFk
+ WHERE b.departmentFk = OLD.id;
+
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/department_beforeInsert.sql b/db/routines/vn/triggers/department_beforeInsert.sql
new file mode 100644
index 000000000..6bd6617ae
--- /dev/null
+++ b/db/routines/vn/triggers/department_beforeInsert.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`department_beforeInsert`
+ BEFORE INSERT ON `department`
+ FOR EACH ROW
+BEGIN
+ UPDATE vn.department_recalc SET isChanged = TRUE;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/deviceProductionConfig_afterUpdate.sql b/db/routines/vn/triggers/deviceProductionConfig_afterUpdate.sql
new file mode 100644
index 000000000..98e4f844f
--- /dev/null
+++ b/db/routines/vn/triggers/deviceProductionConfig_afterUpdate.sql
@@ -0,0 +1,13 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`deviceProductionConfig_afterUpdate`
+ AFTER UPDATE ON `deviceProductionConfig`
+ FOR EACH ROW
+BEGIN
+ IF NEW.isAllUsersAllowed = 1 OR NEW.isAllUsersAllowed = -1 THEN
+ SET @username := (SELECT account.myUser_getName());
+ INSERT INTO vn.mail (receiver, subject, body)
+ VALUES ('cau@verdnatura.es', 'Se ha activado la autenticación sin restricciones en la app',
+ CONCAT('El usuario ', @username,' ha habilitado la opción para que todos los usuarios puedan acceder a la app sin restricciones'));
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/deviceProductionModels_beforeInsert.sql b/db/routines/vn/triggers/deviceProductionModels_beforeInsert.sql
new file mode 100644
index 000000000..3994520b7
--- /dev/null
+++ b/db/routines/vn/triggers/deviceProductionModels_beforeInsert.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`deviceProductionModels_beforeInsert`
+ BEFORE INSERT ON `deviceProductionModels`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/deviceProductionModels_beforeUpdate.sql b/db/routines/vn/triggers/deviceProductionModels_beforeUpdate.sql
new file mode 100644
index 000000000..01c8d347e
--- /dev/null
+++ b/db/routines/vn/triggers/deviceProductionModels_beforeUpdate.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`deviceProductionModels_beforeUpdate`
+ BEFORE UPDATE ON `deviceProductionModels`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/deviceProductionState_beforeInsert.sql b/db/routines/vn/triggers/deviceProductionState_beforeInsert.sql
new file mode 100644
index 000000000..1a2a66e10
--- /dev/null
+++ b/db/routines/vn/triggers/deviceProductionState_beforeInsert.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`deviceProductionState_beforeInsert`
+ BEFORE INSERT ON `deviceProductionState`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/deviceProductionState_beforeUpdate.sql b/db/routines/vn/triggers/deviceProductionState_beforeUpdate.sql
new file mode 100644
index 000000000..e8172fb42
--- /dev/null
+++ b/db/routines/vn/triggers/deviceProductionState_beforeUpdate.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`deviceProductionState_beforeUpdate`
+ BEFORE UPDATE ON `deviceProductionState`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/deviceProductionUser_afterDelete.sql b/db/routines/vn/triggers/deviceProductionUser_afterDelete.sql
new file mode 100644
index 000000000..a95170e9a
--- /dev/null
+++ b/db/routines/vn/triggers/deviceProductionUser_afterDelete.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`deviceProductionUser_afterDelete`
+ AFTER DELETE ON `deviceProductionUser`
+ FOR EACH ROW
+BEGIN
+ INSERT INTO deviceProductionLog
+ SET `action` = 'delete',
+ `changedModel` = 'DeviceProductionUser',
+ `changedModelId` = OLD.deviceProductionFk,
+ `userFk` = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/deviceProductionUser_beforeInsert.sql b/db/routines/vn/triggers/deviceProductionUser_beforeInsert.sql
new file mode 100644
index 000000000..b392cf5a1
--- /dev/null
+++ b/db/routines/vn/triggers/deviceProductionUser_beforeInsert.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`deviceProductionUser_beforeInsert`
+ BEFORE INSERT ON `deviceProductionUser`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/deviceProductionUser_beforeUpdate.sql b/db/routines/vn/triggers/deviceProductionUser_beforeUpdate.sql
new file mode 100644
index 000000000..055f81790
--- /dev/null
+++ b/db/routines/vn/triggers/deviceProductionUser_beforeUpdate.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`deviceProductionUser_beforeUpdate`
+ BEFORE UPDATE ON `deviceProductionUser`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/deviceProduction_afterDelete.sql b/db/routines/vn/triggers/deviceProduction_afterDelete.sql
new file mode 100644
index 000000000..af2b640e5
--- /dev/null
+++ b/db/routines/vn/triggers/deviceProduction_afterDelete.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`deviceProduction_afterDelete`
+ AFTER DELETE ON `deviceProduction`
+ FOR EACH ROW
+BEGIN
+ INSERT INTO deviceProductionLog
+ SET `action` = 'delete',
+ `changedModel` = 'DeviceProduction',
+ `changedModelId` = OLD.id,
+ `userFk` = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/deviceProduction_beforeInsert.sql b/db/routines/vn/triggers/deviceProduction_beforeInsert.sql
new file mode 100644
index 000000000..66b5c2aef
--- /dev/null
+++ b/db/routines/vn/triggers/deviceProduction_beforeInsert.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`deviceProduction_beforeInsert`
+ BEFORE INSERT ON `deviceProduction`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/deviceProduction_beforeUpdate.sql b/db/routines/vn/triggers/deviceProduction_beforeUpdate.sql
new file mode 100644
index 000000000..9206195fe
--- /dev/null
+++ b/db/routines/vn/triggers/deviceProduction_beforeUpdate.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`deviceProduction_beforeUpdate`
+ BEFORE UPDATE ON `deviceProduction`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/dms_beforeDelete.sql b/db/routines/vn/triggers/dms_beforeDelete.sql
new file mode 100644
index 000000000..3bbc05ba3
--- /dev/null
+++ b/db/routines/vn/triggers/dms_beforeDelete.sql
@@ -0,0 +1,16 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`dms_beforeDelete`
+ BEFORE DELETE ON `dms`
+ FOR EACH ROW
+BEGIN
+ DECLARE vCanNotBeDeleted INT;
+ SELECT COUNT(*) INTO vCanNotBeDeleted
+ FROM dmsType dt
+ WHERE NOT (code <=> 'trash')
+ AND dt.id = OLD.dmsTypeFk;
+
+ IF vCanNotBeDeleted THEN
+ CALL util.throw('A dms can not be deleted');
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/dms_beforeInsert.sql b/db/routines/vn/triggers/dms_beforeInsert.sql
new file mode 100644
index 000000000..f7877ecb8
--- /dev/null
+++ b/db/routines/vn/triggers/dms_beforeInsert.sql
@@ -0,0 +1,27 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`dms_beforeInsert`
+ BEFORE INSERT ON `dms`
+ FOR EACH ROW
+BEGIN
+ DECLARE vHardCopyNumber INT;
+ DECLARE vDmsTypeCode INT;
+
+ IF (SELECT NOT hasDms FROM warehouse WHERE id = NEW.warehouseFk) THEN
+ CALL util.throw('this warehouse has not dms');
+ END IF;
+
+ IF NEW.hasFile THEN
+ SELECT 1 + MAX(hardCopyNumber) INTO vHardCopyNumber
+ FROM dms
+ WHERE warehouseFk = NEW.warehouseFk;
+
+ SET NEW.hardCopyNumber = IFNULL(vHardCopyNumber,1);
+ END IF;
+
+ SELECT code INTO vDmsTypeCode
+ FROM dmsType WHERE NEW.dmsTypeFk = id;
+ IF (vDmsTypeCode ='ticket') THEN
+ UPDATE ticket SET isSigned = 1 WHERE id = NEW.reference;
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/dms_beforeUpdate.sql b/db/routines/vn/triggers/dms_beforeUpdate.sql
new file mode 100644
index 000000000..c93659d45
--- /dev/null
+++ b/db/routines/vn/triggers/dms_beforeUpdate.sql
@@ -0,0 +1,28 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`dms_beforeUpdate`
+ BEFORE UPDATE ON `dms`
+ FOR EACH ROW
+BEGIN
+ DECLARE vHardCopyNumber INT;
+
+ IF (NEW.hasFile <> 0) AND (OLD.hasFile = 0) AND (NEW.hardCopyNumber IS NULL)
+ OR
+ (NEW.hardCopyNumber = OLD.hardCopyNumber AND OLD.warehouseFk <> NEW.warehouseFk) THEN
+
+ IF (SELECT NOT hasDms FROM warehouse WHERE id = NEW.warehouseFk) THEN
+ SET NEW.warehouseFk = (SELECT id FROM warehouse WHERE name = 'Algemesi');
+ END IF;
+
+ SELECT 1 + MAX(hardCopyNumber) INTO vHardCopyNumber
+ FROM dms
+ WHERE warehouseFk = NEW.warehouseFk;
+
+ SET NEW.hardCopyNumber = IFNULL(vHardCopyNumber,1);
+ END IF;
+
+ IF ((NEW.hardCopyNumber = 0) OR NEW.hardCopyNumber IS NULL) AND (OLD.hardCopyNumber <> 0) THEN
+
+ SET NEW.hasFile = 0;
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/duaTax_beforeInsert.sql b/db/routines/vn/triggers/duaTax_beforeInsert.sql
new file mode 100644
index 000000000..9ca1d970d
--- /dev/null
+++ b/db/routines/vn/triggers/duaTax_beforeInsert.sql
@@ -0,0 +1,9 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`duaTax_beforeInsert`
+ BEFORE INSERT ON `duaTax`
+ FOR EACH ROW
+BEGIN
+ SET NEW.rate = duaTax_getRate(NEW.duaFk, NEW.taxClassFk);
+ SET NEW.tax = NEW.base * NEW.rate / 100;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/duaTax_beforeUpdate.sql b/db/routines/vn/triggers/duaTax_beforeUpdate.sql
new file mode 100644
index 000000000..dca8958a9
--- /dev/null
+++ b/db/routines/vn/triggers/duaTax_beforeUpdate.sql
@@ -0,0 +1,9 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`duaTax_beforeUpdate`
+ BEFORE UPDATE ON `duaTax`
+ FOR EACH ROW
+BEGIN
+ SET NEW.rate = duaTax_getRate(NEW.duaFk, NEW.taxClassFk);
+ SET NEW.tax = NEW.base * NEW.rate / 100;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/ektEntryAssign_afterInsert.sql b/db/routines/vn/triggers/ektEntryAssign_afterInsert.sql
new file mode 100644
index 000000000..e42b43ca1
--- /dev/null
+++ b/db/routines/vn/triggers/ektEntryAssign_afterInsert.sql
@@ -0,0 +1,6 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ektEntryAssign_afterInsert`
+ AFTER INSERT ON `ektEntryAssign`
+ FOR EACH ROW
+UPDATE entry SET reference = NEW.`ref` WHERE id = NEW.entryFk$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/ektEntryAssign_afterUpdate.sql b/db/routines/vn/triggers/ektEntryAssign_afterUpdate.sql
new file mode 100644
index 000000000..8d2791d0f
--- /dev/null
+++ b/db/routines/vn/triggers/ektEntryAssign_afterUpdate.sql
@@ -0,0 +1,10 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ektEntryAssign_afterUpdate`
+ AFTER UPDATE ON `ektEntryAssign`
+ FOR EACH ROW
+BEGIN
+ IF NOT(NEW.`ref` <=> OLD.`ref`) OR NOT(NEW.`entryFk` <=> OLD.`entryFk`) THEN
+ UPDATE entry SET reference = NEW.`ref` WHERE id = NEW.entryFk;
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/entryDms_afterDelete.sql b/db/routines/vn/triggers/entryDms_afterDelete.sql
new file mode 100644
index 000000000..9ae8e7058
--- /dev/null
+++ b/db/routines/vn/triggers/entryDms_afterDelete.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`entryDms_afterDelete`
+ AFTER DELETE ON `entryDms`
+ FOR EACH ROW
+BEGIN
+ INSERT INTO entryLog
+ SET `action` = 'delete',
+ `changedModel` = 'EntryDms',
+ `changedModelId` = OLD.entryFk,
+ `userFk` = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/entryDms_beforeInsert.sql b/db/routines/vn/triggers/entryDms_beforeInsert.sql
new file mode 100644
index 000000000..4f9550f48
--- /dev/null
+++ b/db/routines/vn/triggers/entryDms_beforeInsert.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`entryDms_beforeInsert`
+ BEFORE INSERT ON `entryDms`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/entryDms_beforeUpdate.sql b/db/routines/vn/triggers/entryDms_beforeUpdate.sql
new file mode 100644
index 000000000..ecc047029
--- /dev/null
+++ b/db/routines/vn/triggers/entryDms_beforeUpdate.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`entryDms_beforeUpdate`
+ BEFORE UPDATE ON `entryDms`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/entryObservation_afterDelete.sql b/db/routines/vn/triggers/entryObservation_afterDelete.sql
new file mode 100644
index 000000000..d143e105a
--- /dev/null
+++ b/db/routines/vn/triggers/entryObservation_afterDelete.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`entryObservation_afterDelete`
+ AFTER DELETE ON `entryObservation`
+ FOR EACH ROW
+BEGIN
+ INSERT INTO entryLog
+ SET `action` = 'delete',
+ `changedModel` = 'EntryObservation',
+ `changedModelId` = OLD.id,
+ `userFk` = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/entryObservation_beforeInsert.sql b/db/routines/vn/triggers/entryObservation_beforeInsert.sql
new file mode 100644
index 000000000..b842aeee7
--- /dev/null
+++ b/db/routines/vn/triggers/entryObservation_beforeInsert.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`entryObservation_beforeInsert`
+ BEFORE INSERT ON `entryObservation`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/entryObservation_beforeUpdate.sql b/db/routines/vn/triggers/entryObservation_beforeUpdate.sql
new file mode 100644
index 000000000..501631c69
--- /dev/null
+++ b/db/routines/vn/triggers/entryObservation_beforeUpdate.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`entryObservation_beforeUpdate`
+ BEFORE UPDATE ON `entryObservation`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/entry_afterDelete.sql b/db/routines/vn/triggers/entry_afterDelete.sql
new file mode 100644
index 000000000..5c246651d
--- /dev/null
+++ b/db/routines/vn/triggers/entry_afterDelete.sql
@@ -0,0 +1,14 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`entry_afterDelete`
+ AFTER DELETE ON `entry`
+ FOR EACH ROW
+BEGIN
+ INSERT INTO entryLog
+ SET `action` = 'delete',
+ `changedModel` = 'Entry',
+ `changedModelId` = OLD.id,
+ `userFk` = account.myUser_getId();
+
+ CALL travel_requestRecalc(OLD.travelFk);
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/entry_afterInsert.sql b/db/routines/vn/triggers/entry_afterInsert.sql
new file mode 100644
index 000000000..79563c17f
--- /dev/null
+++ b/db/routines/vn/triggers/entry_afterInsert.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`entry_afterInsert`
+ AFTER INSERT ON `entry`
+ FOR EACH ROW
+BEGIN
+ CALL travel_requestRecalc(NEW.travelFk);
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/entry_afterUpdate.sql b/db/routines/vn/triggers/entry_afterUpdate.sql
new file mode 100644
index 000000000..60adc0003
--- /dev/null
+++ b/db/routines/vn/triggers/entry_afterUpdate.sql
@@ -0,0 +1,27 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`entry_afterUpdate`
+ AFTER UPDATE ON `entry`
+ FOR EACH ROW
+BEGIN
+ IF NOT(NEW.id <=> OLD.id)
+ OR NOT(NEW.travelFk <=> OLD.travelFk)
+ OR NOT(NEW.isRaid <=> OLD.isRaid) THEN
+ CALL stock.log_add('entry', NEW.id, OLD.id);
+ END IF;
+
+ IF NOT (NEW.travelFk <=> OLD.travelFk) THEN
+ CALL travel_requestRecalc(OLD.travelFk);
+ CALL travel_requestRecalc(NEW.travelFk);
+ END IF;
+
+
+ IF NOT (NEW.travelFk <=> OLD.travelFk) THEN
+ CREATE OR REPLACE TEMPORARY TABLE tmp.buysToCheck
+ SELECT b.id
+ FROM buy b
+ WHERE b.entryFk = NEW.id;
+
+ CALL buy_checkItem();
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/entry_beforeDelete.sql b/db/routines/vn/triggers/entry_beforeDelete.sql
new file mode 100644
index 000000000..1d2c84b9e
--- /dev/null
+++ b/db/routines/vn/triggers/entry_beforeDelete.sql
@@ -0,0 +1,9 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`entry_beforeDelete`
+ BEFORE DELETE ON `entry`
+ FOR EACH ROW
+BEGIN
+ CALL entry_checkBooked(OLD.id);
+ DELETE FROM buy WHERE entryFk = OLD.id;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/entry_beforeInsert.sql b/db/routines/vn/triggers/entry_beforeInsert.sql
new file mode 100644
index 000000000..c0c0aa28c
--- /dev/null
+++ b/db/routines/vn/triggers/entry_beforeInsert.sql
@@ -0,0 +1,14 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`entry_beforeInsert`
+ BEFORE INSERT ON `entry`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+ CALL supplier_checkIsActive(NEW.supplierFk);
+ SET NEW.currencyFk = entry_getCurrency(NEW.currencyFk, NEW.supplierFk);
+ SET NEW.commission = entry_getCommission(NEW.travelFk, NEW.currencyFk,NEW.supplierFk);
+ IF NEW.travelFk IS NOT NULL AND NOT travel_hasUniqueAwb(NEW.travelFk) THEN
+ CALL util.throw('The travel is incorrect, there is a different AWB in the associated entries');
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/entry_beforeUpdate.sql b/db/routines/vn/triggers/entry_beforeUpdate.sql
new file mode 100644
index 000000000..98ebe1364
--- /dev/null
+++ b/db/routines/vn/triggers/entry_beforeUpdate.sql
@@ -0,0 +1,59 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`entry_beforeUpdate`
+ BEFORE UPDATE ON `entry`
+ FOR EACH ROW
+BEGIN
+ DECLARE vIsVirtual BOOL;
+ DECLARE vPrintedCount INT;
+ DECLARE vHasDistinctWarehouses BOOL;
+
+ IF NEW.isBooked = OLD.isBooked THEN
+ CALL entry_checkBooked(OLD.id);
+ END IF;
+
+ SET NEW.editorFk = account.myUser_getId();
+
+ IF NOT (NEW.travelFk <=> OLD.travelFk) THEN
+
+ IF NEW.travelFk IS NOT NULL AND NOT travel_hasUniqueAwb(NEW.travelFk) THEN
+ CALL util.throw('The travel is incorrect, there is a different AWB in the associated entries');
+ END IF;
+
+ SELECT COUNT(*) > 0 INTO vIsVirtual
+ FROM entryVirtual WHERE entryFk = NEW.id;
+
+ SELECT NOT (o.warehouseInFk <=> n.warehouseInFk)
+ OR NOT (o.warehouseOutFk <=> n.warehouseOutFk)
+ INTO vHasDistinctWarehouses
+ FROM travel o, travel n
+ WHERE o.id = OLD.travelFk
+ AND n.id = NEW.travelFk;
+
+ IF vIsVirtual AND vHasDistinctWarehouses THEN
+ SIGNAL SQLSTATE '45000'
+ SET MESSAGE_TEXT = 'A cloned entry cannot be moved to a travel with different warehouses';
+ END IF;
+
+ IF NEW.travelFk IS NULL THEN
+ SELECT COUNT(*) INTO vPrintedCount
+ FROM buy
+ WHERE entryFk = OLD.id
+ AND printedStickers > 0;
+
+ IF vPrintedCount > 0 THEN
+ SIGNAL SQLSTATE '45000'
+ SET MESSAGE_TEXT = 'An entry that contains lines with printed labels cannot be deleted';
+ END IF;
+ END IF;
+ END IF;
+
+ IF NOT (NEW.supplierFk <=> OLD.supplierFk) THEN
+ CALL supplier_checkIsActive(NEW.supplierFk);
+ SET NEW.currencyFk = entry_getCurrency(NEW.currencyFk, NEW.supplierFk);
+ END IF;
+
+ IF NOT (NEW.travelFk <=> OLD.travelFk) OR NOT (NEW.currencyFk <=> OLD.currencyFk) THEN
+ SET NEW.commission = entry_getCommission(NEW.travelFk, NEW.currencyFk, NEW.supplierFk);
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/expeditionPallet_beforeInsert.sql b/db/routines/vn/triggers/expeditionPallet_beforeInsert.sql
new file mode 100644
index 000000000..419cc2553
--- /dev/null
+++ b/db/routines/vn/triggers/expeditionPallet_beforeInsert.sql
@@ -0,0 +1,16 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`expeditionPallet_beforeInsert`
+ BEFORE INSERT ON `expeditionPallet`
+ FOR EACH ROW
+BEGIN
+
+ DECLARE vNewPosition INT;
+
+ SELECT MAX(position) + 1 INTO vNewPosition
+ FROM vn.expeditionPallet
+ WHERE truckFk = NEW.truckFk;
+
+ SET NEW.position = IFNULL(vNewPosition,1);
+
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/expeditionScan_beforeInsert.sql b/db/routines/vn/triggers/expeditionScan_beforeInsert.sql
new file mode 100644
index 000000000..1dce8fe9b
--- /dev/null
+++ b/db/routines/vn/triggers/expeditionScan_beforeInsert.sql
@@ -0,0 +1,10 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`expeditionScan_beforeInsert`
+ BEFORE INSERT ON `expeditionScan`
+ FOR EACH ROW
+BEGIN
+
+ SET NEW.workerFk = vn.getUser();
+
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/expeditionState_afterInsert.sql b/db/routines/vn/triggers/expeditionState_afterInsert.sql
new file mode 100644
index 000000000..3d8f4130c
--- /dev/null
+++ b/db/routines/vn/triggers/expeditionState_afterInsert.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`expeditionState_afterInsert`
+ AFTER INSERT ON `expeditionState`
+ FOR EACH ROW
+BEGIN
+
+ UPDATE vn.expedition e
+ SET e.stateTypeFk = NEW.typeFk
+ WHERE e.id = NEW.expeditionFk;
+
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/expeditionState_beforeInsert.sql b/db/routines/vn/triggers/expeditionState_beforeInsert.sql
new file mode 100644
index 000000000..350240aab
--- /dev/null
+++ b/db/routines/vn/triggers/expeditionState_beforeInsert.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`expeditionState_beforeInsert`
+ BEFORE INSERT ON `expeditionState`
+ FOR EACH ROW
+BEGIN
+ SET NEW.userFk = IFNULL(NEW.userFk, account.myUser_getId());
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/expeditionTruck_beforeInsert.sql b/db/routines/vn/triggers/expeditionTruck_beforeInsert.sql
new file mode 100644
index 000000000..23cba7b3a
--- /dev/null
+++ b/db/routines/vn/triggers/expeditionTruck_beforeInsert.sql
@@ -0,0 +1,10 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`expeditionTruck_beforeInsert`
+ BEFORE INSERT ON `expeditionTruck`
+ FOR EACH ROW
+BEGIN
+
+ SET NEW.description = UCASE(NEW.description);
+
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/expeditionTruck_beforeUpdate.sql b/db/routines/vn/triggers/expeditionTruck_beforeUpdate.sql
new file mode 100644
index 000000000..1b3b97238
--- /dev/null
+++ b/db/routines/vn/triggers/expeditionTruck_beforeUpdate.sql
@@ -0,0 +1,10 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`expeditionTruck_beforeUpdate`
+ BEFORE UPDATE ON `expeditionTruck`
+ FOR EACH ROW
+BEGIN
+
+ SET NEW.description = UCASE(NEW.description);
+
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/expedition_afterDelete.sql b/db/routines/vn/triggers/expedition_afterDelete.sql
new file mode 100644
index 000000000..e05cbf279
--- /dev/null
+++ b/db/routines/vn/triggers/expedition_afterDelete.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`expedition_afterDelete`
+ AFTER DELETE ON `expedition`
+ FOR EACH ROW
+BEGIN
+ INSERT INTO ticketLog
+ SET `action` = 'delete',
+ `changedModel` = 'Expedition',
+ `changedModelId` = OLD.id,
+ `userFk` = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/expedition_beforeDelete.sql b/db/routines/vn/triggers/expedition_beforeDelete.sql
new file mode 100644
index 000000000..cbcc5a3bb
--- /dev/null
+++ b/db/routines/vn/triggers/expedition_beforeDelete.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`expedition_beforeDelete`
+ BEFORE DELETE ON `expedition`
+ FOR EACH ROW
+BEGIN
+ UPDATE ticket t
+ SET packages = (SELECT COUNT(counter)-1
+ FROM expedition e WHERE e.ticketFk = OLD.ticketFk and e.freightItemFk)
+ WHERE t.id = OLD.ticketFk;
+
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/expedition_beforeInsert.sql b/db/routines/vn/triggers/expedition_beforeInsert.sql
new file mode 100644
index 000000000..685de72cb
--- /dev/null
+++ b/db/routines/vn/triggers/expedition_beforeInsert.sql
@@ -0,0 +1,27 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`expedition_beforeInsert`
+ BEFORE INSERT ON `expedition`
+ FOR EACH ROW
+BEGIN
+ DECLARE intcounter INT;
+ DECLARE vShipFk INT;
+
+ SET NEW.editorFk = account.myUser_getId();
+
+ IF NEW.freightItemFk IS NOT NULL THEN
+
+ UPDATE ticket SET packages = IFNULL(packages, 0) + 1 WHERE id = NEW.ticketFk;
+
+ SELECT IFNULL(MAX(counter),0) +1 INTO intcounter
+ FROM expedition e
+ INNER JOIN ticket t1 ON e.ticketFk = t1.id
+ LEFT JOIN ticketState ts ON ts.ticketFk = t1.id
+ INNER JOIN ticket t2 ON t2.addressFk = t1.addressFk AND DATE(t2.shipped) = DATE(t1.shipped)
+ AND t1.warehouseFk = t2.warehouseFk
+ WHERE t2.id = NEW.ticketFk AND ts.alertLevel < 3 AND t1.companyFk = t2.companyFk
+ AND t1.agencyModeFk = t2.agencyModeFk;
+
+ SET NEW.`counter` = intcounter;
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/expedition_beforeUpdate.sql b/db/routines/vn/triggers/expedition_beforeUpdate.sql
new file mode 100644
index 000000000..870c1a285
--- /dev/null
+++ b/db/routines/vn/triggers/expedition_beforeUpdate.sql
@@ -0,0 +1,17 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`expedition_beforeUpdate`
+ BEFORE UPDATE ON `expedition`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+
+ IF NEW.counter <> OLD.counter THEN
+ IF (SELECT COUNT(*) FROM expedition e
+ INNER JOIN ticket t1 ON e.ticketFk = t1.id
+ INNER JOIN ticket t2 ON t2.addressFk = t1.addressFk AND DATE(t2.shipped) = DATE(t1.shipped)
+ WHERE t1.id = NEW.ticketFk AND counter = NEW.counter) > 0 THEN
+ SET NEW.id = NULL;
+ END IF;
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/floramondoConfig_afterInsert.sql b/db/routines/vn/triggers/floramondoConfig_afterInsert.sql
new file mode 100644
index 000000000..f64cb7878
--- /dev/null
+++ b/db/routines/vn/triggers/floramondoConfig_afterInsert.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`floramondoConfig_afterInsert`
+ AFTER INSERT ON `floramondoConfig`
+ FOR EACH ROW
+BEGIN
+ CALL util.throw ("Tabla config no permite añadir más registros");
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/gregue_beforeInsert.sql b/db/routines/vn/triggers/gregue_beforeInsert.sql
new file mode 100644
index 000000000..76e178356
--- /dev/null
+++ b/db/routines/vn/triggers/gregue_beforeInsert.sql
@@ -0,0 +1,10 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`gregue_beforeInsert`
+ BEFORE INSERT ON `greuge`
+ FOR EACH ROW
+BEGIN
+ IF NEW.userFk IS NULL THEN
+ SET NEW.userFk = account.myUser_getId();
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/greuge_afterDelete.sql b/db/routines/vn/triggers/greuge_afterDelete.sql
new file mode 100644
index 000000000..947359b4c
--- /dev/null
+++ b/db/routines/vn/triggers/greuge_afterDelete.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`greuge_afterDelete`
+ AFTER DELETE ON `greuge`
+ FOR EACH ROW
+BEGIN
+ INSERT INTO clientLog
+ SET `action` = 'delete',
+ `changedModel` = 'Greuge',
+ `changedModelId` = OLD.id,
+ `userFk` = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/greuge_beforeInsert.sql b/db/routines/vn/triggers/greuge_beforeInsert.sql
new file mode 100644
index 000000000..100f2f244
--- /dev/null
+++ b/db/routines/vn/triggers/greuge_beforeInsert.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`greuge_beforeInsert`
+ BEFORE INSERT ON `greuge`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/greuge_beforeUpdate.sql b/db/routines/vn/triggers/greuge_beforeUpdate.sql
new file mode 100644
index 000000000..265861db5
--- /dev/null
+++ b/db/routines/vn/triggers/greuge_beforeUpdate.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`greuge_beforeUpdate`
+ BEFORE UPDATE ON `greuge`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/host_beforeUpdate.sql b/db/routines/vn/triggers/host_beforeUpdate.sql
new file mode 100644
index 000000000..0b0962e86
--- /dev/null
+++ b/db/routines/vn/triggers/host_beforeUpdate.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`host_beforeUpdate`
+ BEFORE UPDATE ON `host`
+ FOR EACH ROW
+BEGIN
+ SET new.updated = util.VN_NOW();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/invoiceInDueDay_afterDelete.sql b/db/routines/vn/triggers/invoiceInDueDay_afterDelete.sql
new file mode 100644
index 000000000..1e5b75bb2
--- /dev/null
+++ b/db/routines/vn/triggers/invoiceInDueDay_afterDelete.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`invoiceInDueDay_afterDelete`
+ AFTER DELETE ON `invoiceInDueDay`
+ FOR EACH ROW
+BEGIN
+ INSERT INTO invoiceInLog
+ SET `action` = 'delete',
+ `changedModel` = 'InvoiceInDueDay',
+ `changedModelId` = OLD.id,
+ `userFk` = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/invoiceInDueDay_beforeInsert.sql b/db/routines/vn/triggers/invoiceInDueDay_beforeInsert.sql
new file mode 100644
index 000000000..f7e4265a7
--- /dev/null
+++ b/db/routines/vn/triggers/invoiceInDueDay_beforeInsert.sql
@@ -0,0 +1,30 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`invoiceInDueDay_beforeInsert`
+ BEFORE INSERT ON `invoiceInDueDay`
+ FOR EACH ROW
+BEGIN
+ DECLARE vIsNotified BOOLEAN;
+
+ SET NEW.editorFk = account.myUser_getId();
+
+ SELECT isNotified INTO vIsNotified
+ FROM vn.invoiceIn ii
+ JOIN vn.supplier s ON s.id = ii.supplierFk
+ JOIN vn.payMethod pm ON pm.id = s.payMethodFk
+ WHERE ii.id = NEW.invoiceInFk;
+
+ IF (NEW.dueDated <= util.VN_CURDATE() AND vIsNotified)
+ THEN
+ CALL mail_insert(
+ 'begonya@verdnatura.es',
+ 'begonya@verdnatura.es',
+ 'Añadido vencimiento en el pasado',
+ CONCAT(
+ account.myUser_getName(), ' ha añadido un vencimiento de ',
+ NEW.amount, '€ en una fecha pasada en la recibida ', NEW.invoiceInFk
+ )
+ );
+ END IF;
+
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/invoiceInDueDay_beforeUpdate.sql b/db/routines/vn/triggers/invoiceInDueDay_beforeUpdate.sql
new file mode 100644
index 000000000..2452ff0d1
--- /dev/null
+++ b/db/routines/vn/triggers/invoiceInDueDay_beforeUpdate.sql
@@ -0,0 +1,30 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`invoiceInDueDay_beforeUpdate`
+ BEFORE UPDATE ON `invoiceInDueDay`
+ FOR EACH ROW
+BEGIN
+ DECLARE vIsNotified BOOLEAN;
+
+ SET NEW.editorFk = account.myUser_getId();
+
+ SELECT isNotified INTO vIsNotified
+ FROM vn.invoiceIn ii
+ JOIN vn.supplier s ON s.id = ii.supplierFk
+ JOIN vn.payMethod pm ON pm.id = s.payMethodFk
+ WHERE ii.id = NEW.invoiceInFk;
+
+ IF (NEW.dueDated <= util.VN_CURDATE() AND vIsNotified)
+ THEN
+ CALL mail_insert(
+ 'begonya@verdnatura.es',
+ 'begonya@verdnatura.es',
+ 'Añadido vencimiento en el pasado',
+ CONCAT(
+ account.myUser_getName(), ' ha añadido un vencimiento de ',
+ NEW.amount,'€ en una fecha pasada en la recibida ',NEW.invoiceInFk
+ )
+ );
+ END IF;
+
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/invoiceInTax_afterDelete.sql b/db/routines/vn/triggers/invoiceInTax_afterDelete.sql
new file mode 100644
index 000000000..f541503ff
--- /dev/null
+++ b/db/routines/vn/triggers/invoiceInTax_afterDelete.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`invoiceInTax_afterDelete`
+ AFTER DELETE ON `invoiceInTax`
+ FOR EACH ROW
+BEGIN
+ INSERT INTO invoiceInLog
+ SET `action` = 'delete',
+ `changedModel` = 'InvoiceInTax',
+ `changedModelId` = OLD.id,
+ `userFk` = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/invoiceInTax_beforeInsert.sql b/db/routines/vn/triggers/invoiceInTax_beforeInsert.sql
new file mode 100644
index 000000000..b1138fc3a
--- /dev/null
+++ b/db/routines/vn/triggers/invoiceInTax_beforeInsert.sql
@@ -0,0 +1,9 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`invoiceInTax_beforeInsert`
+ BEFORE INSERT ON `invoiceInTax`
+ FOR EACH ROW
+BEGIN
+ CALL invoiceInTax_afterUpsert(NEW.invoiceInFk);
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/invoiceInTax_beforeUpdate.sql b/db/routines/vn/triggers/invoiceInTax_beforeUpdate.sql
new file mode 100644
index 000000000..30918b7c5
--- /dev/null
+++ b/db/routines/vn/triggers/invoiceInTax_beforeUpdate.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`invoiceInTax_beforeUpdate`
+ BEFORE UPDATE ON `invoiceInTax`
+ FOR EACH ROW
+BEGIN
+ IF NOT (NEW.invoiceInFk <=> OLD.invoiceInFk) THEN
+ CALL invoiceInTax_afterUpsert(NEW.invoiceInFk);
+ END IF;
+
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/invoiceIn_afterDelete.sql b/db/routines/vn/triggers/invoiceIn_afterDelete.sql
new file mode 100644
index 000000000..c088f6492
--- /dev/null
+++ b/db/routines/vn/triggers/invoiceIn_afterDelete.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`invoiceIn_afterDelete`
+ AFTER DELETE ON `invoiceIn`
+ FOR EACH ROW
+BEGIN
+ INSERT INTO invoiceInLog
+ SET `action` = 'delete',
+ `changedModel` = 'InvoiceIn',
+ `changedModelId` = OLD.id,
+ `userFk` = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/invoiceIn_afterUpdate.sql b/db/routines/vn/triggers/invoiceIn_afterUpdate.sql
new file mode 100644
index 000000000..b1308393c
--- /dev/null
+++ b/db/routines/vn/triggers/invoiceIn_afterUpdate.sql
@@ -0,0 +1,27 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`invoiceIn_afterUpdate`
+ AFTER UPDATE ON `invoiceIn`
+ FOR EACH ROW
+BEGIN
+
+ IF NEW.issued != OLD.issued
+ OR NEW.currencyFk != OLD.currencyFk THEN
+
+ UPDATE invoiceInTax iit
+ JOIN invoiceIn ii ON ii.id = iit.invoiceInFk
+ LEFT JOIN referenceRate rr ON rr.dated = ii.issued
+ AND rr.currencyFk = ii.currencyFk
+ SET iit.taxableBase = IF(iit.foreignValue IS NULL, iit.taxableBase, iit.foreignValue / rr.value)
+ WHERE ii.id = NEW.id;
+
+ UPDATE invoiceInDueDay iidd
+ JOIN invoiceIn ii ON ii.id = iidd.invoiceInFk
+ LEFT JOIN referenceRate rr ON rr.dated = ii.issued
+ AND rr.currencyFk = ii.currencyFk
+ SET iidd.amount = IF(iidd.foreignValue IS NULL, iidd.amount, iidd.foreignValue / rr.value)
+ WHERE ii.id = NEW.id;
+
+ END IF;
+
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/invoiceIn_beforeInsert.sql b/db/routines/vn/triggers/invoiceIn_beforeInsert.sql
new file mode 100644
index 000000000..2b80f2534
--- /dev/null
+++ b/db/routines/vn/triggers/invoiceIn_beforeInsert.sql
@@ -0,0 +1,56 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`invoiceIn_beforeInsert`
+ BEFORE INSERT ON `invoiceIn`
+ FOR EACH ROW
+BEGIN
+ DECLARE vSerie CHAR(1) DEFAULT 'R';
+ DECLARE vNumReceived INT;
+ DECLARE vIssuingCountry, vhostCountry INT;
+ DECLARE vActive TINYINT;
+ DECLARE vWithholdingSageFk INT;
+
+ IF NOT util.checkPrintableChars(NEW.supplierRef) THEN
+ CALL util.throw('The invoiceIn reference contains invalid characters');
+ END IF;
+
+ SET NEW.editorFk = account.myUser_getId();
+
+ SELECT withholdingSageFk INTO vWithholdingSageFk
+ FROM vn.supplier
+ WHERE id = NEW.supplierFk;
+
+ SET NEW.withholdingSageFk = vWithholdingSageFk;
+
+ SELECT countryFk, isActive INTO vIssuingCountry, vActive
+ FROM vn.supplier
+ WHERE id = NEW.supplierFk;
+
+ SELECT countryFk INTO vhostCountry
+ FROM vn.supplier
+ WHERE id = NEW.companyFk;
+
+ IF vActive = 0 THEN
+ CALL util.throw('INACTIVE_PROVIDER');
+ END IF;
+
+ IF (SELECT COUNT(*) FROM vn.invoiceIn
+ WHERE supplierRef = NEW.supplierRef
+ AND supplierFk = NEW.supplierFk
+ AND YEAR(issued) = YEAR(NEW.issued)
+ ) THEN
+ CALL util.throw('reference duplicated');
+ END IF;
+
+ SELECT CASE WHEN (SELECT account FROM vn.supplier where id = NEW.supplierFk) LIKE '___3______' THEN 'C'
+ WHEN (SELECT vIssuingCountry=vhostCountry from vn.country p1 join vn.country p2 ON p2.id = vhostCountry AND p1.id = vIssuingCountry
+ where p1.CEE < 2 and p2.CEE < 2) = 1 THEN 'R'
+ WHEN (SELECT vIssuingCountry <> vhostCountry from vn.country p1 join vn.country p2 ON p2.id = vhostCountry AND p1.id = vIssuingCountry
+ where p1.CEE < 2 and p2.CEE < 2) = 1 THEN 'E'
+ WHEN (SELECT vIssuingCountry<>vhostCountry from vn.country p1 join vn.country p2 ON p2.id = vhostCountry AND p1.id = vIssuingCountry
+ where NOT p1.CEE < 2 AND not p1.id = 1) = 1 THEN 'W'
+ END INTO vSerie;
+
+ SET NEW.serial = IFNULL(vSerie,'R');
+
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/invoiceIn_beforeUpdate.sql b/db/routines/vn/triggers/invoiceIn_beforeUpdate.sql
new file mode 100644
index 000000000..4503c7dbd
--- /dev/null
+++ b/db/routines/vn/triggers/invoiceIn_beforeUpdate.sql
@@ -0,0 +1,32 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`invoiceIn_beforeUpdate`
+ BEFORE UPDATE ON `invoiceIn`
+ FOR EACH ROW
+BEGIN
+ DECLARE vWithholdingSageFk INT;
+
+ IF NOT (NEW.supplierRef <=> OLD.supplierRef) AND NOT util.checkPrintableChars(NEW.supplierRef) THEN
+ CALL util.throw('The invoiceIn reference contains invalid characters');
+ END IF;
+
+ SET NEW.editorFk = account.myUser_getId();
+
+ IF (SELECT COUNT(*) FROM vn.invoiceIn
+ WHERE supplierRef = NEW.supplierRef
+ AND supplierFk = NEW.supplierFk
+ AND YEAR(issued) = YEAR(NEW.issued)
+ AND id <> NEW.id
+ ) THEN
+ CALL util.throw('reference duplicated');
+ END IF;
+
+ IF NEW.supplierFk != OLD.supplierFk THEN
+ CALL supplier_checkIsActive(NEW.supplierFk);
+ SELECT withholdingSageFk INTO vWithholdingSageFk
+ FROM vn.supplier
+ WHERE id = NEW.supplierFk;
+ SET NEW.withholdingSageFk = vWithholdingSageFk;
+ END IF;
+
+END$$
+DELIMITER ;
diff --git a/db/changes/231401/00-invoiceOutAfterInsert.sql b/db/routines/vn/triggers/invoiceOut_afterInsert.sql
similarity index 51%
rename from db/changes/231401/00-invoiceOutAfterInsert.sql
rename to db/routines/vn/triggers/invoiceOut_afterInsert.sql
index adeaf9834..389c01111 100644
--- a/db/changes/231401/00-invoiceOutAfterInsert.sql
+++ b/db/routines/vn/triggers/invoiceOut_afterInsert.sql
@@ -1,13 +1,8 @@
-DROP TRIGGER IF EXISTS `vn`.`invoiceOut_afterInsert`;
-USE vn;
-
DELIMITER $$
-$$
-CREATE DEFINER=`root`@`localhost` TRIGGER `vn`.`invoiceOut_afterInsert`
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`invoiceOut_afterInsert`
AFTER INSERT ON `invoiceOut`
FOR EACH ROW
BEGIN
CALL clientRisk_update(NEW.clientFk, NEW.companyFk, NEW.amount);
END$$
DELIMITER ;
-
diff --git a/db/routines/vn/triggers/invoiceOut_beforeDelete.sql b/db/routines/vn/triggers/invoiceOut_beforeDelete.sql
new file mode 100644
index 000000000..8c8d7464c
--- /dev/null
+++ b/db/routines/vn/triggers/invoiceOut_beforeDelete.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`invoiceOut_beforeDelete`
+ BEFORE DELETE ON `invoiceOut`
+ FOR EACH ROW
+BEGIN
+ CALL clientRisk_update (OLD.clientFk, OLD.companyFk, -OLD.amount);
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/invoiceOut_beforeInsert.sql b/db/routines/vn/triggers/invoiceOut_beforeInsert.sql
new file mode 100644
index 000000000..0081c8803
--- /dev/null
+++ b/db/routines/vn/triggers/invoiceOut_beforeInsert.sql
@@ -0,0 +1,59 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`invoiceOut_beforeInsert`
+ BEFORE INSERT ON `invoiceOut`
+ FOR EACH ROW
+BEGIN
+/**
+ * Generates the next reference for the invoice serial. There cannot be gaps
+ * between identifiers of the same serial!
+ *
+ * Reference format:
+ * {0} Invoice serial
+ * {1} The company code
+ * {2-3} Last two digits of issue year
+ * {4-$} Autoincrement identifier
+ */
+ DECLARE vRef INT DEFAULT 0;
+ DECLARE vRefLen INT;
+ DECLARE vRefPrefix VARCHAR(255);
+ DECLARE vLastRef VARCHAR(255);
+ DECLARE vCompanyCode INT;
+ DECLARE vYearLen INT DEFAULT 2;
+ DECLARE vPrefixLen INT;
+
+ SELECT companyCode INTO vCompanyCode
+ FROM company
+ WHERE id = NEW.companyFk;
+
+ IF vCompanyCode IS NULL THEN
+ CALL util.throw('companyCodeNotDefined');
+ END IF;
+
+ SELECT MAX(i.ref) INTO vLastRef
+ FROM invoiceOut i
+ WHERE i.serial = NEW.serial
+ AND i.issued BETWEEN util.firstDayOfYear(NEW.issued) AND util.lastDayOfYear(NEW.issued)
+ AND i.companyFk = NEW.companyFk;
+
+ IF vLastRef IS NOT NULL THEN
+ SET vPrefixLen = LENGTH(NEW.serial) + LENGTH(vCompanyCode) + vYearLen;
+ SET vRefLen = LENGTH(vLastRef) - vPrefixLen;
+ SET vRefPrefix = LEFT(vLastRef, vPrefixLen);
+ SET vRef = RIGHT(vLastRef, vRefLen);
+ ELSE
+ SELECT refLen INTO vRefLen FROM invoiceOutConfig;
+ SET vRefPrefix = CONCAT(
+ NEW.serial,
+ vCompanyCode,
+ RIGHT(YEAR(NEW.issued), vYearLen)
+ );
+ END IF;
+
+ SET vRef = vRef + 1;
+ IF LENGTH(vRef) > vRefLen THEN
+ CALL util.throw('refIdLenExceeded');
+ END IF;
+
+ SET NEW.ref = CONCAT(vRefPrefix, LPAD(vRef, vRefLen, '0'));
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/invoiceOut_beforeUpdate.sql b/db/routines/vn/triggers/invoiceOut_beforeUpdate.sql
new file mode 100644
index 000000000..72be9cef0
--- /dev/null
+++ b/db/routines/vn/triggers/invoiceOut_beforeUpdate.sql
@@ -0,0 +1,9 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`invoiceOut_beforeUpdate`
+ BEFORE UPDATE ON `invoiceOut`
+ FOR EACH ROW
+BEGIN
+CALL clientRisk_update (OLD.clientFk, OLD.companyFk, -OLD.amount);
+CALL clientRisk_update (NEW.clientFk, NEW.companyFk, NEW.amount);
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/itemBarcode_afterDelete.sql b/db/routines/vn/triggers/itemBarcode_afterDelete.sql
new file mode 100644
index 000000000..4453d4a2f
--- /dev/null
+++ b/db/routines/vn/triggers/itemBarcode_afterDelete.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`itemBarcode_afterDelete`
+ AFTER DELETE ON `itemBarcode`
+ FOR EACH ROW
+BEGIN
+ INSERT INTO itemLog
+ SET `action` = 'delete',
+ `changedModel` = 'ItemBarcode',
+ `changedModelId` = OLD.id,
+ `userFk` = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/itemBarcode_beforeInsert.sql b/db/routines/vn/triggers/itemBarcode_beforeInsert.sql
new file mode 100644
index 000000000..503f1eb8a
--- /dev/null
+++ b/db/routines/vn/triggers/itemBarcode_beforeInsert.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`itemBarcode_beforeInsert`
+ BEFORE INSERT ON `itemBarcode`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/itemBarcode_beforeUpdate.sql b/db/routines/vn/triggers/itemBarcode_beforeUpdate.sql
new file mode 100644
index 000000000..2131427b2
--- /dev/null
+++ b/db/routines/vn/triggers/itemBarcode_beforeUpdate.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`itemBarcode_beforeUpdate`
+ BEFORE UPDATE ON `itemBarcode`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/itemBotanical_afterDelete.sql b/db/routines/vn/triggers/itemBotanical_afterDelete.sql
new file mode 100644
index 000000000..1b3c50ad1
--- /dev/null
+++ b/db/routines/vn/triggers/itemBotanical_afterDelete.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`itemBotanical_afterDelete`
+ AFTER DELETE ON `itemBotanical`
+ FOR EACH ROW
+BEGIN
+ INSERT INTO itemLog
+ SET `action` = 'delete',
+ `changedModel` = 'ItemBotanical',
+ `changedModelId` = OLD.itemFk,
+ `userFk` = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/itemBotanical_beforeInsert.sql b/db/routines/vn/triggers/itemBotanical_beforeInsert.sql
new file mode 100644
index 000000000..8a1b9346d
--- /dev/null
+++ b/db/routines/vn/triggers/itemBotanical_beforeInsert.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`itemBotanical_beforeInsert`
+ BEFORE INSERT ON `itemBotanical`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/itemBotanical_beforeUpdate.sql b/db/routines/vn/triggers/itemBotanical_beforeUpdate.sql
new file mode 100644
index 000000000..55939c403
--- /dev/null
+++ b/db/routines/vn/triggers/itemBotanical_beforeUpdate.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`itemBotanical_beforeUpdate`
+ BEFORE UPDATE ON `itemBotanical`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/itemCategory_afterInsert.sql b/db/routines/vn/triggers/itemCategory_afterInsert.sql
new file mode 100644
index 000000000..9449737d1
--- /dev/null
+++ b/db/routines/vn/triggers/itemCategory_afterInsert.sql
@@ -0,0 +1,11 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`itemCategory_afterInsert`
+ AFTER INSERT ON `itemCategory`
+ FOR EACH ROW
+BEGIN
+ CALL mail_insert('cau@verdnatura.es',
+ NULL,
+ CONCAT('Se ha añadido la familia: ', NEW.name),
+ 'Hay que añadir la familia en el formulario gastos');
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/itemCost_beforeInsert.sql b/db/routines/vn/triggers/itemCost_beforeInsert.sql
new file mode 100644
index 000000000..ba80193a6
--- /dev/null
+++ b/db/routines/vn/triggers/itemCost_beforeInsert.sql
@@ -0,0 +1,11 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`itemCost_beforeInsert`
+ BEFORE INSERT ON `itemCost`
+ FOR EACH ROW
+BEGIN
+ IF NEW.itemFk IN (95, 98) THEN
+ SET NEW.cm3 = 0;
+ END IF;
+
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/itemCost_beforeUpdate.sql b/db/routines/vn/triggers/itemCost_beforeUpdate.sql
new file mode 100644
index 000000000..242c768f5
--- /dev/null
+++ b/db/routines/vn/triggers/itemCost_beforeUpdate.sql
@@ -0,0 +1,30 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`itemCost_beforeUpdate`
+ BEFORE UPDATE ON `itemCost`
+ FOR EACH ROW
+BEGIN
+ IF NEW.itemFk IN (95, 98) THEN
+ SET NEW.cm3 = 0;
+ END IF;
+
+ IF !(NEW.cm3delivery <=> OLD.cm3delivery) THEN
+ INSERT IGNORE INTO `vn`.`routeRecalc` (`routeFk`)
+ SELECT r.id
+ FROM vn.itemCost ic
+ JOIN vn.sale s ON s.itemFk = ic.itemFk
+ JOIN vn.ticket t ON t.id = s.ticketFk AND t.warehouseFk = ic.warehouseFk
+ JOIN vn.route r ON r.id = t.routeFk
+ WHERE r.isOk = FALSE
+ AND ic.itemFk = NEW.itemFk
+ AND r.created >= util.VN_CURDATE()
+ GROUP BY r.id;
+ IF NEW.cm3Delivery = 0 AND NEW.warehouseFk = 60 THEN
+ CALL mail_insert(
+ 'jgallego@verdnatura.es',
+ NULL,
+ 'update cm3Delivery',
+ CONCAT('articulo: ', NEW.itemFk));
+ END IF;
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/itemShelving _afterDelete.sql b/db/routines/vn/triggers/itemShelving _afterDelete.sql
new file mode 100644
index 000000000..7c0d54358
--- /dev/null
+++ b/db/routines/vn/triggers/itemShelving _afterDelete.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`itemShelving _afterDelete`
+ AFTER DELETE ON `itemShelving`
+ FOR EACH ROW
+BEGIN
+ INSERT INTO shelvingLog
+ SET `action` = 'delete',
+ `changedModel` = 'itemShelving',
+ `changedModelId` = OLD.id,
+ `userFk` = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/itemShelvingSale_afterInsert.sql b/db/routines/vn/triggers/itemShelvingSale_afterInsert.sql
new file mode 100644
index 000000000..63ca893bd
--- /dev/null
+++ b/db/routines/vn/triggers/itemShelvingSale_afterInsert.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`itemShelvingSale_afterInsert`
+ AFTER INSERT ON `itemShelvingSale`
+ FOR EACH ROW
+BEGIN
+
+ UPDATE vn.sale
+ SET isPicked = TRUE
+ WHERE id = NEW.saleFk;
+
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/itemShelving_afterInsert.sql b/db/routines/vn/triggers/itemShelving_afterInsert.sql
new file mode 100644
index 000000000..5c0cb3853
--- /dev/null
+++ b/db/routines/vn/triggers/itemShelving_afterInsert.sql
@@ -0,0 +1,22 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`itemShelving_afterInsert`
+ AFTER INSERT ON `itemShelving`
+ FOR EACH ROW
+INSERT INTO vn.itemShelvingLog( itemShelvingFk,
+ workerFk,
+ accion,
+ itemFk,
+ shelvingFk,
+ visible,
+ `grouping`,
+ packing)
+ VALUES( NEW.id,
+ NEW.userFk,
+ 'CREA REGISTRO',
+ NEW.itemFk,
+ NEW.shelvingFk,
+ NEW.visible,
+ NEW.`grouping`,
+ NEW.packing
+ )$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/itemShelving_afterUpdate.sql b/db/routines/vn/triggers/itemShelving_afterUpdate.sql
new file mode 100644
index 000000000..107e8ecdc
--- /dev/null
+++ b/db/routines/vn/triggers/itemShelving_afterUpdate.sql
@@ -0,0 +1,14 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`itemShelving_afterUpdate`
+ AFTER UPDATE ON `itemShelving`
+ FOR EACH ROW
+INSERT INTO itemShelvingLog
+ SET itemShelvingFk = NEW.id,
+ workerFk = account.myUser_getId(),
+ accion = 'CAMBIO',
+ itemFk = NEW.itemFk,
+ shelvingFk = NEW.shelvingFk,
+ visible = NEW.visible,
+ `grouping` = NEW.`grouping`,
+ packing = NEW.packing$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/itemShelving_beforeDelete.sql b/db/routines/vn/triggers/itemShelving_beforeDelete.sql
new file mode 100644
index 000000000..a9f59e011
--- /dev/null
+++ b/db/routines/vn/triggers/itemShelving_beforeDelete.sql
@@ -0,0 +1,15 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`itemShelving_beforeDelete`
+ BEFORE DELETE ON `itemShelving`
+ FOR EACH ROW
+INSERT INTO vn.itemShelvingLog(itemShelvingFk,
+ workerFk,
+ accion,
+ shelvingFk,
+ itemFk)
+ VALUES( OLD.id,
+ account.myUser_getId(),
+ 'ELIMINADO',
+ OLD.shelvingFk,
+ OLD.itemFk)$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/itemShelving_beforeInsert.sql b/db/routines/vn/triggers/itemShelving_beforeInsert.sql
new file mode 100644
index 000000000..011cf3701
--- /dev/null
+++ b/db/routines/vn/triggers/itemShelving_beforeInsert.sql
@@ -0,0 +1,10 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`itemShelving_beforeInsert`
+ BEFORE INSERT ON `itemShelving`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+ SET NEW.userFk = account.myUser_getId();
+
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/itemShelving_beforeUpdate.sql b/db/routines/vn/triggers/itemShelving_beforeUpdate.sql
new file mode 100644
index 000000000..6fd919d2e
--- /dev/null
+++ b/db/routines/vn/triggers/itemShelving_beforeUpdate.sql
@@ -0,0 +1,11 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`itemShelving_beforeUpdate`
+ BEFORE UPDATE ON `itemShelving`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+ IF NEW.userFk IS NULL THEN
+ SET NEW.userFk = account.myUser_getId();
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/itemTag_afterDelete.sql b/db/routines/vn/triggers/itemTag_afterDelete.sql
new file mode 100644
index 000000000..4014c88b5
--- /dev/null
+++ b/db/routines/vn/triggers/itemTag_afterDelete.sql
@@ -0,0 +1,18 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`itemTag_afterDelete`
+ AFTER DELETE ON `itemTag`
+ FOR EACH ROW
+trig: BEGIN
+ INSERT INTO itemLog
+ SET `action` = 'delete',
+ `changedModel` = 'ItemTag',
+ `changedModelId` = OLD.id,
+ `userFk` = account.myUser_getId();
+
+ IF @isTriggerDisabled THEN
+ LEAVE trig;
+ END IF;
+
+ CALL item_refreshFromTags(OLD.itemFk);
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/itemTag_afterInsert.sql b/db/routines/vn/triggers/itemTag_afterInsert.sql
new file mode 100644
index 000000000..3dfb25ad3
--- /dev/null
+++ b/db/routines/vn/triggers/itemTag_afterInsert.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`itemTag_afterInsert`
+ AFTER INSERT ON `itemTag`
+ FOR EACH ROW
+trig: BEGIN
+ IF @isTriggerDisabled THEN
+ LEAVE trig;
+ END IF;
+
+ CALL item_refreshFromTags(NEW.itemFk);
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/itemTag_afterUpdate.sql b/db/routines/vn/triggers/itemTag_afterUpdate.sql
new file mode 100644
index 000000000..61b45a161
--- /dev/null
+++ b/db/routines/vn/triggers/itemTag_afterUpdate.sql
@@ -0,0 +1,24 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`itemTag_afterUpdate`
+ AFTER UPDATE ON `itemTag`
+ FOR EACH ROW
+trig: BEGIN
+ DECLARE vItemFk INT;
+ DECLARE visTriggerDisabled BOOL;
+
+ SELECT isItemTagTriggerDisabled INTO visTriggerDisabled
+ FROM vn.itemConfig;
+
+ IF @isTriggerDisabled OR visTriggerDisabled THEN
+ LEAVE trig;
+ END IF;
+
+ SET vItemFk = NEW.itemFk;
+ DROP TEMPORARY TABLE IF EXISTS tmp.item;
+ CREATE TEMPORARY TABLE tmp.item
+ SELECT vItemFk id;
+
+ CALL item_refreshTags();
+ DROP TEMPORARY TABLE tmp.item;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/itemTag_beforeInsert.sql b/db/routines/vn/triggers/itemTag_beforeInsert.sql
new file mode 100644
index 000000000..cec4fd02f
--- /dev/null
+++ b/db/routines/vn/triggers/itemTag_beforeInsert.sql
@@ -0,0 +1,9 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`itemTag_beforeInsert`
+ BEFORE INSERT ON `itemTag`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+ SET NEW.intValue = itemTag_getIntValue(NEW.`value`);
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/itemTag_beforeUpdate.sql b/db/routines/vn/triggers/itemTag_beforeUpdate.sql
new file mode 100644
index 000000000..41de249ef
--- /dev/null
+++ b/db/routines/vn/triggers/itemTag_beforeUpdate.sql
@@ -0,0 +1,13 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`itemTag_beforeUpdate`
+ BEFORE UPDATE ON `itemTag`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+
+ IF !(OLD.`value` <=> NEW.`value`)
+ OR !(OLD.intValue <=> NEW.intValue) THEN
+ SET NEW.intValue = itemTag_getIntValue(NEW.`value`);
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/itemTaxCountry_afterDelete.sql b/db/routines/vn/triggers/itemTaxCountry_afterDelete.sql
new file mode 100644
index 000000000..8f91b26e1
--- /dev/null
+++ b/db/routines/vn/triggers/itemTaxCountry_afterDelete.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`itemTaxCountry_afterDelete`
+ AFTER DELETE ON `itemTaxCountry`
+ FOR EACH ROW
+BEGIN
+ INSERT INTO itemLog
+ SET `action` = 'delete',
+ `changedModel` = 'ItemTaxCountry',
+ `changedModelId` = OLD.id,
+ `userFk` = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/itemTaxCountry_beforeInsert.sql b/db/routines/vn/triggers/itemTaxCountry_beforeInsert.sql
new file mode 100644
index 000000000..348dac023
--- /dev/null
+++ b/db/routines/vn/triggers/itemTaxCountry_beforeInsert.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`itemTaxCountry_beforeInsert`
+ BEFORE INSERT ON `itemTaxCountry`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/itemTaxCountry_beforeUpdate.sql b/db/routines/vn/triggers/itemTaxCountry_beforeUpdate.sql
new file mode 100644
index 000000000..7470cd81e
--- /dev/null
+++ b/db/routines/vn/triggers/itemTaxCountry_beforeUpdate.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`itemTaxCountry_beforeUpdate`
+ BEFORE UPDATE ON `itemTaxCountry`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/itemType_beforeUpdate.sql b/db/routines/vn/triggers/itemType_beforeUpdate.sql
new file mode 100644
index 000000000..0e0aa0098
--- /dev/null
+++ b/db/routines/vn/triggers/itemType_beforeUpdate.sql
@@ -0,0 +1,18 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`itemType_beforeUpdate`
+ BEFORE UPDATE ON `itemType`
+ FOR EACH ROW
+BEGIN
+ IF NEW.itemPackingTypeFk = '' THEN
+
+ SET NEW.itemPackingTypeFk = NULL;
+
+ END IF;
+
+ IF NEW.itemPackingTypeFk != OLD.itemPackingTypeFk THEN
+ UPDATE vn.item
+ SET itemPackingTypeFk = NEW.itemPackingTypeFk
+ WHERE typeFk = NEW.id;
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/item_afterDelete.sql b/db/routines/vn/triggers/item_afterDelete.sql
new file mode 100644
index 000000000..34f702cdd
--- /dev/null
+++ b/db/routines/vn/triggers/item_afterDelete.sql
@@ -0,0 +1,13 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`item_afterDelete`
+ AFTER DELETE ON `item`
+ FOR EACH ROW
+BEGIN
+ CALL hedera.image_unref('catalog', OLD.image);
+
+ IF OLD.isFloramondo THEN
+ INSERT IGNORE edi.item_free
+ SET id = OLD.id;
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/item_afterInsert.sql b/db/routines/vn/triggers/item_afterInsert.sql
new file mode 100644
index 000000000..a4f9c5f5a
--- /dev/null
+++ b/db/routines/vn/triggers/item_afterInsert.sql
@@ -0,0 +1,16 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`item_afterInsert`
+ AFTER INSERT ON `item`
+ FOR EACH ROW
+BEGIN
+ CALL hedera.image_ref('catalog', NEW.image);
+
+ INSERT INTO vn.itemTaxCountry(itemFk, countryFk) VALUES
+ (NEW.id, 1),
+ (NEW.id, 5);
+
+ DELETE ifr.*
+ FROM edi.item_free ifr
+ WHERE ifr.id = NEW.id;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/item_afterUpdate.sql b/db/routines/vn/triggers/item_afterUpdate.sql
new file mode 100644
index 000000000..3b433c302
--- /dev/null
+++ b/db/routines/vn/triggers/item_afterUpdate.sql
@@ -0,0 +1,11 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`item_afterUpdate`
+ AFTER UPDATE ON `item`
+ FOR EACH ROW
+BEGIN
+ IF !(NEW.image <=> OLD.image) THEN
+ CALL hedera.image_unref('catalog', OLD.image);
+ CALL hedera.image_ref('catalog', NEW.image);
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/item_beforeInsert.sql b/db/routines/vn/triggers/item_beforeInsert.sql
new file mode 100644
index 000000000..d7ee4db34
--- /dev/null
+++ b/db/routines/vn/triggers/item_beforeInsert.sql
@@ -0,0 +1,18 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`item_beforeInsert`
+ BEFORE INSERT ON `item`
+ FOR EACH ROW
+BEGIN
+ DECLARE vItemPackingType VARCHAR(1);
+
+ SET NEW.editorFk = account.myUser_getId();
+
+ IF NEW.itemPackingTypeFk IS NULL THEN
+ SELECT itemPackingTypeFk INTO vItemPackingType
+ FROM vn.itemType it
+ WHERE id = NEW.typeFk;
+
+ SET NEW.itemPackingTypeFk = vItemPackingType;
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/item_beforeUpdate.sql b/db/routines/vn/triggers/item_beforeUpdate.sql
new file mode 100644
index 000000000..3cf630d18
--- /dev/null
+++ b/db/routines/vn/triggers/item_beforeUpdate.sql
@@ -0,0 +1,14 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`item_beforeUpdate`
+ BEFORE UPDATE ON `item`
+ FOR EACH ROW
+BEGIN
+ DECLARE vNewPackingShelve INT;
+
+ SET NEW.editorFk = account.myUser_getId();
+
+ IF NEW.itemPackingTypeFk = '' THEN
+ SET NEW.itemPackingTypeFk = NULL;
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/machine_beforeInsert.sql b/db/routines/vn/triggers/machine_beforeInsert.sql
new file mode 100644
index 000000000..269879b22
--- /dev/null
+++ b/db/routines/vn/triggers/machine_beforeInsert.sql
@@ -0,0 +1,10 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`machine_beforeInsert`
+ BEFORE INSERT ON `machine`
+ FOR EACH ROW
+BEGIN
+
+ SET NEW.workerFk = vn.getUser();
+
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/mail_beforeInsert.sql b/db/routines/vn/triggers/mail_beforeInsert.sql
new file mode 100644
index 000000000..fc598f829
--- /dev/null
+++ b/db/routines/vn/triggers/mail_beforeInsert.sql
@@ -0,0 +1,14 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`mail_beforeInsert`
+ BEFORE INSERT ON `mail`
+ FOR EACH ROW
+BEGIN
+
+ IF NEW.sender IS NOT NULL THEN
+
+ SET NEW.receiver = NEW.sender;
+
+ END IF;
+
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/mandate_beforeInsert.sql b/db/routines/vn/triggers/mandate_beforeInsert.sql
new file mode 100644
index 000000000..7d1e9a59e
--- /dev/null
+++ b/db/routines/vn/triggers/mandate_beforeInsert.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`mandate_beforeInsert`
+ BEFORE INSERT ON `mandate`
+ FOR EACH ROW
+BEGIN
+ IF (NEW.code IS NULL) THEN
+ SET NEW.code=CONCAT(NEW.clientFk,'-',(SELECT AUTO_INCREMENT
+ FROM information_schema.TABLES
+ WHERE TABLE_SCHEMA='vn' and TABLE_NAME='mandate'));
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/operator_beforeInsert.sql b/db/routines/vn/triggers/operator_beforeInsert.sql
new file mode 100644
index 000000000..c1805d0fc
--- /dev/null
+++ b/db/routines/vn/triggers/operator_beforeInsert.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`operator_beforeInsert`
+ BEFORE INSERT ON `operator`
+ FOR EACH ROW
+BEGIN
+ CALL vn.printer_checkSector(NEW.labelerFk, NEW.sectorFk);
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/operator_beforeUpdate.sql b/db/routines/vn/triggers/operator_beforeUpdate.sql
new file mode 100644
index 000000000..84fb8ca04
--- /dev/null
+++ b/db/routines/vn/triggers/operator_beforeUpdate.sql
@@ -0,0 +1,10 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`operator_beforeUpdate`
+ BEFORE UPDATE ON `operator`
+ FOR EACH ROW
+BEGIN
+ IF NOT (NEW.labelerFk <=> OLD.labelerFk AND NEW.sectorFk <=> OLD.sectorFk) THEN
+ CALL vn.printer_checkSector(NEW.labelerFk, NEW.sectorFk);
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/packaging_beforeInsert.sql b/db/routines/vn/triggers/packaging_beforeInsert.sql
new file mode 100644
index 000000000..02ba3cf4f
--- /dev/null
+++ b/db/routines/vn/triggers/packaging_beforeInsert.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`packaging_beforeInsert`
+ BEFORE INSERT ON `packaging`
+ FOR EACH ROW
+BEGIN
+ SET NEW.value = packaging_calculate(NEW.isPackageReturnable, NEW.packagingReturnFk, NEW.base, NEW.price, NEW.upload);
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/packaging_beforeUpdate.sql b/db/routines/vn/triggers/packaging_beforeUpdate.sql
new file mode 100644
index 000000000..515c94bb5
--- /dev/null
+++ b/db/routines/vn/triggers/packaging_beforeUpdate.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`packaging_beforeUpdate`
+ BEFORE UPDATE ON `packaging`
+ FOR EACH ROW
+BEGIN
+ SET NEW.value = packaging_calculate(NEW.isPackageReturnable, NEW.packagingReturnFk, NEW.base, NEW.price, NEW.upload);
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/packingSite_afterDelete.sql b/db/routines/vn/triggers/packingSite_afterDelete.sql
new file mode 100644
index 000000000..7c76ae7ec
--- /dev/null
+++ b/db/routines/vn/triggers/packingSite_afterDelete.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`packingSite_afterDelete`
+ AFTER DELETE ON `packingSite`
+ FOR EACH ROW
+BEGIN
+ INSERT INTO packingSiteDeviceLog
+ SET `action` = 'delete',
+ `changedModel` = 'PackingSite',
+ `changedModelId` = OLD.id,
+ `userFk` = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/packingSite_beforeInsert.sql b/db/routines/vn/triggers/packingSite_beforeInsert.sql
new file mode 100644
index 000000000..966dfdd53
--- /dev/null
+++ b/db/routines/vn/triggers/packingSite_beforeInsert.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`packingSite_beforeInsert`
+ BEFORE INSERT ON `packingSite`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/packingSite_beforeUpdate.sql b/db/routines/vn/triggers/packingSite_beforeUpdate.sql
new file mode 100644
index 000000000..4d56ac1b5
--- /dev/null
+++ b/db/routines/vn/triggers/packingSite_beforeUpdate.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`packingSite_beforeUpdate`
+ BEFORE UPDATE ON `packingSite`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/parking_afterDelete.sql b/db/routines/vn/triggers/parking_afterDelete.sql
new file mode 100644
index 000000000..1ec96c24d
--- /dev/null
+++ b/db/routines/vn/triggers/parking_afterDelete.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`parking_afterDelete`
+ AFTER DELETE ON `parking`
+ FOR EACH ROW
+BEGIN
+ INSERT INTO parkingLog
+ SET `action` = 'delete',
+ `changedModel` = 'Parking',
+ `changedModelId` = OLD.id,
+ `userFk` = account.myUser_getId();
+END$$
+DELIMITER ;
\ No newline at end of file
diff --git a/db/routines/vn/triggers/parking_beforeInsert.sql b/db/routines/vn/triggers/parking_beforeInsert.sql
new file mode 100644
index 000000000..cdec4c759
--- /dev/null
+++ b/db/routines/vn/triggers/parking_beforeInsert.sql
@@ -0,0 +1,10 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`parking_beforeInsert`
+ BEFORE INSERT ON `parking`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+ -- SET new.`code` = CONCAT(new.`column`,' - ',new.`row`) ;
+
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/parking_beforeUpdate.sql b/db/routines/vn/triggers/parking_beforeUpdate.sql
new file mode 100644
index 000000000..3e808f505
--- /dev/null
+++ b/db/routines/vn/triggers/parking_beforeUpdate.sql
@@ -0,0 +1,10 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`parking_beforeUpdate`
+ BEFORE UPDATE ON `parking`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+ -- SET new.`code` = CONCAT(new.`column`,' - ',new.`row`) ;
+
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/payment_afterInsert.sql b/db/routines/vn/triggers/payment_afterInsert.sql
new file mode 100644
index 000000000..5585d6682
--- /dev/null
+++ b/db/routines/vn/triggers/payment_afterInsert.sql
@@ -0,0 +1,34 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`payment_afterInsert`
+ AFTER INSERT ON `payment`
+ FOR EACH ROW
+BEGIN
+ DECLARE vIsPayMethodChecked BOOLEAN;
+ DECLARE vEmail VARCHAR(150);
+
+ SELECT isPayMethodChecked INTO vIsPayMethodChecked
+ FROM supplier
+ WHERE id = NEW.supplierFk;
+
+
+ IF vIsPayMethodChecked = FALSE THEN
+
+ SELECT notificationEmail INTO vEmail
+ FROM department
+ WHERE name = 'FINANZAS';
+
+ CALL mail_insert(
+ vEmail,
+ NULL,
+ 'Pago con método sin verificar',
+ CONCAT(
+ 'Se ha realizado el pago ',
+ NEW.id,
+ ' al proveedor ',
+ NEW.supplierFk,
+ ' con el método de pago sin verificar.'
+ )
+ );
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/payment_beforeInsert.sql b/db/routines/vn/triggers/payment_beforeInsert.sql
new file mode 100644
index 000000000..1b343712f
--- /dev/null
+++ b/db/routines/vn/triggers/payment_beforeInsert.sql
@@ -0,0 +1,94 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`payment_beforeInsert`
+ BEFORE INSERT ON `payment`
+ FOR EACH ROW
+BEGIN
+ DECLARE cuenta_banco,cuenta_proveedor DOUBLE;
+ DECLARE vNewBookEntry INT;
+ DECLARE bolCASH BOOLEAN;
+ DECLARE isSupplierActive BOOLEAN;
+
+ -- PAK 10/02/15 No se asientan los pagos directamente, salvo en el caso de las cajas de CASH
+ SELECT (at2.code = 'cash') INTO bolCASH
+ FROM accounting a
+ JOIN accountingType at2 ON at2.id = a.accountingTypeFk
+ WHERE a.id = NEW.bankFk;
+
+ IF bolCASH THEN
+
+ SELECT account INTO cuenta_banco
+ FROM accounting
+ WHERE id = NEW.bankFk;
+
+ SELECT account INTO cuenta_proveedor
+ FROM supplier
+ WHERE id = NEW.supplierFk;
+
+ CALL ledger_next(vNewBookEntry);
+
+ INSERT INTO XDiario ( ASIEN,
+ FECHA,
+ SUBCTA,
+ CONTRA,
+ CONCEPTO,
+ EURODEBE,
+ EUROHABER,
+ empresa_id)
+ SELECT vNewBookEntry,
+ NEW.received,
+ SUBCTA,
+ CONTRA,
+ NEW.concept,
+ EURODEBE,
+ EUROHABER,
+ NEW.companyFk
+ FROM ( SELECT cuenta_banco SUBCTA,
+ cuenta_proveedor CONTRA,
+ 0 EURODEBE,
+ NEW.amount + NEW.bankingFees EUROHABER
+ UNION ALL
+ SELECT cuenta_proveedor SUBCTA,
+ cuenta_banco CONTRA,
+ NEW.amount EURODEBE,
+ 0 EUROHABER) gf;
+
+ IF NEW.bankingFees <> 0 THEN
+ INSERT INTO XDiario ( ASIEN,
+ FECHA,
+ SUBCTA,
+ CONTRA,
+ CONCEPTO,
+ EURODEBE,
+ EUROHABER,
+ empresa_id)
+ SELECT vNewBookEntry,
+ NEW.received,
+ IF(c.id = 1,6260000002,
+ IF(CEE = 1,6260000003,6260000004)),
+ cuenta_banco,
+ NEW.concept,
+ NEW.bankingFees,
+ 0,
+ NEW.companyFk
+ FROM supplier s
+ JOIN country c ON s.countryFk = c.id
+ WHERE s.id = NEW.supplierFk;
+ END IF;
+ END IF;
+
+ SET NEW.dueDated = IFNULL(NEW.dueDated, NEW.received);
+
+ SELECT isActive INTO isSupplierActive
+ FROM supplier
+ WHERE id = NEW.supplierFk;
+
+ IF isSupplierActive = FALSE THEN
+ CALL util.throw('SUPPLIER_INACTIVE');
+ END IF;
+
+ IF ISNULL(NEW.workerFk) THEN
+ SET NEW.workerFk = account.myUser_getId();
+ END IF;
+
+ END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/payment_beforeUpdate.sql b/db/routines/vn/triggers/payment_beforeUpdate.sql
new file mode 100644
index 000000000..b3ef1342b
--- /dev/null
+++ b/db/routines/vn/triggers/payment_beforeUpdate.sql
@@ -0,0 +1,10 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`payment_beforeUpdate`
+ BEFORE UPDATE ON `payment`
+ FOR EACH ROW
+BEGIN
+ IF ISNULL(NEW.workerFk) THEN
+ SET NEW.workerFk = account.myUser_getId();
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/postCode_afterDelete.sql b/db/routines/vn/triggers/postCode_afterDelete.sql
new file mode 100644
index 000000000..736d5f5f3
--- /dev/null
+++ b/db/routines/vn/triggers/postCode_afterDelete.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`postCode_afterDelete`
+ AFTER DELETE ON `postCode`
+ FOR EACH ROW
+BEGIN
+ CALL zoneGeo_delete(OLD.geoFk);
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/postCode_afterUpdate.sql b/db/routines/vn/triggers/postCode_afterUpdate.sql
new file mode 100644
index 000000000..c1e56044a
--- /dev/null
+++ b/db/routines/vn/triggers/postCode_afterUpdate.sql
@@ -0,0 +1,16 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`postCode_afterUpdate`
+ AFTER UPDATE ON `postCode`
+ FOR EACH ROW
+BEGIN
+ IF !(OLD.townFk <=> NEW.townFk) THEN
+ CALL zoneGeo_setParent(NEW.geoFk,
+ (SELECT geoFk FROM town WHERE id = NEW.townFk));
+ END IF;
+
+ IF !(OLD.`code` <=> NEW.`code`) THEN
+ UPDATE zoneGeo SET `name` = NEW.`code`
+ WHERE id = NEW.geoFk;
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/postCode_beforeInsert.sql b/db/routines/vn/triggers/postCode_beforeInsert.sql
new file mode 100644
index 000000000..9e6d7e592
--- /dev/null
+++ b/db/routines/vn/triggers/postCode_beforeInsert.sql
@@ -0,0 +1,9 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`postCode_beforeInsert`
+ BEFORE INSERT ON `postCode`
+ FOR EACH ROW
+BEGIN
+ SET NEW.geoFk = zoneGeo_new('postCode', NEW.`code`,
+ (SELECT geoFk FROM town WHERE id = NEW.townFk));
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/postCode_beforeUpdate.sql b/db/routines/vn/triggers/postCode_beforeUpdate.sql
new file mode 100644
index 000000000..1b3c228a3
--- /dev/null
+++ b/db/routines/vn/triggers/postCode_beforeUpdate.sql
@@ -0,0 +1,10 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`postCode_beforeUpdate`
+ BEFORE UPDATE ON `postCode`
+ FOR EACH ROW
+BEGIN
+ -- IF !(OLD.geoFk <=> NEW.geoFk) THEN
+ -- CALL zoneGeo_throwNotEditable;
+ -- END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/priceFixed_beforeInsert.sql b/db/routines/vn/triggers/priceFixed_beforeInsert.sql
new file mode 100644
index 000000000..ecf6f3e30
--- /dev/null
+++ b/db/routines/vn/triggers/priceFixed_beforeInsert.sql
@@ -0,0 +1,13 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`priceFixed_beforeInsert`
+ BEFORE INSERT ON `priceFixed`
+ FOR EACH ROW
+BEGIN
+ DECLARE vDated DATE;
+ IF NEW.started > NEW.ended THEN
+ SET vDated = NEW.started;
+ SET NEW.started = NEW.ended;
+ SET NEW.ended = vDated;
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/priceFixed_beforeUpdate.sql b/db/routines/vn/triggers/priceFixed_beforeUpdate.sql
new file mode 100644
index 000000000..f675322b9
--- /dev/null
+++ b/db/routines/vn/triggers/priceFixed_beforeUpdate.sql
@@ -0,0 +1,13 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`priceFixed_beforeUpdate`
+ BEFORE UPDATE ON `priceFixed`
+ FOR EACH ROW
+BEGIN
+ DECLARE vDated DATE;
+ IF NEW.started > NEW.ended THEN
+ SET vDated = NEW.started;
+ SET NEW.started = NEW.ended;
+ SET NEW.ended = vDated;
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/projectNotes_beforeInsert.sql b/db/routines/vn/triggers/projectNotes_beforeInsert.sql
new file mode 100644
index 000000000..58d75bec7
--- /dev/null
+++ b/db/routines/vn/triggers/projectNotes_beforeInsert.sql
@@ -0,0 +1,14 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`projectNotes_beforeInsert`
+ BEFORE INSERT ON `projectNotes`
+ FOR EACH ROW
+BEGIN
+
+ IF ISNULL(NEW.userFk) THEN
+
+ SET NEW.userFk = account.myUser_getId();
+
+ END IF;
+
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/province_afterDelete.sql b/db/routines/vn/triggers/province_afterDelete.sql
new file mode 100644
index 000000000..d0cee78e7
--- /dev/null
+++ b/db/routines/vn/triggers/province_afterDelete.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`province_afterDelete`
+ AFTER DELETE ON `province`
+ FOR EACH ROW
+BEGIN
+ CALL zoneGeo_delete(OLD.geoFk);
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/province_afterUpdate.sql b/db/routines/vn/triggers/province_afterUpdate.sql
new file mode 100644
index 000000000..e8f3958b2
--- /dev/null
+++ b/db/routines/vn/triggers/province_afterUpdate.sql
@@ -0,0 +1,16 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`province_afterUpdate`
+ AFTER UPDATE ON `province`
+ FOR EACH ROW
+BEGIN
+ IF !(OLD.autonomyFk <=> NEW.autonomyFk) THEN
+ CALL zoneGeo_setParent(NEW.geoFk,
+ (SELECT geoFk FROM autonomy WHERE id = NEW.autonomyFk));
+ END IF;
+
+ IF !(OLD.`name` <=> NEW.`name`) THEN
+ UPDATE zoneGeo SET `name` = NEW.`name`
+ WHERE id = NEW.geoFk;
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/province_beforeInsert.sql b/db/routines/vn/triggers/province_beforeInsert.sql
new file mode 100644
index 000000000..f3f039fc3
--- /dev/null
+++ b/db/routines/vn/triggers/province_beforeInsert.sql
@@ -0,0 +1,13 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`province_beforeInsert`
+ BEFORE INSERT ON `province`
+ FOR EACH ROW
+BEGIN
+
+ SET NEW.geoFk = zoneGeo_new('province', NEW.`name`,
+ (SELECT geoFk FROM autonomy WHERE id = NEW.autonomyFk));
+
+ SET NEW.countryFk = (SELECT a.countryFk FROM vn.autonomy a WHERE a.id = NEW.autonomyFk);
+
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/province_beforeUpdate.sql b/db/routines/vn/triggers/province_beforeUpdate.sql
new file mode 100644
index 000000000..23ca49d4a
--- /dev/null
+++ b/db/routines/vn/triggers/province_beforeUpdate.sql
@@ -0,0 +1,14 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`province_beforeUpdate`
+ BEFORE UPDATE ON `province`
+ FOR EACH ROW
+BEGIN
+
+ IF !(OLD.autonomyFk <=> NEW.autonomyFk) THEN
+
+ SET NEW.countryFk = (SELECT a.countryFk FROM vn.autonomy a WHERE a.id = NEW.autonomyFk);
+
+ END IF;
+
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/rate_afterDelete.sql b/db/routines/vn/triggers/rate_afterDelete.sql
new file mode 100644
index 000000000..dae240c15
--- /dev/null
+++ b/db/routines/vn/triggers/rate_afterDelete.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`rate_afterDelete`
+ AFTER DELETE ON `rate`
+ FOR EACH ROW
+BEGIN
+ INSERT INTO rateLog
+ SET `action` = 'delete',
+ `changedModel` = 'Rate',
+ `changedModelId` = OLD.id,
+ `userFk` = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/rate_beforeInsert.sql b/db/routines/vn/triggers/rate_beforeInsert.sql
new file mode 100644
index 000000000..0d77a95d7
--- /dev/null
+++ b/db/routines/vn/triggers/rate_beforeInsert.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`rate_beforeInsert`
+ BEFORE INSERT ON `rate`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/rate_beforeUpdate.sql b/db/routines/vn/triggers/rate_beforeUpdate.sql
new file mode 100644
index 000000000..2055d14fd
--- /dev/null
+++ b/db/routines/vn/triggers/rate_beforeUpdate.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`rate_beforeUpdate`
+ BEFORE UPDATE ON `rate`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/receipt_afterInsert.sql b/db/routines/vn/triggers/receipt_afterInsert.sql
new file mode 100644
index 000000000..3881cb4d2
--- /dev/null
+++ b/db/routines/vn/triggers/receipt_afterInsert.sql
@@ -0,0 +1,6 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`receipt_afterInsert`
+ AFTER INSERT ON `receipt`
+ FOR EACH ROW
+CALL clientRisk_update(NEW.clientFk, NEW.companyFk, -NEW.amountPaid)$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/receipt_afterUpdate.sql b/db/routines/vn/triggers/receipt_afterUpdate.sql
new file mode 100644
index 000000000..3d739e8f1
--- /dev/null
+++ b/db/routines/vn/triggers/receipt_afterUpdate.sql
@@ -0,0 +1,15 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`receipt_afterUpdate`
+ AFTER UPDATE ON `receipt`
+ FOR EACH ROW
+BEGIN
+ IF NEW.isConciliate = FALSE AND NEW.payed > OLD.payed THEN
+ CALL mail_insert(
+ 'finanzas@verdnatura.es',
+ NULL,
+ CONCAT('Cambios de recibos del cliente: ', NEW.clientFk),
+ CONCAT('Se ha cambiado el recibo: ', NEW.Id, ' de ', OLD.payed, ' a ', NEW.payed)
+ );
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/receipt_beforeDelete.sql b/db/routines/vn/triggers/receipt_beforeDelete.sql
new file mode 100644
index 000000000..fc75a4c35
--- /dev/null
+++ b/db/routines/vn/triggers/receipt_beforeDelete.sql
@@ -0,0 +1,6 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`receipt_beforeDelete`
+ BEFORE DELETE ON `receipt`
+ FOR EACH ROW
+CALL clientRisk_update(OLD.clientFk, OLD.companyFk, OLD.amountPaid)$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/receipt_beforeInsert.sql b/db/routines/vn/triggers/receipt_beforeInsert.sql
new file mode 100644
index 000000000..696cad241
--- /dev/null
+++ b/db/routines/vn/triggers/receipt_beforeInsert.sql
@@ -0,0 +1,17 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`receipt_beforeInsert`
+ BEFORE INSERT ON `receipt`
+ FOR EACH ROW
+BEGIN
+ DECLARE vIsAutoConciliated BOOLEAN;
+
+ IF NEW.isConciliate = FALSE THEN
+ SELECT isAutoConciliated INTO vIsAutoConciliated
+ FROM accounting a
+ JOIN accountingType at2 ON at2.id = a.accountingTypeFk
+ WHERE a.id = NEW.bankFk;
+
+ SET NEW.isConciliate = vIsAutoConciliated;
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/receipt_beforeUpdate.sql b/db/routines/vn/triggers/receipt_beforeUpdate.sql
new file mode 100644
index 000000000..8ea14c17c
--- /dev/null
+++ b/db/routines/vn/triggers/receipt_beforeUpdate.sql
@@ -0,0 +1,10 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`receipt_beforeUpdate`
+ BEFORE UPDATE ON `receipt`
+ FOR EACH ROW
+BEGIN
+ CALL clientRisk_update(OLD.clientFk, OLD.companyFk, OLD.amountPaid);
+ CALL clientRisk_update(NEW.clientFk, NEW.companyFk, -NEW.amountPaid);
+ SET NEW.workerFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/recovery_afterDelete.sql b/db/routines/vn/triggers/recovery_afterDelete.sql
new file mode 100644
index 000000000..429f562ac
--- /dev/null
+++ b/db/routines/vn/triggers/recovery_afterDelete.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`recovery_afterDelete`
+ AFTER DELETE ON `recovery`
+ FOR EACH ROW
+BEGIN
+ INSERT INTO clientLog
+ SET `action` = 'delete',
+ `changedModel` = 'Recovery',
+ `changedModelId` = OLD.id,
+ `userFk` = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/recovery_beforeInsert.sql b/db/routines/vn/triggers/recovery_beforeInsert.sql
new file mode 100644
index 000000000..2318e0b7b
--- /dev/null
+++ b/db/routines/vn/triggers/recovery_beforeInsert.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`recovery_beforeInsert`
+ BEFORE INSERT ON `recovery`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/recovery_beforeUpdate.sql b/db/routines/vn/triggers/recovery_beforeUpdate.sql
new file mode 100644
index 000000000..4d485c075
--- /dev/null
+++ b/db/routines/vn/triggers/recovery_beforeUpdate.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`recovery_beforeUpdate`
+ BEFORE UPDATE ON `recovery`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/route_afterDelete.sql b/db/routines/vn/triggers/route_afterDelete.sql
new file mode 100644
index 000000000..e929bd519
--- /dev/null
+++ b/db/routines/vn/triggers/route_afterDelete.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`route_afterDelete`
+ AFTER DELETE ON `route`
+ FOR EACH ROW
+BEGIN
+ INSERT INTO routeLog
+ SET `action` = 'delete',
+ `changedModel` = 'Route',
+ `changedModelId` = OLD.id,
+ `userFk` = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/route_afterInsert.sql b/db/routines/vn/triggers/route_afterInsert.sql
new file mode 100644
index 000000000..f030f09fa
--- /dev/null
+++ b/db/routines/vn/triggers/route_afterInsert.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`route_afterInsert`
+ AFTER INSERT ON `route`
+ FOR EACH ROW
+BEGIN
+ CALL route_calcCommission(NEW.id);
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/route_afterUpdate.sql b/db/routines/vn/triggers/route_afterUpdate.sql
new file mode 100644
index 000000000..14b53c2a5
--- /dev/null
+++ b/db/routines/vn/triggers/route_afterUpdate.sql
@@ -0,0 +1,29 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`route_afterUpdate`
+ AFTER UPDATE ON `route`
+ FOR EACH ROW
+BEGIN
+ IF IFNULL(NEW.gestdocFk,0) <> IFNULL(OLD.gestdocFk,0) AND NEW.gestdocFk > 0 THEN
+ -- JGF 09/09/14 cuando se añade un gestdoc a una ruta, se le asigna automagicamente a todos sus Tickets
+
+ -- Inserta el gestdoc en todos los tickets de la ruta
+ INSERT INTO ticketDms(ticketFk,dmsFk)
+ SELECT id, NEW.gestdocFk FROM ticket WHERE routeFk = NEW.id
+ ON DUPLICATE KEY UPDATE dmsFk = NEW.gestdocFk;
+
+ -- Update del firmado
+ UPDATE ticket t
+ JOIN ticketDms tg ON t.id = tg.ticketFk
+ SET isSigned = 1 WHERE t.routeFk = NEW.id;
+ END IF;
+
+ IF !(NEW.kmStart <=> OLD.kmStart)
+ OR !(NEW.kmEnd <=> OLD.kmEnd)
+ OR !(NEW.workerFk <=> OLD.workerFk)
+ OR !(NEW.m3 <=> OLD.m3)
+ OR !(NEW.agencyModeFk <=> OLD.agencyModeFk)THEN
+ CALL route_calcCommission(NEW.id);
+ END IF;
+
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/route_beforeInsert.sql b/db/routines/vn/triggers/route_beforeInsert.sql
new file mode 100644
index 000000000..442b0620e
--- /dev/null
+++ b/db/routines/vn/triggers/route_beforeInsert.sql
@@ -0,0 +1,29 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`route_beforeInsert`
+ BEFORE INSERT ON `route`
+ FOR EACH ROW
+BEGIN
+ DECLARE vDefaultAgencyModeFk INT;
+ DECLARE vUserFk INT ;
+
+ SET vUserFk = account.myUser_getId();
+ SET NEW.editorFk = vUserFk;
+ SET NEW.firstEditorFk = vUserFk;
+
+ SET NEW.commissionWorkCenterFk = (
+ SELECT IFNULL(b.workCenterFK, r.defaultWorkCenterFk)
+ FROM vn.routeConfig r
+ LEFT JOIN vn.business b ON b.workerFk = vUserFk
+ AND NEW.created BETWEEN b.started AND IFNULL(b.ended, NEW.created));
+
+ IF ISNULL(NEW.agencyModeFk) THEN
+ SELECT r.agencyModeFk INTO vDefaultAgencyModeFk
+ FROM routeDefaultAgencyMode r
+ JOIN business b ON b.workCenterFk = r.workCenterFK
+ JOIN worker w ON w.businessFk = b.id
+ WHERE b.workerFk = vUserFk;
+
+ SET NEW.agencyModeFk = vDefaultAgencyModeFk;
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/route_beforeUpdate.sql b/db/routines/vn/triggers/route_beforeUpdate.sql
new file mode 100644
index 000000000..43ee802f5
--- /dev/null
+++ b/db/routines/vn/triggers/route_beforeUpdate.sql
@@ -0,0 +1,29 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`route_beforeUpdate`
+ BEFORE UPDATE ON `route`
+ FOR EACH ROW
+BEGIN
+ DECLARE vKmMax INT;
+
+ SET NEW.editorFk = account.myUser_getId();
+
+ IF NEW.isOk <> FALSE AND OLD.isOk = FALSE THEN
+ SET NEW.m3 = ( SELECT SUM(litros)/1000
+ FROM vn.saleVolume s
+ JOIN vn.ticket t ON s.ticketFk = t.id
+ WHERE t.routeFk = NEW.id);
+ END IF;
+
+ IF NEW.kmEnd < NEW.kmStart AND NEW.kmEnd <> 0 THEN
+ CALL util.throw ('KmEnd menor que kmStart');
+ END IF;
+
+ SELECT kmMax INTO vKmMax
+ FROM routeConfig rc;
+
+ IF ((NEW.kmEnd - NEW.kmStart) > vKmMax) AND NEW.kmEnd <> 0 THEN
+ CALL util.throw (CONCAT('The km can not exceed ', vKmMax));
+ END IF;
+
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/routesMonitor_afterDelete.sql b/db/routines/vn/triggers/routesMonitor_afterDelete.sql
new file mode 100644
index 000000000..000425dad
--- /dev/null
+++ b/db/routines/vn/triggers/routesMonitor_afterDelete.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`routesMonitor_afterDelete`
+ AFTER DELETE ON `routesMonitor`
+ FOR EACH ROW
+BEGIN
+ INSERT INTO routeLog
+ SET `action` = 'delete',
+ `changedModel` = 'RoutesMonitor',
+ `changedModelId` = OLD.routeFk,
+ `userFk` = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/routesMonitor_beforeInsert.sql b/db/routines/vn/triggers/routesMonitor_beforeInsert.sql
new file mode 100644
index 000000000..70b723d54
--- /dev/null
+++ b/db/routines/vn/triggers/routesMonitor_beforeInsert.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`routesMonitor_beforeInsert`
+ BEFORE INSERT ON `routesMonitor`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/routesMonitor_beforeUpdate.sql b/db/routines/vn/triggers/routesMonitor_beforeUpdate.sql
new file mode 100644
index 000000000..0ca867b7a
--- /dev/null
+++ b/db/routines/vn/triggers/routesMonitor_beforeUpdate.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`routesMonitor_beforeUpdate`
+ BEFORE UPDATE ON `routesMonitor`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/saleBuy_beforeInsert.sql b/db/routines/vn/triggers/saleBuy_beforeInsert.sql
new file mode 100644
index 000000000..1c36671d5
--- /dev/null
+++ b/db/routines/vn/triggers/saleBuy_beforeInsert.sql
@@ -0,0 +1,10 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`saleBuy_beforeInsert`
+ BEFORE INSERT ON `saleBuy`
+ FOR EACH ROW
+BEGIN
+
+ SET NEW.workerFk = vn.getUser();
+
+ END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/saleGroup_afterDelete.sql b/db/routines/vn/triggers/saleGroup_afterDelete.sql
new file mode 100644
index 000000000..1e0163187
--- /dev/null
+++ b/db/routines/vn/triggers/saleGroup_afterDelete.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`saleGroup_afterDelete`
+ AFTER DELETE ON `saleGroup`
+ FOR EACH ROW
+BEGIN
+ INSERT INTO ticketLog
+ SET `action` = 'delete',
+ `changedModel` = 'SaleGroup',
+ `changedModelId` = OLD.id,
+ `userFk` = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/saleGroup_beforeInsert.sql b/db/routines/vn/triggers/saleGroup_beforeInsert.sql
new file mode 100644
index 000000000..18be92ed6
--- /dev/null
+++ b/db/routines/vn/triggers/saleGroup_beforeInsert.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`saleGroup_beforeInsert`
+ BEFORE INSERT ON `saleGroup`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/saleGroup_beforeUpdate.sql b/db/routines/vn/triggers/saleGroup_beforeUpdate.sql
new file mode 100644
index 000000000..1f6aa6def
--- /dev/null
+++ b/db/routines/vn/triggers/saleGroup_beforeUpdate.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`saleGroup_beforeUpdate`
+ BEFORE UPDATE ON `saleGroup`
+ FOR EACH ROW
+BEGIN
+ SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/saleLabel_afterUpdate.sql b/db/routines/vn/triggers/saleLabel_afterUpdate.sql
new file mode 100644
index 000000000..ff3787358
--- /dev/null
+++ b/db/routines/vn/triggers/saleLabel_afterUpdate.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`saleLabel_afterUpdate`
+ AFTER UPDATE ON `vn`.`saleLabel`
+ FOR EACH ROW
+IF NEW.stem >= (SELECT s.quantity FROM sale s WHERE s.id = NEW.saleFk) THEN
+ UPDATE sale s SET s.isPicked = TRUE WHERE s.id = NEW.saleFk;
+END IF$$
+DELIMITER ;
\ No newline at end of file
diff --git a/db/routines/vn/triggers/saleTracking_afterInsert.sql b/db/routines/vn/triggers/saleTracking_afterInsert.sql
new file mode 100644
index 000000000..00bef8486
--- /dev/null
+++ b/db/routines/vn/triggers/saleTracking_afterInsert.sql
@@ -0,0 +1,17 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`saleTracking_afterInsert`
+ AFTER INSERT ON `saleTracking`
+ FOR EACH ROW
+BEGIN
+
+ IF NEW.isChecked THEN
+
+ UPDATE vn.sale s
+ SET s.isPicked = TRUE
+ WHERE s.id = NEW.saleFk
+ AND s.isPicked = 0;
+
+ END IF;
+
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/sale_afterDelete.sql b/db/routines/vn/triggers/sale_afterDelete.sql
new file mode 100644
index 000000000..fab1c52cd
--- /dev/null
+++ b/db/routines/vn/triggers/sale_afterDelete.sql
@@ -0,0 +1,48 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`sale_afterDelete`
+ AFTER DELETE ON `sale`
+ FOR EACH ROW
+BEGIN
+ DECLARE vIsToSendMail BOOL;
+ DECLARE vUserRole VARCHAR(255);
+
+ INSERT INTO ticketLog
+ SET `action` = 'delete',
+ `changedModel` = 'Sale',
+ `changedModelId` = OLD.id,
+ `userFk` = account.myUser_getId();
+
+ CALL stock.log_add('sale', NULL, OLD.id);
+ CALL ticket_requestRecalc(OLD.ticketFk);
+
+ SELECT account.myUser_getName() INTO vUserRole;
+ SELECT account.user_getMysqlRole(vUserRole) INTO vUserRole;
+
+ SELECT COUNT(*) INTO vIsToSendMail
+ FROM ticketTracking tt
+ JOIN vn.state s ON s.id = tt.stateFk
+ WHERE s.code='PACKED'
+ AND tt.ticketFk = OLD.ticketFk
+ AND vUserRole IN ('salesPerson', 'salesBoss')
+ LIMIT 1;
+
+ IF vIsToSendMail THEN
+ CALL vn.mail_insert('jefesventas@verdnatura.es',
+ 'noreply@verdnatura.es',
+ CONCAT('Ticket ', OLD.ticketFk ,' eliminado artículo tras encajado' ),
+ CONCAT('Ticket ', OLD.ticketFk ,'.
', + 'Eliminado artículo ', OLD.itemFk, ' tras estado encajado del ticket.
Este email se ha generado automáticamente' ) + ); + END IF; + + IF OLD.quantity > 0 THEN + UPDATE vn.collection c + JOIN vn.ticketCollection tc ON tc.collectionFk = c.id AND tc.ticketFk = OLD.ticketFk + JOIN vn.item i ON i.id = OLD.itemFk + AND (c.itemPackingTypeFk = i.itemPackingTypeFk + OR ISNULL(c.itemPackingTypeFk)) + SET c.saleTotalCount = c.saleTotalCount - 1, + c.salePickedCount = c.salePickedCount - ABS(OLD.isPicked); + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/sale_afterInsert.sql b/db/routines/vn/triggers/sale_afterInsert.sql new file mode 100644 index 000000000..d4c2d60f5 --- /dev/null +++ b/db/routines/vn/triggers/sale_afterInsert.sql @@ -0,0 +1,34 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`sale_afterInsert` + AFTER INSERT ON `sale` + FOR EACH ROW +BEGIN + IF (SELECT COUNT(*) from item i WHERE id = NEW.itemFk AND family = 'SER') THEN + CALL util.throw('Cannot insert a service item into a ticket'); + END IF; + + CALL stock.log_add('sale', NEW.id, NULL); + CALL ticket_requestRecalc(NEW.ticketFk); + + IF NEW.quantity > 0 THEN + + UPDATE vn.collection c + JOIN vn.ticketCollection tc ON tc.collectionFk = c.id + AND tc.ticketFk = NEW.ticketFk + JOIN vn.item i ON i.id = NEW.itemFk + AND (c.itemPackingTypeFk = i.itemPackingTypeFk + OR c.itemPackingTypeFk IS NULL) + SET c.saleTotalCount = c.saleTotalCount + 1; + + INSERT IGNORE INTO `vn`.`routeRecalc` (`routeFk`) + SELECT r.id + FROM vn.sale s + JOIN vn.ticket t ON t.id = s.ticketFk + JOIN vn.route r ON r.id = t.routeFk + WHERE r.isOk = FALSE + AND s.id = NEW.id + AND r.created >= util.VN_CURDATE() + GROUP BY r.id; + END IF; +END$$ +DELIMITER ; diff --git a/db/.archive/224701/00-sale_afterUpdate.sql b/db/routines/vn/triggers/sale_afterUpdate.sql similarity index 83% rename from db/.archive/224701/00-sale_afterUpdate.sql rename to db/routines/vn/triggers/sale_afterUpdate.sql index 407fb52c9..0d21f08d7 100644 --- a/db/.archive/224701/00-sale_afterUpdate.sql +++ b/db/routines/vn/triggers/sale_afterUpdate.sql @@ -1,17 +1,11 @@ -DROP TRIGGER IF EXISTS vn.sale_afterUpdate; -USE vn; - DELIMITER $$ -$$ -CREATE DEFINER=`root`@`localhost` TRIGGER `vn`.`sale_afterUpdate` +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`sale_afterUpdate` AFTER UPDATE ON `sale` FOR EACH ROW BEGIN DECLARE vIsToSendMail BOOL; - DECLARE vPickedLines INT; - DECLARE vCollectionFk INT; DECLARE vUserRole VARCHAR(255); - + IF !(NEW.id <=> OLD.id) OR !(NEW.ticketFk <=> OLD.ticketFk) OR !(NEW.itemFk <=> OLD.itemFk) @@ -34,64 +28,61 @@ BEGIN UPDATE ticketRequest SET ticketFk = NEW.ticketFk WHERE saleFk = NEW.id; END IF; - + SELECT account.myUser_getName() INTO vUserRole; SELECT account.user_getMysqlRole(vUserRole) INTO vUserRole; IF !(OLD.quantity <=> NEW.quantity) THEN - SELECT COUNT(*) INTO vIsToSendMail - FROM vncontrol.inter i - JOIN vn.state s ON s.id = i.state_id - WHERE s.code='PACKED' - AND i.Id_Ticket = OLD.ticketFk + SELECT COUNT(*) INTO vIsToSendMail + FROM ticketTracking tt + JOIN vn.state s ON s.id = tt.stateFk + WHERE s.code='PACKED' + AND tt.ticketFk = OLD.ticketFk AND vUserRole IN ('salesPerson', 'salesTeamBoss') LIMIT 1; - - IF vIsToSendMail THEN + + IF vIsToSendMail THEN CALL vn.mail_insert('jefesventas@verdnatura.es', 'noreply@verdnatura.es', CONCAT('Ticket ', OLD.ticketFk ,' modificada cantidad tras encajado'), CONCAT('Ticket ', OLD.ticketFk ,'.
', - 'Modificada la catidad de ', OLD.quantity, ' a ' , NEW.quantity, + 'Modificada la catidad de ', OLD.quantity, ' a ' , NEW.quantity, ' del artículo ', OLD.itemFk, ' tras estado encajado del ticket.
', 'Este email se ha generado automáticamente' ) ); - END IF; + END IF; IF (OLD.quantity > NEW.quantity) THEN INSERT INTO saleComponent(saleFk, componentFk, value) - SELECT NEW.id, cm.id, sc.value + SELECT NEW.id, cm.id, sc.value FROM saleComponent sc JOIN component cd ON cd.id = sc.componentFk JOIN component cm ON cm.code = 'mana' WHERE saleFk = NEW.id AND cd.code = 'lastUnitsDiscount' ON DUPLICATE KEY UPDATE value = sc.value + VALUES(value); - - DELETE sc.* + + DELETE sc.* FROM vn.saleComponent sc JOIN component c ON c.id = sc.componentFk WHERE saleFk = NEW.id AND c.code = 'lastUnitsDiscount'; - END IF; + END IF; INSERT IGNORE INTO `vn`.`routeRecalc` (`routeFk`) - SELECT r.id + SELECT r.id FROM vn.sale s JOIN vn.ticket t ON t.id = s.ticketFk JOIN vn.route r ON r.id = t.routeFk - WHERE r.isOk = FALSE + WHERE r.isOk = FALSE AND s.id = NEW.id - AND r.created >= CURDATE() + AND r.created >= util.VN_CURDATE() GROUP BY r.id; END IF; IF !(ABS(NEW.isPicked) <=> ABS(OLD.isPicked)) AND NEW.quantity > 0 THEN - UPDATE vn.collection c JOIN vn.ticketCollection tc ON tc.collectionFk = c.id AND tc.ticketFk = NEW.ticketFk SET c.salePickedCount = c.salePickedCount + IF(NEW.isPicked != 0, 1, -1); - END IF; IF !(NEW.quantity <=> OLD.quantity) AND (NEW.quantity = 0 OR OLD.quantity = 0) THEN - UPDATE vn.collection c JOIN vn.ticketCollection tc ON tc.collectionFk = c.id AND tc.ticketFk = NEW.ticketFk SET c.saleTotalCount = c.saleTotalCount + IF(OLD.quantity = 0, 1, -1); diff --git a/db/routines/vn/triggers/sale_beforeDelete.sql b/db/routines/vn/triggers/sale_beforeDelete.sql new file mode 100644 index 000000000..a91e7f010 --- /dev/null +++ b/db/routines/vn/triggers/sale_beforeDelete.sql @@ -0,0 +1,18 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`sale_beforeDelete` + BEFORE DELETE ON `sale` + FOR EACH ROW +BEGIN + IF OLD.quantity > 0 THEN + INSERT IGNORE INTO `vn`.`routeRecalc` (`routeFk`) + SELECT r.id + FROM vn.sale s + JOIN vn.ticket t ON t.id = s.ticketFk + JOIN vn.route r ON r.id = t.routeFk + WHERE r.isOk = FALSE + AND s.id = OLD.id + AND r.created >= util.VN_CURDATE() + GROUP BY r.id; + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/sale_beforeInsert.sql b/db/routines/vn/triggers/sale_beforeInsert.sql new file mode 100644 index 000000000..0ef368513 --- /dev/null +++ b/db/routines/vn/triggers/sale_beforeInsert.sql @@ -0,0 +1,9 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`sale_beforeInsert` + BEFORE INSERT ON `sale` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); + SET NEW.originalQuantity = NEW.quantity; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/sale_beforeUpdate.sql b/db/routines/vn/triggers/sale_beforeUpdate.sql new file mode 100644 index 000000000..c5a748503 --- /dev/null +++ b/db/routines/vn/triggers/sale_beforeUpdate.sql @@ -0,0 +1,23 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`sale_beforeUpdate` + BEFORE UPDATE ON `sale` + FOR EACH ROW +BEGIN +/* + IF (SELECT COUNT(*) from item i WHERE id = NEW.itemFk AND family = 'SER') THEN + CALL util.throw('Cannot insert a service item into a ticket'); + END IF; +*/ + SET NEW.editorFk = account.myUser_getId(); + + IF NEW.discount > 100 THEN + SET NEW.discount = 0; + END IF; + + IF old.discount > 0 AND NEW.discount = 0 THEN + INSERT INTO ticketLog + SET originFk = NEW.ticketFk, userFk = account.myUser_getId(), `action` = 'insert', + description = CONCAT('Cambio de descuento del item :', ' ', new.itemFk, ' de ', old.discount ,' a 0 '); + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/sharingCart_beforeDelete.sql b/db/routines/vn/triggers/sharingCart_beforeDelete.sql new file mode 100644 index 000000000..6996b3138 --- /dev/null +++ b/db/routines/vn/triggers/sharingCart_beforeDelete.sql @@ -0,0 +1,11 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`sharingCart_beforeDelete` + BEFORE DELETE ON `sharingCart` + FOR EACH ROW +BEGIN + DELETE sc FROM sharingCartDaily sc + WHERE sc.dated BETWEEN OLD.started AND OLD.ended AND + sc.ownerFk = OLD.workerFk AND + sc.substituteFk = OLD.workerSubstitute; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/sharingCart_beforeInsert.sql b/db/routines/vn/triggers/sharingCart_beforeInsert.sql new file mode 100644 index 000000000..116337b62 --- /dev/null +++ b/db/routines/vn/triggers/sharingCart_beforeInsert.sql @@ -0,0 +1,15 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`sharingCart_beforeInsert` + BEFORE INSERT ON `sharingCart` + FOR EACH ROW +BEGIN + IF NEW.workerFk = NEW.workerSubstitute THEN + CALL util.throw ('worker and workerSubstitute must be different'); + ELSE + INSERT IGNORE INTO sharingCartDaily (ownerFk, substituteFk, dated) + SELECT NEW.workerFk, NEW.workerSubstitute, dated + FROM time + WHERE dated BETWEEN NEW.started AND NEW.ended; + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/sharingCart_beforeUpdate.sql b/db/routines/vn/triggers/sharingCart_beforeUpdate.sql new file mode 100644 index 000000000..91cbfb3d0 --- /dev/null +++ b/db/routines/vn/triggers/sharingCart_beforeUpdate.sql @@ -0,0 +1,21 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`sharingCart_beforeUpdate` + BEFORE UPDATE ON `sharingCart` + FOR EACH ROW +BEGIN + IF NEW.workerFk = NEW.workerSubstitute THEN + CALL util.throw ('worker and workerSubstitute must be different'); + ELSE + DELETE sc FROM sharingCartDaily sc + WHERE sc.dated BETWEEN OLD.started AND OLD.ended AND + sc.ownerFk = OLD.workerFk AND + sc.substituteFk = OLD.workerSubstitute; + + INSERT IGNORE INTO sharingCartDaily (ownerFk, substituteFk, dated) + SELECT NEW.workerFk, NEW.workerSubstitute, dated + FROM time + WHERE dated BETWEEN NEW.started AND NEW.ended; + + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/sharingClient_beforeInsert.sql b/db/routines/vn/triggers/sharingClient_beforeInsert.sql new file mode 100644 index 000000000..eea65e74c --- /dev/null +++ b/db/routines/vn/triggers/sharingClient_beforeInsert.sql @@ -0,0 +1,9 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`sharingClient_beforeInsert` + BEFORE INSERT ON `sharingClient` + FOR EACH ROW +BEGIN + SET NEW.ended = GREATEST(util.VN_CURDATE(),NEW.ended); + SET NEW.started = GREATEST(util.VN_CURDATE(),NEW.started); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/sharingClient_beforeUpdate.sql b/db/routines/vn/triggers/sharingClient_beforeUpdate.sql new file mode 100644 index 000000000..fceab691c --- /dev/null +++ b/db/routines/vn/triggers/sharingClient_beforeUpdate.sql @@ -0,0 +1,9 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`sharingClient_beforeUpdate` + BEFORE UPDATE ON `sharingClient` + FOR EACH ROW +BEGIN + SET NEW.ended = GREATEST(util.VN_CURDATE(),NEW.ended); + SET NEW.started = GREATEST(util.VN_CURDATE(),NEW.started); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/shelving_afterDelete.sql b/db/routines/vn/triggers/shelving_afterDelete.sql new file mode 100644 index 000000000..964a866e7 --- /dev/null +++ b/db/routines/vn/triggers/shelving_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`shelving_afterDelete` + AFTER DELETE ON `shelving` + FOR EACH ROW +BEGIN + INSERT INTO shelvingLog + SET `action` = 'delete', + `changedModel` = 'Shelving', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/shelving_beforeInsert.sql b/db/routines/vn/triggers/shelving_beforeInsert.sql new file mode 100644 index 000000000..ef3c7030c --- /dev/null +++ b/db/routines/vn/triggers/shelving_beforeInsert.sql @@ -0,0 +1,13 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`shelving_beforeInsert` + BEFORE INSERT ON `shelving` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); + + IF NEW.code = "" THEN + CALL util.throw('NOT_EMPTY_CODE_ALLOWED'); + END IF; + +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/shelving_beforeUpdate.sql b/db/routines/vn/triggers/shelving_beforeUpdate.sql new file mode 100644 index 000000000..89e7cb7e9 --- /dev/null +++ b/db/routines/vn/triggers/shelving_beforeUpdate.sql @@ -0,0 +1,16 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`shelving_beforeUpdate` + BEFORE UPDATE ON `shelving` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); + + IF NEW.code = "" THEN + CALL util.throw('NOT_EMPTY_CODE_ALLOWED'); + END IF; + + IF NOT(OLD.parkingFk <=> NEW.parkingFK) THEN + SET NEW.isMoving = FALSE; + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/solunionCAP_afterInsert.sql b/db/routines/vn/triggers/solunionCAP_afterInsert.sql new file mode 100644 index 000000000..8524689a7 --- /dev/null +++ b/db/routines/vn/triggers/solunionCAP_afterInsert.sql @@ -0,0 +1,11 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`solunionCAP_afterInsert` + AFTER INSERT ON `solunionCAP` + FOR EACH ROW +BEGIN + UPDATE vn2008.Clientes c + JOIN creditClassification cc ON c.Id_Cliente = cc.client + JOIN creditInsurance ci ON ci.creditClassification = cc.id + SET creditInsurance = ci.credit * 2 WHERE ci.id = NEW.creditInsurance; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/solunionCAP_afterUpdate.sql b/db/routines/vn/triggers/solunionCAP_afterUpdate.sql new file mode 100644 index 000000000..688241515 --- /dev/null +++ b/db/routines/vn/triggers/solunionCAP_afterUpdate.sql @@ -0,0 +1,18 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`solunionCAP_afterUpdate` + AFTER UPDATE ON `solunionCAP` + FOR EACH ROW +BEGIN + IF NEW.dateLeaving IS NOT NULL THEN + UPDATE vn2008.Clientes c + JOIN creditClassification cc ON c.Id_Cliente = cc.client + JOIN creditInsurance ci ON ci.creditClassification = cc.id + SET creditInsurance = ci.credit WHERE ci.id = OLD.creditInsurance; + ELSE + UPDATE vn2008.Clientes c + JOIN creditClassification cc ON c.Id_Cliente = cc.client + JOIN creditInsurance ci ON ci.creditClassification = cc.id + SET creditInsurance = ci.credit * 2 WHERE ci.id = OLD.creditInsurance; + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/solunionCAP_beforeDelete.sql b/db/routines/vn/triggers/solunionCAP_beforeDelete.sql new file mode 100644 index 000000000..85d65a949 --- /dev/null +++ b/db/routines/vn/triggers/solunionCAP_beforeDelete.sql @@ -0,0 +1,11 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`solunionCAP_beforeDelete` + BEFORE DELETE ON `solunionCAP` + FOR EACH ROW +BEGIN + UPDATE vn2008.Clientes c + JOIN creditClassification cc ON c.Id_Cliente = cc.client + JOIN creditInsurance ci ON ci.creditClassification = cc.id + SET creditInsurance = ci.credit WHERE ci.id = OLD.creditInsurance; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/specie_beforeInsert.sql b/db/routines/vn/triggers/specie_beforeInsert.sql new file mode 100644 index 000000000..68abf0d30 --- /dev/null +++ b/db/routines/vn/triggers/specie_beforeInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`specie_beforeInsert` + BEFORE INSERT ON `specie` + FOR EACH ROW +BEGIN + SET NEW.name = LCASE(NEW.name); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/specie_beforeUpdate.sql b/db/routines/vn/triggers/specie_beforeUpdate.sql new file mode 100644 index 000000000..364b1d52f --- /dev/null +++ b/db/routines/vn/triggers/specie_beforeUpdate.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`specie_beforeUpdate` + BEFORE UPDATE ON `specie` + FOR EACH ROW +BEGIN + SET NEW.name = LCASE(NEW.name); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/supplierAccount_afterDelete.sql b/db/routines/vn/triggers/supplierAccount_afterDelete.sql new file mode 100644 index 000000000..23c2cd4a4 --- /dev/null +++ b/db/routines/vn/triggers/supplierAccount_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`supplierAccount_afterDelete` + AFTER DELETE ON `supplierAccount` + FOR EACH ROW +BEGIN + INSERT INTO supplierLog + SET `action` = 'delete', + `changedModel` = 'SupplierAccount', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/supplierAccount_beforeInsert.sql b/db/routines/vn/triggers/supplierAccount_beforeInsert.sql new file mode 100644 index 000000000..512f172e1 --- /dev/null +++ b/db/routines/vn/triggers/supplierAccount_beforeInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`supplierAccount_beforeInsert` + BEFORE INSERT ON `supplierAccount` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/supplierAccount_beforeUpdate.sql b/db/routines/vn/triggers/supplierAccount_beforeUpdate.sql new file mode 100644 index 000000000..0fac19deb --- /dev/null +++ b/db/routines/vn/triggers/supplierAccount_beforeUpdate.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`supplierAccount_beforeUpdate` + BEFORE UPDATE ON `supplierAccount` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/supplierAddress_afterDelete.sql b/db/routines/vn/triggers/supplierAddress_afterDelete.sql new file mode 100644 index 000000000..69dd94dfe --- /dev/null +++ b/db/routines/vn/triggers/supplierAddress_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`supplierAddress_afterDelete` + AFTER DELETE ON `supplierAddress` + FOR EACH ROW +BEGIN + INSERT INTO supplierLog + SET `action` = 'delete', + `changedModel` = 'SupplierAddress', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/supplierAddress_beforeInsert.sql b/db/routines/vn/triggers/supplierAddress_beforeInsert.sql new file mode 100644 index 000000000..db8d0ea94 --- /dev/null +++ b/db/routines/vn/triggers/supplierAddress_beforeInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`supplierAddress_beforeInsert` + BEFORE INSERT ON `supplierAddress` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/supplierAddress_beforeUpdate.sql b/db/routines/vn/triggers/supplierAddress_beforeUpdate.sql new file mode 100644 index 000000000..8e484e4de --- /dev/null +++ b/db/routines/vn/triggers/supplierAddress_beforeUpdate.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`supplierAddress_beforeUpdate` + BEFORE UPDATE ON `supplierAddress` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/supplierContact_afterDelete.sql b/db/routines/vn/triggers/supplierContact_afterDelete.sql new file mode 100644 index 000000000..401ec9e9e --- /dev/null +++ b/db/routines/vn/triggers/supplierContact_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`supplierContact_afterDelete` + AFTER DELETE ON `supplierContact` + FOR EACH ROW +BEGIN + INSERT INTO supplierLog + SET `action` = 'delete', + `changedModel` = 'SupplierContact', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/supplierContact_beforeInsert.sql b/db/routines/vn/triggers/supplierContact_beforeInsert.sql new file mode 100644 index 000000000..76e78ba5a --- /dev/null +++ b/db/routines/vn/triggers/supplierContact_beforeInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`supplierContact_beforeInsert` + BEFORE INSERT ON `supplierContact` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/supplierContact_beforeUpdate.sql b/db/routines/vn/triggers/supplierContact_beforeUpdate.sql new file mode 100644 index 000000000..24723656a --- /dev/null +++ b/db/routines/vn/triggers/supplierContact_beforeUpdate.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`supplierContact_beforeUpdate` + BEFORE UPDATE ON `supplierContact` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/supplierDms_afterDelete.sql b/db/routines/vn/triggers/supplierDms_afterDelete.sql new file mode 100644 index 000000000..482decbb6 --- /dev/null +++ b/db/routines/vn/triggers/supplierDms_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`supplierDms_afterDelete` + AFTER DELETE ON `supplierDms` + FOR EACH ROW +BEGIN + INSERT INTO clientLog + SET `action` = 'delete', + `changedModel` = 'supplierDms', + `changedModelId` = OLD.dmsFk, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; \ No newline at end of file diff --git a/db/routines/vn/triggers/supplierDms_beforeInsert.sql b/db/routines/vn/triggers/supplierDms_beforeInsert.sql new file mode 100644 index 000000000..130428d1e --- /dev/null +++ b/db/routines/vn/triggers/supplierDms_beforeInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`supplierDms_beforeInsert` + BEFORE INSERT ON `supplierDms` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/supplierDms_beforeUpdate.sql b/db/routines/vn/triggers/supplierDms_beforeUpdate.sql new file mode 100644 index 000000000..54dcef049 --- /dev/null +++ b/db/routines/vn/triggers/supplierDms_beforeUpdate.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`supplierDms_beforeUpdate` + BEFORE UPDATE ON `supplierDms` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/supplier_afterDelete.sql b/db/routines/vn/triggers/supplier_afterDelete.sql new file mode 100644 index 000000000..d4b8e0d21 --- /dev/null +++ b/db/routines/vn/triggers/supplier_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`supplier_afterDelete` + AFTER DELETE ON `supplier` + FOR EACH ROW +BEGIN + INSERT INTO supplierLog + SET `action` = 'delete', + `changedModel` = 'Supplier', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/supplier_beforeInsert.sql b/db/routines/vn/triggers/supplier_beforeInsert.sql new file mode 100644 index 000000000..aef8d02ab --- /dev/null +++ b/db/routines/vn/triggers/supplier_beforeInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`supplier_beforeInsert` + BEFORE INSERT ON `supplier` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/.archive/225201/00-supplier_beforeUpdate.sql b/db/routines/vn/triggers/supplier_beforeUpdate.sql similarity index 88% rename from db/.archive/225201/00-supplier_beforeUpdate.sql rename to db/routines/vn/triggers/supplier_beforeUpdate.sql index 08af8666b..f462d6f57 100644 --- a/db/.archive/225201/00-supplier_beforeUpdate.sql +++ b/db/routines/vn/triggers/supplier_beforeUpdate.sql @@ -1,9 +1,5 @@ -DROP TRIGGER IF EXISTS `vn`.`supplier_beforeUpdate`; -USE `vn`; - DELIMITER $$ -$$ -CREATE DEFINER=`root`@`localhost` TRIGGER `vn`.`supplier_beforeUpdate` +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`supplier_beforeUpdate` BEFORE UPDATE ON `supplier` FOR EACH ROW BEGIN @@ -14,6 +10,8 @@ BEGIN DECLARE vOldPayMethodName VARCHAR(20); DECLARE vNewPayMethodName VARCHAR(20); + SET NEW.editorFk = account.myUser_getId(); + SELECT hasVerified INTO vPayMethodHasVerified FROM payMethod WHERE id = NEW.payMethodFk; diff --git a/db/routines/vn/triggers/tag_beforeInsert.sql b/db/routines/vn/triggers/tag_beforeInsert.sql new file mode 100644 index 000000000..27057754d --- /dev/null +++ b/db/routines/vn/triggers/tag_beforeInsert.sql @@ -0,0 +1,10 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`tag_beforeInsert` + BEFORE INSERT ON `tag` + FOR EACH ROW +BEGIN + IF NEW.ediTypeFk IS NULL AND (SELECT COUNT(*) FROM tag WHERE `name` = NEW.`name`) THEN + CALL util.throw('name duplicated'); + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketCollection_afterDelete.sql b/db/routines/vn/triggers/ticketCollection_afterDelete.sql new file mode 100644 index 000000000..e0917452a --- /dev/null +++ b/db/routines/vn/triggers/ticketCollection_afterDelete.sql @@ -0,0 +1,28 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketCollection_afterDelete` + AFTER DELETE ON `ticketCollection` + FOR EACH ROW +BEGIN + + DECLARE vSalesRemaining INT; + + SELECT count(*) INTO vSalesRemaining + FROM vn.ticketCollection tc + JOIN sale s ON s.ticketFk = tc.ticketFk + WHERE collectionFk = OLD.collectionFk + AND tc.id != OLD.id; + + IF NOT vSalesRemaining THEN + + DELETE FROM vn.collection WHERE id = OLD.collectionFk; + + ELSE + + UPDATE vn.collection + SET saleTotalCount = vSalesRemaining + WHERE id = OLD.collectionFk; + + END IF; + +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketDms_afterDelete.sql b/db/routines/vn/triggers/ticketDms_afterDelete.sql new file mode 100644 index 000000000..834079520 --- /dev/null +++ b/db/routines/vn/triggers/ticketDms_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketDms_afterDelete` + AFTER DELETE ON `ticketDms` + FOR EACH ROW +BEGIN + INSERT INTO ticketLog + SET `action` = 'delete', + `changedModel` = 'ticketDms', + `changedModelId` = OLD.ticketFk, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketDms_beforeDelete.sql b/db/routines/vn/triggers/ticketDms_beforeDelete.sql new file mode 100644 index 000000000..9c251fba1 --- /dev/null +++ b/db/routines/vn/triggers/ticketDms_beforeDelete.sql @@ -0,0 +1,16 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketDms_beforeDelete` + BEFORE DELETE ON `ticketDms` + FOR EACH ROW +BEGIN + UPDATE dms + SET dmsTypeFk = (SELECT id + FROM dmsType + WHERE `code` = 'trash' + ) + WHERE id = OLD.dmsFk AND ( SELECT IF(COUNT(*) > 0, FALSE, TRUE) + FROM ticketDms + WHERE dmsFk = OLD.dmsFk + ) ; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketDms_beforeInsert.sql b/db/routines/vn/triggers/ticketDms_beforeInsert.sql new file mode 100644 index 000000000..0c00dba28 --- /dev/null +++ b/db/routines/vn/triggers/ticketDms_beforeInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketDms_beforeInsert` + BEFORE INSERT ON `ticketDms` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketDms_beforeUpdate.sql b/db/routines/vn/triggers/ticketDms_beforeUpdate.sql new file mode 100644 index 000000000..aab22dd99 --- /dev/null +++ b/db/routines/vn/triggers/ticketDms_beforeUpdate.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketDms_beforeUpdate` + BEFORE UPDATE ON `ticketDms` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketObservation_afterDelete.sql b/db/routines/vn/triggers/ticketObservation_afterDelete.sql new file mode 100644 index 000000000..f8d88add6 --- /dev/null +++ b/db/routines/vn/triggers/ticketObservation_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketObservation_afterDelete` + AFTER DELETE ON `ticketObservation` + FOR EACH ROW +BEGIN + INSERT INTO ticketLog + SET `action` = 'delete', + `changedModel` = 'TicketObservation', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketObservation_beforeInsert.sql b/db/routines/vn/triggers/ticketObservation_beforeInsert.sql new file mode 100644 index 000000000..ce141d56a --- /dev/null +++ b/db/routines/vn/triggers/ticketObservation_beforeInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketObservation_beforeInsert` + BEFORE INSERT ON `ticketObservation` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketObservation_beforeUpdate.sql b/db/routines/vn/triggers/ticketObservation_beforeUpdate.sql new file mode 100644 index 000000000..466e17e85 --- /dev/null +++ b/db/routines/vn/triggers/ticketObservation_beforeUpdate.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketObservation_beforeUpdate` + BEFORE UPDATE ON `ticketObservation` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketPackaging_afterDelete.sql b/db/routines/vn/triggers/ticketPackaging_afterDelete.sql new file mode 100644 index 000000000..320f7e01e --- /dev/null +++ b/db/routines/vn/triggers/ticketPackaging_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketPackaging_afterDelete` + AFTER DELETE ON `ticketPackaging` + FOR EACH ROW +BEGIN + INSERT INTO ticketLog + SET `action` = 'delete', + `changedModel` = 'TicketPackaging', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketPackaging_beforeInsert.sql b/db/routines/vn/triggers/ticketPackaging_beforeInsert.sql new file mode 100644 index 000000000..a58955e0d --- /dev/null +++ b/db/routines/vn/triggers/ticketPackaging_beforeInsert.sql @@ -0,0 +1,10 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketPackaging_beforeInsert` + BEFORE INSERT ON `ticketPackaging` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); + SET NEW.workerFk = account.myUser_getId(); + +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketPackaging_beforeUpdate.sql b/db/routines/vn/triggers/ticketPackaging_beforeUpdate.sql new file mode 100644 index 000000000..5d15249c4 --- /dev/null +++ b/db/routines/vn/triggers/ticketPackaging_beforeUpdate.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketPackaging_beforeUpdate` + BEFORE UPDATE ON `ticketPackaging` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketParking_beforeInsert.sql b/db/routines/vn/triggers/ticketParking_beforeInsert.sql new file mode 100644 index 000000000..2add4f3ea --- /dev/null +++ b/db/routines/vn/triggers/ticketParking_beforeInsert.sql @@ -0,0 +1,10 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketParking_beforeInsert` + BEFORE INSERT ON `ticketParking` + FOR EACH ROW +BEGIN + + SET NEW.workerFk = vn.getUser(); + +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketRefund_afterDelete.sql b/db/routines/vn/triggers/ticketRefund_afterDelete.sql new file mode 100644 index 000000000..167030d4a --- /dev/null +++ b/db/routines/vn/triggers/ticketRefund_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketRefund_afterDelete` + AFTER DELETE ON `ticketRefund` + FOR EACH ROW +BEGIN + INSERT INTO ticketLog + SET `action` = 'delete', + `changedModel` = 'TicketRefund', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketRefund_beforeInsert.sql b/db/routines/vn/triggers/ticketRefund_beforeInsert.sql new file mode 100644 index 000000000..7893f6c51 --- /dev/null +++ b/db/routines/vn/triggers/ticketRefund_beforeInsert.sql @@ -0,0 +1,9 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketRefund_beforeInsert` + BEFORE INSERT ON `ticketRefund` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); + CALL ticketRefund_beforeUpsert(NEW.refundTicketFk, NEW.originalTicketFk); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketRefund_beforeUpdate.sql b/db/routines/vn/triggers/ticketRefund_beforeUpdate.sql new file mode 100644 index 000000000..51c7db8f2 --- /dev/null +++ b/db/routines/vn/triggers/ticketRefund_beforeUpdate.sql @@ -0,0 +1,9 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketRefund_beforeUpdate` + BEFORE UPDATE ON `ticketRefund` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); + CALL ticketRefund_beforeUpsert(NEW.refundTicketFk, NEW.originalTicketFk); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketRequest_afterDelete.sql b/db/routines/vn/triggers/ticketRequest_afterDelete.sql new file mode 100644 index 000000000..a8932a744 --- /dev/null +++ b/db/routines/vn/triggers/ticketRequest_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketRequest_afterDelete` + AFTER DELETE ON `ticketRequest` + FOR EACH ROW +BEGIN + INSERT INTO ticketLog + SET `action` = 'delete', + `changedModel` = 'TicketRequest', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketRequest_beforeInsert.sql b/db/routines/vn/triggers/ticketRequest_beforeInsert.sql new file mode 100644 index 000000000..d17459912 --- /dev/null +++ b/db/routines/vn/triggers/ticketRequest_beforeInsert.sql @@ -0,0 +1,20 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketRequest_beforeInsert` + BEFORE INSERT ON `ticketRequest` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); + + IF NEW.ticketFk IS NULL THEN + SET NEW.ticketFk = (SELECT s.ticketFk FROM sale s WHERE s.id = NEW.saleFk); + END IF; + + IF NEW.requesterFk IS NULL THEN + SET NEW.requesterFk = (SELECT w.id FROM worker w WHERE w.code = NEW.salesPersonCode); + END IF; + + IF NEW.attenderFk IS NULL THEN + SET NEW.attenderFk = (SELECT w.id FROM worker w WHERE w.code = NEW.buyerCode); + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketRequest_beforeUpdate.sql b/db/routines/vn/triggers/ticketRequest_beforeUpdate.sql new file mode 100644 index 000000000..e5e9c307e --- /dev/null +++ b/db/routines/vn/triggers/ticketRequest_beforeUpdate.sql @@ -0,0 +1,20 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketRequest_beforeUpdate` + BEFORE UPDATE ON `ticketRequest` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); + + IF NEW.saleFk <> OLD.saleFk THEN + SET NEW.ticketFk = (SELECT s.ticketFk FROM sale s WHERE s.id = NEW.saleFk); + END IF; + + IF NEW.salesPersonCode <> OLD.salesPersonCode THEN + SET NEW.requesterFk = (SELECT w.id FROM worker w WHERE w.code = NEW.salesPersonCode); + END IF; + + IF NEW.buyerCode <> OLD.buyerCode THEN + SET NEW.attenderFk = (SELECT w.id FROM worker w WHERE w.code = NEW.buyerCode); + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketService_afterDelete.sql b/db/routines/vn/triggers/ticketService_afterDelete.sql new file mode 100644 index 000000000..11d5aaf24 --- /dev/null +++ b/db/routines/vn/triggers/ticketService_afterDelete.sql @@ -0,0 +1,15 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketService_afterDelete` + AFTER DELETE ON `ticketService` + FOR EACH ROW +BEGIN + INSERT INTO ticketLog + SET `action` = 'delete', + `changedModel` = 'TicketService', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); + + CALL ticket_requestRecalc(OLD.ticketFk); + +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketService_afterInsert.sql b/db/routines/vn/triggers/ticketService_afterInsert.sql new file mode 100644 index 000000000..b9142ff72 --- /dev/null +++ b/db/routines/vn/triggers/ticketService_afterInsert.sql @@ -0,0 +1,10 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketService_afterInsert` + AFTER INSERT ON `ticketService` + FOR EACH ROW +BEGIN + + CALL ticket_requestRecalc(NEW.ticketFk); + +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketService_afterUpdate.sql b/db/routines/vn/triggers/ticketService_afterUpdate.sql new file mode 100644 index 000000000..ecc9e9a5a --- /dev/null +++ b/db/routines/vn/triggers/ticketService_afterUpdate.sql @@ -0,0 +1,13 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketService_afterUpdate` + AFTER UPDATE ON `ticketService` + FOR EACH ROW +BEGIN + IF !(NEW.price <=> OLD.price) + OR !(NEW.ticketFk <=> OLD.ticketFk) + OR !(NEW.quantity <=> OLD.quantity) THEN + CALL ticket_requestRecalc(NEW.ticketFk); + CALL ticket_requestRecalc(OLD.ticketFk); + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketService_beforeInsert.sql b/db/routines/vn/triggers/ticketService_beforeInsert.sql new file mode 100644 index 000000000..81b7e5e91 --- /dev/null +++ b/db/routines/vn/triggers/ticketService_beforeInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketService_beforeInsert` + BEFORE INSERT ON `ticketService` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketService_beforeUpdate.sql b/db/routines/vn/triggers/ticketService_beforeUpdate.sql new file mode 100644 index 000000000..a24af8269 --- /dev/null +++ b/db/routines/vn/triggers/ticketService_beforeUpdate.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketService_beforeUpdate` + BEFORE UPDATE ON `ticketService` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketTracking_afterDelete.sql b/db/routines/vn/triggers/ticketTracking_afterDelete.sql new file mode 100644 index 000000000..2f1bbbcee --- /dev/null +++ b/db/routines/vn/triggers/ticketTracking_afterDelete.sql @@ -0,0 +1,40 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketTracking_afterDelete` + AFTER DELETE ON `ticketTracking` + FOR EACH ROW +BEGIN + DECLARE vTicketFk INT; + DECLARE vTicketTrackingFk INT; + DECLARE vStateName VARCHAR(15); + + DECLARE CONTINUE HANDLER FOR SQLSTATE '23000' + BEGIN + DELETE FROM vn.ticketLastState + WHERE ticketFk = OLD.ticketFk; + END; + + INSERT INTO ticketLog + SET `action` = 'delete', + `changedModel` = 'TicketTracking', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); + + CALL util.debugAdd('deletedState', + CONCAT('interFk: ', OLD.id, + ' ticketFk: ', OLD.ticketFk, + ' stateFk: ', OLD.stateFk)); + + SELECT i.ticketFk, i.id, s.`name` + INTO vTicketFk, vTicketTrackingFk, vStateName + FROM ticketTracking i + JOIN state s ON i.stateFk = s.id + WHERE ticketFk = OLD.ticketFk + ORDER BY created DESC + LIMIT 1; + + IF vTicketFk > 0 THEN + REPLACE INTO ticketLastState(ticketFk, ticketTrackingFk,name) + VALUES(vTicketFk, vTicketTrackingFk, vStateName); + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketTracking_afterInsert.sql b/db/routines/vn/triggers/ticketTracking_afterInsert.sql new file mode 100644 index 000000000..b246cd44f --- /dev/null +++ b/db/routines/vn/triggers/ticketTracking_afterInsert.sql @@ -0,0 +1,13 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketTracking_afterInsert` + AFTER INSERT ON `ticketTracking` + FOR EACH ROW +BEGIN + DECLARE vNumTicketsPrepared INT; + + REPLACE vn.ticketLastState(ticketFk, ticketTrackingFk, name) + SELECT NEW.ticketFk, NEW.id, `name` + FROM state + WHERE id = NEW.stateFk; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketTracking_afterUpdate.sql b/db/routines/vn/triggers/ticketTracking_afterUpdate.sql new file mode 100644 index 000000000..ce5586569 --- /dev/null +++ b/db/routines/vn/triggers/ticketTracking_afterUpdate.sql @@ -0,0 +1,32 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketTracking_afterUpdate` + AFTER UPDATE ON `ticketTracking` + FOR EACH ROW +BEGIN + DECLARE vTicketFk INT; + DECLARE vTicketTrackingFk INT; + DECLARE vStateName VARCHAR(15); + + IF NEW.stateFk <> OLD.stateFk THEN + REPLACE vn.ticketLastState(ticketFk, ticketTrackingFk, name) + SELECT NEW.ticketFk, NEW.id, `name` + FROM state + WHERE id = NEW.stateFk; + END IF; + + IF NEW.ticketFk <> OLD.ticketFk THEN + SELECT i.ticketFk, i.id, s.`name` + INTO vTicketFk, vTicketTrackingFk, vStateName + FROM ticketTracking i + JOIN state s ON i.stateFk = s.id + WHERE ticketFk = NEW.ticketFk + ORDER BY created DESC + LIMIT 1; + + IF vTicketFk > 0 THEN + REPLACE INTO ticketLastState(ticketFk, ticketTrackingFk,name) + VALUES(vTicketFk, vTicketTrackingFk, vStateName); + END IF; + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketTracking_beforeInsert.sql b/db/routines/vn/triggers/ticketTracking_beforeInsert.sql new file mode 100644 index 000000000..685713aea --- /dev/null +++ b/db/routines/vn/triggers/ticketTracking_beforeInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketTracking_beforeInsert` + BEFORE INSERT ON `ticketTracking` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketTracking_beforeUpdate.sql b/db/routines/vn/triggers/ticketTracking_beforeUpdate.sql new file mode 100644 index 000000000..ec875387e --- /dev/null +++ b/db/routines/vn/triggers/ticketTracking_beforeUpdate.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketTracking_beforeUpdate` + BEFORE UPDATE ON `ticketTracking` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketWeekly_afterDelete.sql b/db/routines/vn/triggers/ticketWeekly_afterDelete.sql new file mode 100644 index 000000000..d0ef0b8df --- /dev/null +++ b/db/routines/vn/triggers/ticketWeekly_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketWeekly_afterDelete` + AFTER DELETE ON `ticketWeekly` + FOR EACH ROW +BEGIN + INSERT INTO ticketLog + SET `action` = 'delete', + `changedModel` = 'TicketWeekly', + `changedModelId` = OLD.ticketFk, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketWeekly_beforeInsert.sql b/db/routines/vn/triggers/ticketWeekly_beforeInsert.sql new file mode 100644 index 000000000..e4a61d203 --- /dev/null +++ b/db/routines/vn/triggers/ticketWeekly_beforeInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketWeekly_beforeInsert` + BEFORE INSERT ON `ticketWeekly` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketWeekly_beforeUpdate.sql b/db/routines/vn/triggers/ticketWeekly_beforeUpdate.sql new file mode 100644 index 000000000..1a631bec1 --- /dev/null +++ b/db/routines/vn/triggers/ticketWeekly_beforeUpdate.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketWeekly_beforeUpdate` + BEFORE UPDATE ON `ticketWeekly` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticket_afterDelete.sql b/db/routines/vn/triggers/ticket_afterDelete.sql new file mode 100644 index 000000000..c80f3dbe1 --- /dev/null +++ b/db/routines/vn/triggers/ticket_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticket_afterDelete` + AFTER DELETE ON `ticket` + FOR EACH ROW +BEGIN + INSERT INTO ticketLog + SET `action` = 'delete', + `changedModel` = 'Ticket', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticket_afterInsert.sql b/db/routines/vn/triggers/ticket_afterInsert.sql new file mode 100644 index 000000000..0fad0aaee --- /dev/null +++ b/db/routines/vn/triggers/ticket_afterInsert.sql @@ -0,0 +1,38 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticket_afterInsert` + AFTER INSERT ON `ticket` + FOR EACH ROW +BEGIN + + DECLARE vClientType VARCHAR(255); + DECLARE vStateCode VARCHAR(255); + DECLARE vTransferorFirstShipped DATE; + + -- Borrar cuando se cambie el insert ticket en la APP móvil + + SELECT typeFk INTO vClientType + FROM vn.`client` WHERE id = NEW.clientFk; + + IF vClientType = 'loses' THEN + SET vStateCode = 'DELIVERED'; + ELSE + SET vStateCode = 'FREE'; + END IF; + + CALL ticket_setState(NEW.id, vStateCode); + + IF YEAR(NEW.shipped) > 2000 THEN + + SELECT cnb.firstShipped INTO vTransferorFirstShipped + FROM bs.clientNewBorn cnb + JOIN `client` c ON c.transferorFk = cnb.clientFk + WHERE c.id = NEW.clientFk; + + INSERT INTO bs.clientNewBorn(clientFk, firstShipped, lastShipped) + VALUES(NEW.clientFk, IFNULL(vTransferorFirstShipped, util.VN_CURDATE()), util.VN_CURDATE()) + ON DUPLICATE KEY UPDATE lastShipped = util.VN_CURDATE(); + + END IF; + +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticket_afterUpdate.sql b/db/routines/vn/triggers/ticket_afterUpdate.sql new file mode 100644 index 000000000..df939c9d1 --- /dev/null +++ b/db/routines/vn/triggers/ticket_afterUpdate.sql @@ -0,0 +1,26 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticket_afterUpdate` + AFTER UPDATE ON `ticket` + FOR EACH ROW +BEGIN + + IF !(NEW.id <=> OLD.id) + OR !(NEW.warehouseFk <=> OLD.warehouseFk) + OR !(NEW.shipped <=> OLD.shipped) THEN + CALL stock.log_add('ticket', NEW.id, OLD.id); + END IF; + + IF !(NEW.clientFk <=> OLD.clientFk) + OR !(NEW.addressFk <=> OLD.addressFk) + OR !(NEW.companyFk <=> OLD.companyFk) THEN + CALL ticket_requestRecalc(NEW.id); + END IF; + + IF NEW.routeFk <> OLD.routeFk THEN + UPDATE expedition + SET hasNewRoute = TRUE + WHERE ticketFk = NEW.id; + END IF; + +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticket_beforeDelete.sql b/db/routines/vn/triggers/ticket_beforeDelete.sql new file mode 100644 index 000000000..02c5352e6 --- /dev/null +++ b/db/routines/vn/triggers/ticket_beforeDelete.sql @@ -0,0 +1,18 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticket_beforeDelete` + BEFORE DELETE ON `ticket` + FOR EACH ROW +BEGIN + INSERT IGNORE INTO `vn`.`routeRecalc` (`routeFk`) + SELECT r.id + FROM vn.route r + WHERE r.isOk = FALSE + AND r.id = OLD.routeFk + AND r.created >= util.VN_CURDATE() + GROUP BY r.id; + + DELETE FROM sale WHERE ticketFk = OLD.id; + + DELETE FROM ticketDms WHERE ticketFk = OLD.id; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticket_beforeInsert.sql b/db/routines/vn/triggers/ticket_beforeInsert.sql new file mode 100644 index 000000000..7e0fc57b8 --- /dev/null +++ b/db/routines/vn/triggers/ticket_beforeInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticket_beforeInsert` + BEFORE INSERT ON `ticket` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticket_beforeUpdate.sql b/db/routines/vn/triggers/ticket_beforeUpdate.sql new file mode 100644 index 000000000..72831bc3d --- /dev/null +++ b/db/routines/vn/triggers/ticket_beforeUpdate.sql @@ -0,0 +1,67 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticket_beforeUpdate` + BEFORE UPDATE ON `ticket` + FOR EACH ROW +BEGIN + DECLARE vNewTime TIME; + + SET NEW.editorFk = account.myUser_getId(); + + IF NOT (NEW.routeFk <=> OLD.routeFk) THEN + INSERT IGNORE INTO `vn`.`routeRecalc` (`routeFk`) + SELECT r.id + FROM vn.route r + WHERE r.isOk = FALSE + AND r.id IN (OLD.routeFk,NEW.routeFk) + AND r.created >= util.VN_CURDATE() + GROUP BY r.id; + END IF; + + IF NOT (DATE(NEW.shipped) <=> DATE(OLD.shipped)) THEN + IF YEAR(NEW.shipped) < 2000 THEN + SIGNAL SQLSTATE '46000' + SET MESSAGE_TEXT = 'Year cannot be lesser than 2000'; + END IF; + + IF YEAR(NEW.shipped) = 2000 THEN + SET NEW.isDeleted = TRUE; + END IF; + + END IF; + + IF NOT (NEW.isDeleted <=> OLD.isDeleted) AND NEW.isDeleted THEN + INSERT IGNORE INTO `vn`.`routeRecalc` (`routeFk`) + SELECT r.id + FROM vn.ticket t + JOIN vn.route r ON r.id = t.routeFk + WHERE r.isOk = FALSE + AND t.id = NEW.id + AND r.created >= util.VN_CURDATE() + GROUP BY r.id; + SET NEW.shipped = DATE_FORMAT(NEW.shipped, '2000-%m-%d %T'); + SET NEW.landed = DATE_FORMAT(NEW.landed, '2000-%m-%d %T'); + SET NEW.routeFk = NULL; + SET NEW.zoneFk = NULL; + END IF; + + IF NEW.routeFk AND NEW.isDeleted THEN + CALL util.throw ('This ticket is deleted'); + END IF; + + IF NOT (NEW.routeFk <=> OLD.routeFk) AND NEW.routeFk IS NOT NULL THEN + SELECT MAX(TIME(shipped)) INTO vNewTime + FROM vn.ticket + WHERE routeFk = NEW.routeFk + HAVING MAX(TIME(shipped)) > TIME(NEW.shipped); + + IF vNewTime THEN + SET NEW.shipped = TIMESTAMP(DATE(NEW.shipped), vNewTime); + END IF; + INSERT IGNORE INTO zoneAgencyMode (agencyModeFk,zoneFk) + SELECT r.agencyModeFk, NEW.zoneFk FROM route r + WHERE r.id = NEW.routeFk; + + CALL vn.routeUpdateM3(NEW.routeFk); + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/time_afterUpdate.sql b/db/routines/vn/triggers/time_afterUpdate.sql new file mode 100644 index 000000000..1eb735923 --- /dev/null +++ b/db/routines/vn/triggers/time_afterUpdate.sql @@ -0,0 +1,13 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`time_afterUpdate` + AFTER UPDATE ON `time` + FOR EACH ROW +BEGIN + /*INSERT INTO vn.mail SET + `sender` = 'jgallego@verdnatura.es', + `replyTo` = 'jgallego@verdnatura.es', + `subject` = 'tabla time modificada', + `body` = CONCAT(account.myUser_getName(), ' ha modificado la tabla time ', + NEW.`dated`);*/ +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/town_afterDelete.sql b/db/routines/vn/triggers/town_afterDelete.sql new file mode 100644 index 000000000..e6ca82d80 --- /dev/null +++ b/db/routines/vn/triggers/town_afterDelete.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`town_afterDelete` + AFTER DELETE ON `town` + FOR EACH ROW +BEGIN + CALL zoneGeo_delete(OLD.geoFk); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/town_afterUpdate.sql b/db/routines/vn/triggers/town_afterUpdate.sql new file mode 100644 index 000000000..830428061 --- /dev/null +++ b/db/routines/vn/triggers/town_afterUpdate.sql @@ -0,0 +1,16 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`town_afterUpdate` + AFTER UPDATE ON `town` + FOR EACH ROW +BEGIN + IF !(OLD.provinceFk <=> NEW.provinceFk) THEN + CALL zoneGeo_setParent(NEW.geoFk, + (SELECT geoFk FROM province WHERE id = NEW.provinceFk)); + END IF; + + IF !(OLD.`name` <=> NEW.`name`) THEN + UPDATE zoneGeo SET `name` = NEW.`name` + WHERE id = NEW.geoFk; + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/town_beforeInsert.sql b/db/routines/vn/triggers/town_beforeInsert.sql new file mode 100644 index 000000000..f3a060b2d --- /dev/null +++ b/db/routines/vn/triggers/town_beforeInsert.sql @@ -0,0 +1,9 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`town_beforeInsert` + BEFORE INSERT ON `town` + FOR EACH ROW +BEGIN + SET NEW.geoFk = zoneGeo_new('town', NEW.`name`, + (SELECT geoFk FROM province WHERE id = NEW.provinceFk)); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/town_beforeUpdate.sql b/db/routines/vn/triggers/town_beforeUpdate.sql new file mode 100644 index 000000000..e607b3f41 --- /dev/null +++ b/db/routines/vn/triggers/town_beforeUpdate.sql @@ -0,0 +1,10 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`town_beforeUpdate` + BEFORE UPDATE ON `town` + FOR EACH ROW +BEGIN + -- IF !(OLD.geoFk <=> NEW.geoFk) THEN + -- CALL zoneGeo_throwNotEditable; + -- END IF; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/travelThermograph_afterDelete.sql b/db/routines/vn/triggers/travelThermograph_afterDelete.sql new file mode 100644 index 000000000..14a875799 --- /dev/null +++ b/db/routines/vn/triggers/travelThermograph_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`travelThermograph_afterDelete` + AFTER DELETE ON `travelThermograph` + FOR EACH ROW +BEGIN + INSERT INTO travelLog + SET `action` = 'delete', + `changedModel` = 'TravelThermograph', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/travelThermograph_beforeInsert.sql b/db/routines/vn/triggers/travelThermograph_beforeInsert.sql new file mode 100644 index 000000000..4ebe14e75 --- /dev/null +++ b/db/routines/vn/triggers/travelThermograph_beforeInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`travelThermograph_beforeInsert` + BEFORE INSERT ON `travelThermograph` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/travelThermograph_beforeUpdate.sql b/db/routines/vn/triggers/travelThermograph_beforeUpdate.sql new file mode 100644 index 000000000..381e655f3 --- /dev/null +++ b/db/routines/vn/triggers/travelThermograph_beforeUpdate.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`travelThermograph_beforeUpdate` + BEFORE UPDATE ON `travelThermograph` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/travel_afterDelete.sql b/db/routines/vn/triggers/travel_afterDelete.sql new file mode 100644 index 000000000..a528793e9 --- /dev/null +++ b/db/routines/vn/triggers/travel_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`travel_afterDelete` + AFTER DELETE ON `travel` + FOR EACH ROW +BEGIN + INSERT INTO travelLog + SET `action` = 'delete', + `changedModel` = 'Travel', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/travel_afterUpdate.sql b/db/routines/vn/triggers/travel_afterUpdate.sql new file mode 100644 index 000000000..38cd3ba13 --- /dev/null +++ b/db/routines/vn/triggers/travel_afterUpdate.sql @@ -0,0 +1,27 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`travel_afterUpdate` + AFTER UPDATE ON `travel` + FOR EACH ROW +BEGIN + CALL stock.log_add('travel', NEW.id, OLD.id); + + IF NOT(NEW.shipped <=> OLD.shipped) THEN + UPDATE entry + SET commission = entry_getCommission(travelFk, currencyFk,supplierFk) + WHERE travelFk = NEW.id; + END IF; + + IF NOT (NEW.agencyModeFk <=> OLD.agencyModeFk) THEN + IF (SELECT hasWeightVolumetric FROM agencyMode WHERE id = NEW.agencyModeFk) THEN + CREATE OR REPLACE TEMPORARY TABLE tmp.buysToCheck + SELECT b.id + FROM entry e + JOIN buy b ON b.entryFk = e.id + JOIN item i ON i.id = b.itemFk + WHERE e.travelFk = NEW.id; + + CALL buy_checkItem(); + END IF; + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/travel_beforeInsert.sql b/db/routines/vn/triggers/travel_beforeInsert.sql new file mode 100644 index 000000000..817bd69bb --- /dev/null +++ b/db/routines/vn/triggers/travel_beforeInsert.sql @@ -0,0 +1,16 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`travel_beforeInsert` + BEFORE INSERT ON `travel` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); + + CALL travel_checkDates(NEW.shipped, NEW.landed); + + CALL travel_checkWarehouseIsFeedStock(NEW.warehouseInFk); + + IF NEW.awbFk IS NOT NULL AND NOT travel_hasUniqueAwb(NEW.id) THEN + CALL util.throw('The AWB is incorrect, there is a different AWB in the associated entries'); + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/travel_beforeUpdate.sql b/db/routines/vn/triggers/travel_beforeUpdate.sql new file mode 100644 index 000000000..5e43c8761 --- /dev/null +++ b/db/routines/vn/triggers/travel_beforeUpdate.sql @@ -0,0 +1,40 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`travel_beforeUpdate` + BEFORE UPDATE ON `travel` + FOR EACH ROW +BEGIN + DECLARE vHasAnyInvoiceBooked BOOL; + + SET NEW.editorFk = account.myUser_getId(); + + IF NOT (NEW.landed <=> OLD.landed) + OR NOT (NEW.shipped <=> OLD.shipped) THEN + CALL travel_checkDates(NEW.shipped, NEW.landed); + END IF; + + IF NOT (NEW.isReceived <=> OLD.isReceived) THEN + CALL travel_checkPackaging(NEW.id); + END IF; + + IF NOT (NEW.warehouseInFk <=> OLD.warehouseInFk) THEN + CALL travel_checkWarehouseIsFeedStock(NEW.warehouseInFk); + END IF; + + IF NOT (NEW.awbFk <=> OLD.awbFk)THEN + SELECT COUNT(*) INTO vHasAnyInvoiceBooked + FROM travel t + JOIN entry e ON e.travelFk = t.id + JOIN invoiceIn ii ON ii.id = e.invoiceInFk + WHERE t.id = NEW.id + AND ii.isBooked; + + IF vHasAnyInvoiceBooked THEN + CALL util.throw('The travel has entries with booked invoices'); + END IF; + END IF; + + IF (NOT(NEW.awbFk <=> OLD.awbFk)) AND NEW.awbFk IS NOT NULL AND NOT travel_hasUniqueAwb(NEW.id) THEN + CALL util.throw('The AWB is incorrect, there is a different AWB in the associated entries'); + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/vehicle_beforeInsert.sql b/db/routines/vn/triggers/vehicle_beforeInsert.sql new file mode 100644 index 000000000..046e11703 --- /dev/null +++ b/db/routines/vn/triggers/vehicle_beforeInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`vehicle_beforeInsert` + BEFORE INSERT ON `vehicle` + FOR EACH ROW +BEGIN + CALL vehicle_checkNumberPlate(NEW.numberPlate, NEW.countryCodeFk); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/vehicle_beforeUpdate.sql b/db/routines/vn/triggers/vehicle_beforeUpdate.sql new file mode 100644 index 000000000..d61005468 --- /dev/null +++ b/db/routines/vn/triggers/vehicle_beforeUpdate.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`vehicle_beforeUpdate` + BEFORE UPDATE ON `vehicle` + FOR EACH ROW +BEGIN + CALL vehicle_checkNumberPlate(NEW.numberPlate, NEW.countryCodeFk); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/warehouse_afterInsert.sql b/db/routines/vn/triggers/warehouse_afterInsert.sql new file mode 100644 index 000000000..97a8c4152 --- /dev/null +++ b/db/routines/vn/triggers/warehouse_afterInsert.sql @@ -0,0 +1,10 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`warehouse_afterInsert` + BEFORE UPDATE ON `warehouse` + FOR EACH ROW +BEGIN + IF NEW.isFeedStock AND NEW.isInventory THEN + CALL util.throw("isFeedStock and isInventory cannot both be true"); + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/workerDocument_afterDelete.sql b/db/routines/vn/triggers/workerDocument_afterDelete.sql new file mode 100644 index 000000000..b266d3bf6 --- /dev/null +++ b/db/routines/vn/triggers/workerDocument_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`workerDocument_afterDelete` + AFTER DELETE ON `workerDocument` + FOR EACH ROW +BEGIN + INSERT INTO workerLog + SET `action` = 'delete', + `changedModel` = 'WorkerDocument', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/workerDocument_beforeInsert.sql b/db/routines/vn/triggers/workerDocument_beforeInsert.sql new file mode 100644 index 000000000..2a795ba38 --- /dev/null +++ b/db/routines/vn/triggers/workerDocument_beforeInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`workerDocument_beforeInsert` + BEFORE INSERT ON `workerDocument` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/workerDocument_beforeUpdate.sql b/db/routines/vn/triggers/workerDocument_beforeUpdate.sql new file mode 100644 index 000000000..ffa137b3a --- /dev/null +++ b/db/routines/vn/triggers/workerDocument_beforeUpdate.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`workerDocument_beforeUpdate` + BEFORE UPDATE ON `workerDocument` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/workerIncome_afterDelete.sql b/db/routines/vn/triggers/workerIncome_afterDelete.sql new file mode 100644 index 000000000..e19df59a8 --- /dev/null +++ b/db/routines/vn/triggers/workerIncome_afterDelete.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`workerIncome_afterDelete` + AFTER DELETE ON `workerIncome` + FOR EACH ROW +BEGIN + CALL worker_updateBalance(OLD.workerFk,-OLD.credit,-OLD.debit); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/workerIncome_afterInsert.sql b/db/routines/vn/triggers/workerIncome_afterInsert.sql new file mode 100644 index 000000000..8837f9c07 --- /dev/null +++ b/db/routines/vn/triggers/workerIncome_afterInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`workerIncome_afterInsert` + AFTER INSERT ON `workerIncome` + FOR EACH ROW +BEGIN + CALL worker_updateBalance(NEW.workerFk,NEW.credit,NEW.debit); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/workerIncome_afterUpdate.sql b/db/routines/vn/triggers/workerIncome_afterUpdate.sql new file mode 100644 index 000000000..a2584df22 --- /dev/null +++ b/db/routines/vn/triggers/workerIncome_afterUpdate.sql @@ -0,0 +1,10 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`workerIncome_afterUpdate` + AFTER UPDATE ON `workerIncome` + FOR EACH ROW +BEGIN + CALL worker_updateBalance(NEW.workerFk,-OLD.credit,-OLD.debit); + + CALL worker_updateBalance(NEW.workerFk,NEW.credit,NEW.debit); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/workerTimeControl_afterDelete.sql b/db/routines/vn/triggers/workerTimeControl_afterDelete.sql new file mode 100644 index 000000000..19653c913 --- /dev/null +++ b/db/routines/vn/triggers/workerTimeControl_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`workerTimeControl_afterDelete` + AFTER DELETE ON `workerTimeControl` + FOR EACH ROW +BEGIN + INSERT INTO workerLog + SET `action` = 'delete', + `changedModel` = 'WorkerTimeControl', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/workerTimeControl_afterInsert.sql b/db/routines/vn/triggers/workerTimeControl_afterInsert.sql new file mode 100644 index 000000000..b8b9c3b01 --- /dev/null +++ b/db/routines/vn/triggers/workerTimeControl_afterInsert.sql @@ -0,0 +1,10 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`workerTimeControl_afterInsert` + AFTER INSERT ON `workerTimeControl` + FOR EACH ROW +BEGIN + IF NEW.timed > (util.VN_NOW() + INTERVAL 1 DAY) THEN + CALL util.throw('date in the future'); + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/workerTimeControl_beforeInsert.sql b/db/routines/vn/triggers/workerTimeControl_beforeInsert.sql new file mode 100644 index 000000000..ad7acb784 --- /dev/null +++ b/db/routines/vn/triggers/workerTimeControl_beforeInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`workerTimeControl_beforeInsert` + BEFORE INSERT ON `workerTimeControl` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/workerTimeControl_beforeUpdate.sql b/db/routines/vn/triggers/workerTimeControl_beforeUpdate.sql new file mode 100644 index 000000000..bb391ad61 --- /dev/null +++ b/db/routines/vn/triggers/workerTimeControl_beforeUpdate.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`workerTimeControl_beforeUpdate` + BEFORE UPDATE ON `workerTimeControl` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/worker_afterDelete.sql b/db/routines/vn/triggers/worker_afterDelete.sql new file mode 100644 index 000000000..0104248ff --- /dev/null +++ b/db/routines/vn/triggers/worker_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`worker_afterDelete` + AFTER DELETE ON `worker` + FOR EACH ROW +BEGIN + INSERT INTO workerLog + SET `action` = 'delete', + `changedModel` = 'Worker', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/worker_beforeInsert.sql b/db/routines/vn/triggers/worker_beforeInsert.sql new file mode 100644 index 000000000..8830bd77e --- /dev/null +++ b/db/routines/vn/triggers/worker_beforeInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`worker_beforeInsert` + BEFORE INSERT ON `worker` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/worker_beforeUpdate.sql b/db/routines/vn/triggers/worker_beforeUpdate.sql new file mode 100644 index 000000000..05705d273 --- /dev/null +++ b/db/routines/vn/triggers/worker_beforeUpdate.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`worker_beforeUpdate` + BEFORE UPDATE ON `worker` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/workingHours_beforeInsert.sql b/db/routines/vn/triggers/workingHours_beforeInsert.sql new file mode 100644 index 000000000..dce726f10 --- /dev/null +++ b/db/routines/vn/triggers/workingHours_beforeInsert.sql @@ -0,0 +1,10 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`workingHours_beforeInsert` + BEFORE INSERT ON `workingHours` + FOR EACH ROW +BEGIN + IF (SELECT COUNT(*) FROM workingHours WHERE userId = NEW.userId AND DATE(timeIn) = util.VN_CURDATE()) > 0 THEN + CALL util.throw ('ALREADY_LOGGED'); + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/zoneEvent_afterDelete.sql b/db/routines/vn/triggers/zoneEvent_afterDelete.sql new file mode 100644 index 000000000..1eecc21dc --- /dev/null +++ b/db/routines/vn/triggers/zoneEvent_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`zoneEvent_afterDelete` + AFTER DELETE ON `zoneEvent` + FOR EACH ROW +BEGIN + INSERT INTO zoneLog + SET `action` = 'delete', + `changedModel` = 'zoneEvent', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/zoneEvent_beforeInsert.sql b/db/routines/vn/triggers/zoneEvent_beforeInsert.sql new file mode 100644 index 000000000..ae1542851 --- /dev/null +++ b/db/routines/vn/triggers/zoneEvent_beforeInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`zoneEvent_beforeInsert` + BEFORE INSERT ON `zoneEvent` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/zoneEvent_beforeUpdate.sql b/db/routines/vn/triggers/zoneEvent_beforeUpdate.sql new file mode 100644 index 000000000..09698a2c9 --- /dev/null +++ b/db/routines/vn/triggers/zoneEvent_beforeUpdate.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`zoneEvent_beforeUpdate` + BEFORE UPDATE ON `zoneEvent` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/zoneExclusion_afterDelete.sql b/db/routines/vn/triggers/zoneExclusion_afterDelete.sql new file mode 100644 index 000000000..6c8a441aa --- /dev/null +++ b/db/routines/vn/triggers/zoneExclusion_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`zoneExclusion_afterDelete` + AFTER DELETE ON `zoneExclusion` + FOR EACH ROW +BEGIN + INSERT INTO zoneLog + SET `action` = 'delete', + `changedModel` = 'zoneExclusion', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/zoneExclusion_beforeInsert.sql b/db/routines/vn/triggers/zoneExclusion_beforeInsert.sql new file mode 100644 index 000000000..6b2d2f5c7 --- /dev/null +++ b/db/routines/vn/triggers/zoneExclusion_beforeInsert.sql @@ -0,0 +1,10 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`zoneExclusion_beforeInsert` + BEFORE INSERT ON `zoneExclusion` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); + SET NEW.userFk = account.myUser_getId(); + +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/zoneExclusion_beforeUpdate.sql b/db/routines/vn/triggers/zoneExclusion_beforeUpdate.sql new file mode 100644 index 000000000..1daa6d2f0 --- /dev/null +++ b/db/routines/vn/triggers/zoneExclusion_beforeUpdate.sql @@ -0,0 +1,10 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`zoneExclusion_beforeUpdate` + BEFORE UPDATE ON `zoneExclusion` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); + SET NEW.userFk = account.myUser_getId(); + +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/zoneGeo_beforeInsert.sql b/db/routines/vn/triggers/zoneGeo_beforeInsert.sql new file mode 100644 index 000000000..1dbefbed9 --- /dev/null +++ b/db/routines/vn/triggers/zoneGeo_beforeInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`zoneGeo_beforeInsert` + BEFORE INSERT ON `zoneGeo` + FOR EACH ROW +BEGIN + CALL zoneGeo_checkName(NEW.`name`); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/zoneGeo_beforeUpdate.sql b/db/routines/vn/triggers/zoneGeo_beforeUpdate.sql new file mode 100644 index 000000000..0fdd7a682 --- /dev/null +++ b/db/routines/vn/triggers/zoneGeo_beforeUpdate.sql @@ -0,0 +1,10 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`zoneGeo_beforeUpdate` + BEFORE UPDATE ON `zoneGeo` + FOR EACH ROW +BEGIN + IF !(OLD.`name` <=> NEW.`name`) THEN + CALL zoneGeo_checkName(NEW.`name`); + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/zoneIncluded_afterDelete.sql b/db/routines/vn/triggers/zoneIncluded_afterDelete.sql new file mode 100644 index 000000000..18332bb55 --- /dev/null +++ b/db/routines/vn/triggers/zoneIncluded_afterDelete.sql @@ -0,0 +1,13 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`zoneIncluded_afterDelete` + AFTER DELETE ON `zoneIncluded` + FOR EACH ROW +BEGIN + INSERT INTO zoneLog + SET `action` = 'delete', + `changedModel` = 'zoneIncluded', + `changedModelId` = OLD.zoneFk, + `userFk` = account.myUser_getId(); + +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/zoneIncluded_beforeInsert.sql b/db/routines/vn/triggers/zoneIncluded_beforeInsert.sql new file mode 100644 index 000000000..18895c9a5 --- /dev/null +++ b/db/routines/vn/triggers/zoneIncluded_beforeInsert.sql @@ -0,0 +1,9 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`zoneIncluded_beforeInsert` + BEFORE INSERT ON `zoneIncluded` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); + +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/zoneIncluded_beforeUpdate.sql b/db/routines/vn/triggers/zoneIncluded_beforeUpdate.sql new file mode 100644 index 000000000..e3f0a27e2 --- /dev/null +++ b/db/routines/vn/triggers/zoneIncluded_beforeUpdate.sql @@ -0,0 +1,9 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`zoneIncluded_beforeUpdate` + BEFORE UPDATE ON `zoneIncluded` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); + +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/zoneWarehouse_afterDelete.sql b/db/routines/vn/triggers/zoneWarehouse_afterDelete.sql new file mode 100644 index 000000000..3befff38a --- /dev/null +++ b/db/routines/vn/triggers/zoneWarehouse_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`zoneWarehouse_afterDelete` + AFTER DELETE ON `zoneWarehouse` + FOR EACH ROW +BEGIN + INSERT INTO zoneLog + SET `action` = 'delete', + `changedModel` = 'ZoneWarehouse', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/zoneWarehouse_beforeInsert.sql b/db/routines/vn/triggers/zoneWarehouse_beforeInsert.sql new file mode 100644 index 000000000..099e66587 --- /dev/null +++ b/db/routines/vn/triggers/zoneWarehouse_beforeInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`zoneWarehouse_beforeInsert` + BEFORE INSERT ON `zoneWarehouse` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/zoneWarehouse_beforeUpdate.sql b/db/routines/vn/triggers/zoneWarehouse_beforeUpdate.sql new file mode 100644 index 000000000..2a6563dc5 --- /dev/null +++ b/db/routines/vn/triggers/zoneWarehouse_beforeUpdate.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`zoneWarehouse_beforeUpdate` + BEFORE UPDATE ON `zoneWarehouse` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/zone_afterDelete.sql b/db/routines/vn/triggers/zone_afterDelete.sql new file mode 100644 index 000000000..463fa89e8 --- /dev/null +++ b/db/routines/vn/triggers/zone_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`zone_afterDelete` + AFTER DELETE ON `zone` + FOR EACH ROW +BEGIN + INSERT INTO zoneLog + SET `action` = 'delete', + `changedModel` = 'Zone', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/zone_beforeInsert.sql b/db/routines/vn/triggers/zone_beforeInsert.sql new file mode 100644 index 000000000..e0449a989 --- /dev/null +++ b/db/routines/vn/triggers/zone_beforeInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`zone_beforeInsert` + BEFORE INSERT ON `zone` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/zone_beforeUpdate.sql b/db/routines/vn/triggers/zone_beforeUpdate.sql new file mode 100644 index 000000000..f945ad32c --- /dev/null +++ b/db/routines/vn/triggers/zone_beforeUpdate.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`zone_beforeUpdate` + BEFORE UPDATE ON `zone` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/views/NewView.sql b/db/routines/vn/views/NewView.sql new file mode 100644 index 000000000..389564966 --- /dev/null +++ b/db/routines/vn/views/NewView.sql @@ -0,0 +1,19 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`NewView` +AS SELECT `c`.`id` AS `clientFk`, + max(`t`.`shipped`) AS `lastShipped`, + `pc`.`notBuyingMonths` AS `notBuyingMonths` +FROM ( + ( + `vn`.`client` `c` + JOIN `vn`.`productionConfig` `pc` + ) + LEFT JOIN `vn`.`ticket` `t` ON( + `c`.`id` = `t`.`clientFk` + AND `t`.`shipped` < `util`.`VN_CURDATE`() + INTERVAL - `pc`.`rookieDays` DAY + ) + ) +GROUP BY `c`.`id` +HAVING `lastShipped` IS NULL + OR `lastShipped` < `util`.`VN_CURDATE`() + INTERVAL - `notBuyingMonths` MONTH diff --git a/db/routines/vn/views/agencyTerm.sql b/db/routines/vn/views/agencyTerm.sql new file mode 100644 index 000000000..5f54cf39f --- /dev/null +++ b/db/routines/vn/views/agencyTerm.sql @@ -0,0 +1,12 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`agencyTerm` +AS SELECT `sat`.`agencyFk` AS `agencyFk`, + `sat`.`minimumPackages` AS `minimumPackages`, + `sat`.`kmPrice` AS `kmPrice`, + `sat`.`packagePrice` AS `packagePrice`, + `sat`.`routePrice` AS `routePrice`, + `sat`.`minimumKm` AS `minimumKm`, + `sat`.`minimumM3` AS `minimumM3`, + `sat`.`m3Price` AS `m3Price` +FROM `vn`.`supplierAgencyTerm` `sat` diff --git a/db/routines/vn/views/annualAverageInvoiced.sql b/db/routines/vn/views/annualAverageInvoiced.sql new file mode 100644 index 000000000..30e81e1ec --- /dev/null +++ b/db/routines/vn/views/annualAverageInvoiced.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`annualAverageInvoiced` +AS SELECT `cec`.`clientFk` AS `clientFk`, + `cec`.`invoiced` AS `invoiced` +FROM `bs`.`clientAnnualConsumption` `cec` diff --git a/db/routines/vn/views/awbVolume.sql b/db/routines/vn/views/awbVolume.sql new file mode 100644 index 000000000..df3b1ed1a --- /dev/null +++ b/db/routines/vn/views/awbVolume.sql @@ -0,0 +1,31 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`awbVolume` +AS SELECT `t`.`awbFk` AS `awbFk`, + `b`.`stickers` * `i`.`density` * IF( + `p`.`volume` > 0, + `p`.`volume`, + `p`.`width` * `p`.`depth` * IF(`p`.`height` = 0, `i`.`size` + 10, `p`.`height`) + ) / (`vc`.`aerealVolumetricDensity` * 1000) AS `volume`, + `b`.`id` AS `buyFk` +FROM ( + ( + ( + ( + ( + ( + `vn`.`buy` `b` + JOIN `vn`.`item` `i` ON(`b`.`itemFk` = `i`.`id`) + ) + JOIN `vn`.`itemType` `it` ON(`i`.`typeFk` = `it`.`id`) + ) + JOIN `vn`.`packaging` `p` ON(`p`.`id` = `b`.`packagingFk`) + ) + JOIN `vn`.`entry` `e` ON(`b`.`entryFk` = `e`.`id`) + ) + JOIN `vn`.`travel` `t` ON(`t`.`id` = `e`.`travelFk`) + ) + JOIN `vn`.`volumeConfig` `vc` + ) +WHERE `t`.`shipped` > makedate(year(`util`.`VN_CURDATE`()) - 1, 1) + AND `t`.`awbFk` <> 0 diff --git a/db/routines/vn/views/businessCalendar.sql b/db/routines/vn/views/businessCalendar.sql new file mode 100644 index 000000000..feda22793 --- /dev/null +++ b/db/routines/vn/views/businessCalendar.sql @@ -0,0 +1,8 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`businessCalendar` +AS SELECT `c`.`id` AS `id`, + `c`.`businessFk` AS `businessFk`, + `c`.`dayOffTypeFk` AS `absenceTypeFk`, + `c`.`dated` AS `dated` +FROM `vn`.`calendar` `c` diff --git a/db/routines/vn/views/buyer.sql b/db/routines/vn/views/buyer.sql new file mode 100644 index 000000000..7114c50bc --- /dev/null +++ b/db/routines/vn/views/buyer.sql @@ -0,0 +1,11 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`buyer` +AS SELECT DISTINCT `u`.`id` AS `userFk`, + `u`.`nickname` AS `nickname` +FROM ( + `account`.`user` `u` + JOIN `vn`.`itemType` `it` ON(`it`.`workerFk` = `u`.`id`) + ) +WHERE `u`.`active` <> 0 +ORDER BY `u`.`nickname` diff --git a/db/routines/vn/views/buyerSales.sql b/db/routines/vn/views/buyerSales.sql new file mode 100644 index 000000000..b67e17569 --- /dev/null +++ b/db/routines/vn/views/buyerSales.sql @@ -0,0 +1,17 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`buyerSales` +AS SELECT `v`.`importe` AS `importe`, + `w`.`code` AS `comprador`, + `t`.`year` AS `año`, + `t`.`week` AS `semana` +FROM ( + ( + ( + `bs`.`ventas` `v` + JOIN `vn`.`time` `t` ON(`t`.`dated` = `v`.`fecha`) + ) + JOIN `vn`.`itemType` `it` ON(`it`.`id` = `v`.`tipo_id`) + ) + JOIN `vn`.`worker` `w` ON(`w`.`id` = `it`.`workerFk`) + ) diff --git a/db/routines/vn/views/clientLost.sql b/db/routines/vn/views/clientLost.sql new file mode 100644 index 000000000..764782d08 --- /dev/null +++ b/db/routines/vn/views/clientLost.sql @@ -0,0 +1,19 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`clientLost` +AS SELECT `c`.`id` AS `clientFk`, + max(`t`.`shipped`) AS `lastShipped`, + `pc`.`notBuyingMonths` AS `notBuyingMonths` +FROM ( + ( + `vn`.`client` `c` + JOIN `vn`.`productionConfig` `pc` + ) + LEFT JOIN `vn`.`ticket` `t` ON( + `c`.`id` = `t`.`clientFk` + AND `t`.`shipped` < `util`.`VN_CURDATE`() + INTERVAL - `pc`.`rookieDays` DAY + ) + ) +GROUP BY `c`.`id` +HAVING `lastShipped` IS NULL + OR `lastShipped` < `util`.`VN_CURDATE`() + INTERVAL - `notBuyingMonths` MONTH diff --git a/db/routines/vn/views/clientPhoneBook.sql b/db/routines/vn/views/clientPhoneBook.sql new file mode 100644 index 000000000..7ab2a99db --- /dev/null +++ b/db/routines/vn/views/clientPhoneBook.sql @@ -0,0 +1,41 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`clientPhoneBook` +AS SELECT `c`.`id` AS `clientFk`, + trim(`c`.`phone`) AS `phone` +FROM `vn`.`client` `c` +WHERE `c`.`phone` <> 0 + AND `c`.`isActive` <> 0 +UNION +SELECT `c`.`id` AS `clientFk`, + trim(`c`.`mobile`) AS `phone` +FROM `vn`.`client` `c` +WHERE `c`.`mobile` <> 0 + AND `c`.`isActive` <> 0 +UNION +SELECT `a`.`clientFk` AS `clientFk`, + trim(`a`.`phone`) AS `phone` +FROM ( + `vn`.`address` `a` + JOIN `vn`.`client` `c` ON(`c`.`id` = `a`.`clientFk`) + ) +WHERE `a`.`phone` <> 0 + AND `c`.`isActive` <> 0 +UNION +SELECT `a`.`clientFk` AS `clientFk`, + trim(`a`.`mobile`) AS `phone` +FROM ( + `vn`.`address` `a` + JOIN `vn`.`client` `c` ON(`c`.`id` = `a`.`clientFk`) + ) +WHERE `a`.`mobile` <> 0 + AND `c`.`isActive` <> 0 +UNION +SELECT `cc`.`clientFk` AS `clientFk`, + trim(`cc`.`phone`) AS `phone` +FROM ( + `vn`.`clientContact` `cc` + LEFT JOIN `vn`.`client` `c` ON(`c`.`id` = `cc`.`clientFk`) + ) +WHERE `c`.`phone` <> 0 + AND `c`.`isActive` <> 0 diff --git a/db/routines/vn/views/companyL10n.sql b/db/routines/vn/views/companyL10n.sql new file mode 100644 index 000000000..fa5c4c5d8 --- /dev/null +++ b/db/routines/vn/views/companyL10n.sql @@ -0,0 +1,12 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`companyL10n` +AS SELECT `c`.`id` AS `id`, + IFNULL(`ci`.`footnotes`, `c`.`footnotes`) AS `footnotes` +FROM ( + `vn`.`company` `c` + LEFT JOIN `vn`.`companyI18n` `ci` ON( + `ci`.`companyFk` = `c`.`id` + AND `ci`.`lang` = `util`.`LANG`() + ) + ) diff --git a/db/routines/vn/views/defaulter.sql b/db/routines/vn/views/defaulter.sql new file mode 100644 index 000000000..9d48978b2 --- /dev/null +++ b/db/routines/vn/views/defaulter.sql @@ -0,0 +1,20 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`defaulter` +AS SELECT `d`.`clientFk` AS `clientFk`, + `d`.`created` AS `created`, + `d`.`amount` AS `amount`, + `d`.`defaulterSinced` AS `defaulterSinced`, + `d`.`hasChanged` AS `hasChanged`, + `c`.`countryFk` AS `country`, + `c`.`payMethodFk` AS `payMethod` +FROM ( + ( + ( + `bs`.`defaulter` `d` + JOIN `vn`.`client` `c` ON(`c`.`id` = `d`.`clientFk`) + ) + JOIN `vn`.`country` `co` ON(`co`.`id` = `c`.`countryFk`) + ) + JOIN `vn`.`payMethod` `pm` ON(`pm`.`id` = `c`.`payMethodFk`) + ) diff --git a/db/routines/vn/views/departmentTree.sql b/db/routines/vn/views/departmentTree.sql new file mode 100644 index 000000000..6f5a1205a --- /dev/null +++ b/db/routines/vn/views/departmentTree.sql @@ -0,0 +1,17 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`departmentTree` +AS SELECT `node`.`id` AS `id`, + concat( + CONVERT( + repeat(repeat(' ', 5), COUNT(`parent`.`id`) - 1) USING utf8mb3 + ), + `node`.`name` + ) AS `dep` +FROM ( + `vn`.`department` `node` + JOIN `vn`.`department` `parent` + ) +WHERE `node`.`lft` BETWEEN `parent`.`lft` AND `parent`.`rgt` +GROUP BY `node`.`id` +ORDER BY `node`.`lft` diff --git a/db/routines/vn/views/ediGenus.sql b/db/routines/vn/views/ediGenus.sql new file mode 100644 index 000000000..4546afa33 --- /dev/null +++ b/db/routines/vn/views/ediGenus.sql @@ -0,0 +1,9 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`ediGenus` +AS SELECT `g`.`genus_id` AS `id`, + `g`.`latin_genus_name` AS `latinGenusName`, + `g`.`entry_date` AS `entried`, + `g`.`expiry_date` AS `dued`, + `g`.`change_date_time` AS `modified` +FROM `edi`.`genus` `g` diff --git a/db/routines/vn/views/ediSpecie.sql b/db/routines/vn/views/ediSpecie.sql new file mode 100644 index 000000000..9587cb530 --- /dev/null +++ b/db/routines/vn/views/ediSpecie.sql @@ -0,0 +1,10 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`ediSpecie` +AS SELECT `s`.`specie_id` AS `id`, + `s`.`genus_id` AS `genusFk`, + `s`.`latin_species_name` AS `latinSpeciesName`, + `s`.`entry_date` AS `entried`, + `s`.`expiry_date` AS `dued`, + `s`.`change_date_time` AS `modified` +FROM `edi`.`specie` `s` diff --git a/db/routines/vn/views/ektSubAddress.sql b/db/routines/vn/views/ektSubAddress.sql new file mode 100644 index 000000000..11f6e2e70 --- /dev/null +++ b/db/routines/vn/views/ektSubAddress.sql @@ -0,0 +1,12 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`ektSubAddress` +AS SELECT `eea`.`sub` AS `sub`, + `a`.`clientFk` AS `clientFk`, + `a`.`nickname` AS `nickname`, + `eea`.`addressFk` AS `addressFk` +FROM ( + `vn`.`ektEntryAssign` `eea` + JOIN `vn`.`address` `a` ON(`a`.`id` = `eea`.`addressFk`) + ) +GROUP BY `eea`.`sub` diff --git a/db/routines/vn/views/especialPrice.sql b/db/routines/vn/views/especialPrice.sql new file mode 100644 index 000000000..08b9b434a --- /dev/null +++ b/db/routines/vn/views/especialPrice.sql @@ -0,0 +1,8 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`especialPrice` +AS SELECT `p`.`Id_PrecioEspecial` AS `id`, + `p`.`Id_Cliente` AS `clientFk`, + `p`.`Id_Article` AS `itemFk`, + `p`.`PrecioEspecial` AS `value` +FROM `vn2008`.`PreciosEspeciales` `p` diff --git a/db/routines/vn/views/exchangeInsurance.sql b/db/routines/vn/views/exchangeInsurance.sql new file mode 100644 index 000000000..5df3c2f1d --- /dev/null +++ b/db/routines/vn/views/exchangeInsurance.sql @@ -0,0 +1,16 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`exchangeInsurance` +AS SELECT `vn2008`.`pago_sdc`.`pago_sdc_id` AS `id`, + `vn2008`.`pago_sdc`.`importe` AS `amount`, + `vn2008`.`pago_sdc`.`fecha` AS `dated`, + `vn2008`.`pago_sdc`.`vencimiento` AS `finished`, + `vn2008`.`pago_sdc`.`entity_id` AS `entityFk`, + `vn2008`.`pago_sdc`.`ref` AS `ref`, + `vn2008`.`pago_sdc`.`rate` AS `rate`, + `vn2008`.`pago_sdc`.`empresa_id` AS `companyFk`, + `vn2008`.`pago_sdc`.`financialProductTypefk` AS `financialProductTypefk`, + `vn2008`.`pago_sdc`.`upperBarrier` AS `upperBarrier`, + `vn2008`.`pago_sdc`.`lowerBarrier` AS `lowerBarrier`, + `vn2008`.`pago_sdc`.`strike` AS `strike` +FROM `vn2008`.`pago_sdc` diff --git a/db/routines/vn/views/exchangeInsuranceEntry.sql b/db/routines/vn/views/exchangeInsuranceEntry.sql new file mode 100644 index 000000000..e9c7a7bbe --- /dev/null +++ b/db/routines/vn/views/exchangeInsuranceEntry.sql @@ -0,0 +1,28 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`exchangeInsuranceEntry` +AS SELECT max(`tr`.`landed`) AS `dated`, + cast( + sum( + (`b`.`buyingValue` + `b`.`freightValue`) * `b`.`quantity` + ) AS decimal(10, 2) + ) AS `Dolares`, + cast( + sum( + (`b`.`buyingValue` + `b`.`freightValue`) * `b`.`quantity` + ) / sum( + (100 + `e`.`commission`) / 100 * (`b`.`buyingValue` + `b`.`freightValue`) * `b`.`quantity` + ) AS decimal(10, 4) + ) AS `rate` +FROM ( + ( + `vn`.`entry` `e` + JOIN `vn`.`buy` `b` ON(`e`.`id` = `b`.`entryFk`) + ) + JOIN `vn`.`travel` `tr` ON(`tr`.`id` = `e`.`travelFk`) + ) +WHERE `tr`.`landed` BETWEEN '2016-01-31' AND `util`.`VN_CURDATE`() + AND `e`.`commission` < 0 + AND `e`.`currencyFk` = 2 +GROUP BY MONTH(`tr`.`landed`), + year(`tr`.`landed`) diff --git a/db/routines/vn/views/exchangeInsuranceIn.sql b/db/routines/vn/views/exchangeInsuranceIn.sql new file mode 100644 index 000000000..aa27cfb4c --- /dev/null +++ b/db/routines/vn/views/exchangeInsuranceIn.sql @@ -0,0 +1,12 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`exchangeInsuranceIn` +AS SELECT `exchangeInsuranceInPrevious`.`dated` AS `dated`, + sum(`exchangeInsuranceInPrevious`.`amount`) AS `amount`, + cast( + sum( + `exchangeInsuranceInPrevious`.`amount` * `exchangeInsuranceInPrevious`.`rate` + ) / sum(`exchangeInsuranceInPrevious`.`amount`) AS decimal(10, 4) + ) AS `rate` +FROM `vn`.`exchangeInsuranceInPrevious` +GROUP BY `exchangeInsuranceInPrevious`.`dated` diff --git a/db/routines/vn/views/exchangeInsuranceInPrevious.sql b/db/routines/vn/views/exchangeInsuranceInPrevious.sql new file mode 100644 index 000000000..3f997e8bf --- /dev/null +++ b/db/routines/vn/views/exchangeInsuranceInPrevious.sql @@ -0,0 +1,9 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`exchangeInsuranceInPrevious` +AS SELECT `ei`.`dueDated` AS `dated`, + `ei`.`amount` AS `amount`, + `ei`.`rate` AS `rate` +FROM `vn`.`exchangeInsurance` `ei` +WHERE `ei`.`amount` <> 0 + AND `ei`.`financialProductTypefk` = 'SC' diff --git a/db/routines/vn/views/exchangeInsuranceOut.sql b/db/routines/vn/views/exchangeInsuranceOut.sql new file mode 100644 index 000000000..5c41dbb24 --- /dev/null +++ b/db/routines/vn/views/exchangeInsuranceOut.sql @@ -0,0 +1,17 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`exchangeInsuranceOut` +AS SELECT `p`.`received` AS `received`, + sum(`p`.`divisa`) AS `divisa`, + sum(`p`.`divisa`) / sum(`p`.`amount`) AS `rate` +FROM ( + ( + `vn`.`payment` `p` + JOIN `vn`.`accounting` `a` ON(`a`.`id` = `p`.`bankFk`) + ) + JOIN `vn`.`accountingType` `at2` ON(`at2`.`id` = `a`.`accountingTypeFk`) + ) +WHERE `p`.`currencyFk` = 2 + AND `at2`.`code` = 'wireTransfer' + AND `p`.`supplierFk` <> 2213 +GROUP BY `p`.`received` diff --git a/db/routines/vn/views/exchangeReportSource.sql b/db/routines/vn/views/exchangeReportSource.sql new file mode 100644 index 000000000..6a2b9bb7e --- /dev/null +++ b/db/routines/vn/views/exchangeReportSource.sql @@ -0,0 +1,22 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`exchangeReportSource` +AS SELECT `e`.`dated` AS `dated`, + cast(sum(`e`.`amountIn`) AS decimal(10, 2)) AS `amountIn`, + cast(sum(`e`.`rateIn`) AS decimal(10, 4)) AS `rateIn`, + cast(sum(`e`.`amountOut`) AS decimal(10, 2)) AS `amountOut`, + cast(sum(`e`.`rateOut`) AS decimal(10, 4)) AS `rateOut`, + cast(sum(`e`.`amountEntry`) AS decimal(10, 2)) AS `amountEntry`, + cast(sum(`e`.`rateEntry`) AS decimal(10, 4)) AS `rateEntry`, + cast( + IFNULL(`rr`.`value`, `rrc`.`simulatedValue`) AS decimal(10, 4) + ) AS `rateECB` +FROM ( + ( + `vn`.`exchangeReportSourcePrevious` `e` + LEFT JOIN `vn`.`referenceRate` `rr` ON(`rr`.`dated` = `e`.`dated`) + ) + JOIN `vn`.`referenceRateConfig` `rrc` ON(1) + ) +GROUP BY `e`.`dated` +ORDER BY `e`.`dated` diff --git a/db/routines/vn/views/exchangeReportSourcePrevious.sql b/db/routines/vn/views/exchangeReportSourcePrevious.sql new file mode 100644 index 000000000..b9e8ba8c1 --- /dev/null +++ b/db/routines/vn/views/exchangeReportSourcePrevious.sql @@ -0,0 +1,29 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`exchangeReportSourcePrevious` +AS SELECT `exchangeInsuranceIn`.`dated` AS `dated`, + `exchangeInsuranceIn`.`amount` AS `amountIn`, + `exchangeInsuranceIn`.`rate` AS `rateIn`, + 0.00 AS `amountOut`, + 0.00 AS `rateOut`, + 0.00 AS `amountEntry`, + 0.00 AS `rateEntry` +FROM `vn`.`exchangeInsuranceIn` +UNION ALL +SELECT `exchangeInsuranceOut`.`received` AS `received`, + 0.00 AS `amountIn`, + 0.00 AS `ratedIn`, + `exchangeInsuranceOut`.`divisa` AS `amountOut`, + `exchangeInsuranceOut`.`rate` AS `ratedOut`, + 0.00 AS `amountEntry`, + 0.00 AS `rateEntry` +FROM `vn`.`exchangeInsuranceOut` +UNION ALL +SELECT `exchangeInsuranceEntry`.`dated` AS `dated`, + 0.00 AS `amountIn`, + 0.00 AS `ratedIn`, + 0.00 AS `amountOut`, + 0.00 AS `ratedOut`, + `exchangeInsuranceEntry`.`Dolares` AS `amountEntry`, + `exchangeInsuranceEntry`.`rate` AS `rateEntry` +FROM `vn`.`exchangeInsuranceEntry` diff --git a/db/routines/vn/views/expeditionCommon.sql b/db/routines/vn/views/expeditionCommon.sql new file mode 100644 index 000000000..f03966c05 --- /dev/null +++ b/db/routines/vn/views/expeditionCommon.sql @@ -0,0 +1,31 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`expeditionCommon` +AS SELECT `et`.`id` AS `truckFk`, + `et`.`eta` AS `eta`, + IFNULL(ucase(`et`.`description`), 'SIN ESCANEAR') AS `description`, + `es`.`palletFk` AS `palletFk`, + `t`.`routeFk` AS `routeFk`, + `es`.`id` AS `scanFk`, + `e`.`id` AS `expeditionFk`, + `r`.`expeditionTruckFk` AS `expeditionTruckFk`, + `t`.`warehouseFk` AS `warehouseFk`, + `e`.`created` AS `lastPacked`, + `t`.`id` AS `ticketFk` +FROM ( + ( + ( + ( + ( + `vn`.`expeditionTruck` `et` + LEFT JOIN `vn`.`routesMonitor` `r` ON(`et`.`id` = `r`.`expeditionTruckFk`) + ) + LEFT JOIN `vn`.`ticket` `t` ON(`r`.`routeFk` = `t`.`routeFk`) + ) + LEFT JOIN `vn`.`expedition` `e` ON(`t`.`id` = `e`.`ticketFk`) + ) + LEFT JOIN `vn`.`expeditionScan` `es` ON(`e`.`id` = `es`.`expeditionFk`) + ) + LEFT JOIN `vn`.`expeditionPallet` `ep` ON(`es`.`palletFk` = `ep`.`id`) + ) +WHERE `et`.`eta` >= `util`.`VN_CURDATE`() diff --git a/db/routines/vn/views/expeditionPallet_Print.sql b/db/routines/vn/views/expeditionPallet_Print.sql new file mode 100644 index 000000000..07627e817 --- /dev/null +++ b/db/routines/vn/views/expeditionPallet_Print.sql @@ -0,0 +1,39 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`expeditionPallet_Print` +AS SELECT `et2`.`description` AS `truck`, + `t`.`routeFk` AS `routeFk`, + `r`.`description` AS `zone`, + COUNT(`es`.`id`) AS `eti`, + `ep`.`id` AS `palletFk`, + `et`.`id` <=> `rm`.`expeditionTruckFk` AS `isMatch`, + `t`.`warehouseFk` AS `warehouseFk`, + IF( + `r`.`created` > `util`.`VN_CURDATE`() + INTERVAL 1 DAY, + ucase(dayname(`r`.`created`)), + NULL + ) AS `nombreDia` +FROM ( + ( + ( + ( + ( + ( + ( + `vn`.`expeditionTruck` `et` + JOIN `vn`.`expeditionPallet` `ep` ON(`ep`.`truckFk` = `et`.`id`) + ) + JOIN `vn`.`expeditionScan` `es` ON(`es`.`palletFk` = `ep`.`id`) + ) + JOIN `vn`.`expedition` `e` ON(`e`.`id` = `es`.`expeditionFk`) + ) + JOIN `vn`.`ticket` `t` ON(`t`.`id` = `e`.`ticketFk`) + ) + JOIN `vn`.`route` `r` ON(`r`.`id` = `t`.`routeFk`) + ) + LEFT JOIN `vn`.`routesMonitor` `rm` ON(`rm`.`routeFk` = `r`.`id`) + ) + LEFT JOIN `vn`.`expeditionTruck` `et2` ON(`et2`.`id` = `rm`.`expeditionTruckFk`) + ) +GROUP BY `ep`.`id`, + `t`.`routeFk` diff --git a/db/routines/vn/views/expeditionRoute_Monitor.sql b/db/routines/vn/views/expeditionRoute_Monitor.sql new file mode 100644 index 000000000..774f21433 --- /dev/null +++ b/db/routines/vn/views/expeditionRoute_Monitor.sql @@ -0,0 +1,27 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`expeditionRoute_Monitor` +AS SELECT `r`.`id` AS `routeFk`, + COUNT(DISTINCT IF(`e`.`id` IS NULL, `t`.`id`, NULL)) AS `tickets`, + COUNT(DISTINCT `e`.`id`) AS `expeditions`, + COUNT(DISTINCT `es`.`id`) AS `scanned`, + max(`e`.`created`) AS `lastPacked`, + `r`.`created` AS `created` +FROM ( + ( + ( + ( + ( + `vn`.`route` `r` + LEFT JOIN `vn`.`routesMonitor` `rm` ON(`r`.`id` = `rm`.`routeFk`) + ) + LEFT JOIN `vn`.`expeditionTruck` `et` ON(`et`.`id` = `rm`.`expeditionTruckFk`) + ) + JOIN `vn`.`ticket` `t` ON(`t`.`routeFk` = `r`.`id`) + ) + LEFT JOIN `vn`.`expedition` `e` ON(`e`.`ticketFk` = `t`.`id`) + ) + LEFT JOIN `vn`.`expeditionScan` `es` ON(`es`.`expeditionFk` = `e`.`id`) + ) +WHERE `r`.`created` >= `util`.`yesterday`() +GROUP BY `r`.`id` diff --git a/db/routines/vn/views/expeditionRoute_freeTickets.sql b/db/routines/vn/views/expeditionRoute_freeTickets.sql new file mode 100644 index 000000000..85e6297c9 --- /dev/null +++ b/db/routines/vn/views/expeditionRoute_freeTickets.sql @@ -0,0 +1,26 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`expeditionRoute_freeTickets` +AS SELECT `t`.`routeFk` AS `routeFk`, + `tss`.`ticketFk` AS `ticket`, + `s`.`name` AS `code`, + `w`.`name` AS `almacen`, + `tss`.`updated` AS `updated`, + `p`.`code` AS `parkingCode` +FROM ( + ( + ( + ( + ( + `vn`.`ticketState` `tss` + JOIN `vn`.`ticket` `t` ON(`t`.`id` = `tss`.`ticketFk`) + ) + JOIN `vn`.`warehouse` `w` ON(`w`.`id` = `t`.`warehouseFk`) + ) + JOIN `vn`.`state` `s` ON(`s`.`id` = `tss`.`state`) + ) + LEFT JOIN `vn`.`ticketParking` `tp` ON(`tp`.`ticketFk` = `t`.`id`) + ) + LEFT JOIN `vn`.`parking` `p` ON(`p`.`id` = `tp`.`parkingFk`) + ) +WHERE IFNULL(`t`.`packages`, 0) = 0 diff --git a/db/routines/vn/views/expeditionScan_Monitor.sql b/db/routines/vn/views/expeditionScan_Monitor.sql new file mode 100644 index 000000000..7566a0bfd --- /dev/null +++ b/db/routines/vn/views/expeditionScan_Monitor.sql @@ -0,0 +1,19 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`expeditionScan_Monitor` +AS SELECT `et`.`id` AS `truckFk`, + `et`.`eta` AS `ETD`, + `et`.`description` AS `description`, + `ep`.`id` AS `palletFk`, + `ep`.`position` AS `position`, + `ep`.`built` AS `built`, + `es`.`id` AS `scanFk`, + `es`.`expeditionFk` AS `expeditionFk`, + `es`.`scanned` AS `scanned` +FROM ( + ( + `vn`.`expeditionTruck` `et` + LEFT JOIN `vn`.`expeditionPallet` `ep` ON(`ep`.`truckFk` = `et`.`id`) + ) + LEFT JOIN `vn`.`expeditionScan` `es` ON(`es`.`palletFk` = `ep`.`id`) + ) diff --git a/db/routines/vn/views/expeditionSticker.sql b/db/routines/vn/views/expeditionSticker.sql new file mode 100644 index 000000000..2b6bf18d2 --- /dev/null +++ b/db/routines/vn/views/expeditionSticker.sql @@ -0,0 +1,61 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`expeditionSticker` +AS SELECT `e`.`id` AS `expeditionFk`, + `e`.`ticketFk` AS `ticketFk`, + `t`.`addressFk` AS `addressFk`, + `t`.`clientFk` AS `clientFk`, + `a`.`street` AS `street`, + `a`.`postalCode` AS `postalCode`, + `a`.`city` AS `city`, + `a`.`nickname` AS `nickname`, + concat('R(', right(`t`.`routeFk`, 3), ')') AS `routeFk`, + `rm`.`beachFk` AS `beachFk`, + IF( + `t`.`routeFk`, + IFNULL( + `et`.`description`, + REPLACE(`am`.`name`, 'ZONA ', 'Z') + ), + `z`.`name` + ) AS `zona`, + `p`.`name` AS `province`, + IFNULL( + `c`.`mobile`, + IFNULL(`a`.`mobile`, IFNULL(`c`.`phone`, `a`.`phone`)) + ) AS `phone`, + `w`.`code` AS `workerCode` +FROM ( + ( + ( + ( + ( + ( + ( + ( + ( + ( + ( + `vn`.`expedition` `e` + JOIN `vn`.`ticket` `t` ON(`t`.`id` = `e`.`ticketFk`) + ) + JOIN `vn`.`address` `a` ON(`a`.`id` = `t`.`addressFk`) + ) + JOIN `vn`.`province` `p` ON(`p`.`id` = `a`.`provinceFk`) + ) + LEFT JOIN `vn`.`routesMonitor` `rm` ON(`rm`.`routeFk` = `t`.`routeFk`) + ) + LEFT JOIN `vn`.`expeditionTruck` `et` ON(`et`.`id` = `rm`.`expeditionTruckFk`) + ) + LEFT JOIN `vn`.`beach` `b` ON(`b`.`code` = `rm`.`beachFk`) + ) + LEFT JOIN `vn`.`zone` `z` ON(`z`.`id` = `t`.`zoneFk`) + ) + LEFT JOIN `vn`.`route` `r` ON(`r`.`id` = `t`.`routeFk`) + ) + LEFT JOIN `vn`.`agencyMode` `am` ON(`am`.`id` = `r`.`agencyModeFk`) + ) + JOIN `vn`.`client` `c` ON(`c`.`id` = `a`.`clientFk`) + ) + JOIN `vn`.`worker` `w` ON(`w`.`id` = `e`.`workerFk`) + ) diff --git a/db/routines/vn/views/expeditionTicket_NoBoxes.sql b/db/routines/vn/views/expeditionTicket_NoBoxes.sql new file mode 100644 index 000000000..080edd3ac --- /dev/null +++ b/db/routines/vn/views/expeditionTicket_NoBoxes.sql @@ -0,0 +1,19 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`expeditionTicket_NoBoxes` +AS SELECT `t`.`id` AS `ticketFk`, + `t`.`warehouseFk` AS `warehouseFk`, + `t`.`routeFk` AS `routeFk`, + `et`.`description` AS `description` +FROM ( + ( + ( + `vn`.`ticket` `t` + LEFT JOIN `vn`.`expedition` `e` ON(`e`.`ticketFk` = `t`.`id`) + ) + JOIN `vn`.`routesMonitor` `rm` ON(`rm`.`routeFk` = `t`.`routeFk`) + ) + JOIN `vn`.`expeditionTruck` `et` ON(`et`.`id` = `rm`.`expeditionTruckFk`) + ) +WHERE `e`.`id` IS NULL + AND `et`.`eta` > `util`.`VN_CURDATE`() diff --git a/db/routines/vn/views/expeditionTimeExpended.sql b/db/routines/vn/views/expeditionTimeExpended.sql new file mode 100644 index 000000000..65aeb72b2 --- /dev/null +++ b/db/routines/vn/views/expeditionTimeExpended.sql @@ -0,0 +1,18 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`expeditionTimeExpended` +AS SELECT `e`.`ticketFk` AS `ticketFk`, + min(`e`.`created`) AS `started`, + max(`e`.`created`) AS `finished`, + max(`e`.`counter`) AS `cajas`, + `w`.`code` AS `code`, + `t`.`warehouseFk` AS `warehouseFk` +FROM ( + ( + `vn`.`expedition` `e` + JOIN `vn`.`worker` `w` ON(`w`.`id` = `e`.`workerFk`) + ) + JOIN `vn`.`ticket` `t` ON(`t`.`id` = `e`.`ticketFk`) + ) +WHERE `e`.`created` > `util`.`VN_CURDATE`() +GROUP BY `e`.`ticketFk` diff --git a/db/routines/vn/views/expeditionTruck_Control.sql b/db/routines/vn/views/expeditionTruck_Control.sql new file mode 100644 index 000000000..838e1f89e --- /dev/null +++ b/db/routines/vn/views/expeditionTruck_Control.sql @@ -0,0 +1,19 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`expeditionTruck_Control` +AS SELECT `e`.`truckFk` AS `id`, + `e`.`eta` AS `ETD`, + `e`.`description` AS `description`, + COUNT( + DISTINCT IF(`e`.`expeditionFk` IS NULL, `e`.`ticketFk`, NULL) + ) AS `ticketsSinBultos`, + COUNT(DISTINCT `e`.`palletFk`) AS `pallets`, + COUNT(DISTINCT `e`.`routeFk`) AS `routes`, + COUNT(DISTINCT `e`.`scanFk`) AS `scans`, + COUNT(DISTINCT `e`.`expeditionFk`) AS `expeditions`, + sum(`e`.`truckFk` <> `e`.`expeditionTruckFk`) AS `fallos`, + max(`e`.`lastPacked`) AS `lastPacked` +FROM `vn`.`expeditionCommon` `e` +GROUP BY `e`.`truckFk` +ORDER BY sum(`e`.`truckFk` <> `e`.`expeditionTruckFk`) DESC, + `e`.`eta` diff --git a/db/routines/vn/views/expeditionTruck_Control_Detail.sql b/db/routines/vn/views/expeditionTruck_Control_Detail.sql new file mode 100644 index 000000000..96a5b78e6 --- /dev/null +++ b/db/routines/vn/views/expeditionTruck_Control_Detail.sql @@ -0,0 +1,18 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`expeditionTruck_Control_Detail` +AS SELECT `e`.`truckFk` AS `id`, + `e`.`eta` AS `eta`, + `e`.`description` AS `destino`, + `e`.`palletFk` AS `pallet`, + COUNT(DISTINCT `e`.`routeFk`) AS `routes`, + COUNT(DISTINCT `e`.`scanFk`) AS `scans`, + COUNT(DISTINCT `e`.`expeditionTruckFk`) AS `destinos`, + sum(`e`.`truckFk` <> `e`.`expeditionTruckFk`) AS `fallos`, + max(`e`.`lastPacked`) AS `lastPacked` +FROM `vn`.`expeditionCommon` `e` +GROUP BY `e`.`truckFk`, + `e`.`palletFk` +ORDER BY sum(`e`.`truckFk` <> `e`.`expeditionTruckFk`) DESC, + `e`.`eta`, + `e`.`truckFk` diff --git a/db/routines/vn/views/expeditionTruck_Control_Detail_Pallet.sql b/db/routines/vn/views/expeditionTruck_Control_Detail_Pallet.sql new file mode 100644 index 000000000..01bdbf795 --- /dev/null +++ b/db/routines/vn/views/expeditionTruck_Control_Detail_Pallet.sql @@ -0,0 +1,22 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`expeditionTruck_Control_Detail_Pallet` +AS SELECT `e`.`truckFk` AS `id`, + `e`.`eta` AS `eta`, + `e`.`description` AS `destino`, + `e`.`palletFk` AS `pallet`, + `e`.`routeFk` AS `route`, + COUNT(DISTINCT `e`.`scanFk`) AS `scans`, + `et`.`description` AS `destinos`, + sum(`e`.`truckFk` <> `e`.`expeditionTruckFk`) AS `fallos`, + `e`.`expeditionTruckFk` AS `expeditionTruckFk`, + max(`e`.`lastPacked`) AS `lastPacked` +FROM ( + `vn`.`expeditionCommon` `e` + LEFT JOIN `vn`.`expeditionTruck` `et` ON(`et`.`id` = `e`.`expeditionTruckFk`) + ) +GROUP BY `e`.`truckFk`, + `e`.`palletFk`, + `e`.`routeFk` +ORDER BY sum(`e`.`truckFk` <> `e`.`expeditionTruckFk`) DESC, + `e`.`palletFk` diff --git a/db/routines/vn/views/firstTicketShipped.sql b/db/routines/vn/views/firstTicketShipped.sql new file mode 100644 index 000000000..c01a17976 --- /dev/null +++ b/db/routines/vn/views/firstTicketShipped.sql @@ -0,0 +1,8 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`firstTicketShipped` +AS SELECT min(`vn`.`ticket`.`shipped`) AS `shipped`, + `vn`.`ticket`.`clientFk` AS `clientFk` +FROM `vn`.`ticket` +WHERE `vn`.`ticket`.`shipped` > '2001-01-01' +GROUP BY `vn`.`ticket`.`clientFk` diff --git a/db/routines/vn/views/floraHollandBuyedItems.sql b/db/routines/vn/views/floraHollandBuyedItems.sql new file mode 100644 index 000000000..b695c49fd --- /dev/null +++ b/db/routines/vn/views/floraHollandBuyedItems.sql @@ -0,0 +1,31 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`floraHollandBuyedItems` +AS SELECT `b`.`itemFk` AS `itemFk`, + `i`.`longName` AS `longName`, + `b`.`quantity` AS `quantity`, + `b`.`buyingValue` AS `buyingValue`, + `tr`.`landed` AS `landed`, + `e`.`companyFk` AS `companyFk` +FROM ( + ( + ( + ( + ( + `vn`.`buy` `b` + JOIN `vn`.`item` `i` ON(`b`.`itemFk` = `i`.`id`) + ) + JOIN `vn`.`itemType` `it` ON(`it`.`id` = `i`.`typeFk`) + ) + JOIN `vn`.`itemCategory` `ic` ON(`ic`.`id` = `it`.`categoryFk`) + ) + JOIN `vn`.`entry` `e` ON(`e`.`id` = `b`.`entryFk`) + ) + JOIN `vn`.`travel` `tr` ON( + `tr`.`id` = `e`.`travelFk` + AND `ic`.`id` NOT IN (8, 6) + AND `b`.`buyingValue` <> 0 + AND `b`.`quantity` <> 0 + AND `e`.`supplierFk` IN (1664, 1665, 1666, 1465, 1433) + ) + ) diff --git a/db/routines/vn/views/inkL10n.sql b/db/routines/vn/views/inkL10n.sql new file mode 100644 index 000000000..14958ff0a --- /dev/null +++ b/db/routines/vn/views/inkL10n.sql @@ -0,0 +1,12 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`inkL10n` +AS SELECT `k`.`id` AS `id`, + IFNULL(`i`.`name`, `k`.`name`) AS `name` +FROM ( + `vn`.`ink` `k` + LEFT JOIN `vn`.`inkI18n` `i` ON( + `i`.`inkFk` = `k`.`id` + AND `i`.`lang` = `util`.`lang`() + ) + ) diff --git a/db/routines/vn/views/invoiceCorrectionDataSource.sql b/db/routines/vn/views/invoiceCorrectionDataSource.sql new file mode 100644 index 000000000..d401c20f1 --- /dev/null +++ b/db/routines/vn/views/invoiceCorrectionDataSource.sql @@ -0,0 +1,16 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`invoiceCorrectionDataSource` +AS SELECT `s`.`itemFk` AS `itemFk`, + `s`.`quantity` AS `quantity`, + `s`.`concept` AS `concept`, + `s`.`price` AS `price`, + `s`.`discount` AS `discount`, + `t`.`refFk` AS `refFk`, + `s`.`id` AS `saleFk`, + `t`.`shipped` AS `shipped` +FROM ( + `vn`.`sale` `s` + JOIN `vn`.`ticket` `t` ON(`t`.`id` = `s`.`ticketFk`) + ) +WHERE `t`.`shipped` > `util`.`VN_CURDATE`() + INTERVAL -3 year diff --git a/db/routines/vn/views/itemBotanicalWithGenus.sql b/db/routines/vn/views/itemBotanicalWithGenus.sql new file mode 100644 index 000000000..3bc0b943d --- /dev/null +++ b/db/routines/vn/views/itemBotanicalWithGenus.sql @@ -0,0 +1,12 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`itemBotanicalWithGenus` +AS SELECT `ib`.`itemFk` AS `itemFk`, + concat(`g`.`name`, ' ', IFNULL(`s`.`name`, '')) AS `ediBotanic` +FROM ( + ( + `vn`.`itemBotanical` `ib` + LEFT JOIN `vn`.`specie` `s` ON(`s`.`id` = `ib`.`specieFk`) + ) + LEFT JOIN `vn`.`genus` `g` ON(`g`.`id` = `ib`.`genusFk`) + ) diff --git a/db/routines/vn/views/itemCategoryL10n.sql b/db/routines/vn/views/itemCategoryL10n.sql new file mode 100644 index 000000000..08a7c7321 --- /dev/null +++ b/db/routines/vn/views/itemCategoryL10n.sql @@ -0,0 +1,12 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`itemCategoryL10n` +AS SELECT `c`.`id` AS `id`, + IFNULL(`i`.`name`, `c`.`name`) AS `name` +FROM ( + `vn`.`itemCategory` `c` + LEFT JOIN `vn`.`itemCategoryI18n` `i` ON( + `i`.`categoryFk` = `c`.`id` + AND `i`.`lang` = `util`.`lang`() + ) + ) diff --git a/db/routines/vn/views/itemColor.sql b/db/routines/vn/views/itemColor.sql new file mode 100644 index 000000000..5ab8a4c4f --- /dev/null +++ b/db/routines/vn/views/itemColor.sql @@ -0,0 +1,10 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`itemColor` +AS SELECT `it`.`itemFk` AS `itemFk`, + `it`.`value` AS `color` +FROM ( + `vn`.`itemTag` `it` + JOIN `vn`.`tag` `t` ON(`t`.`id` = `it`.`tagFk`) + ) +WHERE `t`.`code` = 'COLOR' diff --git a/db/routines/vn/views/itemEntryIn.sql b/db/routines/vn/views/itemEntryIn.sql new file mode 100644 index 000000000..184ccbf59 --- /dev/null +++ b/db/routines/vn/views/itemEntryIn.sql @@ -0,0 +1,19 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`itemEntryIn` +AS SELECT `t`.`warehouseInFk` AS `warehouseInFk`, + `t`.`landed` AS `landed`, + `b`.`itemFk` AS `itemFk`, + `b`.`quantity` AS `quantity`, + `t`.`isReceived` AS `isReceived`, + `e`.`isRaid` AS `isVirtualStock`, + `e`.`id` AS `entryFk` +FROM ( + ( + `vn`.`buy` `b` + JOIN `vn`.`entry` `e` ON(`b`.`entryFk` = `e`.`id`) + ) + JOIN `vn`.`travel` `t` ON(`e`.`travelFk` = `t`.`id`) + ) +WHERE `e`.`isExcludedFromAvailable` = 0 + AND `b`.`quantity` <> 0 diff --git a/db/routines/vn/views/itemEntryOut.sql b/db/routines/vn/views/itemEntryOut.sql new file mode 100644 index 000000000..82b065985 --- /dev/null +++ b/db/routines/vn/views/itemEntryOut.sql @@ -0,0 +1,19 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`itemEntryOut` +AS SELECT `t`.`warehouseOutFk` AS `warehouseOutFk`, + `t`.`shipped` AS `shipped`, + `b`.`itemFk` AS `itemFk`, + - `b`.`quantity` AS `quantity`, + `t`.`isDelivered` AS `isDelivered`, + `e`.`id` AS `entryFk` +FROM ( + ( + `vn`.`buy` `b` + JOIN `vn`.`entry` `e` ON(`b`.`entryFk` = `e`.`id`) + ) + JOIN `vn`.`travel` `t` ON(`e`.`travelFk` = `t`.`id`) + ) +WHERE `e`.`isExcludedFromAvailable` = 0 + AND `e`.`isRaid` = 0 + AND `b`.`quantity` <> 0 diff --git a/db/routines/vn/views/itemInk.sql b/db/routines/vn/views/itemInk.sql new file mode 100644 index 000000000..d13a862e7 --- /dev/null +++ b/db/routines/vn/views/itemInk.sql @@ -0,0 +1,12 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`itemInk` +AS SELECT `i`.`longName` AS `longName`, + `i`.`inkFk` AS `inkFk`, + `vn`.`ink`.`name` AS `color` +FROM ( + `vn`.`item` `i` + JOIN `vn`.`ink` ON(`vn`.`ink`.`id` = `i`.`inkFk`) + ) +WHERE `vn`.`ink`.`isRealColor` <> 0 +GROUP BY `i`.`longName` diff --git a/db/routines/vn/views/itemPlacementSupplyList.sql b/db/routines/vn/views/itemPlacementSupplyList.sql new file mode 100644 index 000000000..10e7ae3ef --- /dev/null +++ b/db/routines/vn/views/itemPlacementSupplyList.sql @@ -0,0 +1,34 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`itemPlacementSupplyList` +AS SELECT `ips`.`id` AS `id`, + `ips`.`itemFk` AS `itemFk`, + `ips`.`quantity` AS `quantity`, + `ips`.`priority` AS `priority`, + IFNULL(`isps`.`created`, `ips`.`created`) AS `created`, + `ips`.`userFk` AS `userFk`, + `ips`.`repoUserFk` AS `repoUserFk`, + `ips`.`quantity` - sum(IFNULL(`isps`.`quantity`, 0)) AS `saldo`, + concat(`i`.`longName`, ' ', `i`.`size`) AS `longName`, + `i`.`subName` AS `subName`, + `i`.`size` AS `size`, + `w`.`code` AS `workerCode`, + `rw`.`code` AS `repoCode`, + `ips`.`sectorFk` AS `sectorFk` +FROM ( + ( + ( + ( + `vn`.`itemPlacementSupply` `ips` + JOIN `vn`.`item` `i` ON(`i`.`id` = `ips`.`itemFk`) + ) + LEFT JOIN `vn`.`worker` `w` ON(`w`.`id` = `ips`.`userFk`) + ) + LEFT JOIN `vn`.`worker` `rw` ON(`rw`.`id` = `ips`.`repoUserFk`) + ) + LEFT JOIN `vn`.`itemShelvingPlacementSupply` `isps` ON(`isps`.`itemPlacementSupplyFk` = `ips`.`id`) + ) +WHERE `ips`.`created` >= `util`.`VN_CURDATE`() +GROUP BY `ips`.`priority`, + `ips`.`id`, + `ips`.`sectorFk` diff --git a/db/routines/vn/views/itemProductor.sql b/db/routines/vn/views/itemProductor.sql new file mode 100644 index 000000000..f6cb0eb19 --- /dev/null +++ b/db/routines/vn/views/itemProductor.sql @@ -0,0 +1,10 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`itemProductor` +AS SELECT `it`.`itemFk` AS `itemFk`, + `it`.`value` AS `productor` +FROM ( + `vn`.`itemTag` `it` + JOIN `vn`.`tag` `t` ON(`t`.`id` = `it`.`tagFk`) + ) +WHERE `t`.`code` = 'PRODUCER' diff --git a/db/routines/vn/views/itemSearch.sql b/db/routines/vn/views/itemSearch.sql new file mode 100644 index 000000000..6a21b9e92 --- /dev/null +++ b/db/routines/vn/views/itemSearch.sql @@ -0,0 +1,17 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`itemSearch` +AS SELECT `s`.`itemFk` AS `itemFk`, + `s`.`concept` AS `concept`, + `s`.`quantity` AS `quantity`, + `t`.`nickname` AS `nickname`, + `t`.`shipped` AS `shipped` +FROM ( + ( + `vn`.`sale` `s` + JOIN `vn`.`ticket` `t` ON(`t`.`id` = `s`.`ticketFk`) + ) + JOIN `vn`.`warehouse` `w` ON(`w`.`id` = `t`.`warehouseFk`) + ) +WHERE `t`.`shipped` BETWEEN `util`.`yesterday`() AND `util`.`tomorrow`() + AND `w`.`name` IN ('VNH', 'Floramondo') diff --git a/db/routines/vn/views/itemShelvingAvailable.sql b/db/routines/vn/views/itemShelvingAvailable.sql new file mode 100644 index 000000000..868d6a963 --- /dev/null +++ b/db/routines/vn/views/itemShelvingAvailable.sql @@ -0,0 +1,59 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`itemShelvingAvailable` +AS SELECT `s`.`id` AS `saleFk`, + `tst`.`updated` AS `Modificado`, + `s`.`ticketFk` AS `ticketFk`, + 0 AS `isPicked`, + `s`.`itemFk` AS `itemFk`, + `s`.`quantity` AS `quantity`, + `s`.`concept` AS `concept`, + `i`.`size` AS `size`, + `st`.`name` AS `Estado`, + `st`.`sectorProdPriority` AS `sectorProdPriority`, + `stock`.`visible` AS `available`, + `stock`.`sectorFk` AS `sectorFk`, + `stock`.`shelvingFk` AS `matricula`, + `stock`.`parkingFk` AS `parking`, + `stock`.`itemShelvingFk` AS `itemShelving`, + `am`.`name` AS `Agency`, + `t`.`shipped` AS `shipped`, + `stock`.`grouping` AS `grouping`, + `stock`.`packing` AS `packing`, + `z`.`hour` AS `hour`, + `st`.`isPreviousPreparable` AS `isPreviousPreparable`, + `sv`.`physicalVolume` AS `physicalVolume`, + `t`.`warehouseFk` AS `warehouseFk` +FROM ( + ( + ( + ( + ( + ( + ( + ( + ( + `vn`.`sale` `s` + JOIN `vn`.`ticket` `t` ON(`t`.`id` = `s`.`ticketFk`) + ) + JOIN `vn`.`agencyMode` `am` ON(`am`.`id` = `t`.`agencyModeFk`) + ) + JOIN `vn`.`ticketStateToday` `tst` ON(`tst`.`ticketFk` = `t`.`id`) + ) + JOIN `vn`.`state` `st` ON(`st`.`id` = `tst`.`state`) + ) + JOIN `vn`.`item` `i` ON(`i`.`id` = `s`.`itemFk`) + ) + JOIN `vn`.`itemShelvingStock` `stock` ON(`stock`.`itemFk` = `i`.`id`) + ) + LEFT JOIN `vn`.`saleTracking` `stk` ON(`stk`.`saleFk` = `s`.`id`) + ) + LEFT JOIN `vn`.`zone` `z` ON(`z`.`id` = `t`.`zoneFk`) + ) + LEFT JOIN `vn`.`saleVolume` `sv` ON(`sv`.`saleFk` = `s`.`id`) + ) +WHERE `t`.`shipped` BETWEEN `util`.`yesterday`() AND `util`.`dayend`(`util`.`VN_CURDATE`()) + AND `stk`.`id` IS NULL + AND `stock`.`visible` > 0 + AND `stk`.`saleFk` IS NULL + AND `st`.`isPreviousPreparable` <> 0 diff --git a/db/routines/vn/views/itemShelvingList.sql b/db/routines/vn/views/itemShelvingList.sql new file mode 100644 index 000000000..570bf0be6 --- /dev/null +++ b/db/routines/vn/views/itemShelvingList.sql @@ -0,0 +1,24 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`itemShelvingList` +AS SELECT `ish`.`shelvingFk` AS `shelvingFk`, + `ish`.`visible` AS `visible`, + `ish`.`created` AS `created`, + `pk`.`code` AS `parking`, + `ish`.`itemFk` AS `itemFk`, + `i`.`longName` AS `longName`, + `i`.`size` AS `size`, + `i`.`subName` AS `subName`, + `sh`.`parked` AS `parked`, + `pk`.`sectorFk` AS `sectorFk` +FROM ( + ( + ( + `vn`.`itemShelving` `ish` + JOIN `vn`.`shelving` `sh` ON(`sh`.`code` = `ish`.`shelvingFk`) + ) + JOIN `vn`.`item` `i` ON(`i`.`id` = `ish`.`itemFk`) + ) + LEFT JOIN `vn`.`parking` `pk` ON(`pk`.`id` = `sh`.`parkingFk`) + ) +ORDER BY `ish`.`created` diff --git a/db/routines/vn/views/itemShelvingPlacementSupplyStock.sql b/db/routines/vn/views/itemShelvingPlacementSupplyStock.sql new file mode 100644 index 000000000..217aaf6ac --- /dev/null +++ b/db/routines/vn/views/itemShelvingPlacementSupplyStock.sql @@ -0,0 +1,27 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`itemShelvingPlacementSupplyStock` +AS SELECT `ish`.`id` AS `itemShelvingFk`, + `ish`.`itemFk` AS `itemFk`, + `ish`.`packing` AS `packing`, + `ish`.`visible` AS `stock`, + `i`.`longName` AS `longName`, + `i`.`size` AS `size`, + `i`.`subName` AS `subName`, + `sh`.`code` AS `shelving`, + `p`.`code` AS `parking`, + `ish`.`created` AS `created`, + IFNULL(`sh`.`priority`, 1) AS `priority`, + `p`.`id` AS `parkingFk`, + `p`.`sectorFk` AS `sectorFk` +FROM ( + ( + ( + `vn`.`itemShelving` `ish` + JOIN `vn`.`shelving` `sh` ON(`sh`.`code` = `ish`.`shelvingFk`) + ) + LEFT JOIN `vn`.`parking` `p` ON(`p`.`id` = `sh`.`parkingFk`) + ) + JOIN `vn`.`item` `i` ON(`i`.`id` = `ish`.`itemFk`) + ) +GROUP BY `ish`.`id` diff --git a/db/routines/vn/views/itemShelvingSaleSum.sql b/db/routines/vn/views/itemShelvingSaleSum.sql new file mode 100644 index 000000000..566e20a69 --- /dev/null +++ b/db/routines/vn/views/itemShelvingSaleSum.sql @@ -0,0 +1,20 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`itemShelvingSaleSum` +AS SELECT `iss`.`id` AS `id`, + `iss`.`itemShelvingFk` AS `itemShelvingFk`, + `iss`.`saleFk` AS `saleFk`, + sum(`iss`.`quantity`) AS `quantity`, + `iss`.`created` AS `created`, + `p`.`sectorFk` AS `sectorFk` +FROM ( + ( + ( + `vn`.`itemShelvingSale` `iss` + JOIN `vn`.`itemShelving` `ish` ON(`ish`.`id` = `iss`.`itemShelvingFk`) + ) + JOIN `vn`.`shelving` `sh` ON(`sh`.`code` = `ish`.`shelvingFk`) + ) + JOIN `vn`.`parking` `p` ON(`p`.`id` = `sh`.`parkingFk`) + ) +GROUP BY `iss`.`saleFk` diff --git a/db/routines/vn/views/itemShelvingStock.sql b/db/routines/vn/views/itemShelvingStock.sql new file mode 100644 index 000000000..e0825eae5 --- /dev/null +++ b/db/routines/vn/views/itemShelvingStock.sql @@ -0,0 +1,35 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`itemShelvingStock` +AS SELECT `ish`.`itemFk` AS `itemFk`, + sum(`ish`.`visible`) AS `visible`, + min(`ish`.`packing`) AS `packing`, + min(`ish`.`grouping`) AS `grouping`, + `s`.`description` AS `sector`, + sum(`ish`.`visible`) AS `visibleOriginal`, + 0 AS `removed`, + `p`.`sectorFk` AS `sectorFk`, + `s`.`warehouseFk` AS `warehouseFk`, + `ish`.`shelvingFk` AS `shelvingFk`, + `p`.`code` AS `parkingCode`, + `sh`.`parkingFk` AS `parkingFk`, + `ish`.`id` AS `itemShelvingFk`, + `ish`.`created` AS `created`, + `st`.`code` = 'previousPrepared' AS `isPreviousPrepared` +FROM ( + ( + ( + ( + `vn`.`itemShelving` `ish` + LEFT JOIN `vn`.`shelving` `sh` ON(`sh`.`code` = `ish`.`shelvingFk`) + ) + LEFT JOIN `vn`.`parking` `p` ON(`p`.`id` = `sh`.`parkingFk`) + ) + LEFT JOIN `vn`.`sector` `s` ON(`s`.`id` = `p`.`sectorFk`) + ) + LEFT JOIN `vn`.`sectorType` `st` ON(`st`.`id` = `s`.`typeFk`) + ) +WHERE `ish`.`visible` <> 0 + AND `p`.`sectorFk` <> 0 +GROUP BY `ish`.`itemFk`, + `p`.`sectorFk` diff --git a/db/routines/vn/views/itemShelvingStockFull.sql b/db/routines/vn/views/itemShelvingStockFull.sql new file mode 100644 index 000000000..71ce5ed79 --- /dev/null +++ b/db/routines/vn/views/itemShelvingStockFull.sql @@ -0,0 +1,29 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`itemShelvingStockFull` +AS SELECT `ish`.`itemFk` AS `itemFk`, + `ish`.`visible` AS `quantity`, + `ish`.`packing` AS `packing`, + `ish`.`grouping` AS `grouping`, + `s`.`description` AS `sector`, + `issr`.`removed` AS `removed`, + `p`.`sectorFk` AS `sectorFk`, + `s`.`warehouseFk` AS `warehouseFk`, + `ish`.`shelvingFk` AS `shelvingFk`, + `p`.`code` AS `parkingCode`, + `sh`.`parkingFk` AS `parkingFk`, + `ish`.`id` AS `itemShelvingFk`, + `ish`.`created` AS `created` +FROM ( + ( + ( + ( + `vn`.`itemShelving` `ish` + JOIN `vn`.`shelving` `sh` ON(`sh`.`code` = `ish`.`shelvingFk`) + ) + JOIN `vn`.`parking` `p` ON(`p`.`id` = `sh`.`parkingFk`) + ) + JOIN `vn`.`sector` `s` ON(`s`.`id` = `p`.`sectorFk`) + ) + LEFT JOIN `vn`.`itemShelvingStockRemoved` `issr` ON(`issr`.`itemShelvingFk` = `ish`.`id`) + ) diff --git a/db/routines/vn/views/itemShelvingStockRemoved.sql b/db/routines/vn/views/itemShelvingStockRemoved.sql new file mode 100644 index 000000000..fb201e0f1 --- /dev/null +++ b/db/routines/vn/views/itemShelvingStockRemoved.sql @@ -0,0 +1,14 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`itemShelvingStockRemoved` +AS SELECT `ish`.`id` AS `itemShelvingFk`, + `ish`.`itemFk` AS `itemFk`, + 0 AS `removed` +FROM ( + ( + `vn`.`itemShelving` `ish` + LEFT JOIN `vn`.`itemShelvingSale` `iss` ON(`iss`.`itemShelvingFk` = `ish`.`id`) + ) + LEFT JOIN `vn`.`itemShelvingPlacementSupply` `isps` ON(`isps`.`itemShelvingFk` = `ish`.`id`) + ) +GROUP BY `ish`.`id` diff --git a/db/routines/vn/views/itemTagged.sql b/db/routines/vn/views/itemTagged.sql new file mode 100644 index 000000000..c22354bda --- /dev/null +++ b/db/routines/vn/views/itemTagged.sql @@ -0,0 +1,5 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`itemTagged` +AS SELECT DISTINCT `vn`.`itemTag`.`itemFk` AS `itemFk` +FROM `vn`.`itemTag` diff --git a/db/routines/vn/views/itemTaxCountrySpain.sql b/db/routines/vn/views/itemTaxCountrySpain.sql new file mode 100644 index 000000000..9dfaf0b41 --- /dev/null +++ b/db/routines/vn/views/itemTaxCountrySpain.sql @@ -0,0 +1,20 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`itemTaxCountrySpain` +AS SELECT `i`.`id` AS `id`, + `i`.`name` AS `name`, + `i`.`typeFk` AS `typeFk`, + `i`.`stems` AS `stems`, + `i`.`description` AS `description`, + `i`.`intrastatFk` AS `intrastatFk`, + `i`.`expenseFk` AS `expenseFk`, + `i`.`comment` AS `comment`, + `i`.`relevancy` AS `relevancy`, + `i`.`image` AS `image`, + `i`.`generic` AS `generic`, + `itc`.`taxClassFk` AS `taxClassFk` +FROM ( + `vn`.`item` `i` + JOIN `vn`.`itemTaxCountry` `itc` ON(`itc`.`itemFk` = `i`.`id`) + ) +WHERE `itc`.`countryFk` = 1 diff --git a/db/routines/vn/views/itemTicketOut.sql b/db/routines/vn/views/itemTicketOut.sql new file mode 100644 index 000000000..d9bbd54bd --- /dev/null +++ b/db/routines/vn/views/itemTicketOut.sql @@ -0,0 +1,17 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`itemTicketOut` +AS SELECT `t`.`warehouseFk` AS `warehouseFk`, + `t`.`shipped` AS `shipped`, + `s`.`itemFk` AS `itemFk`, + - `s`.`quantity` AS `quantity`, + `s`.`isPicked` AS `isPicked`, + `s`.`reserved` AS `reserved`, + `t`.`refFk` AS `refFk`, + `s`.`id` AS `saleFk`, + `s`.`ticketFk` AS `ticketFk` +FROM ( + `vn`.`sale` `s` + JOIN `vn`.`ticket` `t` ON(`s`.`ticketFk` = `t`.`id`) + ) +WHERE `s`.`quantity` <> 0 diff --git a/db/routines/vn/views/itemTypeL10n.sql b/db/routines/vn/views/itemTypeL10n.sql new file mode 100644 index 000000000..03d72f0d4 --- /dev/null +++ b/db/routines/vn/views/itemTypeL10n.sql @@ -0,0 +1,12 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`itemTypeL10n` +AS SELECT `t`.`id` AS `id`, + IFNULL(`i`.`name`, `t`.`name`) AS `name` +FROM ( + `vn`.`itemType` `t` + LEFT JOIN `vn`.`itemTypeI18n` `i` ON( + `i`.`typeFk` = `t`.`id` + AND `i`.`lang` = `util`.`LANG`() + ) + ) diff --git a/db/routines/vn/views/item_Free_Id.sql b/db/routines/vn/views/item_Free_Id.sql new file mode 100644 index 000000000..36464004c --- /dev/null +++ b/db/routines/vn/views/item_Free_Id.sql @@ -0,0 +1,10 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`item_Free_Id` +AS SELECT `i1`.`id` + 1 AS `newId` +FROM ( + `vn`.`item` `i1` + LEFT JOIN `vn`.`item` `i2` ON(`i1`.`id` + 1 = `i2`.`id`) + ) +WHERE `i2`.`id` IS NULL + AND `i1`.`isFloramondo` <> 0 diff --git a/db/routines/vn/views/labelInfo.sql b/db/routines/vn/views/labelInfo.sql new file mode 100644 index 000000000..ccc6fc6ac --- /dev/null +++ b/db/routines/vn/views/labelInfo.sql @@ -0,0 +1,35 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`labelInfo` +AS SELECT `i`.`id` AS `itemId`, + `i`.`name` AS `itemName`, + `b`.`stickers` AS `stickers`, + `b`.`printedStickers` AS `life`, + `i`.`inkFk` AS `colorCode`, + `i`.`stems` AS `stems`, + `i`.`category` AS `category`, + `i`.`subName` AS `productor`, + `b`.`packing` AS `packing`, + `clb`.`warehouse_id` AS `warehouse_id`, + `i`.`size` AS `size`, + `b`.`isPickedOff` AS `isPickedOff`, + `e`.`evaNotes` AS `notes`, + `w`.`name` AS `wh_in`, + `e`.`id` AS `entryId`, + `b`.`id` AS `buyId` +FROM ( + ( + ( + ( + ( + `vn`.`buy` `b` + JOIN `vn`.`item` `i` ON(`i`.`id` = `b`.`itemFk`) + ) + JOIN `cache`.`last_buy` `clb` ON(`clb`.`item_id` = `i`.`id`) + ) + JOIN `vn`.`entry` `e` ON(`e`.`id` = `b`.`entryFk`) + ) + LEFT JOIN `vn`.`travel` `tr` ON(`tr`.`id` = `e`.`travelFk`) + ) + JOIN `vn`.`warehouse` `w` ON(`w`.`id` = `tr`.`warehouseInFk`) + ) diff --git a/db/routines/vn/views/lastHourProduction.sql b/db/routines/vn/views/lastHourProduction.sql new file mode 100644 index 000000000..90bc0cd76 --- /dev/null +++ b/db/routines/vn/views/lastHourProduction.sql @@ -0,0 +1,25 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`lastHourProduction` +AS SELECT `t`.`warehouseFk` AS `warehouseFk`, + cast( + sum( + IFNULL( + `p`.`volume`, + `p`.`width` * `p`.`height` * `p`.`depth` + ) / 1000000 + ) AS decimal(5, 1) + ) AS `m3` +FROM ( + ( + ( + `vn`.`warehouse` `w` + JOIN `vn`.`ticket` `t` ON(`t`.`warehouseFk` = `w`.`id`) + ) + LEFT JOIN `vn`.`expedition` `e` ON(`t`.`id` = `e`.`ticketFk`) + ) + LEFT JOIN `vn`.`packaging` `p` ON(`p`.`id` = `e`.`packagingFk`) + ) +WHERE `e`.`created` BETWEEN `util`.`VN_NOW`() - INTERVAL 1 HOUR + AND `util`.`VN_NOW`() +GROUP BY `t`.`warehouseFk` diff --git a/db/routines/vn/views/lastPurchases.sql b/db/routines/vn/views/lastPurchases.sql new file mode 100644 index 000000000..04a9f8c05 --- /dev/null +++ b/db/routines/vn/views/lastPurchases.sql @@ -0,0 +1,35 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`lastPurchases` +AS SELECT `tr`.`landed` AS `landed`, + `w`.`id` AS `warehouseFk`, + `w`.`name` AS `warehouse`, + `i`.`longName` AS `longName`, + `i`.`subName` AS `subName`, + `e`.`id` AS `entryFk`, + `b`.`stickers` AS `stickers`, + `b`.`packing` AS `packing`, + `e`.`invoiceNumber` AS `ref`, + `b`.`itemFk` AS `itemFk`, + `ek`.`pro` AS `pro`, + `ek`.`ref` AS `ektRef`, + `ek`.`agj` AS `agj` +FROM ( + ( + ( + ( + ( + `vn`.`buy` `b` + JOIN `vn`.`entry` `e` ON(`e`.`id` = `b`.`entryFk`) + ) + JOIN `vn`.`item` `i` ON(`i`.`id` = `b`.`itemFk`) + ) + JOIN `vn`.`travel` `tr` ON(`tr`.`id` = `e`.`travelFk`) + ) + JOIN `vn`.`warehouse` `w` ON(`w`.`id` = `tr`.`warehouseInFk`) + ) + LEFT JOIN `edi`.`ekt` `ek` ON(`ek`.`id` = `b`.`ektFk`) + ) +WHERE `tr`.`landed` BETWEEN `util`.`yesterday`() AND `util`.`tomorrow`() + AND `e`.`isRaid` = 0 + AND `b`.`stickers` > 0 diff --git a/db/routines/vn/views/lastTopClaims.sql b/db/routines/vn/views/lastTopClaims.sql new file mode 100644 index 000000000..0bc36e3c2 --- /dev/null +++ b/db/routines/vn/views/lastTopClaims.sql @@ -0,0 +1,38 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`lastTopClaims` +AS SELECT `s`.`itemFk` AS `itemFk`, + `i`.`longName` AS `itemName`, + `it`.`name` AS `itemTypeName`, + COUNT(0) AS `claimsNumber`, + round( + sum( + `cb`.`quantity` * `s`.`price` * (1 - (`c`.`responsibility` - 1) / 4) * (100 - `s`.`discount`) / 100 + ), + 2 + ) AS `claimedAmount`, + round( + sum( + `cb`.`quantity` * `s`.`price` * (100 - `s`.`discount`) / 100 + ), + 2 + ) AS `totalAmount` +FROM ( + ( + ( + ( + `vn`.`claim` `c` + JOIN `vn`.`claimBeginning` `cb` ON(`cb`.`claimFk` = `c`.`id`) + ) + JOIN `vn`.`sale` `s` ON(`s`.`id` = `cb`.`saleFk`) + ) + JOIN `vn`.`item` `i` ON(`i`.`id` = `s`.`itemFk`) + ) + JOIN `vn`.`itemType` `it` ON(`it`.`id` = `i`.`typeFk`) + ) +WHERE `c`.`created` >= `util`.`VN_CURDATE`() + INTERVAL -1 week +GROUP BY `s`.`itemFk` +HAVING `claimedAmount` > 100 + AND `claimsNumber` > 2 + OR `claimsNumber` > 4 +ORDER BY COUNT(0) DESC diff --git a/db/routines/vn/views/mistake.sql b/db/routines/vn/views/mistake.sql new file mode 100644 index 000000000..0ed4dccf2 --- /dev/null +++ b/db/routines/vn/views/mistake.sql @@ -0,0 +1,27 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`mistake` +AS SELECT `wr`.`code` AS `revisador`, + `s`.`concept` AS `concept`, + `w`.`code` AS `sacador`, + `w`.`firstName` AS `firstName`, + `w`.`lastName` AS `lastName`, + `mt`.`description` AS `description`, + cast(`iss`.`created` AS date) AS `created`, + `w`.`id` AS `workerFk` +FROM ( + ( + ( + ( + ( + `vn`.`saleMistake` `sm` + JOIN `vn`.`mistakeType` `mt` ON(`mt`.`id` = `sm`.`typeFk`) + ) + JOIN `vn`.`worker` `wr` ON(`wr`.`id` = `sm`.`userFk`) + ) + JOIN `vn`.`sale` `s` ON(`s`.`id` = `sm`.`saleFk`) + ) + JOIN `vn`.`itemShelvingSale` `iss` ON(`iss`.`saleFk` = `sm`.`saleFk`) + ) + JOIN `vn`.`worker` `w` ON(`w`.`id` = `iss`.`userFk`) + ) diff --git a/db/routines/vn/views/mistakeRatio.sql b/db/routines/vn/views/mistakeRatio.sql new file mode 100644 index 000000000..4b7fd5a1f --- /dev/null +++ b/db/routines/vn/views/mistakeRatio.sql @@ -0,0 +1,24 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`mistakeRatio` +AS SELECT `wr`.`code` AS `revisador`, + `w`.`code` AS `sacador`, + `w`.`firstName` AS `firstName`, + `w`.`lastName` AS `lastName`, + `mt`.`description` AS `description`, + cast(`iss`.`created` AS date) AS `created`, + `w`.`id` AS `workerFk`, + `sm`.`saleFk` AS `saleFk` +FROM ( + ( + ( + ( + `vn`.`itemShelvingSale` `iss` + JOIN `vn`.`worker` `w` ON(`w`.`id` = `iss`.`userFk`) + ) + LEFT JOIN `vn`.`saleMistake` `sm` ON(`iss`.`saleFk` = `sm`.`saleFk`) + ) + LEFT JOIN `vn`.`mistakeType` `mt` ON(`mt`.`id` = `sm`.`typeFk`) + ) + LEFT JOIN `vn`.`worker` `wr` ON(`wr`.`id` = `sm`.`userFk`) + ) diff --git a/db/routines/vn/views/newBornSales.sql b/db/routines/vn/views/newBornSales.sql new file mode 100644 index 000000000..d34eff4ef --- /dev/null +++ b/db/routines/vn/views/newBornSales.sql @@ -0,0 +1,26 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`newBornSales` +AS SELECT `v`.`importe` AS `amount`, + `v`.`Id_Cliente` AS `clientFk`, + `c`.`salesPersonFk` AS `userFk`, + `v`.`fecha` AS `dated`, + `cn`.`firstShipped` AS `firstShipped` +FROM ( + ( + ( + ( + `bs`.`clientNewBorn` `cn` + JOIN `bs`.`ventas` `v` ON( + `cn`.`firstShipped` + INTERVAL 1 year > `v`.`fecha` + AND `v`.`Id_Cliente` = `cn`.`clientFk` + ) + ) + JOIN `vn`.`client` `c` ON(`c`.`id` = `v`.`Id_Cliente`) + ) + JOIN `account`.`user` `u` ON(`u`.`id` = `c`.`salesPersonFk`) + ) + JOIN `account`.`role` `r` ON(`r`.`id` = `u`.`role`) + ) +WHERE `r`.`name` = 'salesPerson' + AND `u`.`name` NOT IN ('ismaelalcolea', 'ruben') diff --git a/db/routines/vn/views/operatorWorkerCode.sql b/db/routines/vn/views/operatorWorkerCode.sql new file mode 100644 index 000000000..340d833a7 --- /dev/null +++ b/db/routines/vn/views/operatorWorkerCode.sql @@ -0,0 +1,22 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`operatorWorkerCode` +AS SELECT `o`.`workerFk` AS `workerFk`, + concat(`w`.`firstName`, ' ', `w`.`lastName`) AS `fullName`, + `w`.`code` AS `code`, + `o`.`numberOfWagons` AS `numberOfWagons` +FROM ( + ( + `vn`.`worker` `w` + JOIN `vn`.`operator` `o` ON(`o`.`workerFk` = `w`.`id`) + ) + JOIN `vn`.`sector` `s` ON(`o`.`sectorFk` = `s`.`id`) + ) +WHERE `o`.`sectorFk` IS NOT NULL + AND `s`.`code` IN ( + 'H2', + 'H2', + 'PEQUES_H', + 'ALTILLO COMP', + 'ALTILLO ARTI' + ) diff --git a/db/routines/vn/views/originL10n.sql b/db/routines/vn/views/originL10n.sql new file mode 100644 index 000000000..2ff368e14 --- /dev/null +++ b/db/routines/vn/views/originL10n.sql @@ -0,0 +1,12 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`originL10n` +AS SELECT `o`.`id` AS `id`, + IFNULL(`i`.`name`, `o`.`name`) AS `name` +FROM ( + `vn`.`origin` `o` + LEFT JOIN `vn`.`originI18n` `i` ON( + `i`.`originFk` = `o`.`id` + AND `i`.`lang` = `util`.`lang`() + ) + ) diff --git a/db/routines/vn/views/packageEquivalentItem.sql b/db/routines/vn/views/packageEquivalentItem.sql new file mode 100644 index 000000000..ba2897c14 --- /dev/null +++ b/db/routines/vn/views/packageEquivalentItem.sql @@ -0,0 +1,12 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`packageEquivalentItem` +AS SELECT `p`.`itemFk` AS `itemFk`, + `p2`.`itemFk` AS `equivalentFk` +FROM ( + ( + `vn`.`packageEquivalent` `pe` + JOIN `vn`.`packaging` `p` ON(`p`.`id` = `pe`.`packagingFk`) + ) + JOIN `vn`.`packaging` `p2` ON(`p2`.`id` = `pe`.`equivalentFk`) + ) diff --git a/db/routines/vn/views/paymentExchangeInsurance.sql b/db/routines/vn/views/paymentExchangeInsurance.sql new file mode 100644 index 000000000..7128144ea --- /dev/null +++ b/db/routines/vn/views/paymentExchangeInsurance.sql @@ -0,0 +1,16 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`paymentExchangeInsurance` +AS SELECT `p`.`pago_sdc_id` AS `id`, + `p`.`importe` AS `amount`, + `p`.`fecha` AS `created`, + `p`.`vencimiento` AS `dueDay`, + `p`.`entity_id` AS `entityFk`, + `p`.`ref` AS `ref`, + `p`.`rate` AS `rate`, + `p`.`empresa_id` AS `companyFk`, + `p`.`financialProductTypefk` AS `financialProductTypefk`, + `p`.`upperBarrier` AS `upperBarrier`, + `p`.`lowerBarrier` AS `lowerBarrier`, + `p`.`strike` AS `strike` +FROM `vn2008`.`pago_sdc` `p` diff --git a/db/routines/vn/views/payrollCenter.sql b/db/routines/vn/views/payrollCenter.sql new file mode 100644 index 000000000..fc6635483 --- /dev/null +++ b/db/routines/vn/views/payrollCenter.sql @@ -0,0 +1,12 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`payrollCenter` +AS SELECT `b`.`cod_centro` AS `codCenter`, + `b`.`Centro` AS `name`, + `b`.`nss_cotizacion` AS `nss`, + `b`.`domicilio` AS `street`, + `b`.`poblacion` AS `city`, + `b`.`cp` AS `postcode`, + `b`.`empresa_id` AS `companyFk`, + `b`.`codempresa` AS `companyCode` +FROM `vn2008`.`payroll_centros` `b` diff --git a/db/routines/vn/views/personMedia.sql b/db/routines/vn/views/personMedia.sql new file mode 100644 index 000000000..d17410ef1 --- /dev/null +++ b/db/routines/vn/views/personMedia.sql @@ -0,0 +1,10 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`personMedia` +AS SELECT `c`.`id` AS `workerFk`, + IFNULL(`c`.`mobile`, `c`.`phone`) AS `mediaValue` +FROM ( + `vn`.`client` `c` + JOIN `vn`.`worker` `w` ON(`w`.`id` = `c`.`id`) + ) +HAVING `mediaValue` IS NOT NULL diff --git a/db/routines/vn/views/phoneBook.sql b/db/routines/vn/views/phoneBook.sql new file mode 100644 index 000000000..5fcafe99c --- /dev/null +++ b/db/routines/vn/views/phoneBook.sql @@ -0,0 +1,22 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`phoneBook` +AS SELECT 'C' AS `Tipo`, + `vn`.`client`.`id` AS `Id`, + `vn`.`client`.`name` AS `Cliente`, + `vn`.`client`.`phone` AS `Telefono` +FROM `vn`.`client` +WHERE `vn`.`client`.`phone` IS NOT NULL +UNION +SELECT 'C' AS `Tipo`, + `vn`.`client`.`id` AS `Id`, + `vn`.`client`.`name` AS `Cliente`, + `vn`.`client`.`mobile` AS `Movil` +FROM `vn`.`client` +WHERE `vn`.`client`.`mobile` IS NOT NULL +UNION +SELECT 'C' AS `Tipo`, + `vn`.`clientContact`.`clientFk` AS `clientFk`, + `vn`.`clientContact`.`name` AS `name`, + `vn`.`clientContact`.`phone` AS `phone` +FROM `vn`.`clientContact` diff --git a/db/routines/vn/views/productionVolume.sql b/db/routines/vn/views/productionVolume.sql new file mode 100644 index 000000000..fd83b96bc --- /dev/null +++ b/db/routines/vn/views/productionVolume.sql @@ -0,0 +1,23 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`productionVolume` +AS SELECT HOUR(`e`.`created`) AS `hora`, + MINUTE(`e`.`created`) AS `minuto`, + IFNULL( + `p`.`volume`, + IFNULL(`p`.`width` * `p`.`height` * `p`.`depth`, 94500) + ) AS `cm3`, + `t`.`warehouseFk` AS `warehouseFk`, + `e`.`created` AS `created` +FROM ( + ( + ( + `vn`.`expedition` `e` + LEFT JOIN `vn`.`packaging` `p` ON(`p`.`id` = `e`.`packagingFk`) + ) + JOIN `vn`.`ticket` `t` ON(`t`.`id` = `e`.`ticketFk`) + ) + JOIN `vn`.`client` `c` ON(`c`.`id` = `t`.`clientFk`) + ) +WHERE `e`.`created` BETWEEN `util`.`VN_CURDATE`() AND `util`.`dayend`(`util`.`VN_CURDATE`()) + AND `c`.`isRelevant` <> 0 diff --git a/db/routines/vn/views/productionVolume_LastHour.sql b/db/routines/vn/views/productionVolume_LastHour.sql new file mode 100644 index 000000000..561a23f9b --- /dev/null +++ b/db/routines/vn/views/productionVolume_LastHour.sql @@ -0,0 +1,11 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`productionVolume_LastHour` +AS SELECT cast( + sum(`productionVolume`.`cm3` / 1000000) AS decimal(10, 0) + ) AS `m3`, + `productionVolume`.`warehouseFk` AS `warehouseFk` +FROM `vn`.`productionVolume` +WHERE `productionVolume`.`created` > `util`.`VN_NOW`() + INTERVAL -1 HOUR + AND `productionVolume`.`warehouseFk` IN (1, 44, 60) +GROUP BY `productionVolume`.`warehouseFk` diff --git a/db/routines/vn/views/promissoryNote.sql b/db/routines/vn/views/promissoryNote.sql new file mode 100644 index 000000000..a9f047285 --- /dev/null +++ b/db/routines/vn/views/promissoryNote.sql @@ -0,0 +1,7 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`promissoryNote` +AS SELECT `p`.`Id_Pagare` AS `id`, + `p`.`Concepto` AS `Concept`, + `p`.`pago_id` AS `paymentFk` +FROM `vn2008`.`Pagares` `p` diff --git a/db/routines/vn/views/role.sql b/db/routines/vn/views/role.sql new file mode 100644 index 000000000..310951570 --- /dev/null +++ b/db/routines/vn/views/role.sql @@ -0,0 +1,8 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`role` +AS SELECT `account`.`role`.`id` AS `id`, + `account`.`role`.`name` AS `name`, + `account`.`role`.`description` AS `description`, + `account`.`role`.`hasLogin` AS `hasLogin` +FROM `account`.`role` diff --git a/db/routines/vn/views/routesControl.sql b/db/routines/vn/views/routesControl.sql new file mode 100644 index 000000000..380d9d9ce --- /dev/null +++ b/db/routines/vn/views/routesControl.sql @@ -0,0 +1,27 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`routesControl` +AS SELECT `t`.`routeFk` AS `routeFk`, + COUNT(`e`.`id`) AS `expeditions`, + COUNT(`es`.`id`) AS `scanned`, + COUNT(DISTINCT `es`.`palletFk`) AS `pallets`, + max(`es`.`scanned`) AS `lastScanned`, + max(`et`.`description`) AS `description`, + max(`et`.`eta`) AS `eta` +FROM ( + ( + ( + ( + `vn`.`ticket` `t` + JOIN `vn`.`expedition` `e` ON(`t`.`id` = `e`.`ticketFk`) + ) + LEFT JOIN `vn`.`expeditionScan` `es` ON(`es`.`expeditionFk` = `e`.`id`) + ) + LEFT JOIN `vn`.`expeditionPallet` `ep` ON(`ep`.`id` = `es`.`palletFk`) + ) + LEFT JOIN `vn`.`expeditionTruck` `et` ON(`et`.`id` = `ep`.`truckFk`) + ) +WHERE `t`.`shipped` >= `util`.`VN_CURDATE`() + AND `t`.`routeFk` <> 0 +GROUP BY `t`.`routeFk` +ORDER BY max(`et`.`eta`) diff --git a/db/routines/vn/views/saleCost.sql b/db/routines/vn/views/saleCost.sql new file mode 100644 index 000000000..27265aa93 --- /dev/null +++ b/db/routines/vn/views/saleCost.sql @@ -0,0 +1,22 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`saleCost` +AS SELECT `s`.`itemFk` AS `itemFk`, + `s`.`ticketFk` AS `ticketFk`, + `s`.`concept` AS `concept`, + `s`.`quantity` AS `quantity`, + `s`.`discount` AS `discount`, + `s`.`price` AS `price`, + `c`.`name` AS `component`, + `sc`.`value` AS `coste` +FROM ( + ( + ( + `vn`.`sale` `s` + JOIN `vn`.`saleComponent` `sc` ON(`sc`.`saleFk` = `s`.`id`) + ) + JOIN `vn`.`component` `c` ON(`c`.`id` = `sc`.`componentFk`) + ) + JOIN `vn`.`componentType` `ct` ON(`ct`.`id` = `c`.`typeFk`) + ) +WHERE `ct`.`type` = 'coste' diff --git a/db/routines/vn/views/saleLabel.sql b/db/routines/vn/views/saleLabel.sql new file mode 100644 index 000000000..4feae9294 --- /dev/null +++ b/db/routines/vn/views/saleLabel.sql @@ -0,0 +1,8 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`saleLabel` +AS SELECT `ml`.`Id_movimiento` AS `saleFk`, + `ml`.`label` AS `label`, + `ml`.`stem` AS `stem`, + `ml`.`created` AS `created` +FROM `vn2008`.`movement_label` `ml` diff --git a/db/routines/vn/views/saleMistakeList.sql b/db/routines/vn/views/saleMistakeList.sql new file mode 100644 index 000000000..d362e0d97 --- /dev/null +++ b/db/routines/vn/views/saleMistakeList.sql @@ -0,0 +1,29 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`saleMistakeList` +AS SELECT `st`.`saleFk` AS `saleFk`, + `st`.`workerFk` AS `workerFk`, + concat(`w2`.`firstName`, ' ', `w2`.`lastName`) AS `sacador`, + `st`.`created` AS `created`, + concat(`w`.`firstName`, ' ', `w`.`lastName`) AS `revisador`, + `mt`.`description` AS `description`, + `sm`.`created` AS `controlled` +FROM ( + ( + ( + ( + ( + `vn`.`saleTracking` `st` + JOIN `vn`.`worker` `w2` ON(`w2`.`id` = `st`.`workerFk`) + ) + JOIN `vn`.`state` `s` ON( + `s`.`id` = `st`.`stateFk` + AND `s`.`code` IN ('PREVIOUS_PREPARATION', 'PREPARED', 'OK') + ) + ) + LEFT JOIN `vn`.`saleMistake` `sm` ON(`st`.`saleFk` = `sm`.`saleFk`) + ) + LEFT JOIN `vn`.`mistakeType` `mt` ON(`mt`.`id` = `sm`.`typeFk`) + ) + LEFT JOIN `vn`.`worker` `w` ON(`w`.`id` = `sm`.`userFk`) + ) diff --git a/db/routines/vn/views/saleMistake_list__2.sql b/db/routines/vn/views/saleMistake_list__2.sql new file mode 100644 index 000000000..1f40a89d9 --- /dev/null +++ b/db/routines/vn/views/saleMistake_list__2.sql @@ -0,0 +1,29 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`saleMistake_list__2` +AS SELECT `st`.`saleFk` AS `saleFk`, + `st`.`workerFk` AS `workerFk`, + concat(`w2`.`firstName`, ' ', `w2`.`lastName`) AS `sacador`, + `st`.`created` AS `created`, + concat(`w`.`firstName`, ' ', `w`.`lastName`) AS `revisador`, + `mt`.`description` AS `description`, + `sm`.`created` AS `controlled` +FROM ( + ( + ( + ( + ( + `vn`.`saleTracking` `st` + JOIN `vn`.`worker` `w2` ON(`w2`.`id` = `st`.`workerFk`) + ) + JOIN `vn`.`state` `s` ON( + `s`.`id` = `st`.`stateFk` + AND `s`.`code` IN ('PREVIOUS_PREPARATION', 'PREPARED', 'OK') + ) + ) + LEFT JOIN `vn`.`saleMistake` `sm` ON(`st`.`saleFk` = `sm`.`saleFk`) + ) + LEFT JOIN `vn`.`mistakeType` `mt` ON(`mt`.`id` = `sm`.`typeFk`) + ) + LEFT JOIN `vn`.`worker` `w` ON(`w`.`id` = `sm`.`userFk`) + ) diff --git a/db/routines/vn/views/saleSaleTracking.sql b/db/routines/vn/views/saleSaleTracking.sql new file mode 100644 index 000000000..9ada798cf --- /dev/null +++ b/db/routines/vn/views/saleSaleTracking.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`saleSaleTracking` +AS SELECT DISTINCT `st`.`saleFk` AS `saleFk` +FROM `vn`.`saleTracking` `st` +WHERE `st`.`created` >= `util`.`VN_CURDATE`() + INTERVAL -1 DAY diff --git a/db/routines/vn/views/saleValue.sql b/db/routines/vn/views/saleValue.sql new file mode 100644 index 000000000..2dee4695e --- /dev/null +++ b/db/routines/vn/views/saleValue.sql @@ -0,0 +1,50 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`saleValue` +AS SELECT `wh`.`name` AS `warehouse`, + `c`.`name` AS `client`, + `c`.`typeFk` AS `typeFk`, + `u`.`name` AS `buyer`, + `it`.`id` AS `itemTypeFk`, + `it`.`name` AS `family`, + `s`.`itemFk` AS `itemFk`, + `s`.`concept` AS `concept`, + `s`.`quantity` AS `quantity`, + `b`.`buyingValue` + `b`.`freightValue` + `b`.`comissionValue` + `b`.`packageValue` AS `cost`, +( + `b`.`buyingValue` + `b`.`freightValue` + `b`.`comissionValue` + `b`.`packageValue` + ) * `s`.`quantity` AS `value`, + `tm`.`year` AS `year`, + `tm`.`week` AS `week` +FROM ( + ( + ( + ( + ( + ( + ( + ( + ( + `vn`.`sale` `s` + JOIN `vn`.`item` `i` ON(`i`.`id` = `s`.`itemFk`) + ) + JOIN `vn`.`itemType` `it` ON(`it`.`id` = `i`.`typeFk`) + ) + JOIN `account`.`user` `u` ON(`u`.`id` = `it`.`workerFk`) + ) + JOIN `vn`.`ticket` `t` ON(`t`.`id` = `s`.`ticketFk`) + ) + JOIN `vn`.`client` `c` ON(`c`.`id` = `t`.`clientFk`) + ) + JOIN `vn`.`warehouse` `wh` ON(`wh`.`id` = `t`.`warehouseFk`) + ) + JOIN `vn`.`time` `tm` ON(`tm`.`dated` = cast(`t`.`shipped` AS date)) + ) + JOIN `cache`.`last_buy` `lb` ON( + `lb`.`item_id` = `i`.`id` + AND `lb`.`warehouse_id` = `wh`.`id` + ) + ) + JOIN `vn`.`buy` `b` ON(`b`.`id` = `lb`.`buy_id`) + ) +WHERE `wh`.`isManaged` <> 0 diff --git a/db/routines/vn/views/saleVolume.sql b/db/routines/vn/views/saleVolume.sql new file mode 100644 index 000000000..aec739678 --- /dev/null +++ b/db/routines/vn/views/saleVolume.sql @@ -0,0 +1,45 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`saleVolume` +AS SELECT `s`.`ticketFk` AS `ticketFk`, + `s`.`id` AS `saleFk`, + round(`ic`.`cm3delivery` * `s`.`quantity` / 1000, 0) AS `litros`, + `t`.`routeFk` AS `routeFk`, + `t`.`shipped` AS `shipped`, + `t`.`landed` AS `landed`, + `s`.`quantity` * `ic`.`cm3delivery` / 1000000 AS `volume`, + `s`.`quantity` * `ic`.`grams` / 1000 AS `physicalWeight`, + `s`.`quantity` * `ic`.`cm3delivery` * greatest( + `ic`.`grams` / `ic`.`cm3delivery`, + `vc`.`aerealVolumetricDensity` + ) / 1000000 AS `weight`, + `s`.`quantity` * `ic`.`cm3delivery` / 1000000 AS `physicalVolume`, + `s`.`quantity` * `ic`.`cm3delivery` * IFNULL( + `t`.`zonePrice` - IFNULL(`t`.`zoneBonus`, 0), + `z`.`price` - `z`.`bonus` + ) / (`vc`.`standardFlowerBox` * 1000) * `z`.`inflation` AS `freight`, + `t`.`zoneFk` AS `zoneFk`, + `t`.`clientFk` AS `clientFk`, + `s`.`isPicked` AS `isPicked`, + `s`.`quantity` * `s`.`price` * (100 - `s`.`discount`) / 100 AS `eurosValue`, + `i`.`itemPackingTypeFk` AS `itemPackingTypeFk` +FROM ( + ( + ( + ( + ( + `vn`.`sale` `s` + JOIN `vn`.`item` `i` ON(`i`.`id` = `s`.`itemFk`) + ) + JOIN `vn`.`ticket` `t` ON(`t`.`id` = `s`.`ticketFk`) + ) + JOIN `vn`.`zone` `z` ON(`z`.`id` = `t`.`zoneFk`) + ) + JOIN `vn`.`volumeConfig` `vc` + ) + JOIN `vn`.`itemCost` `ic` ON( + `ic`.`itemFk` = `s`.`itemFk` + AND `ic`.`warehouseFk` = `t`.`warehouseFk` + ) + ) +WHERE `s`.`quantity` > 0 diff --git a/db/routines/vn/views/saleVolume_Today_VNH.sql b/db/routines/vn/views/saleVolume_Today_VNH.sql new file mode 100644 index 000000000..29b921bcb --- /dev/null +++ b/db/routines/vn/views/saleVolume_Today_VNH.sql @@ -0,0 +1,27 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`saleVolume_Today_VNH` +AS SELECT `t`.`nickname` AS `Cliente`, + `p`.`name` AS `Provincia`, + `c`.`country` AS `Pais`, + cast(sum(`sv`.`volume`) AS decimal(5, 1)) AS `volume` +FROM ( + ( + ( + ( + ( + `vn`.`saleVolume` `sv` + JOIN `vn`.`ticket` `t` ON(`t`.`id` = `sv`.`ticketFk`) + ) + JOIN `vn`.`address` `a` ON(`a`.`id` = `t`.`addressFk`) + ) + JOIN `vn`.`province` `p` ON(`p`.`id` = `a`.`provinceFk`) + ) + JOIN `vn`.`country` `c` ON(`c`.`id` = `p`.`countryFk`) + ) + JOIN `vn`.`warehouse` `w` ON(`w`.`id` = `t`.`warehouseFk`) + ) +WHERE `w`.`name` = 'VNH' + AND `t`.`shipped` BETWEEN `util`.`VN_CURDATE`() AND `util`.`dayend`(`util`.`VN_CURDATE`()) +GROUP BY `t`.`nickname`, + `p`.`name` diff --git a/db/routines/vn/views/sale_freightComponent.sql b/db/routines/vn/views/sale_freightComponent.sql new file mode 100644 index 000000000..7a329e0ee --- /dev/null +++ b/db/routines/vn/views/sale_freightComponent.sql @@ -0,0 +1,21 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`sale_freightComponent` +AS SELECT `t`.`id` AS `ticketFk`, + `sc`.`value` * `s`.`quantity` AS `amount`, + `t`.`shipped` AS `shipped` +FROM ( + ( + ( + ( + `vn`.`ticket` `t` STRAIGHT_JOIN `vn`.`sale` `s` ON(`t`.`id` = `s`.`ticketFk`) + ) + JOIN `vn`.`saleComponent` `sc` ON(`sc`.`saleFk` = `s`.`id`) + ) + JOIN `vn`.`component` `c` ON(`c`.`id` = `sc`.`componentFk`) + ) + JOIN `vn`.`componentType` `ct` ON( + `ct`.`id` = `c`.`typeFk` + AND `ct`.`type` = 'agencia' + ) + ) diff --git a/db/routines/vn/views/salesPersonSince.sql b/db/routines/vn/views/salesPersonSince.sql new file mode 100644 index 000000000..4234ecac4 --- /dev/null +++ b/db/routines/vn/views/salesPersonSince.sql @@ -0,0 +1,16 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`salesPersonSince` +AS SELECT `b`.`workerFk` AS `workerFk`, + min(`b`.`started`) AS `started` +FROM ( + ( + `vn`.`business` `b` + JOIN `vn`.`worker` `w` ON(`w`.`id` = `b`.`workerFk`) + ) + LEFT JOIN `vn`.`professionalCategory` `pc` ON( + `pc`.`id` = `b`.`workerBusinessProfessionalCategoryFk` + ) + ) +WHERE `pc`.`description` = 'Aux ventas' +GROUP BY `b`.`workerFk` diff --git a/db/routines/vn/views/salesPreparedLastHour.sql b/db/routines/vn/views/salesPreparedLastHour.sql new file mode 100644 index 000000000..caa7866cb --- /dev/null +++ b/db/routines/vn/views/salesPreparedLastHour.sql @@ -0,0 +1,46 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`salesPreparedLastHour` +AS SELECT `t`.`warehouseFk` AS `warehouseFk`, + `st`.`saleFk` AS `saleFk`, + `st`.`isChecked` AS `isChecked`, + `st`.`originalQuantity` AS `originalQuantity`, + `st`.`created` AS `created`, + `e`.`code` AS `code`, + `w`.`firstName` AS `firstname`, + `w`.`lastName` AS `lastName`, + `w`.`code` AS `workerCode`, + `ic`.`cm3delivery` * `s`.`quantity` / 1000 AS `litros`, + `s`.`concept` AS `concept`, + `d`.`name` AS `departmentName` +FROM ( + ( + ( + ( + ( + ( + ( + ( + `vn`.`saleTracking` `st` + LEFT JOIN `vn`.`salesPreviousPreparated` `prevPrepSales` ON(`prevPrepSales`.`saleFk` = `st`.`saleFk`) + ) + JOIN `vn`.`sale` `s` ON(`s`.`id` = `st`.`saleFk`) + ) + JOIN `vn`.`ticket` `t` ON(`t`.`id` = `s`.`ticketFk`) + ) + JOIN `vn`.`itemCost` `ic` ON( + `ic`.`warehouseFk` = `t`.`warehouseFk` + AND `ic`.`itemFk` = `s`.`itemFk` + ) + ) + JOIN `vn`.`worker` `w` ON(`w`.`id` = `st`.`workerFk`) + ) + JOIN `vn`.`state` `e` ON(`e`.`id` = `st`.`stateFk`) + ) + JOIN `vn`.`workerDepartment` `wd` ON(`wd`.`workerFk` = `st`.`workerFk`) + ) + JOIN `vn`.`department` `d` ON(`d`.`id` = `wd`.`departmentFk`) + ) +WHERE `st`.`created` > `util`.`VN_NOW`() + INTERVAL -1 HOUR + AND `prevPrepSales`.`saleFk` IS NULL + AND `d`.`name` NOT LIKE 'EQUIPO%' diff --git a/db/routines/vn/views/salesPreviousPreparated.sql b/db/routines/vn/views/salesPreviousPreparated.sql new file mode 100644 index 000000000..40ae29eda --- /dev/null +++ b/db/routines/vn/views/salesPreviousPreparated.sql @@ -0,0 +1,10 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`salesPreviousPreparated` +AS SELECT `st`.`saleFk` AS `saleFk` +FROM ( + `vn`.`saleTracking` `st` + JOIN `vn`.`state` `e` ON(`e`.`id` = `st`.`stateFk`) + ) +WHERE `st`.`created` > `util`.`VN_CURDATE`() + AND `e`.`code` LIKE 'PREVIOUS_PREPARATION' diff --git a/db/routines/vn/views/supplierPackaging.sql b/db/routines/vn/views/supplierPackaging.sql new file mode 100644 index 000000000..45a9d46d3 --- /dev/null +++ b/db/routines/vn/views/supplierPackaging.sql @@ -0,0 +1,33 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`supplierPackaging` +AS SELECT `e`.`supplierFk` AS `supplierFk`, + `b`.`itemFk` AS `itemFk`, + `i`.`longName` AS `longName`, + `s`.`name` AS `supplier`, + `b`.`entryFk` AS `entryFk`, + `tr`.`landed` AS `landed`, + - least(`b`.`quantity`, 0) AS `out`, + greatest(`b`.`quantity`, 0) AS `in`, + `w`.`name` AS `warehouse`, + `b`.`buyingValue` AS `buyingValue` +FROM ( + ( + ( + ( + ( + ( + `vn`.`buy` `b` + JOIN `vn`.`item` `i` ON(`i`.`id` = `b`.`itemFk`) + ) + JOIN `vn`.`packaging` `p` ON(`p`.`itemFk` = `i`.`id`) + ) + JOIN `vn`.`entry` `e` ON(`e`.`id` = `b`.`entryFk`) + ) + JOIN `vn`.`supplier` `s` ON(`s`.`id` = `e`.`supplierFk`) + ) + JOIN `vn`.`travel` `tr` ON(`tr`.`id` = `e`.`travelFk`) + ) + JOIN `vn`.`warehouse` `w` ON(`w`.`id` = `tr`.`warehouseInFk`) + ) +WHERE `p`.`isPackageReturnable` <> 0 diff --git a/db/routines/vn/views/tagL10n.sql b/db/routines/vn/views/tagL10n.sql new file mode 100644 index 000000000..982122b13 --- /dev/null +++ b/db/routines/vn/views/tagL10n.sql @@ -0,0 +1,12 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`tagL10n` +AS SELECT `t`.`id` AS `id`, + IFNULL(`i`.`name`, `t`.`name`) AS `name` +FROM ( + `vn`.`tag` `t` + LEFT JOIN `vn`.`tagI18n` `i` ON( + `i`.`tagFk` = `t`.`id` + AND `i`.`lang` = `util`.`LANG`() + ) + ) diff --git a/db/routines/vn/views/ticketDownBuffer.sql b/db/routines/vn/views/ticketDownBuffer.sql new file mode 100644 index 000000000..4d157f20c --- /dev/null +++ b/db/routines/vn/views/ticketDownBuffer.sql @@ -0,0 +1,22 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`ticketDownBuffer` +AS SELECT `td`.`ticketFk` AS `ticketFk`, + `td`.`created` AS `created`, + `td`.`selected` AS `selected`, + concat(`w`.`firstName`, ' ', `w`.`lastName`) AS `sacador`, + `pk`.`code` AS `parking` +FROM ( + ( + ( + ( + `vn`.`ticketDown` `td` + JOIN `vn`.`ticketParking` `tp` ON(`tp`.`ticketFk` = `td`.`ticketFk`) + ) + JOIN `vn`.`parking` `pk` ON(`pk`.`id` = `tp`.`parkingFk`) + ) + JOIN `vn`.`ticketStateToday` `tst` ON(`tst`.`ticketFk` = `td`.`ticketFk`) + ) + JOIN `vn`.`worker` `w` ON(`w`.`id` = `tst`.`userFk`) + ) +WHERE `td`.`selected` = 2 diff --git a/db/routines/vn/views/ticketLastUpdated.sql b/db/routines/vn/views/ticketLastUpdated.sql new file mode 100644 index 000000000..96b6eaa17 --- /dev/null +++ b/db/routines/vn/views/ticketLastUpdated.sql @@ -0,0 +1,7 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`ticketLastUpdated` +AS SELECT `ticketLastUpdatedList`.`ticketFk` AS `ticketFk`, + max(`ticketLastUpdatedList`.`created`) AS `lastUpdated` +FROM `vn`.`ticketLastUpdatedList` +GROUP BY `ticketLastUpdatedList`.`ticketFk` diff --git a/db/routines/vn/views/ticketLastUpdatedList.sql b/db/routines/vn/views/ticketLastUpdatedList.sql new file mode 100644 index 000000000..bfc769e47 --- /dev/null +++ b/db/routines/vn/views/ticketLastUpdatedList.sql @@ -0,0 +1,23 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`ticketLastUpdatedList` +AS SELECT `s`.`ticketFk` AS `ticketFk`, + `st`.`created` AS `created` +FROM ( + `vn`.`saleTracking` `st` + JOIN `vn`.`sale` `s` ON(`s`.`id` = `st`.`saleFk`) + ) +WHERE `st`.`created` > `util`.`VN_CURDATE`() +UNION ALL +SELECT `tt`.`ticketFk` AS `Id_Ticket`, + `tt`.`created` AS `odbc_date` +FROM `vn`.`ticketTracking` `tt` +WHERE `tt`.`created` > `util`.`VN_CURDATE`() +UNION ALL +SELECT `s`.`ticketFk` AS `ticketFk`, + `iss`.`created` AS `created` +FROM ( + `vn`.`itemShelvingSale` `iss` + JOIN `vn`.`sale` `s` ON(`s`.`id` = `iss`.`saleFk`) + ) +WHERE `iss`.`created` > `util`.`VN_CURDATE`() diff --git a/db/routines/vn/views/ticketMRW.sql b/db/routines/vn/views/ticketMRW.sql new file mode 100644 index 000000000..d612c8742 --- /dev/null +++ b/db/routines/vn/views/ticketMRW.sql @@ -0,0 +1,47 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`ticketMRW` +AS SELECT `Tickets`.`Id_Agencia` AS `id_Agencia`, + `Tickets`.`empresa_id` AS `empresa_id`, + `Consignatarios`.`consignatario` AS `Consignatario`, + `Consignatarios`.`domicilio` AS `DOMICILIO`, + `Consignatarios`.`poblacion` AS `POBLACION`, + `Consignatarios`.`codPostal` AS `CODPOSTAL`, + `Consignatarios`.`telefono` AS `telefono`, + IFNULL( + IFNULL( + IFNULL( + IFNULL(`Consignatarios`.`movil`, `Clientes`.`movil`), + `Consignatarios`.`telefono` + ), + `Clientes`.`telefono` + ), + 0 + ) AS `movil`, + `Clientes`.`if` AS `IF`, + `Tickets`.`Id_Ticket` AS `Id_Ticket`, + `Tickets`.`warehouse_id` AS `warehouse_id`, + `Consignatarios`.`id_consigna` AS `Id_Consigna`, + `Paises`.`Codigo` AS `CodigoPais`, + `Tickets`.`Fecha` AS `Fecha`, + `province`.`province_id` AS `province_id`, + `Tickets`.`landing` AS `landing` +FROM ( + ( + ( + ( + `vn2008`.`Clientes` + JOIN `vn2008`.`Consignatarios` ON( + `Clientes`.`id_cliente` = `Consignatarios`.`Id_cliente` + ) + ) + JOIN `vn2008`.`Tickets` ON( + `Consignatarios`.`id_consigna` = `Tickets`.`Id_Consigna` + ) + ) + JOIN `vn2008`.`province` ON( + `Consignatarios`.`province_id` = `province`.`province_id` + ) + ) + JOIN `vn2008`.`Paises` ON(`province`.`Paises_Id` = `Paises`.`Id`) + ) diff --git a/db/routines/vn/views/ticketNotInvoiced.sql b/db/routines/vn/views/ticketNotInvoiced.sql new file mode 100644 index 000000000..c35b414ce --- /dev/null +++ b/db/routines/vn/views/ticketNotInvoiced.sql @@ -0,0 +1,26 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`ticketNotInvoiced` +AS SELECT `t`.`companyFk` AS `companyFk`, + `cm`.`code` AS `companyCode`, + `t`.`clientFk` AS `clientFk`, + `c`.`name` AS `clientName`, + `t`.`shipped` AS `shipped`, + cast( + sum( + `s`.`quantity` * `s`.`price` * (100 - `s`.`discount`) / 100 + ) AS decimal(10, 2) + ) AS `value` +FROM ( + ( + ( + `vn`.`ticket` `t` + JOIN `vn`.`sale` `s` ON(`s`.`ticketFk` = `t`.`id`) + ) + JOIN `vn`.`client` `c` ON(`c`.`id` = `t`.`clientFk`) + ) + JOIN `vn`.`company` `cm` ON(`cm`.`id` = `t`.`companyFk`) + ) +WHERE `t`.`refFk` IS NULL + AND `t`.`shipped` > '2017-01-01' +GROUP BY `t`.`id` diff --git a/db/routines/vn/views/ticketPackingList.sql b/db/routines/vn/views/ticketPackingList.sql new file mode 100644 index 000000000..bafe3c00c --- /dev/null +++ b/db/routines/vn/views/ticketPackingList.sql @@ -0,0 +1,38 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`ticketPackingList` +AS SELECT `t`.`nickname` AS `nickname`, + `t`.`id` AS `ticketFk`, + `am`.`name` AS `agencyMode`, + `am`.`flag` AS `flag`, + `p`.`name` AS `province`, + `s`.`itemFk` AS `itemFk`, + `s`.`concept` AS `concept`, + `s`.`quantity` AS `quantity`, + `sv`.`litros` AS `litros`, + `to`.`description` AS `observaciones` +FROM ( + ( + ( + ( + ( + ( + ( + `vn`.`ticket` `t` + JOIN `vn`.`address` `a` ON(`a`.`id` = `t`.`addressFk`) + ) + JOIN `vn`.`province` `p` ON(`p`.`id` = `a`.`provinceFk`) + ) + JOIN `vn`.`agencyMode` `am` ON(`am`.`id` = `t`.`agencyModeFk`) + ) + LEFT JOIN `vn`.`sale` `s` ON(`s`.`ticketFk` = `t`.`id`) + ) + LEFT JOIN `vn`.`saleVolume` `sv` ON(`sv`.`saleFk` = `s`.`id`) + ) + JOIN `vn`.`observationType` `ot` ON(`ot`.`code` = 'packager') + ) + LEFT JOIN `vn`.`ticketObservation` `to` ON( + `to`.`ticketFk` = `t`.`id` + AND `ot`.`id` = `to`.`observationTypeFk` + ) + ) diff --git a/db/routines/vn/views/ticketPreviousPreparingList.sql b/db/routines/vn/views/ticketPreviousPreparingList.sql new file mode 100644 index 000000000..9c84b8af3 --- /dev/null +++ b/db/routines/vn/views/ticketPreviousPreparingList.sql @@ -0,0 +1,36 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`ticketPreviousPreparingList` +AS SELECT `s`.`ticketFk` AS `ticketFk`, + `w`.`code` AS `code`, + COUNT(`s`.`id`) AS `saleLines`, + sum(`s`.`isPicked` <> 0) AS `alreadyMadeSaleLines`, + sum(`s`.`isPicked` <> 0) / COUNT(`s`.`id`) AS `madeRate`, + `sg`.`created` AS `created`, + `p`.`code` AS `parking`, + `iss`.`sectorFk` AS `sectorFk`, + `al`.`code` AS `alertCode` +FROM ( + ( + ( + ( + ( + ( + ( + `vn`.`saleGroup` `sg` + JOIN `vn`.`saleGroupDetail` `sgd` ON(`sgd`.`saleGroupFk` = `sg`.`id`) + ) + JOIN `vn`.`sale` `s` ON(`s`.`id` = `sgd`.`saleFk`) + ) + JOIN `vn`.`ticketState` `tls` ON(`tls`.`ticketFk` = `s`.`ticketFk`) + ) + JOIN `vn`.`alertLevel` `al` ON(`al`.`id` = `tls`.`alertLevel`) + ) + JOIN `vn`.`worker` `w` ON(`w`.`id` = `sg`.`userFk`) + ) + LEFT JOIN `vn`.`parking` `p` ON(`p`.`id` = `sg`.`parkingFk`) + ) + JOIN `vn`.`itemShelvingStock` `iss` ON(`iss`.`itemFk` = `s`.`itemFk`) + ) +WHERE `sg`.`created` >= `util`.`VN_CURDATE`() + INTERVAL 0.1 DAY +GROUP BY `sg`.`id` diff --git a/db/routines/vn/views/ticketState.sql b/db/routines/vn/views/ticketState.sql new file mode 100644 index 000000000..118a58b34 --- /dev/null +++ b/db/routines/vn/views/ticketState.sql @@ -0,0 +1,20 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`ticketState` +AS SELECT `tt`.`created` AS `updated`, + `tt`.`stateFk` AS `stateFk`, + `tt`.`userFk` AS `userFk`, + `tls`.`ticketFk` AS `ticketFk`, + `s`.`id` AS `state`, + `s`.`order` AS `productionOrder`, + `s`.`alertLevel` AS `alertLevel`, + `s`.`code` AS `code`, + `s`.`isPreviousPreparable` AS `isPreviousPreparable`, + `s`.`isPicked` AS `isPicked` +FROM ( + ( + `vn`.`ticketLastState` `tls` + JOIN `vn`.`ticketTracking` `tt` ON(`tt`.`id` = `tls`.`ticketTrackingFk`) + ) + JOIN `vn`.`state` `s` ON(`s`.`id` = `tt`.`stateFk`) + ) diff --git a/db/routines/vn/views/ticketStateToday.sql b/db/routines/vn/views/ticketStateToday.sql new file mode 100644 index 000000000..1f10aceb1 --- /dev/null +++ b/db/routines/vn/views/ticketStateToday.sql @@ -0,0 +1,16 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`ticketStateToday` +AS SELECT `ts`.`ticketFk` AS `ticketFk`, + `ts`.`state` AS `state`, + `ts`.`productionOrder` AS `productionOrder`, + `ts`.`alertLevel` AS `alertLevel`, + `ts`.`userFk` AS `userFk`, + `ts`.`code` AS `code`, + `ts`.`updated` AS `updated`, + `ts`.`isPicked` AS `isPicked` +FROM ( + `vn`.`ticketState` `ts` + JOIN `vn`.`ticket` `t` ON(`t`.`id` = `ts`.`ticketFk`) + ) +WHERE `t`.`shipped` BETWEEN `util`.`VN_CURDATE`() AND `MIDNIGHT`(`util`.`VN_CURDATE`()) diff --git a/db/routines/vn/views/ticketToPrepare.sql b/db/routines/vn/views/ticketToPrepare.sql new file mode 100644 index 000000000..98302b60d --- /dev/null +++ b/db/routines/vn/views/ticketToPrepare.sql @@ -0,0 +1,58 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`ticketToPrepare` +AS SELECT `m`.`Id_Ticket` AS `Id_Ticket`, + `mk`.`Id_Movimiento` AS `Id_Movimiento`, + `mk`.`Id_Movimiento_mark` AS `Id_Movimiento_mark`, + `mk`.`Id_Trabajador` AS `Id_Trabjador`, + `m`.`Id_Article` AS `Id_Article`, + `m`.`Concepte` AS `Concepte`, + `art`.`subName` AS `subName`, + `mk`.`original_quantity` - IFNULL(`is`.`quantity`, 0) AS `Cantidad`, + `mk`.`original_quantity` AS `original_quantity`, + IF( + HOUR(`t`.`shipped`), + HOUR(`t`.`shipped`), + HOUR(`z`.`hour`) + ) AS `Hora`, + HOUR(`t`.`shipped`) AS `Departure`, + MINUTE(`t`.`shipped`) AS `Minuto`, + `am`.`agencyFk` AS `agency_id`, + `t`.`warehouseFk` AS `warehouse_id`, + `a`.`provinceFk` AS `province_id`, + `is`.`quantity` AS `picked`, + `t`.`zoneFk` AS `zoneFk`, + `p`.`sectorFk` AS `sectorFk` +FROM ( + ( + ( + ( + ( + ( + ( + ( + ( + ( + `vn2008`.`Movimientos_mark` `mk` + JOIN `vn2008`.`Movimientos` `m` ON(`m`.`Id_Movimiento` = `mk`.`Id_Movimiento`) + ) + JOIN `vn`.`ticket` `t` ON(`m`.`Id_Ticket` = `t`.`id`) + ) + JOIN `vn`.`agencyMode` `am` ON(`am`.`id` = `t`.`agencyModeFk`) + ) + JOIN `vn`.`address` `a` ON(`a`.`id` = `t`.`addressFk`) + ) + LEFT JOIN `vn`.`itemShelvingSale` `is` ON(`is`.`saleFk` = `mk`.`Id_Movimiento`) + ) + LEFT JOIN `vn`.`itemShelving` `ish` ON(`ish`.`id` = `is`.`itemShelvingFk`) + ) + LEFT JOIN `vn`.`shelving` `sh` ON(`sh`.`code` = `ish`.`shelvingFk`) + ) + LEFT JOIN `vn`.`parking` `p` ON(`p`.`id` = `sh`.`parkingFk`) + ) + LEFT JOIN `vn2008`.`Articles` `art` ON(`art`.`Id_Article` = `m`.`Id_Article`) + ) + LEFT JOIN `vn`.`zone` `z` ON(`z`.`id` = `t`.`zoneFk`) + ) +WHERE `mk`.`stateFk` = 26 + AND `mk`.`valor` <> 1 diff --git a/db/routines/vn/views/ticketeToPreparePrepared.sql b/db/routines/vn/views/ticketeToPreparePrepared.sql new file mode 100644 index 000000000..76e840816 --- /dev/null +++ b/db/routines/vn/views/ticketeToPreparePrepared.sql @@ -0,0 +1,47 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`ticketeToPreparePrepared` +AS SELECT `m`.`Id_Ticket` AS `Id_Ticket`, + `mk`.`Id_Movimiento` AS `Id_Movimiento`, + `mk`.`Id_Movimiento_mark` AS `Id_Movimiento_mark`, + `mk`.`Id_Trabajador` AS `Id_Trabjador`, + `m`.`Id_Article` AS `Id_Article`, + `m`.`Concepte` AS `Concepte`, + `art`.`subName` AS `subName`, + `mk`.`original_quantity` - IFNULL(`is`.`quantity`, 0) AS `Cantidad`, + `mk`.`original_quantity` AS `original_quantity`, + HOUR(`t`.`shipped`) AS `Hora`, + HOUR(`t`.`shipped`) AS `Departure`, + MINUTE(`t`.`shipped`) AS `Minuto`, + `am`.`agencyFk` AS `agency_id`, + `t`.`warehouseFk` AS `warehouse_id`, + `a`.`provinceFk` AS `province_id`, + `is`.`quantity` AS `picked`, + `t`.`CodigoTrabajador` AS `trabajador`, + `is`.`sectorFk` AS `sectorFk` +FROM ( + ( + ( + ( + ( + ( + ( + ( + `vn2008`.`Movimientos_mark` `mk` + JOIN `vn`.`state` `st` ON(`st`.`id` = `mk`.`stateFk`) + ) + JOIN `vn2008`.`Movimientos` `m` ON(`m`.`Id_Movimiento` = `mk`.`Id_Movimiento`) + ) + JOIN `vn`.`ticket` `t` ON(`m`.`Id_Ticket` = `t`.`id`) + ) + JOIN `vn`.`agencyMode` `am` ON(`am`.`id` = `t`.`agencyModeFk`) + ) + JOIN `vn`.`address` `a` ON(`a`.`id` = `t`.`addressFk`) + ) + LEFT JOIN `vn`.`itemShelvingSaleSum` `is` ON(`is`.`saleFk` = `mk`.`Id_Movimiento`) + ) + JOIN `vn2008`.`Articles` `art` ON(`art`.`Id_Article` = `m`.`Id_Article`) + ) + LEFT JOIN `vn2008`.`Trabajadores` `t` ON(`t`.`Id_Trabajador` = `mk`.`Id_Trabajador`) + ) +WHERE `st`.`code` LIKE 'PREVIOUS_PREPARATION' diff --git a/db/routines/vn/views/tr2.sql b/db/routines/vn/views/tr2.sql new file mode 100644 index 000000000..5abc2bfa8 --- /dev/null +++ b/db/routines/vn/views/tr2.sql @@ -0,0 +1,19 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`tr2` +AS SELECT `vn`.`travel`.`id` AS `id`, + `vn`.`travel`.`shipped` AS `shipped`, + `vn`.`travel`.`shipmentHour` AS `shipmentHour`, + `vn`.`travel`.`landed` AS `landed`, + `vn`.`travel`.`landingHour` AS `landingHour`, + `vn`.`travel`.`warehouseInFk` AS `warehouseInFk`, + `vn`.`travel`.`warehouseOutFk` AS `warehouseOutFk`, + `vn`.`travel`.`agencyModeFk` AS `agencyFk`, + `vn`.`travel`.`ref` AS `ref`, + `vn`.`travel`.`isDelivered` AS `isDelivered`, + `vn`.`travel`.`isReceived` AS `isReceived`, + `vn`.`travel`.`m3` AS `m3`, + `vn`.`travel`.`kg` AS `kg`, + `vn`.`travel`.`cargoSupplierFk` AS `cargoSupplierFk`, + `vn`.`travel`.`totalEntries` AS `totalEntries` +FROM `vn`.`travel` diff --git a/db/routines/vn/views/traceabilityBuy.sql b/db/routines/vn/views/traceabilityBuy.sql new file mode 100644 index 000000000..0257c2f5d --- /dev/null +++ b/db/routines/vn/views/traceabilityBuy.sql @@ -0,0 +1,23 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`traceabilityBuy` +AS SELECT `b`.`id` AS `buyFk`, + `b`.`quantity` AS `quantity`, + `tr`.`landed` AS `landed`, + `w`.`name` AS `warehouseName`, + `b`.`entryFk` AS `entryFk`, + `s`.`name` AS `supplierName`, + IFNULL(`b`.`itemOriginalFk`, `b`.`itemFk`) AS `itemFk` +FROM ( + ( + ( + ( + `vn`.`buy` `b` + JOIN `vn`.`entry` `e` ON(`e`.`id` = `b`.`entryFk`) + ) + JOIN `vn`.`travel` `tr` ON(`tr`.`id` = `e`.`travelFk`) + ) + JOIN `vn`.`supplier` `s` ON(`s`.`id` = `e`.`supplierFk`) + ) + JOIN `vn`.`warehouse` `w` ON(`w`.`id` = `tr`.`warehouseInFk`) + ) diff --git a/db/routines/vn/views/traceabilitySale.sql b/db/routines/vn/views/traceabilitySale.sql new file mode 100644 index 000000000..9caf11d5e --- /dev/null +++ b/db/routines/vn/views/traceabilitySale.sql @@ -0,0 +1,19 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`traceabilitySale` +AS SELECT `s`.`ticketFk` AS `ticketFk`, + `sb`.`buyFk` AS `buyFk`, + `t`.`shipped` AS `shipped`, + `t`.`nickname` AS `nickname`, + `s`.`quantity` AS `quantity`, + concat(`w`.`firstName`, ' ', `w`.`lastName`) AS `worker` +FROM ( + ( + ( + `vn`.`saleBuy` `sb` + JOIN `vn`.`sale` `s` ON(`s`.`id` = `sb`.`saleFk`) + ) + JOIN `vn`.`ticket` `t` ON(`t`.`id` = `s`.`ticketFk`) + ) + JOIN `vn`.`worker` `w` ON(`w`.`id` = `sb`.`workerFk`) + ) diff --git a/db/routines/vn/views/workerBusinessDated.sql b/db/routines/vn/views/workerBusinessDated.sql new file mode 100644 index 000000000..83d6eb48c --- /dev/null +++ b/db/routines/vn/views/workerBusinessDated.sql @@ -0,0 +1,13 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`workerBusinessDated` +AS SELECT `t`.`dated` AS `dated`, + `b`.`id` AS `businessFk`, + `b`.`workerFk` AS `workerFk` +FROM ( + `vn`.`time` `t` + LEFT JOIN `vn`.`business` `b` ON( + `t`.`dated` BETWEEN `b`.`started` AND IFNULL(`b`.`ended`, `util`.`VN_CURDATE`()) + ) + ) +WHERE `t`.`dated` > `util`.`VN_CURDATE`() + INTERVAL -2 year diff --git a/db/routines/vn/views/workerDepartment.sql b/db/routines/vn/views/workerDepartment.sql new file mode 100644 index 000000000..4be3122da --- /dev/null +++ b/db/routines/vn/views/workerDepartment.sql @@ -0,0 +1,9 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`workerDepartment` +AS SELECT `b`.`workerFk` AS `workerFk`, + `b`.`departmentFk` AS `departmentFk` +FROM ( + `vn`.`business` `b` + JOIN `vn`.`worker` `w` ON(`w`.`businessFk` = `b`.`id`) + ) diff --git a/db/routines/vn/views/workerLabour.sql b/db/routines/vn/views/workerLabour.sql new file mode 100644 index 000000000..2f4067c2d --- /dev/null +++ b/db/routines/vn/views/workerLabour.sql @@ -0,0 +1,12 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`workerLabour` +AS SELECT `b`.`id` AS `businessFk`, + `b`.`workerFk` AS `workerFk`, + `b`.`workcenterFk` AS `workCenterFk`, + `b`.`started` AS `started`, + `b`.`ended` AS `ended`, + `b`.`departmentFk` AS `departmentFk`, + `b`.`payedHolidays` AS `payedHolidays` +FROM `vn`.`business` `b` +ORDER BY `b`.`started` DESC diff --git a/db/routines/vn/views/workerMedia.sql b/db/routines/vn/views/workerMedia.sql new file mode 100644 index 000000000..72ee04299 --- /dev/null +++ b/db/routines/vn/views/workerMedia.sql @@ -0,0 +1,7 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`workerMedia` +AS SELECT `w`.`id` AS `workerFk`, + `w`.`phone` AS `mediaValue` +FROM `vn`.`worker` `w` +WHERE `w`.`phone` IS NOT NULL diff --git a/db/routines/vn/views/workerSpeedExpedition.sql b/db/routines/vn/views/workerSpeedExpedition.sql new file mode 100644 index 000000000..db13cf16a --- /dev/null +++ b/db/routines/vn/views/workerSpeedExpedition.sql @@ -0,0 +1,25 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`workerSpeedExpedition` +AS SELECT `sv`.`ticketFk` AS `ticketFk`, + sum(`sv`.`litros`) AS `litros`, + sum( + IF( + `sub`.`started` > `util`.`VN_NOW`() + INTERVAL -1 HOUR, + `sv`.`litros`, + 0 + ) + ) AS `literLastHour`, + cast( + 60 * sum(`sv`.`litros`) / time_to_sec( + timediff(max(`sub`.`finished`), min(`sub`.`started`)) + ) AS decimal(10, 1) + ) AS `litersByMinute`, + `sub`.`code` AS `workerCode`, + `sub`.`cajas` AS `cajas`, + `sub`.`warehouseFk` AS `warehouseFk` +FROM ( + `vn`.`saleVolume` `sv` + JOIN `vn`.`expeditionTimeExpended` `sub` ON(`sub`.`ticketFk` = `sv`.`ticketFk`) + ) +GROUP BY `sub`.`code` diff --git a/db/routines/vn/views/workerSpeedSaleTracking.sql b/db/routines/vn/views/workerSpeedSaleTracking.sql new file mode 100644 index 000000000..21f07ea8a --- /dev/null +++ b/db/routines/vn/views/workerSpeedSaleTracking.sql @@ -0,0 +1,29 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`workerSpeedSaleTracking` +AS SELECT `salesPreparedLastHour`.`warehouseFk` AS `warehouseFk`, + `salesPreparedLastHour`.`code` AS `state`, + `salesPreparedLastHour`.`workerCode` AS `workerCode`, + sum(`salesPreparedLastHour`.`litros`) AS `sumaLitros`, + min(`salesPreparedLastHour`.`created`) AS `started`, + max(`salesPreparedLastHour`.`created`) AS `finished`, + sum( + IF( + `salesPreparedLastHour`.`created` >= `util`.`VN_NOW`() + INTERVAL -1 HOUR, + `salesPreparedLastHour`.`litros`, + 0 + ) + ) AS `sumaLitrosLastHour`, + cast( + 60 * sum(`salesPreparedLastHour`.`litros`) / time_to_sec( + timediff( + max(`salesPreparedLastHour`.`created`), + min(`salesPreparedLastHour`.`created`) + ) + ) AS decimal(10, 1) + ) AS `litersByMinute`, + `salesPreparedLastHour`.`departmentName` AS `departmentName` +FROM `vn`.`salesPreparedLastHour` +GROUP BY `salesPreparedLastHour`.`warehouseFk`, + `salesPreparedLastHour`.`code`, + `salesPreparedLastHour`.`workerCode` diff --git a/db/routines/vn/views/workerTeamCollegues.sql b/db/routines/vn/views/workerTeamCollegues.sql new file mode 100644 index 000000000..dbe245a16 --- /dev/null +++ b/db/routines/vn/views/workerTeamCollegues.sql @@ -0,0 +1,9 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`workerTeamCollegues` +AS SELECT DISTINCT `w`.`workerFk` AS `workerFk`, + `t`.`workerFk` AS `collegueFk` +FROM ( + `vn`.`workerTeam` `w` + JOIN `vn`.`workerTeam` `t` ON(`w`.`team` = `t`.`team`) + ) diff --git a/db/routines/vn/views/workerTimeControlUserInfo.sql b/db/routines/vn/views/workerTimeControlUserInfo.sql new file mode 100644 index 000000000..eea8ffd7c --- /dev/null +++ b/db/routines/vn/views/workerTimeControlUserInfo.sql @@ -0,0 +1,20 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`workerTimeControlUserInfo` +AS SELECT `u`.`id` AS `userFk`, + `w`.`firstName` AS `name`, + `w`.`lastName` AS `surname`, + `u`.`name` AS `user`, + `u`.`password` AS `password`, + `wd`.`departmentFk` AS `departmentFk`, + left(`c`.`fi`, 8) AS `dni` +FROM ( + ( + ( + `account`.`user` `u` + JOIN `vn`.`worker` `w` ON(`w`.`id` = `u`.`id`) + ) + JOIN `vn`.`client` `c` ON(`c`.`id` = `u`.`id`) + ) + LEFT JOIN `vn`.`workerDepartment` `wd` ON(`wd`.`workerFk` = `w`.`id`) + ) diff --git a/db/routines/vn/views/workerTimeJourneyNG.sql b/db/routines/vn/views/workerTimeJourneyNG.sql new file mode 100644 index 000000000..b45b855b7 --- /dev/null +++ b/db/routines/vn/views/workerTimeJourneyNG.sql @@ -0,0 +1,13 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`workerTimeJourneyNG` +AS SELECT `wtc`.`userFk` AS `userFk`, + cast(`wtc`.`timed` AS date) AS `dated`, + IF(`wtc`.`order` MOD 2, -1, 1) * (HOUR(`wtc`.`timed`) + MINUTE(`wtc`.`timed`) / 60) AS `Journey`, + dayname(`wtc`.`timed`) AS `dayName`, + `w`.`lastName` AS `name`, + `w`.`firstName` AS `firstname` +FROM ( + `vn`.`workerTimeControl` `wtc` + JOIN `vn`.`worker` `w` ON(`w`.`id` = `wtc`.`userFk`) + ) diff --git a/db/routines/vn/views/workerWithoutTractor.sql b/db/routines/vn/views/workerWithoutTractor.sql new file mode 100644 index 000000000..e0c0978a5 --- /dev/null +++ b/db/routines/vn/views/workerWithoutTractor.sql @@ -0,0 +1,20 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`workerWithoutTractor` +AS SELECT `c`.`workerFk` AS `workerFk`, + `cl`.`name` AS `Trabajador`, + COUNT(DISTINCT `c`.`id`) AS `Colecciones`, + max(`c`.`created`) AS `created` +FROM ( + ( + `vn`.`collection` `c` + JOIN `vn`.`client` `cl` ON(`cl`.`id` = `c`.`workerFk`) + ) + LEFT JOIN `vn`.`machineWorker` `mw` ON( + `mw`.`workerFk` = `c`.`workerFk` + AND `mw`.`inTimed` > `util`.`VN_CURDATE`() + ) + ) +WHERE `c`.`created` > `util`.`VN_CURDATE`() + AND `mw`.`workerFk` IS NULL +GROUP BY `c`.`workerFk` diff --git a/db/routines/vn/views/zoneEstimatedDelivery.sql b/db/routines/vn/views/zoneEstimatedDelivery.sql new file mode 100644 index 000000000..90c7381d8 --- /dev/null +++ b/db/routines/vn/views/zoneEstimatedDelivery.sql @@ -0,0 +1,45 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`zoneEstimatedDelivery` +AS SELECT `t`.`zoneFk` AS `zoneFk`, + `zc`.`hour` AS `zoneClosureHour`, + `z`.`hour` AS `zoneHour`, + `sv`.`volume` AS `volume`, + `al`.`hasToRecalcPrice` AS `hasToRecalcPrice`, + `lhp`.`m3` AS `m3`, + `dl`.`minSpeed` AS `minSpeed` +FROM ( + ( + ( + ( + ( + ( + ( + ( + ( + `vn`.`ticket` `t` + JOIN `vn`.`ticketStateToday` `tst` ON(`tst`.`ticketFk` = `t`.`id`) + ) + JOIN `vn`.`state` `s` ON(`s`.`id` = `tst`.`state`) + ) + JOIN `vn`.`saleVolume` `sv` ON(`sv`.`ticketFk` = `t`.`id`) + ) + LEFT JOIN `vn`.`lastHourProduction` `lhp` ON(`lhp`.`warehouseFk` = `t`.`warehouseFk`) + ) + JOIN `vn`.`warehouse` `w` ON(`w`.`id` = `t`.`warehouseFk`) + ) + ) STRAIGHT_JOIN `vn`.`zone` `z` ON(`z`.`id` = `t`.`zoneFk`) + ) + LEFT JOIN `vn`.`zoneClosure` `zc` ON( + `zc`.`zoneFk` = `t`.`zoneFk` + AND `zc`.`dated` = `util`.`VN_CURDATE`() + ) + ) + LEFT JOIN `cache`.`departure_limit` `dl` ON( + `dl`.`warehouse_id` = `t`.`warehouseFk` + AND `dl`.`fecha` = `util`.`VN_CURDATE`() + ) + ) + JOIN `vn`.`alertLevel` `al` ON(`al`.`id` = `s`.`alertLevel`) +WHERE `w`.`hasProduction` <> 0 + AND cast(`t`.`shipped` AS date) = `util`.`VN_CURDATE`() \ No newline at end of file diff --git a/db/routines/vn2008/events/raidUpdate.sql b/db/routines/vn2008/events/raidUpdate.sql new file mode 100644 index 000000000..aacfd6dcd --- /dev/null +++ b/db/routines/vn2008/events/raidUpdate.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `vn2008`.`raidUpdate` + ON SCHEDULE EVERY 1 DAY + STARTS '2017-12-29 00:05:00.000' + ON COMPLETION PRESERVE + ENABLE +DO CALL raidUpdate$$ +DELIMITER ; diff --git a/db/routines/vn2008/procedures/account_conciliacion_add.sql b/db/routines/vn2008/procedures/account_conciliacion_add.sql new file mode 100644 index 000000000..94ef0b14b --- /dev/null +++ b/db/routines/vn2008/procedures/account_conciliacion_add.sql @@ -0,0 +1,33 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`account_conciliacion_add`() +BEGIN + UPDATE account_conciliacion ac + JOIN + ( + SELECT idaccount_conciliacion, @c:= if(@id = id_calculated, @c + 1, 1) contador, + @id:= id_calculated as id_calculated, concat(id_calculated,'(',@c,')') as new_id + FROM account_conciliacion + JOIN + ( + select id_calculated, count(*) rep, @c:= 0, @id:= concat('-',id_calculated) + from account_conciliacion + group by id_calculated + having rep > 1 + ) sub using(id_calculated) + ) sub2 using(idaccount_conciliacion) + SET ac.id_calculated = sub2.new_id; + + INSERT INTO Cajas(Cajafecha, Partida, Serie, Concepto, Entrada, + Salida, Id_Banco,empresa_id, warehouse_id, + Proveedores_account_id, id_calculated, InForeignValue, OutForeignValue, Id_Trabajador) + SELECT Fechaoperacion, TRUE, 'MB', ac.Concepto, IF(DebeHaber = 2 AND currencyFk = 1, importe,null), + IF(DebeHaber = 1 AND currencyFk = 1, importe, null), a.id, sa.supplierFk, 1, + ac.Id_Proveedores_account, ac.id_calculated, IF(DebeHaber = 2 AND NOT currencyFk = 1, importe, null), + IF(DebeHaber = 1 AND NOT currencyFk = 1, importe, null), account.myUser_getId() + FROM account_conciliacion ac + JOIN vn.supplierAccount sa on sa.id = ac.Id_Proveedores_account + JOIN vn.accounting a ON a.id = sa.accountingFk + LEFT JOIN Cajas c on c.id_calculated = ac.id_calculated + WHERE c.Id_Caja IS NULL; +END$$ +DELIMITER ; diff --git a/db/routines/vn2008/procedures/agencia_volume.sql b/db/routines/vn2008/procedures/agencia_volume.sql new file mode 100644 index 000000000..ea631793d --- /dev/null +++ b/db/routines/vn2008/procedures/agencia_volume.sql @@ -0,0 +1,44 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`agencia_volume`() +BEGIN + DECLARE vStarted DATETIME DEFAULT TIMESTAMP(util.VN_CURDATE()); + DECLARE vEnded DATETIME DEFAULT TIMESTAMP(util.VN_CURDATE(), '23:59:59'); + + DROP TEMPORARY TABLE IF EXISTS tmp.ticket_PackagingEstimated; + CREATE TEMPORARY TABLE tmp.ticket_PackagingEstimated + ( + ticketFk INT PRIMARY KEY + ,boxes INT DEFAULT 0 + ); + + INSERT INTO tmp.ticket_PackagingEstimated(ticketFk, boxes) + SELECT sv.ticketFk, CEIL(1000 * sum(sv.volume) / vc.standardFlowerBox) + FROM vn.ticket t + JOIN vn.saleVolume sv ON sv.ticketFk = t.id + JOIN vn.volumeConfig vc + WHERE t.shipped BETWEEN vStarted AND vEnded + AND IFNULL(t.packages,0) = 0 + GROUP BY t.id; + SELECT * FROM + ( + SELECT ag.id agency_id, + CONCAT(RPAD(c.country, 16,' _') ,' ',ag.name) Agencia, + count(*) expediciones, + sum(t.packages) Bultos, + sum(tpe.boxes) Faltan + FROM vn.ticket t + JOIN vn.warehouse w ON w.id = t.warehouseFk + JOIN vn.country c ON w.countryFk = c.id + JOIN vn.address a ON a.id = t.addressFk + JOIN vn.agencyMode am ON am.id = t.agencyModeFk + JOIN vn.agency ag ON ag.id = am.agencyFk + JOIN tmp.ticket_PackagingEstimated tpe ON tpe.ticketFk = t.id + WHERE t.shipped BETWEEN vStarted AND vEnded + AND ag.isOwn = FALSE + GROUP BY ag.id + ) sub + ORDER BY Agencia; + + DROP TEMPORARY TABLE tmp.ticket_PackagingEstimated; +END$$ +DELIMITER ; diff --git a/db/routines/vn2008/procedures/article.sql b/db/routines/vn2008/procedures/article.sql new file mode 100644 index 000000000..3c2664c0f --- /dev/null +++ b/db/routines/vn2008/procedures/article.sql @@ -0,0 +1,15 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`article`() +BEGIN +/** + * Crea la tabla temporal: article_inventory + */ + DROP TEMPORARY TABLE IF EXISTS article_inventory; + CREATE TEMPORARY TABLE article_inventory + ( + `article_id` INT(11) NOT NULL PRIMARY KEY, + `future` DATETIME + ) + ENGINE = MEMORY; +END$$ +DELIMITER ; diff --git a/db/routines/vn2008/procedures/article_multiple_buy.sql b/db/routines/vn2008/procedures/article_multiple_buy.sql new file mode 100644 index 000000000..5b0d402c5 --- /dev/null +++ b/db/routines/vn2008/procedures/article_multiple_buy.sql @@ -0,0 +1,6 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`article_multiple_buy`(v_date DATETIME, wh INT) +BEGIN + CALL vn.item_multipleBuy(v_date, wh); +END$$ +DELIMITER ; diff --git a/db/routines/vn2008/procedures/article_multiple_buy_date.sql b/db/routines/vn2008/procedures/article_multiple_buy_date.sql new file mode 100644 index 000000000..7b197cb01 --- /dev/null +++ b/db/routines/vn2008/procedures/article_multiple_buy_date.sql @@ -0,0 +1,9 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`article_multiple_buy_date`( + IN vDated DATETIME, + IN vWarehouseFk TINYINT(3) +) +BEGIN + CALL vn.item_multipleBuyByDate(vDated, vWarehouseFk); +END$$ +DELIMITER ; diff --git a/db/routines/vn2008/procedures/availableTraslate.sql b/db/routines/vn2008/procedures/availableTraslate.sql new file mode 100644 index 000000000..a3d2c8bea --- /dev/null +++ b/db/routines/vn2008/procedures/availableTraslate.sql @@ -0,0 +1,126 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`availableTraslate`( + vWarehouseLanding INT, + vDated DATE, + vWarehouseShipment INT) +proc: BEGIN + DECLARE vDatedFrom DATE; + DECLARE vDatedTo DATETIME; + DECLARE vDatedReserve DATETIME; + DECLARE vDatedInventory DATE; + + IF vDated < util.VN_CURDATE() THEN + LEAVE proc; + END IF; + + CALL vn.item_getStock (vWarehouseLanding, vDated, NULL); + + -- 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 SUBTIME(util.VN_NOW(), reserveTime) INTO vDatedReserve + FROM hedera.orderConfig; + + -- Calcula el ultimo dia de vida para cada producto + DROP TEMPORARY TABLE IF EXISTS itemRange; + CREATE TEMPORARY TABLE itemRange + (PRIMARY KEY (itemFk)) + ENGINE = MEMORY + SELECT c.itemFk, MAX(t.landed) dated + FROM vn.buy c + JOIN vn.entry e ON c.entryFk = e.id + JOIN vn.travel t ON t.id = e.travelFk + JOIN vn.warehouse w ON w.id = t.warehouseInFk + WHERE t.landed BETWEEN vDatedInventory AND vDatedFrom + AND t.warehouseInFk = vWarehouseLanding + AND NOT e.isExcludedFromAvailable + AND NOT e.isRaid + GROUP BY c.itemFk; + + -- Tabla con el ultimo dia de last_buy para cada producto que hace un replace de la anterior + CALL vn.buyUltimate(vWarehouseShipment, util.VN_CURDATE()); + + INSERT INTO itemRange + SELECT t.itemFk, tr.landed + FROM tmp.buyUltimate t + JOIN vn.buy b ON b.id = t.buyFk + JOIN vn.entry e ON e.id = b.entryFk + JOIN vn.travel tr ON tr.id = e.travelFk + LEFT JOIN itemRange i ON t.itemFk = i.itemFk + WHERE t.warehouseFk = vWarehouseShipment + AND NOT e.isRaid + ON DUPLICATE KEY UPDATE itemRange.dated = GREATEST(itemRange.dated, tr.landed); + + DROP TEMPORARY TABLE IF EXISTS itemRangeLive; + CREATE TEMPORARY TABLE itemRangeLive + (PRIMARY KEY (itemFk)) + ENGINE = MEMORY + SELECT ir.itemFk, TIMESTAMP(TIMESTAMPADD(DAY, it.life, ir.dated), '23:59:59') dated + FROM itemRange ir + JOIN vn.item i ON i.id = ir.itemFk + JOIN vn.itemType it ON it.id = i.typeFk + HAVING dated >= vDatedFrom OR dated IS NULL; + + -- Calcula el ATP + DROP TEMPORARY TABLE IF EXISTS tmp.itemCalc; + CREATE TEMPORARY TABLE tmp.itemCalc + (INDEX (itemFk,warehouseFk)) + ENGINE = MEMORY + SELECT i.itemFk, vWarehouseLanding warehouseFk, i.shipped dated, i.quantity + FROM vn.itemTicketOut i + JOIN itemRangeLive ir ON ir.itemFK = i.itemFk + WHERE i.shipped >= vDatedFrom + AND (ir.dated IS NULL OR i.shipped <= ir.dated) + AND i.warehouseFk = vWarehouseLanding + UNION ALL + SELECT b.itemFk, vWarehouseLanding, t.landed, b.quantity + FROM vn.buy b + JOIN vn.entry e ON b.entryFk = e.id + JOIN vn.travel t ON t.id = e.travelFk + JOIN itemRangeLive ir ON ir.itemFk = b.itemFk + WHERE NOT e.isExcludedFromAvailable + AND b.quantity <> 0 + AND NOT e.isRaid + AND t.warehouseInFk = vWarehouseLanding + AND t.landed >= vDatedFrom + AND (ir.dated IS NULL OR t.landed <= ir.dated) + UNION ALL + SELECT i.itemFk, vWarehouseLanding, i.shipped, i.quantity + FROM vn.itemEntryOut i + JOIN itemRangeLive ir ON ir.itemFk = i.itemFk + WHERE i.shipped >= vDatedFrom + AND (ir.dated IS NULL OR i.shipped <= ir.dated) + AND i.warehouseOutFk = vWarehouseLanding + UNION ALL + SELECT r.item_id, vWarehouseLanding, r.shipment, -r.amount + FROM hedera.order_row r + JOIN hedera.`order` o ON o.id = r.order_id + JOIN itemRangeLive ir ON ir.itemFk = r.item_id + WHERE r.shipment >= vDatedFrom + AND (ir.dated IS NULL OR r.shipment <= ir.dated) + AND r.warehouse_id = vWarehouseLanding + AND r.created >= vDatedReserve + AND NOT o.confirmed; + + CALL vn.item_getAtp(vDated); + + DROP TEMPORARY TABLE IF EXISTS availableTraslate; + CREATE TEMPORARY TABLE availableTraslate + (PRIMARY KEY (item_id)) + ENGINE = MEMORY + SELECT t.item_id, SUM(stock) available + FROM ( + SELECT ti.itemFk item_id, stock + FROM tmp.itemList ti + JOIN itemRange ir ON ir.itemFk = ti.itemFk + UNION ALL + SELECT itemFk, quantity + FROM tmp.itemAtp + ) t + GROUP BY t.item_id + HAVING available <> 0; + + DROP TEMPORARY TABLE tmp.itemList, itemRange, itemRangeLive; +END$$ +DELIMITER ; diff --git a/db/routines/vn2008/procedures/balance_create.sql b/db/routines/vn2008/procedures/balance_create.sql new file mode 100644 index 000000000..2acd26834 --- /dev/null +++ b/db/routines/vn2008/procedures/balance_create.sql @@ -0,0 +1,207 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`balance_create`( + IN vStartingMonth INT, + IN vEndingMonth INT, + IN vCompany INT, + IN vIsConsolidated BOOLEAN, + IN vInterGroupSalesIncluded BOOLEAN) +BEGIN + DECLARE intGAP INT DEFAULT 7; + DECLARE vYears INT DEFAULT 2; + DECLARE vYear TEXT; + DECLARE vOneYearAgo TEXT; + DECLARE vTwoYearsAgo TEXT; + DECLARE vQuery TEXT; + DECLARE vConsolidatedGroup INT; + DECLARE vStartingDate DATE DEFAULT '2020-01-01'; + DECLARE vCurYear INT DEFAULT YEAR(util.VN_CURDATE()); + DECLARE vStartingYear INT DEFAULT vCurYear - 2; + DECLARE vTable TEXT; + + SET vTable = util.quoteIdentifier('balance_nest_tree'); + SET vYear = util.quoteIdentifier(vCurYear); + SET vOneYearAgo = util.quoteIdentifier(vCurYear-1); + SET vTwoYearsAgo = util.quoteIdentifier(vCurYear-2); + + -- Solicitamos la tabla tmp.nest, como base para el balance + DROP TEMPORARY TABLE IF EXISTS tmp.nest; + + EXECUTE IMMEDIATE CONCAT( + 'CREATE TEMPORARY TABLE tmp.nest + SELECT node.id + ,CONCAT( REPEAT(REPEAT(" ",?), COUNT(parent.id) - 1), node.name) AS name + ,node.lft + ,node.rgt + ,COUNT(parent.id) - 1 as depth + ,cast((node.rgt - node.lft - 1) / 2 as DECIMAL) as sons + FROM ', vTable, ' AS node, + ', vTable, ' AS parent + WHERE node.lft BETWEEN parent.lft AND parent.rgt + GROUP BY node.id + ORDER BY node.lft') + USING intGAP; + + DROP TEMPORARY TABLE IF EXISTS tmp.balance; + CREATE TEMPORARY TABLE tmp.balance + SELECT * FROM tmp.nest; + + DROP TEMPORARY TABLE IF EXISTS tmp.empresas_receptoras; + DROP TEMPORARY TABLE IF EXISTS tmp.empresas_emisoras; + + SELECT empresa_grupo INTO vConsolidatedGroup + FROM empresa + WHERE id = vCompany; + + CREATE TEMPORARY TABLE tmp.empresas_receptoras + SELECT id as empresa_id + FROM vn2008.empresa + WHERE id = vCompany + OR empresa_grupo = IF(vIsConsolidated, vConsolidatedGroup, NULL); + + CREATE TEMPORARY TABLE tmp.empresas_emisoras + SELECT Id_Proveedor as empresa_id FROM vn2008.Proveedores p; + + IF vInterGroupSalesIncluded = FALSE THEN + + DELETE ee.* + FROM tmp.empresas_emisoras ee + JOIN vn2008.empresa e on e.id = ee.empresa_id + WHERE e.empresa_grupo = vConsolidatedGroup; + + END IF; + + -- Se calculan las facturas que intervienen, para luego poder servir el desglose desde aqui + DROP TEMPORARY TABLE IF EXISTS tmp.balance_desglose; + CREATE TEMPORARY TABLE tmp.balance_desglose + SELECT er.empresa_id receptora_id, + ee.empresa_id emisora_id, + year(IFNULL(r.bookEntried,IFNULL(r.dateBooking, r.Fecha))) `year`, + month(IFNULL(r.bookEntried,IFNULL(r.dateBooking, r.Fecha))) `month`, + gastos_id Id_Gasto, + SUM(bi) importe + FROM recibida r + JOIN recibida_iva ri on ri.recibida_id = r.id + JOIN tmp.empresas_receptoras er on er.empresa_id = r.empresa_id + JOIN tmp.empresas_emisoras ee ON ee.empresa_id = r.proveedor_id + WHERE IFNULL(r.bookEntried,IFNULL(r.dateBooking, r.Fecha)) >= vStartingDate + AND r.contabilizada + GROUP BY Id_Gasto, year, month, emisora_id, receptora_id; + + INSERT INTO tmp.balance_desglose( + receptora_id, + emisora_id, + year, + month, + Id_Gasto, + importe) + SELECT gr.empresa_id, + gr.empresa_id, + year, + month, + Id_Gasto, + SUM(importe) + FROM gastos_resumen gr + JOIN tmp.empresas_receptoras er on gr.empresa_id = er.empresa_id + WHERE year >= vStartingYear + AND month BETWEEN vStartingMonth AND vEndingMonth + GROUP BY Id_Gasto, year, month, gr.empresa_id; + + DELETE FROM tmp.balance_desglose + WHERE month < vStartingMonth + OR month > vEndingMonth; + + -- Ahora el balance + EXECUTE IMMEDIATE CONCAT( + 'ALTER TABLE tmp.balance + ADD COLUMN ', vTwoYearsAgo ,' INT(10) NULL , + ADD COLUMN ', vOneYearAgo ,' INT(10) NULL , + ADD COLUMN ', vYear,' INT(10) NULL , + ADD COLUMN Id_Gasto VARCHAR(10) NULL, + ADD COLUMN Gasto VARCHAR(45) NULL'); + + -- Añadimos los gastos, para facilitar el formulario + UPDATE tmp.balance b + JOIN vn2008.balance_nest_tree bnt on bnt.id = b.id + JOIN (SELECT id Id_Gasto, name Gasto + FROM vn.expense + GROUP BY id) g ON g.Id_Gasto = bnt.Id_Gasto COLLATE utf8_general_ci + SET b.Id_Gasto = g.Id_Gasto COLLATE utf8_general_ci + , b.Gasto = g.Gasto COLLATE utf8_general_ci ; + + -- Rellenamos los valores de primer nivel, los que corresponden a los gastos simples + WHILE vYears >= 0 DO + SET vQuery = CONCAT( + 'UPDATE tmp.balance b + JOIN + (SELECT Id_Gasto, SUM(Importe) as Importe + FROM tmp.balance_desglose + WHERE year = ? + GROUP BY Id_Gasto + ) sub on sub.Id_Gasto = b.Id_Gasto COLLATE utf8_general_ci + SET ', util.quoteIdentifier(vCurYear - vYears), ' = - Importe'); + + EXECUTE IMMEDIATE vQuery + USING vCurYear - vYears; + + SET vYears = vYears - 1; + END WHILE; + + -- Añadimos las ventas + EXECUTE IMMEDIATE CONCAT( + 'UPDATE tmp.balance b + JOIN ( + SELECT SUM(IF(year = ?, venta, 0)) y2, + SUM(IF(year = ?, venta, 0)) y1, + SUM(IF(year = ?, venta, 0)) y0, + c.Gasto + FROM bs.ventas_contables c + JOIN tmp.empresas_receptoras er on er.empresa_id = c.empresa_id + WHERE month BETWEEN ? AND ? + GROUP BY c.Gasto + ) sub ON sub.Gasto = b.Id_Gasto COLLATE utf8_general_ci + SET b.', vTwoYearsAgo, '= IFNULL(b.', vTwoYearsAgo, ', 0) + sub.y2, + b.', vOneYearAgo, '= IFNULL(b.', vOneYearAgo, ', 0) + sub.y1, + b.', vYear, '= IFNULL(b.', vYear, ', 0) + sub.y0') + USING vCurYear-2, + vCurYear-1, + vCurYear, + vStartingMonth, + vEndingMonth; + + -- Ventas intra grupo + IF NOT vInterGroupSalesIncluded THEN + + SELECT lft, rgt INTO @grupoLft, @grupoRgt + FROM tmp.balance b + WHERE TRIM(b.`name`) = 'Grupo'; + + DELETE + FROM tmp.balance + WHERE lft BETWEEN @grupoLft AND @grupoRgt; + + END IF; + + -- Rellenamos el valor de los padres con la suma de los hijos + DROP TEMPORARY TABLE IF EXISTS tmp.balance_aux; + CREATE TEMPORARY TABLE tmp.balance_aux + SELECT * FROM tmp.balance; + + EXECUTE IMMEDIATE + CONCAT('UPDATE tmp.balance b + JOIN ( + SELECT b1.id, + b1.name, + SUM(b2.', vYear,') thisYear, + SUM(b2.', vOneYearAgo,') oneYearAgo, + SUM(b2.', vTwoYearsAgo,') twoYearsAgo + FROM tmp.nest b1 + JOIN tmp.balance_aux b2 on b2.lft BETWEEN b1.lft and b1.rgt + GROUP BY b1.id)sub ON sub.id = b.id + SET b.', vYear, ' = thisYear, + b.', vOneYearAgo, ' = oneYearAgo, + b.', vTwoYearsAgo, ' = twoYearsAgo'); + + SELECT *, CONCAT('',ifnull(Id_Gasto,'')) newgasto + FROM tmp.balance; +END$$ +DELIMITER ; diff --git a/db/routines/vn2008/procedures/buy_tarifas.sql b/db/routines/vn2008/procedures/buy_tarifas.sql new file mode 100644 index 000000000..c6e8dff90 --- /dev/null +++ b/db/routines/vn2008/procedures/buy_tarifas.sql @@ -0,0 +1,6 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`buy_tarifas`(vBuyFk INT) +BEGIN + CALL vn.buy_recalcPricesByBuy(vBuyFk); +END$$ +DELIMITER ; diff --git a/db/routines/vn2008/procedures/buy_tarifas_entry.sql b/db/routines/vn2008/procedures/buy_tarifas_entry.sql new file mode 100644 index 000000000..3fc0739e0 --- /dev/null +++ b/db/routines/vn2008/procedures/buy_tarifas_entry.sql @@ -0,0 +1,11 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`buy_tarifas_entry`(IN vEntryFk INT(11)) +BEGIN +/** + * Recalcula los precios de una entrada + * + * @param vEntryFk + */ + CALL vn.buy_recalcPricesByEntry(vEntryFk); +END$$ +DELIMITER ; diff --git a/db/routines/vn2008/procedures/raidUpdate.sql b/db/routines/vn2008/procedures/raidUpdate.sql new file mode 100644 index 000000000..9746f3cf9 --- /dev/null +++ b/db/routines/vn2008/procedures/raidUpdate.sql @@ -0,0 +1,28 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`raidUpdate`() +BEGIN + + UPDATE Entradas e + JOIN Entradas_Auto ea USING (Id_Entrada) + JOIN travel t ON t.id = e.travel_id + JOIN ( + SELECT * + FROM ( + SELECT id, landing, warehouse_id, warehouse_id_out + FROM travel + JOIN ( + SELECT warehouse_id, warehouse_id_out + FROM Entradas_Auto ea + JOIN Entradas e USING(Id_Entrada) + JOIN travel t ON t.id = e.travel_id + GROUP BY warehouse_id, warehouse_id_out + ) t USING (warehouse_id, warehouse_id_out) + WHERE shipment > util.VN_CURDATE() AND delivered = FALSE + ORDER BY landing + LIMIT 10000000000000000000 + ) t + GROUP BY warehouse_id, warehouse_id_out + ) t USING (warehouse_id, warehouse_id_out) + SET e.travel_id = t.id; +END$$ +DELIMITER ; diff --git a/db/routines/vn2008/procedures/rateView.sql b/db/routines/vn2008/procedures/rateView.sql new file mode 100644 index 000000000..91e317be6 --- /dev/null +++ b/db/routines/vn2008/procedures/rateView.sql @@ -0,0 +1,37 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`rateView`() +BEGIN + + SELECT + t.year as año, + t.month as mes, + pagos.dolares, + pagos.cambioPractico, + CAST(sum(divisa) / sum(bi) as DECIMAL(5,4)) as cambioTeorico, + pagos.cambioOficial + FROM recibida r + JOIN time t ON t.date = r.fecha + JOIN recibida_iva ri ON r.id = ri.recibida_id + JOIN + ( + SELECT + t.year as Año, + t.month as Mes, + cast(sum(divisa) as DECIMAL(10,2)) as dolares, + cast(sum(divisa) / sum(importe) as DECIMAL(5,4)) as cambioPractico, + cast(rr.rate * 0.998 as DECIMAL(5,4)) as cambioOficial + FROM pago p + JOIN time t ON t.date = p.fecha + JOIN reference_rate rr ON rr.date = p.fecha AND moneda_id = 2 + WHERE divisa + AND fecha >= '2015-01-11' + GROUP BY t.year, t.month + ) pagos ON t.year = pagos.Año AND t.month = pagos.Mes + WHERE moneda_id = 2 + AND fecha >= '2015-01-01' + AND divisa + AND bi + GROUP BY t.year, t.month; + +END$$ +DELIMITER ; diff --git a/db/routines/vn2008/procedures/recobro_credito.sql b/db/routines/vn2008/procedures/recobro_credito.sql new file mode 100644 index 000000000..3657f2b9b --- /dev/null +++ b/db/routines/vn2008/procedures/recobro_credito.sql @@ -0,0 +1,45 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`recobro_credito`() +BEGIN + DECLARE EXIT HANDLER FOR SQLSTATE '45000' + BEGIN + ROLLBACK; + RESIGNAL; + END; + + START TRANSACTION; + UPDATE vn.`client` c + JOIN vn.payMethod pm ON pm.id = c.payMethodFk + SET credit = 0 + WHERE pm.`code` = 'card'; + + DROP TEMPORARY TABLE IF EXISTS clientes_credit; + CREATE TEMPORARY TABLE clientes_credit + SELECT Id_Cliente, if (Credito > Recobro ,Credito - Recobro,0) AS newCredit + FROM ( + SELECT r.Id_Cliente, r.amount AS Recobro, + timestampadd(DAY, period, UltimaFecha) AS Deadline, sub2.amount AS Credito + FROM vn2008.recovery r + JOIN ( + SELECT Id_Cliente, amount , odbc_date AS UltimaFecha + FROM ( + SELECT * FROM credit + ORDER BY odbc_date DESC + LIMIT 10000000000000000000 + ) sub + GROUP BY Id_Cliente + ) sub2 USING(Id_Cliente) + WHERE dend IS NULL or dend >= util.VN_CURDATE() + GROUP BY Id_Cliente + HAVING Deadline <= util.VN_CURDATE() + ) sub3 + WHERE Credito > 0; + + UPDATE Clientes + JOIN clientes_credit USING(Id_Cliente) + SET Clientes.Credito = newCredit; + + DROP TEMPORARY TABLE clientes_credit; + COMMIT; +END$$ +DELIMITER ; diff --git a/db/routines/vn2008/procedures/risk_vs_client_list.sql b/db/routines/vn2008/procedures/risk_vs_client_list.sql new file mode 100644 index 000000000..92f94eb9f --- /dev/null +++ b/db/routines/vn2008/procedures/risk_vs_client_list.sql @@ -0,0 +1,84 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`risk_vs_client_list`(maxRiskDate DATE) +BEGIN +/** + * Calcula el riesgo para los clientes activos de la tabla temporal tmp.client_list + * + * @deprecated usar vn.client_getDebt + * @param maxRiskDate Fecha maxima de los registros + * @return table tmp.risk + */ + DECLARE startingDate DATETIME DEFAULT TIMESTAMPADD(DAY, - DAYOFMONTH(util.VN_CURDATE()) - 60, util.VN_CURDATE()); + DECLARE endingDate DATETIME; + DECLARE MAX_RISK_ALLOWED INT DEFAULT 200; + + SET maxRiskDate = IFNULL(maxRiskDate, util.VN_CURDATE()); + SET endingDate = TIMESTAMP(maxRiskDate, '23:59:59'); + + DROP TEMPORARY TABLE IF EXISTS tmp.client_list_2; + CREATE TEMPORARY TABLE tmp.client_list_2 + (PRIMARY KEY (Id_Cliente)) + ENGINE = MEMORY + SELECT * + FROM tmp.client_list; + + DROP TEMPORARY TABLE IF EXISTS tmp.client_list_3; + CREATE TEMPORARY TABLE tmp.client_list_3 + (PRIMARY KEY (Id_Cliente)) + ENGINE = MEMORY + SELECT * + FROM tmp.client_list; + + DROP TEMPORARY TABLE IF EXISTS tmp.tickets_sin_facturar; + CREATE TEMPORARY TABLE tmp.tickets_sin_facturar + (PRIMARY KEY (Id_Cliente)) + ENGINE = MEMORY + SELECT t.Id_Cliente, floor(IF(cl.isVies, 1, 1.1) * sum(Cantidad * Preu * (100 - Descuento) / 100)) as total + FROM Movimientos m + JOIN Tickets t on m.Id_Ticket = t.Id_Ticket + JOIN tmp.client_list c on c.Id_Cliente = t.Id_Cliente + JOIN vn.client cl ON cl.id = t.Id_Cliente + WHERE Factura IS NULL + AND Fecha BETWEEN startingDate AND endingDate + GROUP BY t.Id_Cliente; + + DROP TEMPORARY TABLE IF EXISTS tmp.risk; + CREATE TEMPORARY TABLE tmp.risk + (PRIMARY KEY (Id_Cliente)) + ENGINE = MEMORY + SELECT Id_Cliente, SUM(amount) risk, sum(saldo) saldo + FROM Clientes c + JOIN ( + SELECT clientFk, SUM(amount) amount,SUM(amount) saldo + FROM vn.clientRisk + JOIN tmp.client_list on Id_Cliente = clientFk + GROUP BY clientFk + UNION ALL + SELECT Id_Cliente, SUM(Entregado),SUM(Entregado) + FROM Recibos + JOIN tmp.client_list_2 using(Id_Cliente) + WHERE Fechacobro > endingDate + GROUP BY Id_Cliente + UNION ALL + SELECT Id_Cliente, total,0 + FROM tmp.tickets_sin_facturar + UNION ALL + SELECT t.clientFk, CAST(-SUM(t.amount) / 100 AS DECIMAL(10,2)), CAST(-SUM(t.amount) / 100 AS DECIMAL(10,2)) + FROM hedera.tpvTransaction t + JOIN tmp.client_list_3 on Id_Cliente = t.clientFk + WHERE t.receiptFk IS NULL + AND t.status = 'ok' + GROUP BY t.clientFk + ) t ON c.Id_Cliente = t.clientFk + WHERE c.activo != FALSE + GROUP BY c.Id_Cliente; + + DELETE r.* + FROM tmp.risk r + JOIN vn2008.Clientes c on c.Id_Cliente = r.Id_Cliente + JOIN vn2008.pay_met pm on pm.id = c.pay_met_id + WHERE IFNULL(r.saldo,0) < 10 + AND r.risk <= MAX_RISK_ALLOWED + AND pm.`name` = 'TARJETA'; +END$$ +DELIMITER ; diff --git a/db/routines/vn2008/views/Agencias.sql b/db/routines/vn2008/views/Agencias.sql new file mode 100644 index 000000000..d70ec73f4 --- /dev/null +++ b/db/routines/vn2008/views/Agencias.sql @@ -0,0 +1,18 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Agencias` +AS SELECT `am`.`id` AS `Id_Agencia`, + `am`.`name` AS `Agencia`, + `am`.`description` AS `description`, + `am`.`deliveryMethodFk` AS `Vista`, + `am`.`m3` AS `m3`, + `am`.`web` AS `web`, + `am`.`agencyFk` AS `agency_id`, + `am`.`inflation` AS `inflacion`, + `am`.`isVolumetric` AS `is_volumetric`, + `am`.`reportMail` AS `send_mail`, + `am`.`isActive` AS `tpv`, + `am`.`code` AS `code`, + `am`.`showAgencyName` AS `show_AgencyName`, + `am`.`isRiskFree` AS `isRiskFree` +FROM `vn`.`agencyMode` `am` diff --git a/db/routines/vn2008/views/Articles.sql b/db/routines/vn2008/views/Articles.sql new file mode 100644 index 000000000..385bf310b --- /dev/null +++ b/db/routines/vn2008/views/Articles.sql @@ -0,0 +1,52 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Articles` +AS SELECT `i`.`id` AS `Id_Article`, + `i`.`name` AS `Article`, + `i`.`typeFk` AS `tipo_id`, + `i`.`size` AS `Medida`, + `i`.`inkFk` AS `Color`, + `i`.`category` AS `Categoria`, + `i`.`stems` AS `Tallos`, + `i`.`originFk` AS `id_origen`, + `i`.`description` AS `description`, + `i`.`producerFk` AS `producer_id`, + `i`.`intrastatFk` AS `Codintrastat`, + `i`.`box` AS `caja`, + `i`.`expenseFk` AS `expenseFk`, + `i`.`comment` AS `comments`, + `i`.`relevancy` AS `relevancy`, + `i`.`image` AS `Foto`, + `i`.`generic` AS `generic`, + `i`.`density` AS `density`, + `i`.`minPrice` AS `PVP`, + `i`.`hasMinPrice` AS `Min`, + `i`.`isActive` AS `isActive`, + `i`.`longName` AS `longName`, + `i`.`subName` AS `subName`, + `i`.`tag5` AS `tag5`, + `i`.`value5` AS `value5`, + `i`.`tag6` AS `tag6`, + `i`.`value6` AS `value6`, + `i`.`tag7` AS `tag7`, + `i`.`value7` AS `value7`, + `i`.`tag8` AS `tag8`, + `i`.`value8` AS `value8`, + `i`.`tag9` AS `tag9`, + `i`.`value9` AS `value9`, + `i`.`tag10` AS `tag10`, + `i`.`value10` AS `value10`, + `i`.`minimum` AS `minimum`, + `i`.`upToDown` AS `upToDown`, + `i`.`hasKgPrice` AS `hasKgPrice`, + `i`.`equivalent` AS `Equivalente`, + `i`.`isToPrint` AS `Imprimir`, + `i`.`family` AS `Familia__`, + `i`.`doPhoto` AS `do_photo`, + `i`.`created` AS `odbc_date`, + `i`.`isFloramondo` AS `isFloramondo`, + `i`.`supplyResponseFk` AS `supplyResponseFk`, + `i`.`stemMultiplier` AS `stemMultiplier`, + `i`.`itemPackingTypeFk` AS `itemPackingTypeFk`, + `i`.`packingOut` AS `packingOut` +FROM `vn`.`item` `i` diff --git a/db/routines/vn2008/views/Bancos.sql b/db/routines/vn2008/views/Bancos.sql new file mode 100644 index 000000000..6e850f365 --- /dev/null +++ b/db/routines/vn2008/views/Bancos.sql @@ -0,0 +1,11 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Bancos` +AS SELECT `a`.`id` AS `Id_Banco`, + `a`.`bank` AS `Banco`, + `a`.`account` AS `Cuenta`, + `a`.`accountingTypeFk` AS `cash`, + `a`.`entityFk` AS `entity_id`, + `a`.`isActive` AS `activo`, + `a`.`currencyFk` AS `currencyFk` +FROM `vn`.`accounting` `a` diff --git a/db/routines/vn2008/views/Bancos_poliza.sql b/db/routines/vn2008/views/Bancos_poliza.sql new file mode 100644 index 000000000..4cd443545 --- /dev/null +++ b/db/routines/vn2008/views/Bancos_poliza.sql @@ -0,0 +1,24 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Bancos_poliza` +AS SELECT `bp`.`id` AS `poliza_id`, + `bp`.`ref` AS `referencia`, + `bp`.`amount` AS `importe`, + `bp`.`committedFee` AS `com_dispuesto`, + `bp`.`nonCommittedFee` AS `com_no_dispuesto`, + `bp`.`annualFee` AS `com_anual`, + `bp`.`started` AS `apertura`, + `bp`.`ended` AS `cierre`, + `bp`.`accountingFk` AS `Id_Banco`, + `bp`.`companyFk` AS `empresa_id`, + `bp`.`supplierFk` AS `supplierFk`, + `bp`.`description` AS `description`, + `bp`.`hasGuarantee` AS `hasGuarantee`, + `bp`.`dmsFk` AS `dmsFk`, + `bp`.`notaryFk` AS `notaryFk`, + `bp`.`currencyFk` AS `currencyFk`, + `bp`.`amortizationTypeFk` AS `amortizationTypeFk`, + `bp`.`periodicityTypeFk` AS `periodicityTypeFk`, + `bp`.`insuranceExpired` AS `insuranceExpired` +FROM `vn`.`bankPolicy` `bp` +ORDER BY `bp`.`id` DESC diff --git a/db/routines/vn2008/views/Cajas.sql b/db/routines/vn2008/views/Cajas.sql new file mode 100644 index 000000000..54b9ee189 --- /dev/null +++ b/db/routines/vn2008/views/Cajas.sql @@ -0,0 +1,24 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Cajas` +AS SELECT `t`.`id` AS `Id_Caja`, + `t`.`dated` AS `Cajafecha`, + `t`.`serie` AS `Serie`, + `t`.`concept` AS `Concepto`, + `t`.`in` AS `Entrada`, + `t`.`out` AS `Salida`, + `t`.`bankFk` AS `Id_Banco`, + `t`.`companyFk` AS `empresa_id`, + `t`.`isAccountable` AS `Partida`, + `t`.`InForeignValue` AS `InForeignValue`, + `t`.`OutForeignValue` AS `OutForeignValue`, + `t`.`workerFk` AS `Id_Trabajador`, + `t`.`calculatedCode` AS `id_calculated`, + `t`.`number` AS `Numero`, + `t`.`isLinked` AS `linked`, + `t`.`created` AS `odbc_date`, + `t`.`isOk` AS `ok`, + `t`.`warehouseFk` AS `warehouse_id`, + `t`.`isConciliate` AS `conciliado`, + `t`.`supplierAccountFk` AS `Proveedores_account_Id` +FROM `vn`.`till` `t` diff --git a/db/routines/vn2008/views/Clientes.sql b/db/routines/vn2008/views/Clientes.sql new file mode 100644 index 000000000..a696cb6e0 --- /dev/null +++ b/db/routines/vn2008/views/Clientes.sql @@ -0,0 +1,48 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Clientes` +AS SELECT `c`.`id` AS `id_cliente`, + `c`.`name` AS `cliente`, + `c`.`fi` AS `if`, + `c`.`socialName` AS `razonSocial`, + `c`.`contact` AS `contacto`, + `c`.`street` AS `domicilio`, + `c`.`city` AS `poblacion`, + `c`.`postcode` AS `codPostal`, + `c`.`phone` AS `telefono`, + `c`.`mobile` AS `movil`, + `c`.`isRelevant` AS `real`, + `c`.`email` AS `e-mail`, + `c`.`iban` AS `iban`, + `c`.`dueDay` AS `vencimiento`, + `c`.`accountingAccount` AS `Cuenta`, + `c`.`isEqualizated` AS `RE`, + `c`.`provinceFk` AS `province_id`, + `c`.`hasToInvoice` AS `invoice`, + `c`.`credit` AS `credito`, + `c`.`countryFk` AS `Id_Pais`, + `c`.`isActive` AS `activo`, + `c`.`gestdocFk` AS `gestdoc_id`, + `c`.`quality` AS `calidad`, + `c`.`payMethodFk` AS `pay_met_id`, + `c`.`created` AS `created`, + `c`.`isToBeMailed` AS `mail`, + `c`.`contactChannelFk` AS `chanel_id`, + `c`.`hasSepaVnl` AS `sepaVnl`, + `c`.`hasCoreVnl` AS `coreVnl`, + `c`.`hasCoreVnh` AS `coreVnh`, + `c`.`hasLcr` AS `hasLcr`, + `c`.`defaultAddressFk` AS `default_address`, + `c`.`riskCalculated` AS `risk_calculated`, + `c`.`hasToInvoiceByAddress` AS `invoiceByAddress`, + `c`.`isTaxDataChecked` AS `contabilizado`, + `c`.`isFreezed` AS `congelado`, + `c`.`creditInsurance` AS `creditInsurance`, + `c`.`isCreatedAsServed` AS `isCreatedAsServed`, + `c`.`hasInvoiceSimplified` AS `hasInvoiceSimplified`, + `c`.`salesPersonFk` AS `Id_Trabajador`, + `c`.`isVies` AS `vies`, + `c`.`eypbc` AS `EYPBC`, + `c`.`bankEntityFk` AS `bankEntityFk`, + `c`.`typeFk` AS `typeFk` +FROM `vn`.`client` `c` diff --git a/db/routines/vn2008/views/Comparativa.sql b/db/routines/vn2008/views/Comparativa.sql new file mode 100644 index 000000000..875a5c370 --- /dev/null +++ b/db/routines/vn2008/views/Comparativa.sql @@ -0,0 +1,10 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Comparativa` +AS SELECT `c`.`timePeriod` AS `Periodo`, + `c`.`itemFk` AS `Id_Article`, + `c`.`warehouseFk` AS `warehouse_id`, + `c`.`quantity` AS `Cantidad`, + `c`.`price` AS `price`, + `c`.`countryFk` AS `countryFk` +FROM `vn`.`comparative` `c` diff --git a/db/routines/vn2008/views/Compres.sql b/db/routines/vn2008/views/Compres.sql new file mode 100644 index 000000000..557136192 --- /dev/null +++ b/db/routines/vn2008/views/Compres.sql @@ -0,0 +1,33 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Compres` +AS SELECT `c`.`id` AS `Id_Compra`, + `c`.`entryFk` AS `Id_Entrada`, + `c`.`itemFk` AS `Id_Article`, + `c`.`buyingValue` AS `Costefijo`, + `c`.`quantity` AS `Cantidad`, + `c`.`packagingFk` AS `Id_Cubo`, + `c`.`stickers` AS `Etiquetas`, + `c`.`freightValue` AS `Portefijo`, + `c`.`packageValue` AS `Embalajefijo`, + `c`.`comissionValue` AS `Comisionfija`, + `c`.`packing` AS `Packing`, + `c`.`grouping` AS `grouping`, + `c`.`groupingMode` AS `caja`, + `c`.`location` AS `Nicho`, + `c`.`price1` AS `Tarifa1`, + `c`.`price2` AS `Tarifa2`, + `c`.`price3` AS `Tarifa3`, + `c`.`minPrice` AS `PVP`, + `c`.`printedStickers` AS `Vida`, + `c`.`isChecked` AS `punteo`, + `c`.`ektFk` AS `buy_edi_id`, + `c`.`created` AS `odbc_date`, + `c`.`isIgnored` AS `Novincular`, + `c`.`isPickedOff` AS `isPickedOff`, + `c`.`workerFk` AS `Id_Trabajador`, + `c`.`weight` AS `weight`, + `c`.`dispatched` AS `dispatched`, + `c`.`containerFk` AS `container_id`, + `c`.`itemOriginalFk` AS `itemOriginalFk` +FROM `vn`.`buy` `c` diff --git a/db/routines/vn2008/views/Compres_mark.sql b/db/routines/vn2008/views/Compres_mark.sql new file mode 100644 index 000000000..7138c4e4c --- /dev/null +++ b/db/routines/vn2008/views/Compres_mark.sql @@ -0,0 +1,8 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Compres_mark` +AS SELECT `bm`.`id` AS `Id_Compra`, + `bm`.`comment` AS `comment`, + `bm`.`mark` AS `mark`, + `bm`.`odbcDate` AS `odbc_date` +FROM `vn`.`buyMark` `bm` diff --git a/db/routines/vn2008/views/Consignatarios.sql b/db/routines/vn2008/views/Consignatarios.sql new file mode 100644 index 000000000..13a426f4d --- /dev/null +++ b/db/routines/vn2008/views/Consignatarios.sql @@ -0,0 +1,19 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Consignatarios` +AS SELECT `a`.`id` AS `id_consigna`, + `a`.`clientFk` AS `Id_cliente`, + `a`.`street` AS `domicilio`, + `a`.`city` AS `poblacion`, + `a`.`postalCode` AS `codPostal`, + `a`.`provinceFk` AS `province_id`, + `a`.`phone` AS `telefono`, + `a`.`mobile` AS `movil`, + `a`.`nickname` AS `consignatario`, + `a`.`isDefaultAddress` AS `predeterminada`, + `a`.`longitude` AS `longitude`, + `a`.`latitude` AS `latitude`, + `a`.`agencyModeFk` AS `Id_Agencia`, + `a`.`isEqualizated` AS `isEqualizated`, + `a`.`isActive` AS `active` +FROM `vn`.`address` `a` diff --git a/db/routines/vn2008/views/Cubos.sql b/db/routines/vn2008/views/Cubos.sql new file mode 100644 index 000000000..4ece9c435 --- /dev/null +++ b/db/routines/vn2008/views/Cubos.sql @@ -0,0 +1,21 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Cubos` +AS SELECT `p`.`id` AS `Id_Cubo`, + `p`.`volume` AS `Volumen`, + `p`.`width` AS `X`, + `p`.`depth` AS `Y`, + `p`.`height` AS `Z`, + `p`.`isPackageReturnable` AS `Retornable`, + `p`.`created` AS `odbc_date`, + `p`.`itemFk` AS `item_id`, + `p`.`price` AS `pvp`, + `p`.`cubicPackage` AS `bultoCubico`, + `p`.`value` AS `Valor`, + `p`.`packagingReturnFk` AS `idCubos_Retorno`, + `p`.`lower` AS `Bajan`, + `p`.`upload` AS `Suben`, + `p`.`base` AS `Base`, + `p`.`isBox` AS `box`, + `p`.`returnCost` AS `costeRetorno` +FROM `vn`.`packaging` `p` diff --git a/db/routines/vn2008/views/Cubos_Retorno.sql b/db/routines/vn2008/views/Cubos_Retorno.sql new file mode 100644 index 000000000..bc56f275b --- /dev/null +++ b/db/routines/vn2008/views/Cubos_Retorno.sql @@ -0,0 +1,8 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Cubos_Retorno` +AS SELECT `rb`.`id` AS `idCubos_Retorno`, + `rb`.`freightContainerType` AS `Soporte`, + `rb`.`freightPackagingEmpty` AS `Vacio`, + `rb`.`freightPackagingFull` AS `Lleno` +FROM `vn`.`returnBuckets` `rb` diff --git a/db/routines/vn2008/views/Entradas.sql b/db/routines/vn2008/views/Entradas.sql new file mode 100644 index 000000000..63fbaa728 --- /dev/null +++ b/db/routines/vn2008/views/Entradas.sql @@ -0,0 +1,29 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Entradas` +AS SELECT `e`.`id` AS `Id_Entrada`, + `e`.`supplierFk` AS `Id_Proveedor`, + `e`.`invoiceNumber` AS `Referencia`, + `e`.`reference` AS `reference`, + `e`.`isExcludedFromAvailable` AS `Inventario`, + `e`.`isConfirmed` AS `Confirmada`, + `e`.`isOrdered` AS `Pedida`, + `e`.`isRaid` AS `Redada`, + `e`.`commission` AS `comision`, + `e`.`created` AS `odbc_date`, + `e`.`evaNotes` AS `Notas_Eva`, + `e`.`travelFk` AS `travel_id`, + `e`.`currencyFk` AS `Id_Moneda`, + `e`.`companyFk` AS `empresa_id`, + `e`.`gestDocFk` AS `gestdoc_id`, + `e`.`invoiceInFk` AS `recibida_id`, + `e`.`dated` AS `Fecha`, + `e`.`isBooked` AS `Anotadoencaja`, + `e`.`loadPriority` AS `loadPriority`, + `e`.`sub` AS `sub`, + `e`.`kop` AS `kop`, + `e`.`pro` AS `pro`, + `e`.`invoiceAmount` AS `invoiceAmount`, + `e`.`buyerFk` AS `buyerFk`, + `e`.`typeFk` AS `typeFk` +FROM `vn`.`entry` `e` diff --git a/db/routines/vn2008/views/Entradas_Auto.sql b/db/routines/vn2008/views/Entradas_Auto.sql new file mode 100644 index 000000000..5d1266965 --- /dev/null +++ b/db/routines/vn2008/views/Entradas_Auto.sql @@ -0,0 +1,5 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Entradas_Auto` +AS SELECT `ev`.`entryFk` AS `Id_Entrada` +FROM `vn`.`entryVirtual` `ev` diff --git a/db/routines/vn2008/views/Entradas_orden.sql b/db/routines/vn2008/views/Entradas_orden.sql new file mode 100644 index 000000000..66f46a929 --- /dev/null +++ b/db/routines/vn2008/views/Entradas_orden.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Entradas_orden` +AS SELECT `eo`.`entryFk` AS `Id_Entrada`, + `eo`.`order` AS `orden` +FROM `vn`.`entryOrder` `eo` diff --git a/db/routines/vn2008/views/Impresoras.sql b/db/routines/vn2008/views/Impresoras.sql new file mode 100644 index 000000000..c4782ab72 --- /dev/null +++ b/db/routines/vn2008/views/Impresoras.sql @@ -0,0 +1,9 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Impresoras` +AS SELECT `vn`.`printer`.`id` AS `Id_impresora`, + `vn`.`printer`.`path` AS `Ruta`, + `vn`.`printer`.`name` AS `Impresora`, + `vn`.`printer`.`reference` AS `referencia`, + `vn`.`printer`.`isLabeler` AS `isLabeler` +FROM `vn`.`printer` diff --git a/db/routines/vn2008/views/Monedas.sql b/db/routines/vn2008/views/Monedas.sql new file mode 100644 index 000000000..3693885be --- /dev/null +++ b/db/routines/vn2008/views/Monedas.sql @@ -0,0 +1,8 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Monedas` +AS SELECT `c`.`id` AS `Id_Moneda`, + `c`.`code` AS `Moneda`, + `c`.`name` AS `Descripcion`, + `c`.`ratio` AS `Cambio` +FROM `vn`.`currency` `c` diff --git a/db/routines/vn2008/views/Movimientos.sql b/db/routines/vn2008/views/Movimientos.sql new file mode 100644 index 000000000..da41c51bb --- /dev/null +++ b/db/routines/vn2008/views/Movimientos.sql @@ -0,0 +1,18 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Movimientos` +AS SELECT `m`.`id` AS `Id_Movimiento`, + `m`.`itemFk` AS `Id_Article`, + `m`.`ticketFk` AS `Id_Ticket`, + `m`.`concept` AS `Concepte`, + `m`.`quantity` AS `Cantidad`, + `m`.`price` AS `Preu`, + `m`.`discount` AS `Descuento`, + `m`.`reserved` AS `Reservado`, + `m`.`isPicked` AS `OK`, + `m`.`created` AS `odbc_date`, + `m`.`priceFixed` AS `CostFixat`, + `m`.`isPriceFixed` AS `PrecioFijado`, + `m`.`originalQuantity` AS `quantity`, + `m`.`isAdded` AS `isAdded` +FROM `vn`.`sale` `m` diff --git a/db/routines/vn2008/views/Movimientos_componentes.sql b/db/routines/vn2008/views/Movimientos_componentes.sql new file mode 100644 index 000000000..440fbfb6a --- /dev/null +++ b/db/routines/vn2008/views/Movimientos_componentes.sql @@ -0,0 +1,9 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Movimientos_componentes` +AS SELECT `sc`.`saleFk` AS `Id_Movimiento`, + `sc`.`componentFk` AS `Id_Componente`, + `sc`.`value` AS `Valor`, + `sc`.`created` AS `created`, + `sc`.`isGreuge` AS `greuge` +FROM `vn`.`saleComponent` `sc` diff --git a/db/routines/vn2008/views/Movimientos_mark.sql b/db/routines/vn2008/views/Movimientos_mark.sql new file mode 100644 index 000000000..10ef2fc08 --- /dev/null +++ b/db/routines/vn2008/views/Movimientos_mark.sql @@ -0,0 +1,11 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Movimientos_mark` +AS SELECT `mm`.`saleFk` AS `Id_Movimiento`, + `mm`.`isChecked` AS `valor`, + `mm`.`created` AS `odbc_date`, + `mm`.`originalQuantity` AS `original_quantity`, + `mm`.`workerFk` AS `Id_Trabajador`, + `mm`.`id` AS `Id_Movimiento_mark`, + `mm`.`stateFk` AS `stateFk` +FROM `vn`.`saleTracking` `mm` diff --git a/db/routines/vn2008/views/Ordenes.sql b/db/routines/vn2008/views/Ordenes.sql new file mode 100644 index 000000000..46d9fd89b --- /dev/null +++ b/db/routines/vn2008/views/Ordenes.sql @@ -0,0 +1,23 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Ordenes` +AS SELECT `tr`.`id` AS `Id_ORDEN`, + `tr`.`description` AS `ORDEN`, + `tr`.`requesterFk` AS `requesterFk`, + `tr`.`attenderFk` AS `attenderFk`, + `tr`.`quantity` AS `CANTIDAD`, + `tr`.`itemFk` AS `Id_ARTICLE`, + `tr`.`price` AS `PRECIOMAX`, + `tr`.`isOk` AS `isOk`, + `tr`.`saleFk` AS `Id_Movimiento`, + `tr`.`ticketFk` AS `ticketFk`, + `tr`.`response` AS `COMENTARIO`, + `tr`.`created` AS `odbc_date`, + `tr`.`ordered` AS `datORDEN`, + `tr`.`shipped` AS `datTICKET`, + `tr`.`salesPersonCode` AS `CodVENDEDOR`, + `tr`.`buyerCode` AS `CodCOMPRADOR`, + `tr`.`clientFk` AS `Id_CLIENTE`, + `tr`.`total` AS `TOTAL`, + `tr`.`buyed` AS `datCOMPRA` +FROM `vn`.`ticketRequest` `tr` diff --git a/db/routines/vn2008/views/Origen.sql b/db/routines/vn2008/views/Origen.sql new file mode 100644 index 000000000..5bb1d9b7f --- /dev/null +++ b/db/routines/vn2008/views/Origen.sql @@ -0,0 +1,9 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Origen` +AS SELECT `o`.`id` AS `id`, + `o`.`code` AS `Abreviatura`, + `o`.`name` AS `Origen`, + `o`.`countryFk` AS `Id_Paises`, + `o`.`warehouseFk` AS `warehouse_id` +FROM `vn`.`origin` `o` diff --git a/db/routines/vn2008/views/Paises.sql b/db/routines/vn2008/views/Paises.sql new file mode 100644 index 000000000..ea7172dff --- /dev/null +++ b/db/routines/vn2008/views/Paises.sql @@ -0,0 +1,13 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Paises` +AS SELECT `c`.`id` AS `Id`, + `c`.`country` AS `Pais`, + `c`.`CEE` AS `CEE`, + `c`.`isUeeMember` AS `isUeeMember`, + `c`.`code` AS `Codigo`, + `c`.`currencyFk` AS `Id_Moneda`, + `c`.`geoFk` AS `geoFk`, + `c`.`ibanLength` AS `ibanLength`, + `c`.`hasDailyInvoice` AS `hasDailyInvoice` +FROM `vn`.`country` `c` diff --git a/db/routines/vn2008/views/PreciosEspeciales.sql b/db/routines/vn2008/views/PreciosEspeciales.sql new file mode 100644 index 000000000..cea9f87fd --- /dev/null +++ b/db/routines/vn2008/views/PreciosEspeciales.sql @@ -0,0 +1,8 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`PreciosEspeciales` +AS SELECT `sp`.`id` AS `Id_PrecioEspecial`, + `sp`.`clientFk` AS `Id_Cliente`, + `sp`.`itemFk` AS `Id_Article`, + `sp`.`value` AS `PrecioEspecial` +FROM `vn`.`specialPrice` `sp` diff --git a/db/routines/vn2008/views/Proveedores.sql b/db/routines/vn2008/views/Proveedores.sql new file mode 100644 index 000000000..0b7ee89f8 --- /dev/null +++ b/db/routines/vn2008/views/Proveedores.sql @@ -0,0 +1,35 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Proveedores` +AS SELECT `s`.`id` AS `Id_Proveedor`, + `s`.`name` AS `Proveedor`, + `s`.`account` AS `cuenta`, + `s`.`countryFk` AS `pais_id`, + `s`.`nif` AS `NIF`, + `s`.`isFarmer` AS `Agricola`, + `s`.`phone` AS `Telefono`, + `s`.`retAccount` AS `cuentaret`, + `s`.`commission` AS `ComisionProveedor`, + `s`.`created` AS `odbc_time`, + `s`.`postcodeFk` AS `postcode_id`, + `s`.`isActive` AS `active`, + `s`.`street` AS `Domicilio`, + `s`.`city` AS `Localidad`, + `s`.`provinceFk` AS `province_id`, + `s`.`postCode` AS `codpos`, + `s`.`payMethodFk` AS `pay_met_id`, + `s`.`payDemFk` AS `pay_dem_id`, + `s`.`nickname` AS `Alias`, + `s`.`isOfficial` AS `oficial`, + `s`.`workerFk` AS `workerFk`, + `s`.`payDay` AS `pay_day`, + `s`.`isSerious` AS `serious`, + `s`.`note` AS `notas`, + `s`.`taxTypeSageFk` AS `taxTypeSageFk`, + `s`.`withholdingSageFk` AS `withholdingSageFk`, + `s`.`isTrucker` AS `isTrucker`, + `s`.`transactionTypeSageFk` AS `transactionTypeSageFk`, + `s`.`supplierActivityFk` AS `supplierActivityFk`, + `s`.`healthRegister` AS `healthRegister`, + `s`.`isPayMethodChecked` AS `isPayMethodChecked` +FROM `vn`.`supplier` `s` diff --git a/db/routines/vn2008/views/Proveedores_gestdoc.sql b/db/routines/vn2008/views/Proveedores_gestdoc.sql new file mode 100644 index 000000000..c25623b8b --- /dev/null +++ b/db/routines/vn2008/views/Proveedores_gestdoc.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Proveedores_gestdoc` +AS SELECT `sd`.`supplierFk` AS `Id_Proveedor`, + `sd`.`dmsFk` AS `gestdoc_id` +FROM `vn`.`supplierDms` `sd` diff --git a/db/routines/vn2008/views/Recibos.sql b/db/routines/vn2008/views/Recibos.sql new file mode 100644 index 000000000..93ec7bc6f --- /dev/null +++ b/db/routines/vn2008/views/Recibos.sql @@ -0,0 +1,14 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Recibos` +AS SELECT `r`.`Id` AS `Id`, + `r`.`invoiceFk` AS `Id_Factura`, + `r`.`amountPaid` AS `Entregado`, + `r`.`payed` AS `Fechacobro`, + `r`.`workerFk` AS `Id_Trabajador`, + `r`.`bankFk` AS `Id_Banco`, + `r`.`clientFk` AS `Id_Cliente`, + `r`.`created` AS `odbc_date`, + `r`.`companyFk` AS `empresa_id`, + `r`.`isConciliate` AS `conciliado` +FROM `vn`.`receipt` `r` diff --git a/db/routines/vn2008/views/Remesas.sql b/db/routines/vn2008/views/Remesas.sql new file mode 100644 index 000000000..9e8c18ada --- /dev/null +++ b/db/routines/vn2008/views/Remesas.sql @@ -0,0 +1,8 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Remesas` +AS SELECT `r`.`id` AS `Id_Remesa`, + `r`.`dated` AS `Fecha Remesa`, + `r`.`accountingFk` AS `Banco`, + `r`.`companyFk` AS `empresa_id` +FROM `vn`.`remittance` `r` diff --git a/db/routines/vn2008/views/Rutas.sql b/db/routines/vn2008/views/Rutas.sql new file mode 100644 index 000000000..78b3bb471 --- /dev/null +++ b/db/routines/vn2008/views/Rutas.sql @@ -0,0 +1,19 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Rutas` +AS SELECT `r`.`id` AS `Id_Ruta`, + `r`.`workerFk` AS `Id_Trabajador`, + `r`.`created` AS `Fecha`, + `r`.`vehicleFk` AS `Id_Vehiculo`, + `r`.`agencyModeFk` AS `Id_Agencia`, + `r`.`time` AS `Hora`, + `r`.`isOk` AS `ok`, + `r`.`kmStart` AS `km_start`, + `r`.`kmEnd` AS `km_end`, + `r`.`started` AS `date_start`, + `r`.`finished` AS `date_end`, + `r`.`gestdocFk` AS `gestdoc_id`, + `r`.`cost` AS `cost`, + `r`.`m3` AS `m3`, + `r`.`description` AS `description` +FROM `vn`.`route` `r` diff --git a/db/routines/vn2008/views/Saldos_Prevision.sql b/db/routines/vn2008/views/Saldos_Prevision.sql new file mode 100644 index 000000000..f4749d30f --- /dev/null +++ b/db/routines/vn2008/views/Saldos_Prevision.sql @@ -0,0 +1,10 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Saldos_Prevision` +AS SELECT `fb`.`id` AS `Saldos_Prevision_id`, + `fb`.`description` AS `Descripcion`, + `fb`.`amount` AS `Importe`, + `fb`.`dated` AS `Fecha`, + `fb`.`accountingFk` AS `Id_Banco`, + `fb`.`companyFk` AS `empresa_id` +FROM `vn`.`forecastedBalance` `fb` \ No newline at end of file diff --git a/db/routines/vn2008/views/Split.sql b/db/routines/vn2008/views/Split.sql new file mode 100644 index 000000000..eec90a5f8 --- /dev/null +++ b/db/routines/vn2008/views/Split.sql @@ -0,0 +1,9 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Splits` +AS SELECT `s`.`id` AS `Id_Split`, + `s`.`ticketFk` AS `Id_Ticket`, + `s`.`entryFk` AS `Id_Entrada`, + `s`.`dated` AS `Fecha`, + `s`.`note` AS `Notas` +FROM `vn`.`split` `s` \ No newline at end of file diff --git a/db/routines/vn2008/views/Split_lines.sql b/db/routines/vn2008/views/Split_lines.sql new file mode 100644 index 000000000..0b7897be7 --- /dev/null +++ b/db/routines/vn2008/views/Split_lines.sql @@ -0,0 +1,8 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Split_lines` +AS SELECT `sl`.`id` AS `Id_Split_lines`, + `sl`.`splitFk` AS `Id_Split`, + `sl`.`itemFk` AS `Id_Article`, + `sl`.`buyFk` AS `Id_Compra` +FROM `vn`.`splitLine` `sl` \ No newline at end of file diff --git a/db/routines/vn2008/views/Tickets.sql b/db/routines/vn2008/views/Tickets.sql new file mode 100644 index 000000000..c24b87b72 --- /dev/null +++ b/db/routines/vn2008/views/Tickets.sql @@ -0,0 +1,33 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Tickets` +AS SELECT `t`.`id` AS `Id_Ticket`, + `t`.`clientFk` AS `Id_Cliente`, + `t`.`warehouseFk` AS `warehouse_id`, + `t`.`shipped` AS `Fecha`, + `t`.`landed` AS `landing`, + `t`.`nickname` AS `Alias`, + `t`.`refFk` AS `Factura`, + `t`.`addressFk` AS `Id_Consigna`, + `t`.`location` AS `Localizacion`, + `t`.`solution` AS `Solucion`, + `t`.`routeFk` AS `Id_Ruta`, + `t`.`companyFk` AS `empresa_id`, + `t`.`agencyModeFk` AS `Id_Agencia`, + `t`.`priority` AS `Prioridad`, + `t`.`packages` AS `Bultos`, + `t`.`isDeleted` AS `isDeleted`, + `t`.`created` AS `odbc_date`, + `t`.`workerFk` AS `Id_Trabajador`, + `t`.`observations` AS `Observaciones`, + `t`.`isSigned` AS `Firmado`, + `t`.`isLabeled` AS `Etiquetasemitidas`, + `t`.`isPrinted` AS `PedidoImpreso`, + `t`.`hour` AS `Hora`, + `t`.`isBlocked` AS `blocked`, + `t`.`hasPriority` AS `priority`, + `t`.`isBoxed` AS `boxed`, + `t`.`zoneFk` AS `zoneFk`, + `t`.`totalWithVat` AS `totalWithVat`, + `t`.`totalWithoutVat` AS `totalWithoutVat` +FROM `vn`.`ticket` `t` diff --git a/db/routines/vn2008/views/Tickets_state.sql b/db/routines/vn2008/views/Tickets_state.sql new file mode 100644 index 000000000..be59a750f --- /dev/null +++ b/db/routines/vn2008/views/Tickets_state.sql @@ -0,0 +1,7 @@ +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` diff --git a/db/routines/vn2008/views/Tickets_turno.sql b/db/routines/vn2008/views/Tickets_turno.sql new file mode 100644 index 000000000..28bc2d55f --- /dev/null +++ b/db/routines/vn2008/views/Tickets_turno.sql @@ -0,0 +1,6 @@ +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` diff --git a/db/routines/vn2008/views/Tintas.sql b/db/routines/vn2008/views/Tintas.sql new file mode 100644 index 000000000..2299aa759 --- /dev/null +++ b/db/routines/vn2008/views/Tintas.sql @@ -0,0 +1,11 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Tintas` +AS SELECT `i`.`id` AS `Id_Tinta`, + `i`.`name` AS `name`, + `i`.`picture` AS `Tinta`, + `i`.`showOrder` AS `Orden`, + `i`.`ball` AS `ball`, + `i`.`isCargex` AS `cargex`, + `i`.`hex` AS `colorHex` +FROM `vn`.`ink` `i` diff --git a/db/routines/vn2008/views/Tipos.sql b/db/routines/vn2008/views/Tipos.sql new file mode 100644 index 000000000..4cde954f1 --- /dev/null +++ b/db/routines/vn2008/views/Tipos.sql @@ -0,0 +1,22 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Tipos` +AS SELECT `it`.`id` AS `tipo_id`, + `it`.`code` AS `Id_Tipo`, + `it`.`name` AS `Tipo`, + `it`.`order` AS `Orden`, + `it`.`categoryFk` AS `reino_id`, + `it`.`workerFk` AS `Id_Trabajador`, + `it`.`life` AS `life`, + `it`.`isPackaging` AS `isPackaging`, + `it`.`density` AS `density`, + `it`.`isInventory` AS `inventory`, + `it`.`created` AS `odbc_date`, + `it`.`making` AS `confeccion`, + `it`.`temperatureFk` AS `Temperatura`, + `it`.`promo` AS `promo`, + `it`.`maneuver` AS `maneuver`, + `it`.`target` AS `target`, + `it`.`topMargin` AS `top_margin`, + `it`.`profit` AS `profit` +FROM `vn`.`itemType` `it` diff --git a/db/routines/vn2008/views/Trabajadores.sql b/db/routines/vn2008/views/Trabajadores.sql new file mode 100644 index 000000000..72b53e54e --- /dev/null +++ b/db/routines/vn2008/views/Trabajadores.sql @@ -0,0 +1,16 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Trabajadores` +AS SELECT `w`.`id` AS `Id_Trabajador`, + `w`.`firstName` AS `Nombre`, + `w`.`id` AS `user_id`, + `w`.`phone` AS `phone`, + `w`.`bossFk` AS `boss`, + NULL AS `Foto`, + `w`.`fiDueDate` AS `DniExpiration`, + `w`.`code` AS `CodigoTrabajador`, + `w`.`lastName` AS `Apellidos`, + `w`.`hasMachineryAuthorized` AS `hasMachineryAuthorized`, + `w`.`sub` AS `sub`, + `w`.`maritalStatus` AS `marital_status` +FROM `vn`.`worker` `w` diff --git a/db/routines/vn2008/views/V_edi_item_track.sql b/db/routines/vn2008/views/V_edi_item_track.sql new file mode 100644 index 000000000..64cfdc1c5 --- /dev/null +++ b/db/routines/vn2008/views/V_edi_item_track.sql @@ -0,0 +1,19 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`V_edi_item_track` +AS SELECT `edi`.`item_track`.`item_id` AS `item_id`, + `edi`.`item_track`.`s1` AS `s1`, + `edi`.`item_track`.`s2` AS `s2`, + `edi`.`item_track`.`s3` AS `s3`, + `edi`.`item_track`.`s4` AS `s4`, + `edi`.`item_track`.`s5` AS `s5`, + `edi`.`item_track`.`s6` AS `s6`, + `edi`.`item_track`.`kop` AS `kop`, + `edi`.`item_track`.`pac` AS `pac`, + `edi`.`item_track`.`cat` AS `cat`, + `edi`.`item_track`.`ori` AS `ori`, + `edi`.`item_track`.`pro` AS `pro`, + `edi`.`item_track`.`sub` AS `sub`, + `edi`.`item_track`.`package` AS `package`, + `edi`.`item_track`.`item` AS `item` +FROM `edi`.`item_track` diff --git a/db/routines/vn2008/views/Vehiculos_consumo.sql b/db/routines/vn2008/views/Vehiculos_consumo.sql new file mode 100644 index 000000000..422a77499 --- /dev/null +++ b/db/routines/vn2008/views/Vehiculos_consumo.sql @@ -0,0 +1,20 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Vehiculos_consumo` +AS SELECT `vc`.`id` AS `Vehiculos_consumo_id`, + `vc`.`vehicleFk` AS `Id_Vehiculo`, + `vc`.`dated` AS `fecha`, + `vc`.`km` AS `km`, + `vc`.`liters` AS `litros`, + `vc`.`price` AS `precio`, + `vc`.`adblue` AS `adblue`, + `vc`.`tolls` AS `peajes`, + `vc`.`discount` AS `descuento`, + `vc`.`silla` AS `silla`, + `vc`.`created` AS `odbc_date`, + `vc`.`others` AS `otros`, + `vc`.`fuelTypeFk` AS `fuelTypeFk`, + `vc`.`supplierFk` AS `proveedoresFk`, + `vc`.`liters100km` AS `liters100km`, + `vc`.`gasoline` AS `gasoline` +FROM `vn`.`vehicleConsumption` `vc` \ No newline at end of file diff --git a/db/routines/vn2008/views/account_conciliacion.sql b/db/routines/vn2008/views/account_conciliacion.sql new file mode 100644 index 000000000..66db78eee --- /dev/null +++ b/db/routines/vn2008/views/account_conciliacion.sql @@ -0,0 +1,13 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`account_conciliacion` +AS SELECT `ar`.`id` AS `idaccount_conciliacion`, + `ar`.`supplierAccountFk` AS `Id_Proveedores_account`, + `ar`.`operationDated` AS `Fechaoperacion`, + `ar`.`valueDated` AS `FechaValor`, + `ar`.`amount` AS `importe`, + `ar`.`concept` AS `Concepto`, + `ar`.`debitCredit` AS `DebeHaber`, + `ar`.`calculatedCode` AS `id_calculated`, + `ar`.`created` AS `odbc_date` +FROM `vn`.`accountReconciliation` `ar` diff --git a/db/routines/vn2008/views/account_detail.sql b/db/routines/vn2008/views/account_detail.sql new file mode 100644 index 000000000..74d35ae41 --- /dev/null +++ b/db/routines/vn2008/views/account_detail.sql @@ -0,0 +1,8 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`account_detail` +AS SELECT `ac`.`id` AS `account_detail_id`, + `ac`.`value` AS `value`, + `ac`.`accountDetailTypeFk` AS `account_detail_type_id`, + `ac`.`supplierAccountFk` AS `Id_Proveedores_account` +FROM `vn`.`accountDetail` `ac` diff --git a/db/routines/vn2008/views/account_detail_type.sql b/db/routines/vn2008/views/account_detail_type.sql new file mode 100644 index 000000000..6def86a9a --- /dev/null +++ b/db/routines/vn2008/views/account_detail_type.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`account_detail_type` +AS SELECT `adt`.`id` AS `account_detail_type_id`, + `adt`.`description` AS `description` +FROM `vn`.`accountDetailType` `adt` diff --git a/db/routines/vn2008/views/agency.sql b/db/routines/vn2008/views/agency.sql new file mode 100644 index 000000000..637bb0910 --- /dev/null +++ b/db/routines/vn2008/views/agency.sql @@ -0,0 +1,9 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`agency` +AS SELECT `a`.`id` AS `agency_id`, + `a`.`name` AS `name`, + `a`.`warehouseFk` AS `warehouse_id`, + `a`.`isOwn` AS `propios`, + `a`.`workCenterFk` AS `workCenterFk` +FROM `vn`.`agency` `a` diff --git a/db/routines/vn2008/views/airline.sql b/db/routines/vn2008/views/airline.sql new file mode 100644 index 000000000..786206b1c --- /dev/null +++ b/db/routines/vn2008/views/airline.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`airline` +AS SELECT `a`.`id` AS `airline_id`, + `a`.`name` AS `name` +FROM `vn`.`airline` `a` diff --git a/db/routines/vn2008/views/airport.sql b/db/routines/vn2008/views/airport.sql new file mode 100644 index 000000000..0e8ab39d2 --- /dev/null +++ b/db/routines/vn2008/views/airport.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`airport` +AS SELECT `a`.`id` AS `airport_id`, + `a`.`name` AS `name` +FROM `vn`.`airport` `a` diff --git a/db/routines/vn2008/views/albaran.sql b/db/routines/vn2008/views/albaran.sql new file mode 100644 index 000000000..51a7c77e9 --- /dev/null +++ b/db/routines/vn2008/views/albaran.sql @@ -0,0 +1,19 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`albaran` +AS SELECT `dn`.`id` AS `albaran_id`, + `dn`.`ref` AS `ref`, + `dn`.`note` AS `note`, + `dn`.`shipped` AS `fecha`, + `dn`.`landed` AS `fecha_entrega`, + `dn`.`amount` AS `valor`, + `dn`.`supplierFk` AS `Id_Proveedor`, + `dn`.`companyFk` AS `empresa_id`, + `dn`.`warehouseFk` AS `warehouse_id`, + `dn`.`stateFk` AS `albaran_state_id`, + `dn`.`workerFk` AS `Id_Trabajador`, + `dn`.`supervisorFk` AS `Id_Responsable`, + `dn`.`departmentFk` AS `department_id`, + `dn`.`invoiceInFk` AS `recibida_id`, + `dn`.`farmingFk` AS `farmingFk` +FROM `vn`.`deliveryNote` `dn` diff --git a/db/routines/vn2008/views/albaran_gestdoc.sql b/db/routines/vn2008/views/albaran_gestdoc.sql new file mode 100644 index 000000000..ffde86937 --- /dev/null +++ b/db/routines/vn2008/views/albaran_gestdoc.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`albaran_gestdoc` +AS SELECT `dnd`.`dmsFk` AS `gestdoc_id`, + `dnd`.`deliveryNoteFk` AS `albaran_id` +FROM `vn`.`deliveryNoteDms` `dnd` diff --git a/db/routines/vn2008/views/albaran_state.sql b/db/routines/vn2008/views/albaran_state.sql new file mode 100644 index 000000000..a15938f45 --- /dev/null +++ b/db/routines/vn2008/views/albaran_state.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`albaran_state` +AS SELECT `dn`.`id` AS `albaran_state_id`, + `dn`.`state` AS `state` +FROM `vn`.`deliveryNoteState` `dn` diff --git a/db/routines/vn2008/views/awb.sql b/db/routines/vn2008/views/awb.sql new file mode 100644 index 000000000..010596288 --- /dev/null +++ b/db/routines/vn2008/views/awb.sql @@ -0,0 +1,33 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`awb` +AS SELECT `a`.`id` AS `id`, + `a`.`code` AS `codigo`, + `a`.`package` AS `bultos`, + `a`.`weight` AS `peso`, + `a`.`created` AS `MYSQL_TIME`, + `a`.`transitoryFk` AS `transitario_id`, + `a`.`taxFk` AS `iva_id`, + `a`.`duakk` AS `duakk`, + `a`.`docFk` AS `gestdoc_id`, + `a`.`amount` AS `importe`, + `a`.`freightFk` AS `carguera_id`, + `a`.`m3` AS `m3`, + `a`.`stems` AS `stems`, + `a`.`flightFk` AS `flight_id`, + `a`.`volumeWeight` AS `volume_weight`, + `a`.`hb` AS `hb`, + `a`.`rate` AS `rate`, + `a`.`booked` AS `booked`, + `a`.`issued` AS `issued`, + `a`.`operated` AS `operated`, + `a`.`bookEntried` AS `bookEntried`, + `a`.`invoiceInFk` AS `invoiceInFk`, + `a`.`isChecked` AS `isChecked`, + `a`.`isTransitoryChecked` AS `isTransitoryChecked`, + `a`.`year` AS `year`, + `a`.`invoiceInPaletizedFk` AS `invoiceInPaletizedFk`, + `a`.`observation` AS `observation`, + `a`.`hasFreightPrepaid` AS `hasFreightPrepaid`, + `a`.`propertyNumber` AS `propertyNumber` +FROM `vn`.`awb` `a` diff --git a/db/routines/vn2008/views/awb_component.sql b/db/routines/vn2008/views/awb_component.sql new file mode 100644 index 000000000..8053c4a59 --- /dev/null +++ b/db/routines/vn2008/views/awb_component.sql @@ -0,0 +1,14 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`awb_component` +AS SELECT `ac`.`id` AS `id`, + `ac`.`awbFk` AS `awb_id`, + `ac`.`supplierFk` AS `Id_Proveedor`, + `ac`.`typeFk` AS `awb_component_type_id`, + `ac`.`awbRoleFk` AS `awb_role_id`, + `ac`.`awbUnitFk` AS `awb_unit_id`, + `ac`.`value` AS `value`, + `ac`.`currencyFk` AS `Id_Moneda`, + `ac`.`invoiceInFk` AS `recibida_id` +FROM + `vn`.`awbComponent` `ac`; \ No newline at end of file diff --git a/db/routines/vn2008/views/awb_component_template.sql b/db/routines/vn2008/views/awb_component_template.sql new file mode 100644 index 000000000..bc8fd1cd8 --- /dev/null +++ b/db/routines/vn2008/views/awb_component_template.sql @@ -0,0 +1,19 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`awb_component_template` +AS SELECT`act`.`id` AS `awb_component_template_id`, + `act`.`freightFk` AS `carguera_id`, + `act`.`airportIn` AS `airport_in`, + `act`.`airportOut` AS `airport_out`, + `act`.`airlineFk` AS `airline_id`, + `act`.`typeFk` AS `awb_component_type_id`, + `act`.`dated` AS `Fecha`, + `act`.`awbRoleFk` AS `awb_role_id`, + `act`.`awbUnit` AS `awb_unit_id`, + `act`.`value` AS `value`, + `act`.`maxValue` AS `max_value`, + `act`.`minValue` AS `min_value`, + `act`.`currencyFk` AS `Id_Moneda`, + `act`.`days` AS `days` +FROM + `vn`.`awbComponentTemplate` `act`; diff --git a/db/routines/vn2008/views/awb_component_type.sql b/db/routines/vn2008/views/awb_component_type.sql new file mode 100644 index 000000000..45921e11c --- /dev/null +++ b/db/routines/vn2008/views/awb_component_type.sql @@ -0,0 +1,7 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`awb_component_type` +AS SELECT `act`.`id` AS `awb_component_type_id`, + `act`.`description` AS `description`, + `act`.`hasStems` AS `hasStems` +FROM `vn`.`awbComponentType` `act` diff --git a/db/routines/vn2008/views/awb_gestdoc.sql b/db/routines/vn2008/views/awb_gestdoc.sql new file mode 100644 index 000000000..6b5c58d56 --- /dev/null +++ b/db/routines/vn2008/views/awb_gestdoc.sql @@ -0,0 +1,7 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`awb_gestdoc` +AS SELECT `ad`.`id` AS `awb_gestdoc_id`, + `ad`.`awbFk` AS `awb_id`, + `ad`.`dmsFk` AS `gestdoc_id` +FROM `vn`.`awbDms` `ad` diff --git a/db/routines/vn2008/views/awb_recibida.sql b/db/routines/vn2008/views/awb_recibida.sql new file mode 100644 index 000000000..c7586214d --- /dev/null +++ b/db/routines/vn2008/views/awb_recibida.sql @@ -0,0 +1,7 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`awb_recibida` +AS SELECT `aii`.`awbFk` AS `awb_id`, + `aii`.`invoiceInFk` AS `recibida_id`, + `aii`.`sad` AS `dua` +FROM `vn`.`awbInvoiceIn` `aii`; diff --git a/db/routines/vn2008/views/awb_role.sql b/db/routines/vn2008/views/awb_role.sql new file mode 100644 index 000000000..5ef004244 --- /dev/null +++ b/db/routines/vn2008/views/awb_role.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`awb_role` +AS SELECT `ar`.`id` AS `awb_role_id`, + `ar`.`name` AS `name` +FROM `vn`.`awbRole` `ar` diff --git a/db/routines/vn2008/views/awb_unit.sql b/db/routines/vn2008/views/awb_unit.sql new file mode 100644 index 000000000..7d1193105 --- /dev/null +++ b/db/routines/vn2008/views/awb_unit.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`awb_unit` +AS SELECT `au`.`id` AS `awb_unit_id`, + `au`.`operation` AS `operation` +FROM `vn`.`awbUnit` `au` diff --git a/db/routines/vn2008/views/balance_nest_tree.sql b/db/routines/vn2008/views/balance_nest_tree.sql new file mode 100644 index 000000000..66d048d7f --- /dev/null +++ b/db/routines/vn2008/views/balance_nest_tree.sql @@ -0,0 +1,10 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`balance_nest_tree` +AS SELECT `bnt`.`lft` AS `lft`, + `bnt`.`rgt` AS `rgt`, + `bnt`.`name` AS `name`, + `bnt`.`id` AS `id`, + `bnt`.`expenseFk` AS `Id_Gasto`, + `bnt`.`isSelected` AS `isSelected` +FROM `vn`.`balanceNestTree` `bnt` diff --git a/db/routines/vn2008/views/barcodes.sql b/db/routines/vn2008/views/barcodes.sql new file mode 100644 index 000000000..f366e15fa --- /dev/null +++ b/db/routines/vn2008/views/barcodes.sql @@ -0,0 +1,7 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`barcodes` +AS SELECT `b`.`id` AS `id`, + `b`.`itemFk` AS `Id_Article`, + `b`.`code` AS `code` +FROM `vn`.`itemBarcode` `b` diff --git a/db/routines/vn2008/views/buySource.sql b/db/routines/vn2008/views/buySource.sql new file mode 100644 index 000000000..33226a1dc --- /dev/null +++ b/db/routines/vn2008/views/buySource.sql @@ -0,0 +1,77 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`buySource` +AS SELECT `b`.`entryFk` AS `Id_Entrada`, + `b`.`isPickedOff` AS `isPickedOff`, + NULL AS `tarifa0`, + `e`.`kop` AS `kop`, + `b`.`id` AS `Id_Compra`, + `i`.`typeFk` AS `tipo_id`, + `b`.`itemFk` AS `Id_Article`, + `i`.`size` AS `Medida`, + `i`.`stems` AS `Tallos`, + `b`.`stickers` AS `Etiquetas`, + `b`.`packagingFk` AS `Id_Cubo`, + `b`.`buyingValue` AS `Costefijo`, + `b`.`packing` AS `Packing`, + `b`.`grouping` AS `Grouping`, + `b`.`quantity` AS `Cantidad`, + `b`.`price2` AS `Tarifa2`, + `b`.`price3` AS `Tarifa3`, + `b`.`isChecked` AS `Punteo`, + `b`.`groupingMode` AS `Caja`, + `i`.`isToPrint` AS `Imprimir`, + `i`.`name` AS `Article`, + `vn`.`ink`.`picture` AS `Tinta`, + `i`.`originFk` AS `id_origen`, + `i`.`minPrice` AS `PVP`, + NULL AS `Id_Accion`, + `s`.`company_name` AS `pro`, + `i`.`hasMinPrice` AS `Min`, + `b`.`isIgnored` AS `Novincular`, + `b`.`freightValue` AS `Portefijo`, + round(`b`.`buyingValue` * `b`.`quantity`, 2) AS `Importe`, + `b`.`printedStickers` AS `Vida`, + `i`.`comment` AS `reference`, + `b`.`workerFk` AS `Id_Trabajador`, + `e`.`s1` AS `S1`, + `e`.`s2` AS `S2`, + `e`.`s3` AS `S3`, + `e`.`s4` AS `S4`, + `e`.`s5` AS `S5`, + `e`.`s6` AS `S6`, + 0 AS `price_fixed`, + `i`.`producerFk` AS `producer_id`, + `i`.`subName` AS `tag1`, + `i`.`value5` AS `tag2`, + `i`.`value6` AS `tag3`, + `i`.`value7` AS `tag4`, + `i`.`value8` AS `tag5`, + `i`.`value9` AS `tag6`, + `i`.`value10` AS `tag7`, + `s`.`company_name` AS `company_name`, + `b`.`weight` AS `weightPacking`, + `i`.`packingOut` AS `packingOut`, + `b`.`itemOriginalFk` AS `itemOriginalFk`, + `io`.`longName` AS `itemOriginalName`, + `it`.`gramsMax` AS `gramsMax`, + `i`.`minQuantity` AS `minQuantity` +FROM ( + ( + ( + ( + ( + ( + `vn`.`item` `i` + JOIN `vn`.`itemType` `it` ON(`it`.`id` = `i`.`typeFk`) + ) + LEFT JOIN `vn`.`ink` ON(`vn`.`ink`.`id` = `i`.`inkFk`) + ) + LEFT JOIN `vn`.`buy` `b` ON(`b`.`itemFk` = `i`.`id`) + ) + LEFT JOIN `vn`.`item` `io` ON(`io`.`id` = `b`.`itemOriginalFk`) + ) + LEFT JOIN `edi`.`ekt` `e` ON(`e`.`id` = `b`.`ektFk`) + ) + LEFT JOIN `edi`.`supplier` `s` ON(`e`.`pro` = `s`.`supplier_id`) + ) diff --git a/db/routines/vn2008/views/buy_edi.sql b/db/routines/vn2008/views/buy_edi.sql new file mode 100644 index 000000000..0d194c89e --- /dev/null +++ b/db/routines/vn2008/views/buy_edi.sql @@ -0,0 +1,41 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`buy_edi` +AS SELECT `t`.`id` AS `id`, + `t`.`barcode` AS `barcode`, + `t`.`entryYear` AS `entry_year`, + `t`.`deliveryNumber` AS `delivery_number`, + `t`.`fec` AS `fec`, + `t`.`hor` AS `hor`, + `t`.`now` AS `now`, + `t`.`ptj` AS `ptj`, + `t`.`ref` AS `ref`, + `t`.`item` AS `item`, + `t`.`pac` AS `pac`, + `t`.`qty` AS `qty`, + `t`.`ori` AS `ori`, + `t`.`cat` AS `cat`, + `t`.`agj` AS `agj`, + `t`.`kop` AS `kop`, + `t`.`ptd` AS `ptd`, + `t`.`sub` AS `sub`, + `t`.`pro` AS `pro`, + `t`.`pri` AS `pri`, + `t`.`package` AS `package`, + `t`.`auction` AS `auction`, + `t`.`klo` AS `klo`, + `t`.`k1` AS `k01`, + `t`.`k2` AS `k02`, + `t`.`k3` AS `k03`, + `t`.`k4` AS `k04`, + `t`.`s1` AS `s1`, + `t`.`s2` AS `s2`, + `t`.`s3` AS `s3`, + `t`.`s4` AS `s4`, + `t`.`s5` AS `s5`, + `t`.`s6` AS `s6`, + `t`.`ok` AS `ok`, + `t`.`trolleyFk` AS `trolley_id`, + `t`.`putOrderFk` AS `putOrderFk`, + `t`.`scanned` AS `scanned` +FROM `edi`.`ekt` `t` diff --git a/db/routines/vn2008/views/buy_edi_k012.sql b/db/routines/vn2008/views/buy_edi_k012.sql new file mode 100644 index 000000000..8ef89e5c9 --- /dev/null +++ b/db/routines/vn2008/views/buy_edi_k012.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`buy_edi_k012` +AS SELECT `eek`.`id` AS `buy_edi_k012_id`, + `eek`.`description` AS `description` +FROM `edi`.`ektK1` `eek` diff --git a/db/routines/vn2008/views/buy_edi_k03.sql b/db/routines/vn2008/views/buy_edi_k03.sql new file mode 100644 index 000000000..04ca10ef5 --- /dev/null +++ b/db/routines/vn2008/views/buy_edi_k03.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`buy_edi_k03` +AS SELECT `eek`.`id` AS `buy_edi_k03_id`, + `eek`.`description` AS `description` +FROM `edi`.`ektK3` `eek` diff --git a/db/routines/vn2008/views/buy_edi_k04.sql b/db/routines/vn2008/views/buy_edi_k04.sql new file mode 100644 index 000000000..3c32e3b88 --- /dev/null +++ b/db/routines/vn2008/views/buy_edi_k04.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`buy_edi_k04` +AS SELECT `eek`.`id` AS `buy_edi_k04_id`, + `eek`.`description` AS `description` +FROM `edi`.`ektK4` `eek` diff --git a/db/routines/vn2008/views/cdr.sql b/db/routines/vn2008/views/cdr.sql new file mode 100644 index 000000000..9d0d2f172 --- /dev/null +++ b/db/routines/vn2008/views/cdr.sql @@ -0,0 +1,20 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`cdr` +AS SELECT `c`.`call_date` AS `calldate`, + `c`.`clid` AS `clid`, + `c`.`src` AS `src`, + `c`.`dst` AS `dst`, + `c`.`dcontext` AS `dcontext`, + `c`.`channel` AS `channel`, + `c`.`dst_channel` AS `dstchannel`, + `c`.`last_app` AS `lastapp`, + `c`.`last_data` AS `lastdata`, + `c`.`duration` AS `duration`, + `c`.`billsec` AS `billsec`, + `c`.`disposition` AS `disposition`, + `c`.`ama_flags` AS `amaflags`, + `c`.`account_code` AS `accountcode`, + `c`.`unique_id` AS `uniqueid`, + `c`.`user_field` AS `userfield` +FROM `pbx`.`cdr` `c` diff --git a/db/routines/vn2008/views/chanel.sql b/db/routines/vn2008/views/chanel.sql new file mode 100644 index 000000000..9d2ed0d9c --- /dev/null +++ b/db/routines/vn2008/views/chanel.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`chanel` +AS SELECT `c`.`id` AS `chanel_id`, + `c`.`name` AS `name` +FROM `vn`.`contactChannel` `c` diff --git a/db/routines/vn2008/views/cl_act.sql b/db/routines/vn2008/views/cl_act.sql new file mode 100644 index 000000000..a62ac3efe --- /dev/null +++ b/db/routines/vn2008/views/cl_act.sql @@ -0,0 +1,10 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`cl_act` +AS SELECT `c`.`id` AS `id`, + `c`.`saleFk` AS `Id_Movimiento`, + `c`.`claimFk` AS `cl_main_id`, + `c`.`workerFk` AS `Id_Trabajador`, + `c`.`claimDestinationFk` AS `cl_sol_id`, + `c`.`isGreuge` AS `greuge` +FROM `vn`.`claimEnd` `c` diff --git a/db/routines/vn2008/views/cl_cau.sql b/db/routines/vn2008/views/cl_cau.sql new file mode 100644 index 000000000..a835a94c9 --- /dev/null +++ b/db/routines/vn2008/views/cl_cau.sql @@ -0,0 +1,12 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`cl_cau` +AS SELECT `c`.`id` AS `id`, + `c`.`claimFk` AS `cl_main_id`, + `c`.`claimResponsibleFk` AS `cl_res_id`, + `c`.`workerFk` AS `Id_Trabajador`, + `c`.`claimReasonFk` AS `cl_mot_id`, + `c`.`claimResultFk` AS `cl_con_id`, + `c`.`claimRedeliveryFk` AS `cl_dev`, + `c`.`claimDestinationFk` AS `cl_sol` +FROM `vn`.`claimDevelopment` `c` diff --git a/db/routines/vn2008/views/cl_con.sql b/db/routines/vn2008/views/cl_con.sql new file mode 100644 index 000000000..b4f596d56 --- /dev/null +++ b/db/routines/vn2008/views/cl_con.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`cl_con` +AS SELECT `c`.`id` AS `id`, + `c`.`description` AS `consecuencia` +FROM `vn`.`claimResult` `c` diff --git a/db/routines/vn2008/views/cl_det.sql b/db/routines/vn2008/views/cl_det.sql new file mode 100644 index 000000000..cef5c821d --- /dev/null +++ b/db/routines/vn2008/views/cl_det.sql @@ -0,0 +1,8 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`cl_det` +AS SELECT `c`.`id` AS `id`, + `c`.`claimFk` AS `cl_main_id`, + `c`.`saleFk` AS `Id_Movimiento`, + `c`.`quantity` AS `numero` +FROM `vn`.`claimBeginning` `c` diff --git a/db/routines/vn2008/views/cl_main.sql b/db/routines/vn2008/views/cl_main.sql new file mode 100644 index 000000000..ef0c2cb8a --- /dev/null +++ b/db/routines/vn2008/views/cl_main.sql @@ -0,0 +1,14 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`cl_main` +AS SELECT `c`.`id` AS `id`, + `c`.`ticketCreated` AS `Fecha`, + `c`.`claimStateFk` AS `cl_est_id`, + `c`.`observation` AS `notas`, + `c`.`clientFk` AS `Id_Cliente`, + `c`.`workerFk` AS `Id_Trabajador`, + `c`.`responsibility` AS `sensib`, + `c`.`isChargedToMana` AS `mana`, + `c`.`ticketFk` AS `ticketFk`, + `c`.`created` AS `odbc_date` +FROM `vn`.`claim` `c` diff --git a/db/routines/vn2008/views/cl_mot.sql b/db/routines/vn2008/views/cl_mot.sql new file mode 100644 index 000000000..60fb27041 --- /dev/null +++ b/db/routines/vn2008/views/cl_mot.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`cl_mot` +AS SELECT `c`.`id` AS `id`, + `c`.`description` AS `motivo` +FROM `vn`.`claimReason` `c` diff --git a/db/routines/vn2008/views/cl_res.sql b/db/routines/vn2008/views/cl_res.sql new file mode 100644 index 000000000..e82ee73b0 --- /dev/null +++ b/db/routines/vn2008/views/cl_res.sql @@ -0,0 +1,7 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`cl_res` +AS SELECT `c`.`id` AS `id`, + `c`.`description` AS `responsable`, + `c`.`responsability` AS `sensibility` +FROM `vn`.`claimResponsible` `c` diff --git a/db/routines/vn2008/views/cl_sol.sql b/db/routines/vn2008/views/cl_sol.sql new file mode 100644 index 000000000..23f2b8594 --- /dev/null +++ b/db/routines/vn2008/views/cl_sol.sql @@ -0,0 +1,7 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`cl_sol` +AS SELECT `c`.`id` AS `id`, + `c`.`description` AS `solucion`, + `c`.`addressFk` AS `addressFk` +FROM `vn`.`claimDestination` `c` diff --git a/db/routines/vn2008/views/config_host.sql b/db/routines/vn2008/views/config_host.sql new file mode 100644 index 000000000..2d4d6fa4c --- /dev/null +++ b/db/routines/vn2008/views/config_host.sql @@ -0,0 +1,11 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`config_host` +AS SELECT `vn`.`host`.`code` AS `config_host_id`, + `vn`.`host`.`warehouseFk` AS `warehouse`, + `vn`.`host`.`companyFk` AS `empresaId`, + `vn`.`host`.`bankFk` AS `caja`, + `vn`.`host`.`printerFk` AS `Id_Impresora`, + `vn`.`host`.`routeDaysBefore` AS `route_days_before`, + `vn`.`host`.`routeDaysAfter` AS `route_days_after` +FROM `vn`.`host` diff --git a/db/routines/vn2008/views/consignatarios_observation.sql b/db/routines/vn2008/views/consignatarios_observation.sql new file mode 100644 index 000000000..1f4c2eeb2 --- /dev/null +++ b/db/routines/vn2008/views/consignatarios_observation.sql @@ -0,0 +1,8 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`consignatarios_observation` +AS SELECT `co`.`id` AS `consignatarios_observation_id`, + `co`.`addressFk` AS `Id_Consigna`, + `co`.`observationTypeFk` AS `observation_type_id`, + `co`.`description` AS `text` +FROM `vn`.`addressObservation` `co` diff --git a/db/routines/vn2008/views/credit.sql b/db/routines/vn2008/views/credit.sql new file mode 100644 index 000000000..0de60b967 --- /dev/null +++ b/db/routines/vn2008/views/credit.sql @@ -0,0 +1,11 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`credit` +AS SELECT + `c`.`id` AS `id`, + `c`.`clientFk` AS `Id_Cliente`, + `c`.`workerFk` AS `Id_Trabajador`, + `c`.`amount` AS `amount`, + `c`.`created` AS `odbc_date` +FROM + `vn`.`clientCredit` `c` diff --git a/db/routines/vn2008/views/definitivo.sql b/db/routines/vn2008/views/definitivo.sql new file mode 100644 index 000000000..1bc554161 --- /dev/null +++ b/db/routines/vn2008/views/definitivo.sql @@ -0,0 +1,9 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`definitivo` +AS SELECT `d`.`id` AS `definitivo_id`, + `d`.`companyFk` AS `empresa_id`, + `d`.`started` AS `desde`, + `d`.`ended` AS `hasta`, + `d`.`created` AS `fecha` +FROM `vn`.`dmsStorageBox` `d` diff --git a/db/routines/vn2008/views/edi_article.sql b/db/routines/vn2008/views/edi_article.sql new file mode 100644 index 000000000..34bb64149 --- /dev/null +++ b/db/routines/vn2008/views/edi_article.sql @@ -0,0 +1,12 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`edi_article` +AS SELECT `edi`.`item`.`id` AS `id`, + `edi`.`item`.`product_name` AS `product_name`, + `edi`.`item`.`name` AS `name`, + `edi`.`item`.`plant_id` AS `plant_id`, + `edi`.`item`.`group_id` AS `group_id`, + `edi`.`item`.`entry_date` AS `entry_date`, + `edi`.`item`.`expiry_date` AS `expiry_date`, + `edi`.`item`.`change_date_time` AS `change_date_time` +FROM `edi`.`item` diff --git a/db/routines/vn2008/views/edi_bucket.sql b/db/routines/vn2008/views/edi_bucket.sql new file mode 100644 index 000000000..1af487a6c --- /dev/null +++ b/db/routines/vn2008/views/edi_bucket.sql @@ -0,0 +1,15 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`edi_bucket` +AS SELECT cast( + `edi`.`bucket`.`bucket_id` AS char CHARSET utf8mb3 + ) COLLATE utf8mb3_general_ci AS `bucket_id`, + `edi`.`bucket`.`bucket_type_id` AS `bucket_type_id`, + `edi`.`bucket`.`description` AS `description`, + `edi`.`bucket`.`x_size` AS `x_size`, + `edi`.`bucket`.`y_size` AS `y_size`, + `edi`.`bucket`.`z_size` AS `z_size`, + `edi`.`bucket`.`entry_date` AS `entry_date`, + `edi`.`bucket`.`expiry_date` AS `expiry_date`, + `edi`.`bucket`.`change_date_time` AS `change_date_time` +FROM `edi`.`bucket` diff --git a/db/routines/vn2008/views/edi_bucket_type.sql b/db/routines/vn2008/views/edi_bucket_type.sql new file mode 100644 index 000000000..8e3af2080 --- /dev/null +++ b/db/routines/vn2008/views/edi_bucket_type.sql @@ -0,0 +1,9 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`edi_bucket_type` +AS SELECT `edi`.`bucket_type`.`bucket_type_id` AS `bucket_type_id`, + `edi`.`bucket_type`.`description` AS `description`, + `edi`.`bucket_type`.`entry_date` AS `entry_date`, + `edi`.`bucket_type`.`expiry_date` AS `expiry_date`, + `edi`.`bucket_type`.`change_date_time` AS `change_date_time` +FROM `edi`.`bucket_type` diff --git a/db/routines/vn2008/views/edi_specie.sql b/db/routines/vn2008/views/edi_specie.sql new file mode 100644 index 000000000..33e38482e --- /dev/null +++ b/db/routines/vn2008/views/edi_specie.sql @@ -0,0 +1,10 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`edi_specie` +AS SELECT `edi`.`specie`.`specie_id` AS `specie_id`, + `edi`.`specie`.`genus_id` AS `genus_id`, + `edi`.`specie`.`latin_species_name` AS `latin_species_name`, + `edi`.`specie`.`entry_date` AS `entry_date`, + `edi`.`specie`.`expiry_date` AS `expiry_date`, + `edi`.`specie`.`change_date_time` AS `change_date_time` +FROM `edi`.`specie` diff --git a/db/routines/vn2008/views/edi_supplier.sql b/db/routines/vn2008/views/edi_supplier.sql new file mode 100644 index 000000000..51f96b83d --- /dev/null +++ b/db/routines/vn2008/views/edi_supplier.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`edi_supplier` +AS SELECT `edi`.`supplier`.`supplier_id` AS `supplier_id`, + `edi`.`supplier`.`company_name` AS `company_name` +FROM `edi`.`supplier` diff --git a/db/routines/vn2008/views/empresa.sql b/db/routines/vn2008/views/empresa.sql new file mode 100644 index 000000000..8c80a06e8 --- /dev/null +++ b/db/routines/vn2008/views/empresa.sql @@ -0,0 +1,23 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`empresa` +AS SELECT `c`.`id` AS `id`, + `c`.`code` AS `abbreviation`, + `c`.`supplierAccountFk` AS `Id_Proveedores_account`, + `c`.`workerManagerFk` AS `gerente_id`, + `c`.`phytosanitary` AS `phytosanitary`, + `c`.`companyCode` AS `CodigoEmpresa`, + `c`.`companyGroupFk` AS `empresa_grupo`, + `c`.`isDefaulter` AS `morosidad`, + `c`.`expired` AS `baja`, + `c`.`register` AS `registro`, + `c`.`registered` AS `alta`, + `c`.`logo` AS `logo`, + `c`.`isOfficial` AS `oficial`, + `c`.`hasCyc` AS `cyc`, + `c`.`rgb` AS `rgb`, + `c`.`email` AS `mail`, + `c`.`stamp` AS `cuno`, + `c`.`created` AS `ODBC_DATE`, + `c`.`clientFk` AS `Id_Cliente` +FROM `vn`.`company` `c` diff --git a/db/routines/vn2008/views/empresa_grupo.sql b/db/routines/vn2008/views/empresa_grupo.sql new file mode 100644 index 000000000..35ba27279 --- /dev/null +++ b/db/routines/vn2008/views/empresa_grupo.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`empresa_grupo` +AS SELECT `vn`.`companyGroup`.`id` AS `empresa_grupo_id`, + `vn`.`companyGroup`.`code` AS `grupo` +FROM `vn`.`companyGroup` diff --git a/db/routines/vn2008/views/entrySource.sql b/db/routines/vn2008/views/entrySource.sql new file mode 100644 index 000000000..3a8df41bf --- /dev/null +++ b/db/routines/vn2008/views/entrySource.sql @@ -0,0 +1,55 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`entrySource` +AS SELECT `e`.`gestDocFk` AS `gestdoc_id`, + `e`.`id` AS `Id_Entrada`, + `e`.`invoiceNumber` AS `invoiceNumber`, + `e`.`reference` AS `reference`, + `e`.`isExcludedFromAvailable` AS `Inventario`, + `e`.`isConfirmed` AS `Confirmada`, + `e`.`isOrdered` AS `Pedida`, + `e`.`isRaid` AS `Redada`, + `e`.`evaNotes` AS `notas`, + `e`.`supplierFk` AS `Id_Proveedor`, + `tr`.`shipped` AS `shipment`, + `tr`.`landed` AS `landing`, + `w2`.`name` AS `wh_in`, + `w1`.`name` AS `wh_out`, + `am`.`name` AS `Agencia`, + `e`.`commission` AS `comision`, + `tr`.`warehouseInFk` AS `warehouse_id`, + `w1`.`id` AS `warehouse_id_out`, + `e`.`isBooked` AS `anotadoencaja`, + `e`.`invoiceInFk` AS `invoiceInFk`, + `e`.`companyFk` AS `empresa_id`, + `e`.`currencyFk` AS `Id_Moneda`, + `tr`.`id` AS `TravelFk`, + `e`.`sub` AS `sub`, + `e`.`kop` AS `kop`, + `e`.`pro` AS `pro`, + `e`.`invoiceAmount` AS `invoiceAmount`, + `w`.`code` AS `buyerCode`, + `e`.`typeFk` AS `typeFk`, + `w3`.`code` AS `observationWorkerCode` +FROM ( + ( + ( + ( + ( + ( + ( + `vn`.`entry` `e` + LEFT JOIN `vn`.`travel` `tr` ON(`e`.`travelFk` = `tr`.`id`) + ) + LEFT JOIN `vn`.`agencyMode` `am` ON(`am`.`id` = `tr`.`agencyModeFk`) + ) + LEFT JOIN `vn`.`warehouse` `w1` ON(`tr`.`warehouseOutFk` = `w1`.`id`) + ) + LEFT JOIN `vn`.`warehouse` `w2` ON(`tr`.`warehouseInFk` = `w2`.`id`) + ) + LEFT JOIN `vn`.`supplier` `s` ON(`e`.`supplierFk` = `s`.`id`) + ) + LEFT JOIN `vn`.`worker` `w` ON(`w`.`id` = `e`.`buyerFk`) + ) + LEFT JOIN `vn`.`worker` `w3` ON(`w3`.`id` = `e`.`observationEditorFk`) + ) diff --git a/db/routines/vn2008/views/financialProductType.sql b/db/routines/vn2008/views/financialProductType.sql new file mode 100644 index 000000000..89a063856 --- /dev/null +++ b/db/routines/vn2008/views/financialProductType.sql @@ -0,0 +1,4 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER +VIEW `vn2008`.`financialProductType`AS + SELECT * FROM vn.financialProductType; \ No newline at end of file diff --git a/db/routines/vn2008/views/flight.sql b/db/routines/vn2008/views/flight.sql new file mode 100644 index 000000000..2df5362f7 --- /dev/null +++ b/db/routines/vn2008/views/flight.sql @@ -0,0 +1,13 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`flight` +AS SELECT + `f`.`id` AS `flight_id`, + `f`.`duration` AS `duration`, + `f`.`flightPath` AS `route`, + `f`.`days` AS `days`, + `f`.`airlineFk` AS `airline_id`, + `f`.`airportArrivalFk` AS `airport_out`, + `f`.`airportDepartureFk` AS `airport_in` +FROM + `vn`.`flight` `f`; \ No newline at end of file diff --git a/db/routines/vn2008/views/gastos_resumen.sql b/db/routines/vn2008/views/gastos_resumen.sql new file mode 100644 index 000000000..02231bcbf --- /dev/null +++ b/db/routines/vn2008/views/gastos_resumen.sql @@ -0,0 +1,11 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`gastos_resumen` +AS SELECT + `es`.`expenseFk` AS `Id_Gasto`, + `es`.`year` AS `year`, + `es`.`month` AS `month`, + `es`.`amount` AS `importe`, + `es`.`companyFk` AS `empresa_id` +FROM + `vn`.`expenseManual` `es`; \ No newline at end of file diff --git a/db/routines/vn2008/views/integra2.sql b/db/routines/vn2008/views/integra2.sql new file mode 100644 index 000000000..05840d6bb --- /dev/null +++ b/db/routines/vn2008/views/integra2.sql @@ -0,0 +1,9 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`integra2` +AS SELECT + `i2`.`postCode` AS `postal_code`, + `i2`.`frequency` AS `frequency`, + `i2`.`warehouseFk` AS `warehouse_id` +FROM + `vn`.`integra2` `i2`; \ No newline at end of file diff --git a/db/routines/vn2008/views/integra2_province.sql b/db/routines/vn2008/views/integra2_province.sql new file mode 100644 index 000000000..bc099adb3 --- /dev/null +++ b/db/routines/vn2008/views/integra2_province.sql @@ -0,0 +1,8 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`integra2_province` +AS SELECT + `ip`.`provinceFk` AS `province_id`, + `ip`.`franchise` AS `franquicia` +FROM + `vn`.`integra2Province` `ip`; \ No newline at end of file diff --git a/db/routines/vn2008/views/mail.sql b/db/routines/vn2008/views/mail.sql new file mode 100644 index 000000000..3074dfa95 --- /dev/null +++ b/db/routines/vn2008/views/mail.sql @@ -0,0 +1,16 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`mail` +AS SELECT `m`.`id` AS `id`, + `m`.`senderFk` AS `senderFk`, + `m`.`recipientFk` AS `recipientFk`, + `m`.`receiver` AS `to`, + `m`.`replyTo` AS `reply_to`, + `m`.`subject` AS `subject`, + `m`.`body` AS `text`, + `m`.`plainTextBody` AS `plainTextBody`, + `m`.`attachment` AS `path`, + `m`.`creationDate` AS `DATE_ODBC`, + `m`.`sent` AS `sent`, + `m`.`status` AS `error` +FROM `vn`.`mail` `m` diff --git a/db/routines/vn2008/views/mandato.sql b/db/routines/vn2008/views/mandato.sql new file mode 100644 index 000000000..dde43b48d --- /dev/null +++ b/db/routines/vn2008/views/mandato.sql @@ -0,0 +1,11 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`mandato` +AS SELECT `m`.`id` AS `id`, + `m`.`clientFk` AS `Id_Cliente`, + `m`.`companyFk` AS `empresa_id`, + `m`.`code` AS `Id_mandato`, + `m`.`created` AS `FAlta`, + `m`.`finished` AS `Fbaja`, + `m`.`mandateTypeFk` AS `idmandato_tipo` +FROM `vn`.`mandate` `m` diff --git a/db/routines/vn2008/views/mandato_tipo.sql b/db/routines/vn2008/views/mandato_tipo.sql new file mode 100644 index 000000000..a1b5b0a9f --- /dev/null +++ b/db/routines/vn2008/views/mandato_tipo.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`mandato_tipo` +AS SELECT `m`.`id` AS `idmandato_tipo`, + `m`.`name` AS `Nombre` +FROM `vn`.`mandateType` `m` diff --git a/db/routines/vn2008/views/pago.sql b/db/routines/vn2008/views/pago.sql new file mode 100644 index 000000000..546496070 --- /dev/null +++ b/db/routines/vn2008/views/pago.sql @@ -0,0 +1,18 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`pago` +AS SELECT `p`.`id` AS `id`, + `p`.`received` AS `fecha`, + `p`.`dueDated` AS `dueDated`, + `p`.`supplierFk` AS `id_proveedor`, + `p`.`amount` AS `importe`, + `p`.`currencyFk` AS `id_moneda`, + `p`.`divisa` AS `divisa`, + `p`.`bankFk` AS `id_banco`, + `p`.`payMethodFk` AS `pay_met_id`, + `p`.`companyFk` AS `empresa_id`, + `p`.`isConciliated` AS `conciliado`, + `p`.`bankingFees` AS `g_bancarios`, + `p`.`concept` AS `concepte`, + `p`.`created` AS `odbc_date` +FROM `vn`.`payment` `p` diff --git a/db/routines/vn2008/views/pago_sdc.sql b/db/routines/vn2008/views/pago_sdc.sql new file mode 100644 index 000000000..29480e376 --- /dev/null +++ b/db/routines/vn2008/views/pago_sdc.sql @@ -0,0 +1,16 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`pago_sdc` +AS SELECT `ei`.`id` AS `pago_sdc_id`, + `ei`.`amount` AS `importe`, + `ei`.`dated` AS `fecha`, + `ei`.`dueDated` AS `vencimiento`, + `ei`.`entityFk` AS `entity_id`, + `ei`.`ref` AS `ref`, + `ei`.`rate` AS `rate`, + `ei`.`companyFk` AS `empresa_id`, + `ei`.`financialProductTypefk` AS `financialProductTypefk`, + `ei`.`upperBarrier` AS `upperBarrier`, + `ei`.`lowerBarrier` AS `lowerBarrier`, + `ei`.`strike` AS `strike` +FROM `vn`.`exchangeInsurance` `ei` \ No newline at end of file diff --git a/db/routines/vn2008/views/pay_dem.sql b/db/routines/vn2008/views/pay_dem.sql new file mode 100644 index 000000000..1ef00d645 --- /dev/null +++ b/db/routines/vn2008/views/pay_dem.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`pay_dem` +AS SELECT `pd`.`id` AS `id`, + `pd`.`payDem` AS `pay_dem` +FROM `vn`.`payDem` `pd` diff --git a/db/routines/vn2008/views/pay_dem_det.sql b/db/routines/vn2008/views/pay_dem_det.sql new file mode 100644 index 000000000..822897ed8 --- /dev/null +++ b/db/routines/vn2008/views/pay_dem_det.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`pay_dem_det` +AS SELECT `pdd`.`id` AS `id`, + `pdd`.`detail` AS `detalle` +FROM `vn`.`payDemDetail` `pdd` diff --git a/db/routines/vn2008/views/pay_met.sql b/db/routines/vn2008/views/pay_met.sql new file mode 100644 index 000000000..63e2b30e0 --- /dev/null +++ b/db/routines/vn2008/views/pay_met.sql @@ -0,0 +1,10 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`pay_met` +AS SELECT `pm`.`id` AS `id`, + `pm`.`name` AS `name`, + `pm`.`graceDays` AS `graceDays`, + `pm`.`outstandingDebt` AS `deudaviva`, + `pm`.`solution` AS `solucion`, + `pm`.`isNotified` AS `isNotified` +FROM `vn`.`payMethod` `pm` diff --git a/db/routines/vn2008/views/payroll_categorias.sql b/db/routines/vn2008/views/payroll_categorias.sql new file mode 100644 index 000000000..b71e69019 --- /dev/null +++ b/db/routines/vn2008/views/payroll_categorias.sql @@ -0,0 +1,7 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`payroll_categorias` +AS SELECT `pc`.`id` AS `codcategoria`, + `pc`.`rate` AS `Tarifa`, + `pc`.`description` AS `descripcion` +FROM `vn`.`payrollCategories` `pc` diff --git a/db/routines/vn2008/views/plantpassport.sql b/db/routines/vn2008/views/plantpassport.sql new file mode 100644 index 000000000..b1be6a80b --- /dev/null +++ b/db/routines/vn2008/views/plantpassport.sql @@ -0,0 +1,8 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`plantpassport` +AS SELECT `pp`.`producerFk` AS `producer_id`, + `pp`.`plantpassportAuthorityFk` AS `plantpassport_authority_id`, + `pp`.`number` AS `number`, + `pp`.`isRequested` AS `isRequested` +FROM `vn`.`plantpassport` `pp` diff --git a/db/routines/vn2008/views/plantpassport_authority.sql b/db/routines/vn2008/views/plantpassport_authority.sql new file mode 100644 index 000000000..4548bbede --- /dev/null +++ b/db/routines/vn2008/views/plantpassport_authority.sql @@ -0,0 +1,7 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`plantpassport_authority` +AS SELECT `ppa`.`id` AS `plantpassport_authority_id`, + `ppa`.`denomination` AS `denomination`, + `ppa`.`countryFk` AS `Paises_Id` +FROM `vn`.`plantpassportAuthority` `ppa` diff --git a/db/routines/vn2008/views/price_fixed.sql b/db/routines/vn2008/views/price_fixed.sql new file mode 100644 index 000000000..ce8170e7c --- /dev/null +++ b/db/routines/vn2008/views/price_fixed.sql @@ -0,0 +1,18 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`price_fixed` +AS SELECT `pf`.`itemFk` AS `item_id`, + `pf`.`rate0` AS `rate_0`, + `pf`.`rate1` AS `rate_1`, + `pf`.`rate2` AS `rate_2`, + `pf`.`rate3` AS `rate_3`, + `pf`.`started` AS `date_start`, + `pf`.`ended` AS `date_end`, + `pf`.`bonus` AS `bonus`, + `pf`.`warehouseFk` AS `warehouse_id`, + `pf`.`created` AS `odbc_date`, + `pf`.`id` AS `price_fixed_id`, + `pf`.`grouping` AS `grouping`, + `pf`.`packing` AS `Packing`, + `pf`.`box` AS `caja` +FROM `vn`.`priceFixed` `pf` diff --git a/db/routines/vn2008/views/producer.sql b/db/routines/vn2008/views/producer.sql new file mode 100644 index 000000000..babfb887e --- /dev/null +++ b/db/routines/vn2008/views/producer.sql @@ -0,0 +1,7 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`producer` +AS SELECT `p`.`id` AS `producer_id`, + `p`.`name` AS `name`, + `p`.`isVisible` AS `visible` +FROM `vn`.`producer` `p` diff --git a/db/routines/vn2008/views/promissoryNote.sql b/db/routines/vn2008/views/promissoryNote.sql new file mode 100644 index 000000000..0db0fa86f --- /dev/null +++ b/db/routines/vn2008/views/promissoryNote.sql @@ -0,0 +1,8 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Pagares` +AS SELECT `p`.`id` AS `Id_Pagare`, + `p`.`issued` AS `Fechaemision`, + `p`.`Concept` AS `Concepto`, + `p`.`paymentFk` AS `pago_id` +FROM `vn`.`promissoryNote` `p` \ No newline at end of file diff --git a/db/routines/vn2008/views/proveedores_clientes.sql b/db/routines/vn2008/views/proveedores_clientes.sql new file mode 100644 index 000000000..e08f4a3a7 --- /dev/null +++ b/db/routines/vn2008/views/proveedores_clientes.sql @@ -0,0 +1,11 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`proveedores_clientes` +AS SELECT `Proveedores`.`Id_Proveedor` AS `Id_Proveedor`, + `Proveedores`.`Proveedor` AS `Proveedor`, + `Clientes`.`id_cliente` AS `Id_Cliente`, + `Clientes`.`cliente` AS `Cliente` +FROM ( + `vn2008`.`Proveedores` + JOIN `vn2008`.`Clientes` ON(`Proveedores`.`NIF` = `Clientes`.`if`) + ) diff --git a/db/routines/vn2008/views/province.sql b/db/routines/vn2008/views/province.sql new file mode 100644 index 000000000..1477ec803 --- /dev/null +++ b/db/routines/vn2008/views/province.sql @@ -0,0 +1,10 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`province` +AS SELECT `p`.`id` AS `province_id`, + `p`.`name` AS `name`, + `p`.`countryFk` AS `Paises_Id`, + `p`.`warehouseFk` AS `warehouse_id`, + `p`.`zoneFk` AS `zone`, + `p`.`geoFk` AS `geoFk` +FROM `vn`.`province` `p` diff --git a/db/routines/vn2008/views/recibida.sql b/db/routines/vn2008/views/recibida.sql new file mode 100644 index 000000000..76b86505e --- /dev/null +++ b/db/routines/vn2008/views/recibida.sql @@ -0,0 +1,26 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`recibida` +AS SELECT `r`.`id` AS `id`, + `r`.`serialNumber` AS `num_recibida`, + `r`.`serial` AS `serie`, + `r`.`supplierFk` AS `proveedor_id`, + `r`.`issued` AS `fecha`, + `r`.`supplierRef` AS `sref`, + `r`.`isBooked` AS `contabilizada`, + `r`.`currencyFk` AS `moneda_id`, + `r`.`created` AS `MYSQL_TIME`, + `r`.`companyFk` AS `empresa_id`, + `r`.`docFk` AS `gestdoc_id`, + `r`.`booked` AS `dateBooking`, + `r`.`operated` AS `dateOperation`, + `r`.`siiTypeInvoiceInFk` AS `siiTypeInvoiceInFk`, + `r`.`cplusRectificationTypeFk` AS `cplusRectificationTypeFk`, + `r`.`cplusSubjectOpFk` AS `cplusSubjectOpFk`, + `r`.`cplusTaxBreakFk` AS `cplusTaxBreakFk`, + `r`.`siiTrascendencyInvoiceInFk` AS `siiTrascendencyInvoiceInFk`, + `r`.`bookEntried` AS `bookEntried`, + `r`.`isVatDeductible` AS `isVatDeductible`, + `r`.`withholdingSageFk` AS `withholdingSageFk`, + `r`.`expenseFkDeductible` AS `expenseFkDeductible` +FROM `vn`.`invoiceIn` `r` diff --git a/db/routines/vn2008/views/recibida_intrastat.sql b/db/routines/vn2008/views/recibida_intrastat.sql new file mode 100644 index 000000000..402781931 --- /dev/null +++ b/db/routines/vn2008/views/recibida_intrastat.sql @@ -0,0 +1,7 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`recibida_intrastat` +AS SELECT `i`.`invoiceInFk` AS `recibida_id`, + `i`.`intrastatFk` AS `Codintrastat`, + `i`.`amount` AS `importe` +FROM `vn`.`invoiceInIntrastat` `i` diff --git a/db/routines/vn2008/views/recibida_iva.sql b/db/routines/vn2008/views/recibida_iva.sql new file mode 100644 index 000000000..7d948a6ff --- /dev/null +++ b/db/routines/vn2008/views/recibida_iva.sql @@ -0,0 +1,13 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`recibida_iva` +AS SELECT `i`.`id` AS `id`, + `i`.`invoiceInFk` AS `recibida_id`, + `i`.`taxCodeFk` AS `iva_id`, + `i`.`taxableBase` AS `bi`, + `i`.`expenseFk` AS `gastos_id`, + `i`.`foreignValue` AS `divisa`, + `i`.`taxTypeSageFk` AS `taxTypeSageFk`, + `i`.`transactionTypeSageFk` AS `transactionTypeSageFk`, + `i`.`created` AS `MYSQL_TIME` +FROM `vn`.`invoiceInTax` `i` diff --git a/db/routines/vn2008/views/recibida_vencimiento.sql b/db/routines/vn2008/views/recibida_vencimiento.sql new file mode 100644 index 000000000..813ae40d7 --- /dev/null +++ b/db/routines/vn2008/views/recibida_vencimiento.sql @@ -0,0 +1,11 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`recibida_vencimiento` +AS SELECT `r`.`id` AS `id`, + `r`.`invoiceInFk` AS `recibida_id`, + `r`.`dueDated` AS `fecha`, + `r`.`bankFk` AS `banco_id`, + `r`.`amount` AS `cantidad`, + `r`.`foreignValue` AS `divisa`, + `r`.`created` AS `stamp` +FROM `vn`.`invoiceInDueDay` `r` diff --git a/db/routines/vn2008/views/recovery.sql b/db/routines/vn2008/views/recovery.sql new file mode 100644 index 000000000..5bbff3124 --- /dev/null +++ b/db/routines/vn2008/views/recovery.sql @@ -0,0 +1,10 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`recovery` +AS SELECT `r`.`id` AS `recovery_id`, + `r`.`clientFk` AS `Id_Cliente`, + `r`.`started` AS `dstart`, + `r`.`finished` AS `dend`, + `r`.`amount` AS `amount`, + `r`.`period` AS `period` +FROM `vn`.`recovery` `r` diff --git a/db/routines/vn2008/views/reference_rate.sql b/db/routines/vn2008/views/reference_rate.sql new file mode 100644 index 000000000..eb0f1c25e --- /dev/null +++ b/db/routines/vn2008/views/reference_rate.sql @@ -0,0 +1,7 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`reference_rate` +AS SELECT `rr`.`currencyFk` AS `moneda_id`, + `rr`.`dated` AS `date`, + `rr`.`value` AS `rate` +FROM `vn`.`referenceRate` `rr` diff --git a/db/routines/vn2008/views/reinos.sql b/db/routines/vn2008/views/reinos.sql new file mode 100644 index 000000000..4d98d1f09 --- /dev/null +++ b/db/routines/vn2008/views/reinos.sql @@ -0,0 +1,12 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`reinos` +AS SELECT `r`.`id` AS `id`, + `r`.`name` AS `reino`, + `r`.`display` AS `display`, + `r`.`color` AS `color`, + `r`.`icon` AS `icon`, + `r`.`merchandise` AS `mercancia`, + `r`.`order` AS `orden`, + `r`.`shortLife` AS `efimero` +FROM `vn`.`itemCategory` `r` diff --git a/db/routines/vn2008/views/state.sql b/db/routines/vn2008/views/state.sql new file mode 100644 index 000000000..63f6589af --- /dev/null +++ b/db/routines/vn2008/views/state.sql @@ -0,0 +1,13 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`state` +AS SELECT `s`.`id` AS `id`, + `s`.`name` AS `name`, + `s`.`order` AS `order`, + `s`.`alertLevel` AS `alert_level`, + `s`.`code` AS `code`, + `s`.`sectorProdPriority` AS `sectorProdPriority`, + `s`.`nextStateFk` AS `nextStateFk`, + `s`.`isPreviousPreparable` AS `isPreviousPreparable`, + `s`.`isPicked` AS `isPicked` +FROM `vn`.`state` `s` diff --git a/db/routines/vn2008/views/tag.sql b/db/routines/vn2008/views/tag.sql new file mode 100644 index 000000000..25b3ab82e --- /dev/null +++ b/db/routines/vn2008/views/tag.sql @@ -0,0 +1,10 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`tag` +AS SELECT `t`.`id` AS `id`, + `t`.`name` AS `name`, + `t`.`isFree` AS `isFree`, + `t`.`isQuantitatif` AS `isQuantitatif`, + `t`.`sourceTable` AS `sourceTable`, + `t`.`unit` AS `unit` +FROM `vn`.`tag` `t` diff --git a/db/routines/vn2008/views/tarifa_componentes.sql b/db/routines/vn2008/views/tarifa_componentes.sql new file mode 100644 index 000000000..bec53abd9 --- /dev/null +++ b/db/routines/vn2008/views/tarifa_componentes.sql @@ -0,0 +1,10 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`tarifa_componentes` +AS SELECT `tarifa_componentes`.`Id_Componente` AS `Id_Componente`, + `tarifa_componentes`.`Componente` AS `Componente`, + `tarifa_componentes`.`tarifa_componentes_series_id` AS `tarifa_componentes_series_id`, + `tarifa_componentes`.`tarifa_class` AS `tarifa_class`, + `tarifa_componentes`.`tax` AS `tax`, + `tarifa_componentes`.`is_renewable` AS `is_renewable` +FROM `bi`.`tarifa_componentes` diff --git a/db/routines/vn2008/views/tarifa_componentes_series.sql b/db/routines/vn2008/views/tarifa_componentes_series.sql new file mode 100644 index 000000000..a1d188709 --- /dev/null +++ b/db/routines/vn2008/views/tarifa_componentes_series.sql @@ -0,0 +1,7 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`tarifa_componentes_series` +AS SELECT `tarifa_componentes_series`.`tarifa_componentes_series_id` AS `tarifa_componentes_series_id`, + `tarifa_componentes_series`.`Serie` AS `Serie`, + `tarifa_componentes_series`.`base` AS `base` +FROM `bi`.`tarifa_componentes_series` diff --git a/db/routines/vn2008/views/tblContadores.sql b/db/routines/vn2008/views/tblContadores.sql new file mode 100644 index 000000000..129d3ce8b --- /dev/null +++ b/db/routines/vn2008/views/tblContadores.sql @@ -0,0 +1,39 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`tblContadores` +AS SELECT `c`.`id` AS `id`, + `c`.`ochoa` AS `ochoa`, + `c`.`invoiceOutFk` AS `nfactura`, + `c`.`inventoried` AS `FechaInventario`, + `c`.`itemLog` AS `HistoricoArticulo`, + `c`.`weekGoal` AS `week_goal`, + `c`.`photosPath` AS `Rutafotos`, + `c`.`cashBoxNumber` AS `numCaja`, + `c`.`redCode` AS `CodigoRojo`, + `c`.`TabletTime` AS `Tablet_Hora`, + `c`.`t0` AS `t0`, + `c`.`t1` AS `t1`, + `c`.`t2` AS `t2`, + `c`.`t3` AS `t3`, + `c`.`cc` AS `cc`, + `c`.`palet` AS `palet`, + `c`.`campaign` AS `campaign`, + `c`.`campaignLife` AS `campaign_life`, + `c`.`truckDays` AS `truck_days`, + `c`.`transportCharges` AS `tasa_transporte`, + `c`.`escanerPath` AS `escaner_path`, + `c`.`printedTurn` AS `turnoimpreso`, + `c`.`truckLength` AS `truck_length`, + `c`.`fuelConsumption` AS `fuel_consumption`, + `c`.`petrol` AS `petrol`, + `c`.`maintenance` AS `maintenance`, + `c`.`hourPrice` AS `hour_price`, + `c`.`meterPrice` AS `meter_price`, + `c`.`kmPrice` AS `km_price`, + `c`.`routeOption` AS `route_option`, + `c`.`dbproduccion` AS `dbproduccion`, + `c`.`mdbServer` AS `mdbServer`, + `c`.`fakeEmail` AS `fakeEmail`, + `c`.`defaultersMaxAmount` AS `defaultersMaxAmount`, + `c`.`ASIEN` AS `ASIEN` +FROM `vn`.`config` `c` diff --git a/db/routines/vn2008/views/thermograph.sql b/db/routines/vn2008/views/thermograph.sql new file mode 100644 index 000000000..f51b83d24 --- /dev/null +++ b/db/routines/vn2008/views/thermograph.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`thermograph` +AS SELECT `t`.`id` AS `thermograph_id`, + `t`.`model` AS `model` +FROM `vn`.`thermograph` `t` diff --git a/db/routines/vn2008/views/ticket_observation.sql b/db/routines/vn2008/views/ticket_observation.sql new file mode 100644 index 000000000..deb85e4b6 --- /dev/null +++ b/db/routines/vn2008/views/ticket_observation.sql @@ -0,0 +1,8 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`ticket_observation` +AS SELECT `to`.`id` AS `ticket_observation_id`, + `to`.`ticketFk` AS `Id_Ticket`, + `to`.`observationTypeFk` AS `observation_type_id`, + `to`.`description` AS `text` +FROM `vn`.`ticketObservation` `to` diff --git a/db/routines/vn2008/views/tickets_gestdoc.sql b/db/routines/vn2008/views/tickets_gestdoc.sql new file mode 100644 index 000000000..a8682db57 --- /dev/null +++ b/db/routines/vn2008/views/tickets_gestdoc.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`tickets_gestdoc` +AS SELECT `td`.`ticketFk` AS `Id_Ticket`, + `td`.`dmsFk` AS `gestdoc_id` +FROM `vn`.`ticketDms` `td` diff --git a/db/routines/vn2008/views/time.sql b/db/routines/vn2008/views/time.sql new file mode 100644 index 000000000..f3bbc8607 --- /dev/null +++ b/db/routines/vn2008/views/time.sql @@ -0,0 +1,11 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`time` +AS SELECT `t`.`dated` AS `date`, + `t`.`period` AS `period`, + `t`.`month` AS `month`, + `t`.`year` AS `year`, + `t`.`day` AS `day`, + `t`.`week` AS `week`, + `t`.`yearMonth` AS `yearMonth` +FROM `vn`.`time` `t` diff --git a/db/routines/vn2008/views/travel.sql b/db/routines/vn2008/views/travel.sql new file mode 100644 index 000000000..b55dbf9b6 --- /dev/null +++ b/db/routines/vn2008/views/travel.sql @@ -0,0 +1,21 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`travel` +AS SELECT `t`.`id` AS `id`, + `t`.`shipped` AS `shipment`, + `t`.`shipmentHour` AS `shipment_hour`, + `t`.`landed` AS `landing`, + `t`.`landingHour` AS `landing_hour`, + `t`.`warehouseInFk` AS `warehouse_id`, + `t`.`warehouseOutFk` AS `warehouse_id_out`, + `t`.`agencyModeFk` AS `agency_id`, + `t`.`ref` AS `ref`, + `t`.`isDelivered` AS `delivered`, + `t`.`isReceived` AS `received`, + `t`.`m3` AS `m3`, + `t`.`kg` AS `kg`, + `t`.`cargoSupplierFk` AS `cargoSupplierFk`, + `t`.`totalEntries` AS `totalEntries`, + `t`.`appointment` AS `appointment`, + `t`.`awbFk` AS `awbFk` +FROM `vn`.`travel` `t` diff --git a/db/routines/vn2008/views/v_Articles_botanical.sql b/db/routines/vn2008/views/v_Articles_botanical.sql new file mode 100644 index 000000000..8640bb638 --- /dev/null +++ b/db/routines/vn2008/views/v_Articles_botanical.sql @@ -0,0 +1,15 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`v_Articles_botanical` +AS SELECT `ib`.`itemFk` AS `itemFk`, + concat(`g`.`name`, ' ', IFNULL(`s`.`name`, '')) AS `ediBotanic` +FROM ( + ( + ( + `vn`.`itemBotanical` `ib` + LEFT JOIN `vn`.`genus` `g` ON(`g`.`id` = `ib`.`genusFk`) + ) + LEFT JOIN `vn`.`specie` `s` ON(`s`.`id` = `ib`.`specieFk`) + ) + LEFT JOIN `vn`.`ediSpecie` `es` ON(`es`.`id` = `ib`.`specieFk`) + ) diff --git a/db/routines/vn2008/views/v_compres.sql b/db/routines/vn2008/views/v_compres.sql new file mode 100644 index 000000000..8bd6a4a64 --- /dev/null +++ b/db/routines/vn2008/views/v_compres.sql @@ -0,0 +1,90 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`v_compres` +AS SELECT `TP`.`Id_Tipo` AS `Familia`, + `RN`.`id` AS `reino_id`, + `C`.`Id_Compra` AS `Id_Compra`, + `C`.`Id_Entrada` AS `Id_Entrada`, + `C`.`Id_Article` AS `Id_Article`, + `C`.`Cantidad` AS `Cantidad`, + `C`.`Costefijo` AS `Costefijo`, + `C`.`Portefijo` AS `Portefijo`, + `C`.`Novincular` AS `Novincular`, + `C`.`Etiquetas` AS `Etiquetas`, + `C`.`Packing` AS `Packing`, + `C`.`grouping` AS `grouping`, + `C`.`Comisionfija` AS `Comisionfija`, + `C`.`Embalajefijo` AS `Embalajefijo`, + `C`.`Id_Cubo` AS `Id_Cubo`, + `C`.`Tarifa1` AS `Tarifa1`, + `C`.`Tarifa2` AS `Tarifa2`, + `C`.`Tarifa3` AS `Tarifa3`, + `C`.`PVP` AS `PVP`, + `C`.`Vida` AS `Vida`, + `C`.`Id_Trabajador` AS `Id_Trabajador`, + `C`.`punteo` AS `punteo`, + `C`.`odbc_date` AS `odbc_date`, + `E`.`Inventario` AS `Inventario`, + `E`.`Id_Proveedor` AS `Id_Proveedor`, + `E`.`Fecha` AS `Fecha`, + `E`.`Confirmada` AS `Confirmada`, + `E`.`Redada` AS `Redada`, + `E`.`empresa_id` AS `empresa_id`, + `E`.`travel_id` AS `travel_id`, + `E`.`Pedida` AS `Pedida`, + `E`.`recibida_id` AS `recibida_id`, + `TR`.`id` AS `id`, + `TR`.`shipment` AS `shipment`, + `TR`.`landing` AS `landing`, + `TR`.`warehouse_id` AS `warehouse_id`, + `TR`.`warehouse_id_out` AS `warehouse_id_out`, + `TR`.`agency_id` AS `agency_id`, + `TR`.`ref` AS `ref`, + `TR`.`delivered` AS `delivered`, + `TR`.`received` AS `received`, + `A`.`Article` AS `Article`, + `A`.`Medida` AS `Medida`, + `A`.`Tallos` AS `Tallos`, + `C`.`caja` AS `caja`, + `A`.`Categoria` AS `Categoria`, + `A`.`id_origen` AS `id_origen`, + `TP`.`Id_Tipo` AS `Tipo`, + `A`.`tipo_id` AS `tipo_id`, + `A`.`Color` AS `Color`, + `A`.`Min` AS `Min`, + `C`.`Costefijo` + `C`.`Embalajefijo` + `C`.`Comisionfija` + `C`.`Portefijo` AS `Coste`, + `W_OUT`.`isFeedStock` AS `fuente`, + IF( + `cb`.`Volumen` > 0, + `cb`.`Volumen`, + `cb`.`X` * `cb`.`Y` * IF(`cb`.`Z` = 0, `A`.`Medida` + 10, `cb`.`Z`) + ) * `C`.`Etiquetas` AS `cm3`, + `A`.`producer_id` AS `producer_id` +FROM ( + ( + ( + ( + ( + ( + ( + ( + `vn2008`.`Compres` `C` + JOIN `vn2008`.`Entradas` `E` ON(`C`.`Id_Entrada` = `E`.`Id_Entrada`) + ) + JOIN `vn2008`.`travel` `TR` ON(`TR`.`id` = `E`.`travel_id`) + ) + JOIN `vn`.`warehouse` `W_IN` ON(`W_IN`.`id` = `TR`.`warehouse_id`) + ) + JOIN `vn`.`warehouse` `W_OUT` ON(`W_OUT`.`id` = `TR`.`warehouse_id_out`) + ) + JOIN `vn2008`.`Articles` `A` ON(`C`.`Id_Article` = `A`.`Id_Article`) + ) + JOIN `vn2008`.`Tipos` `TP` ON(`A`.`tipo_id` = `TP`.`tipo_id`) + ) + JOIN `vn2008`.`reinos` `RN` ON(`RN`.`id` = `TP`.`reino_id`) + ) + JOIN `vn2008`.`Cubos` `cb` ON(`cb`.`Id_Cubo` = `C`.`Id_Cubo`) + ) +WHERE `W_IN`.`isFeedStock` = 0 + AND `E`.`Inventario` = 0 + AND `E`.`Redada` = 0 diff --git a/db/routines/vn2008/views/v_empresa.sql b/db/routines/vn2008/views/v_empresa.sql new file mode 100644 index 000000000..5a6d6e0f5 --- /dev/null +++ b/db/routines/vn2008/views/v_empresa.sql @@ -0,0 +1,25 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`v_empresa` +AS SELECT `e`.`logo` AS `logo`, + `e`.`id` AS `id`, + `e`.`registro` AS `registro`, + `e`.`gerente_id` AS `gerente_id`, + `e`.`alta` AS `alta`, + `t`.`Nombre` AS `Nombre`, + `t`.`Apellidos` AS `Apellidos`, + `p`.`Proveedor` AS `Proveedor`, + `p`.`Domicilio` AS `Domicilio`, + `p`.`codpos` AS `CP`, + `p`.`Localidad` AS `Localidad`, + `p`.`NIF` AS `NIF`, + `p`.`Telefono` AS `Telefono`, + `p`.`Alias` AS `Alias`, + `e`.`abbreviation` AS `abbreviation` +FROM ( + ( + `vn2008`.`empresa` `e` + JOIN `vn2008`.`Trabajadores` `t` ON(`t`.`Id_Trabajador` = `e`.`gerente_id`) + ) + JOIN `vn2008`.`Proveedores` `p` ON(`p`.`Id_Proveedor` = `e`.`id`) + ) diff --git a/db/routines/vn2008/views/versiones.sql b/db/routines/vn2008/views/versiones.sql new file mode 100644 index 000000000..3d27f4f92 --- /dev/null +++ b/db/routines/vn2008/views/versiones.sql @@ -0,0 +1,8 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`versiones` +AS SELECT `m`.`app` AS `programa`, + `m`.`version` AS `version`, + 0 AS `critical` +FROM `vn`.`mdbVersion` `m` +WHERE `m`.`branchFk` = 'master' \ No newline at end of file diff --git a/db/routines/vn2008/views/warehouse_pickup.sql b/db/routines/vn2008/views/warehouse_pickup.sql new file mode 100644 index 000000000..c3a7268a1 --- /dev/null +++ b/db/routines/vn2008/views/warehouse_pickup.sql @@ -0,0 +1,9 @@ + +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`warehouse_pickup` +AS SELECT + `wp`.`warehouseFk` AS `warehouse_id`, + `wp`.`agencyModeFk` AS `agency_id` +FROM + `vn`.`warehousePickup` `wp`; \ No newline at end of file diff --git a/db/tests.js b/db/tests.js deleted file mode 100644 index 74ea9a80b..000000000 --- a/db/tests.js +++ /dev/null @@ -1,39 +0,0 @@ -process.on('warning', warning => { - console.log(warning.name); - console.log(warning.message); - console.log(warning.stack); -}); - -let verbose = false; - -if (process.argv[2] === '--v') - verbose = true; - -let app = require(`vn-loopback/server/server`); -app.boot(); -loopbackApp = 'vn-loopback/server/server'; - -let Jasmine = require('jasmine'); -let jasmine = new Jasmine(); -let SpecReporter = require('jasmine-spec-reporter').SpecReporter; - -let serviceSpecs = [ - './tests/**/*[sS]pec.js' -]; - -jasmine.loadConfig({ - spec_dir: 'db', - spec_files: serviceSpecs, - helpers: [] -}); - -jasmine.addReporter(new SpecReporter({ - spec: { - // displayStacktrace: 'summary', - displaySuccessful: verbose, - displayFailedSpec: true, - displaySpecDuration: true - } -})); - -jasmine.execute(); diff --git a/db/tests/cache/last_buy_refresh.spec.js b/db/tests/cache/last_buy_refresh.spec.js deleted file mode 100644 index 71a9c3872..000000000 --- a/db/tests/cache/last_buy_refresh.spec.js +++ /dev/null @@ -1,42 +0,0 @@ -const app = require(`${loopbackApp}`); -const ParameterizedSQL = require('loopback-connector').ParameterizedSQL; - -describe('last_buy_refresh()', () => { - it(`should store some data on cache.last_buy`, async() => { - const stmts = []; - - stmts.push('START TRANSACTION'); - - const lastBuyTableIndex = stmts.push(`SELECT * FROM cache.last_buy ORDER BY item_id ASC`) - 1; - - stmts.push('ROLLBACK'); - - const sql = ParameterizedSQL.join(stmts, ';'); - const result = await app.models.Ticket.rawStmt(sql); - - const lastBuyTable = result[lastBuyTableIndex]; - - expect(lastBuyTable.length).toEqual(12); - - expect(lastBuyTable[0].item_id).toEqual(1); - expect(lastBuyTable[1].item_id).toEqual(1); - expect(lastBuyTable[2].item_id).toEqual(1); - expect(lastBuyTable[3].item_id).toEqual(2); - expect(lastBuyTable[4].item_id).toEqual(2); - expect(lastBuyTable[5].item_id).toEqual(3); - - expect(lastBuyTable[0].warehouse_id).toEqual(1); - expect(lastBuyTable[1].warehouse_id).toEqual(3); - expect(lastBuyTable[2].warehouse_id).toEqual(5); - expect(lastBuyTable[3].warehouse_id).toEqual(1); - expect(lastBuyTable[4].warehouse_id).toEqual(5); - expect(lastBuyTable[5].warehouse_id).toEqual(1); - - expect(lastBuyTable[1].buy_id).toEqual(10); - expect(lastBuyTable[0].buy_id).toEqual(3); - expect(lastBuyTable[2].buy_id).toEqual(13); - expect(lastBuyTable[3].buy_id).toEqual(4); - expect(lastBuyTable[4].buy_id).toEqual(14); - expect(lastBuyTable[5].buy_id).toEqual(5); - }); -}); diff --git a/db/tests/vn/buyUltimate.spec.js b/db/tests/vn/buyUltimate.spec.js deleted file mode 100644 index 4c98945c1..000000000 --- a/db/tests/vn/buyUltimate.spec.js +++ /dev/null @@ -1,55 +0,0 @@ -const app = require('vn-loopback/server/server'); -const ParameterizedSQL = require('loopback-connector').ParameterizedSQL; - -describe('buyUltimate()', () => { - const today = Date.vnNew(); - it(`should create buyUltimate temporal table and update it's values`, async() => { - let stmts = []; - let stmt; - - stmts.push('START TRANSACTION'); - - let params = { - warehouseFk: 1, - date: today - }; - - stmt = new ParameterizedSQL('CALL vn.buyUltimate(?, ?)', [ - params.warehouseFk, - params.date - ]); - stmts.push(stmt); - - let buyUltimateTableIndex = stmts.push(`SELECT * FROM tmp.buyUltimate ORDER BY itemFk ASC`) - 1; - - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - let result = await app.models.Ticket.rawStmt(sql); - - let buyUltimateTable = result[buyUltimateTableIndex]; - - expect(buyUltimateTable.length).toEqual(6); - - expect(buyUltimateTable[0].itemFk).toEqual(1); - expect(buyUltimateTable[1].itemFk).toEqual(2); - expect(buyUltimateTable[2].itemFk).toEqual(3); - expect(buyUltimateTable[3].itemFk).toEqual(4); - expect(buyUltimateTable[4].itemFk).toEqual(8); - expect(buyUltimateTable[5].itemFk).toEqual(9); - - expect(buyUltimateTable[0].warehouseFk).toEqual(1); - expect(buyUltimateTable[1].warehouseFk).toEqual(1); - expect(buyUltimateTable[2].warehouseFk).toEqual(1); - expect(buyUltimateTable[3].warehouseFk).toEqual(1); - expect(buyUltimateTable[4].warehouseFk).toEqual(1); - expect(buyUltimateTable[5].warehouseFk).toEqual(1); - - expect(buyUltimateTable[1].buyFk).toEqual(4); - expect(buyUltimateTable[0].buyFk).toEqual(3); - expect(buyUltimateTable[2].buyFk).toEqual(5); - expect(buyUltimateTable[3].buyFk).toEqual(9); - expect(buyUltimateTable[4].buyFk).toEqual(6); - expect(buyUltimateTable[5].buyFk).toEqual(7); - }); -}); diff --git a/db/tests/vn/buyUltimateFromInterval.spec.js b/db/tests/vn/buyUltimateFromInterval.spec.js deleted file mode 100644 index 7a4a79d47..000000000 --- a/db/tests/vn/buyUltimateFromInterval.spec.js +++ /dev/null @@ -1,132 +0,0 @@ -const app = require('vn-loopback/server/server'); -const ParameterizedSQL = require('loopback-connector').ParameterizedSQL; - -describe('buyUltimateFromInterval()', () => { - let today; - let future; - beforeAll(() => { - let now = Date.vnNew(); - now.setHours(0, 0, 0, 0); - today = now; - - let futureDate = new Date(now); - let futureMonth = now.getMonth() + 1; - futureDate.setMonth(futureMonth); - future = futureDate; - }); - - it(`should create a temporal table with it's data`, async() => { - let stmts = []; - let stmt; - - stmts.push('START TRANSACTION'); - - let params = { - warehouseFk: 1, - started: today, - ended: today - }; - - stmt = new ParameterizedSQL('CALL vn.buyUltimateFromInterval(?, ?, ?)', [ - params.warehouseFk, - params.started, - params.ended - ]); - stmts.push(stmt); - - let buyUltimateFromIntervalTableIndex = stmts.push(`SELECT * FROM tmp.buyUltimateFromInterval`) - 1; - - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - let result = await app.models.Ticket.rawStmt(sql); - - let buyUltimateFromIntervalTable = result[buyUltimateFromIntervalTableIndex]; - - expect(buyUltimateFromIntervalTable.length).toEqual(2); - - expect(buyUltimateFromIntervalTable[0].itemFk).toEqual(1); - expect(buyUltimateFromIntervalTable[1].itemFk).toEqual(3); - - expect(buyUltimateFromIntervalTable[0].warehouseFk).toEqual(1); - expect(buyUltimateFromIntervalTable[1].warehouseFk).toEqual(1); - - expect(buyUltimateFromIntervalTable[0].buyFk).toEqual(3); - expect(buyUltimateFromIntervalTable[1].buyFk).toEqual(5); - - expect(buyUltimateFromIntervalTable[0].landed).toEqual(today); - expect(buyUltimateFromIntervalTable[1].landed).toEqual(today); - }); - - it(`should create a temporal table with it's data in which started value is assigned to ended`, async() => { - let params = { - warehouseFk: 1, - started: today, - ended: null - }; - - let query = ` - START TRANSACTION; - CALL vn.buyUltimateFromInterval(?, ?, ?); - SELECT * FROM tmp.buyUltimateFromInterval; - ROLLBACK;`; - - let result = await app.models.Ticket.rawSql(query, [ - params.warehouseFk, - params.started, - params.ended - ]); - - let buyUltimateFromIntervalTable = result[2]; - - expect(buyUltimateFromIntervalTable.length).toEqual(2); - - expect(buyUltimateFromIntervalTable[0].itemFk).toEqual(1); - expect(buyUltimateFromIntervalTable[1].itemFk).toEqual(3); - - expect(buyUltimateFromIntervalTable[0].warehouseFk).toEqual(1); - expect(buyUltimateFromIntervalTable[1].warehouseFk).toEqual(1); - - expect(buyUltimateFromIntervalTable[0].buyFk).toEqual(3); - expect(buyUltimateFromIntervalTable[1].buyFk).toEqual(5); - - expect(buyUltimateFromIntervalTable[0].landed).toEqual(today); - expect(buyUltimateFromIntervalTable[1].landed).toEqual(today); - }); - - it(`should create a temporal table with it's data in which ended value is a date in the future`, async() => { - let params = { - warehouseFk: 1, - started: today, - ended: future - }; - - let query = ` - START TRANSACTION; - CALL vn.buyUltimateFromInterval(?, ?, ?); - SELECT * FROM tmp.buyUltimateFromInterval; - ROLLBACK;`; - - let result = await app.models.Ticket.rawSql(query, [ - params.warehouseFk, - params.started, - params.ended - ]); - - let buyUltimateFromIntervalTable = result[2]; - - expect(buyUltimateFromIntervalTable.length).toEqual(2); - - expect(buyUltimateFromIntervalTable[0].itemFk).toEqual(1); - expect(buyUltimateFromIntervalTable[1].itemFk).toEqual(3); - - expect(buyUltimateFromIntervalTable[0].warehouseFk).toEqual(1); - expect(buyUltimateFromIntervalTable[1].warehouseFk).toEqual(1); - - expect(buyUltimateFromIntervalTable[0].buyFk).toEqual(3); - expect(buyUltimateFromIntervalTable[1].buyFk).toEqual(5); - - expect(buyUltimateFromIntervalTable[0].landed).toEqual(today); - expect(buyUltimateFromIntervalTable[1].landed).toEqual(today); - }); -}); diff --git a/db/tests/vn/item_getBalance.spec.js b/db/tests/vn/item_getBalance.spec.js deleted file mode 100644 index 74e1e6659..000000000 --- a/db/tests/vn/item_getBalance.spec.js +++ /dev/null @@ -1,31 +0,0 @@ -const app = require('vn-loopback/server/server'); -const ParameterizedSQL = require('loopback-connector').ParameterizedSQL; - -describe('item_getBalance()', () => { - it(`should return the item balance ordered by alert level`, async() => { - let stmts = []; - - let params = { - itemFk: 1, - warehouseFk: 1 - }; - - const conn = await app.models.Item.dataSource.connector; - - stmts.push(new ParameterizedSQL('CALL vn.item_getBalance(?, ?, NULL)', [ - params.warehouseFk, - params.itemFk - ])); - - let sql = ParameterizedSQL.join(stmts, ';'); - let result = await conn.executeStmt(sql); - let itemBalance = result[0]; - - expect(itemBalance[0].alertLevel).toBeGreaterThanOrEqual(itemBalance[1].alertLevel); - expect(itemBalance[1].alertLevel).toBeGreaterThanOrEqual(itemBalance[2].alertLevel); - expect(itemBalance[2].alertLevel).toBeGreaterThanOrEqual(itemBalance[3].alertLevel); - expect(itemBalance[3].alertLevel).toBeGreaterThanOrEqual(itemBalance[4].alertLevel); - expect(itemBalance[4].alertLevel).toBeGreaterThanOrEqual(itemBalance[5].alertLevel); - expect(itemBalance[5].alertLevel).toBeGreaterThanOrEqual(itemBalance[6].alertLevel); - }); -}); diff --git a/db/tests/vn/ticketCalculateClon.spec.js b/db/tests/vn/ticketCalculateClon.spec.js deleted file mode 100644 index 9116d805f..000000000 --- a/db/tests/vn/ticketCalculateClon.spec.js +++ /dev/null @@ -1,107 +0,0 @@ -const app = require('vn-loopback/server/server'); -const ParameterizedSQL = require('loopback-connector').ParameterizedSQL; - -describe('ticket ticketCalculateClon()', () => { - const today = Date.vnNew(); - it('should add the ticket to the order containing the original ticket', async() => { - let stmts = []; - let stmt; - - stmts.push('START TRANSACTION'); - - let params = { - clientFk: 1101, - shipped: today, - warehouseFk: 1, - companyFk: 442, - addressFk: 121, - agencyType: 23, - routeFk: 1, - landed: today, - userId: 21, - originalTicketId: 11 - }; - - stmt = new ParameterizedSQL('CALL vn.ticket_add(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, @result)', [ - params.clientFk, - params.shipped, - params.warehouseFk, - params.companyFk, - params.addressFk, - params.agencyType, - params.routeFk, - params.landed, - params.userId, - true - ]); - stmts.push(stmt); - - stmt = new ParameterizedSQL('CALL vn.ticketCalculateClon(@result, ?)', [params.originalTicketId]); - stmts.push(stmt); - - let orderIndex = stmts.push(`SELECT * FROM vn.orderTicket WHERE ticketFk = @result`) - 1; - - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - let result = await app.models.Ticket.rawStmt(sql); - - let expectedOrder = 11; - let newestTicketIdInFixtures = 21; - - expect(result[orderIndex][0].orderFk).toEqual(expectedOrder); - expect(result[orderIndex][0].ticketFk).toBeGreaterThan(newestTicketIdInFixtures); - }); - - it('should add the ticket to the order containing the original ticket and generate landed value if it was null', async() => { - let stmts = []; - let stmt; - - stmts.push('START TRANSACTION'); - - let params = { - clientFk: 1101, - shipped: today, - warehouseFk: 1, - companyFk: 442, - addressFk: 121, - agencyType: 23, - routeFk: 1, - landed: null, - userId: 21, - originalTicketId: 11 - }; - - stmt = new ParameterizedSQL('CALL vn.ticket_add(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, @result)', [ - params.clientFk, - params.shipped, - params.warehouseFk, - params.companyFk, - params.addressFk, - params.agencyType, - params.routeFk, - params.landed, - params.userId, - true - ]); - stmts.push(stmt); - - stmt = new ParameterizedSQL('CALL vn.ticketCalculateClon(@result, ?)', [params.originalTicketId]); - stmts.push(stmt); - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - - let error; - - try { - await app.models.Ticket.rawStmt(sql); - } catch (e) { - error = e; - } - - expect(error).toBeDefined(); - expect(error.statusCode).toBe(500); - expect(error.code).toBe('ER_SIGNAL_EXCEPTION'); - }); -}); diff --git a/db/tests/vn/ticketComponentUpdateSale.spec.js b/db/tests/vn/ticketComponentUpdateSale.spec.js deleted file mode 100644 index 9e252200b..000000000 --- a/db/tests/vn/ticketComponentUpdateSale.spec.js +++ /dev/null @@ -1,294 +0,0 @@ -const app = require('vn-loopback/server/server'); -const ParameterizedSQL = require('loopback-connector').ParameterizedSQL; - -describe('ticketComponentUpdateSale()', () => { - it(`should update the sale price when option ONE using the base components and reclaculate only the ones with isRenewable TRUE`, async() => { - let stmts = []; - let stmt; - - let params = { - warehouseFk: 1, - ticketFk: 13 - }; - - stmts.push('START TRANSACTION'); - - stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.sale'); - - // createSaleTempTable code comes from vn.ticketComponentUpdate procedure - let createSaleTempTable = ` - CREATE TEMPORARY TABLE tmp.sale - (PRIMARY KEY (saleFk)) - ENGINE = MEMORY - SELECT id AS saleFk, ? warehouseFk - FROM sale s WHERE s.ticketFk = ? - `; - - stmt = new ParameterizedSQL(createSaleTempTable, [ - params.warehouseFk, - params.ticketFk - ]); - stmts.push(stmt); - - stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponent'); - - // createTicketComponentTable code comes partially from vn.ticketComponenetCalculate procedure - let createTicketComponentTable = ` - CREATE TEMPORARY TABLE tmp.ticketComponent ( - warehouseFk INT UNSIGNED NOT NULL, - itemFk INT NOT NULL, - componentFk INT UNSIGNED NOT NULL, - cost DECIMAL(10,4) NOT NULL, - INDEX itemWarehouse USING BTREE (itemFk ASC, warehouseFk ASC), - UNIQUE INDEX itemWarehouseComponent (itemFk ASC, warehouseFk ASC, componentFk ASC)) - `; - - stmts.push(createTicketComponentTable); - - let insertTicketComponentTable = ` - INSERT INTO tmp.ticketComponent (warehouseFk, itemFk, componentFk, cost) - VALUES - (1 , 4 , 15 , 999.00), - (1 , 4 , 17 , 2.00), - (1 , 4 , 22 , 999.00), - (1 , 4 , 28 , 1.00), - (1 , 4 , 29 , 2.00), - (1 , 4 , 32 , 999.00), - (1 , 4 , 39 , 1.00) - `; - - stmts.push(insertTicketComponentTable); - - let updateComponentTwentyNine = ` - UPDATE vn.saleComponent - SET value = '5' - WHERE saleFk = 26 AND componentFk = 29 - `; - - stmts.push(updateComponentTwentyNine); - - let updateComponentTwentyEight = ` - UPDATE vn.saleComponent - SET value = '5' - WHERE saleFk = 26 AND componentFk = 28 - `; - - stmts.push(updateComponentTwentyEight); - - let priceFixtedToZero = ` - UPDATE vn.sale - SET priceFixed = 0 - WHERE id = 26 - `; - - stmts.push(priceFixtedToZero); - - let firstSalePriceIndexBefore = stmts.push('SELECT price FROM vn.sale WHERE id = 26') - 1; - - stmts.push('CALL vn.ticketComponentUpdateSale(1)'); - - let firstSalePriceIndexAfter = stmts.push('SELECT price FROM vn.sale WHERE id = 26') - 1; - - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - let result = await app.models.Ticket.rawStmt(sql); - - expect(result[firstSalePriceIndexBefore][0].price).toEqual(1.72); - expect(result[firstSalePriceIndexAfter][0].price).toEqual(1005); - }); - - it(`should keep the sale price when option TWO using the base components and save the difference in a new component`, async() => { - let stmts = []; - let stmt; - - let params = { - warehouseFk: 1, - ticketFk: 13 - }; - - stmts.push('START TRANSACTION'); - - stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.sale'); - - // createSaleTempTable code comes from vn.ticketComponentUpdate procedure - let createSaleTempTable = ` - CREATE TEMPORARY TABLE tmp.sale - (PRIMARY KEY (saleFk)) - ENGINE = MEMORY - SELECT id AS saleFk, ? warehouseFk - FROM sale s WHERE s.ticketFk = ? - `; - - stmt = new ParameterizedSQL(createSaleTempTable, [ - params.warehouseFk, - params.ticketFk - ]); - stmts.push(stmt); - - stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponent'); - - // createTicketComponentTable code comes partially from vn.ticketComponenetCalculate procedure - let createTicketComponentTable = ` - CREATE TEMPORARY TABLE tmp.ticketComponent ( - warehouseFk INT UNSIGNED NOT NULL, - itemFk INT NOT NULL, - componentFk INT UNSIGNED NOT NULL, - cost DECIMAL(10,4) NOT NULL, - INDEX itemWarehouse USING BTREE (itemFk ASC, warehouseFk ASC), - UNIQUE INDEX itemWarehouseComponent (itemFk ASC, warehouseFk ASC, componentFk ASC)) - `; - - stmts.push(createTicketComponentTable); - - let insertTicketComponentTable = ` - INSERT INTO tmp.ticketComponent (warehouseFk, itemFk, componentFk, cost) - VALUES - (1 , 4 , 15 , 999.00), - (1 , 4 , 17 , 2.00), - (1 , 4 , 22 , 999.00), - (1 , 4 , 28 , 1.00), - (1 , 4 , 29 , 2.00), - (1 , 4 , 32 , 999.00), - (1 , 4 , 39 , 1.00) - `; - - stmts.push(insertTicketComponentTable); - - let updateComponentTwentyNine = ` - UPDATE vn.saleComponent - SET value = '5' - WHERE saleFk = 26 AND componentFk = 29 - `; - - stmts.push(updateComponentTwentyNine); - - let updateComponentTwentyEight = ` - UPDATE vn.saleComponent - SET value = '5' - WHERE saleFk = 26 AND componentFk = 28 - `; - - stmts.push(updateComponentTwentyEight); - - let priceFixtedToZero = ` - UPDATE vn.sale - SET priceFixed = 0 - WHERE id = 26 - `; - - stmts.push(priceFixtedToZero); - - let firstSalePriceIndexBefore = stmts.push('SELECT price FROM vn.sale WHERE id = 26') - 1; - - stmts.push('CALL vn.ticketComponentUpdateSale(2)'); - - let addedComponentIndex = stmts.push('SELECT * FROM vn.saleComponent WHERE saleFk = 26 AND componentFk = 17') - 1; - let firstSalePriceIndexAfter = stmts.push('SELECT price FROM vn.sale WHERE id = 26') - 1; - - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - let result = await app.models.Ticket.rawStmt(sql); - - expect(result[addedComponentIndex][0].value).toEqual(-1003.28); - expect(result[firstSalePriceIndexBefore][0].price).toEqual(result[firstSalePriceIndexAfter][0].price); - }); - - it(`should not change the sale price when option SEVEN, instead it stores 80% and 20% of the price in two components and any price difference in a third one`, async() => { - let stmts = []; - let stmt; - - let params = { - warehouseFk: 1, - ticketFk: 1 - }; - - stmts.push('START TRANSACTION'); - - stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.sale'); - - // createSaleTempTable code comes from vn.ticketComponentUpdate procedure - let createSaleTempTable = ` - CREATE TEMPORARY TABLE tmp.sale - (PRIMARY KEY (saleFk)) - ENGINE = MEMORY - SELECT id AS saleFk, ? warehouseFk - FROM sale s WHERE s.ticketFk = ? - `; - - stmt = new ParameterizedSQL(createSaleTempTable, [ - params.warehouseFk, - params.ticketFk - ]); - stmts.push(stmt); - - stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponent'); - - // createTicketComponentTable code comes partially from vn.ticketComponenetCalculate procedure - let createTicketComponentTable = ` - CREATE TEMPORARY TABLE tmp.ticketComponent ( - warehouseFk INT UNSIGNED NOT NULL, - itemFk INT NOT NULL, - componentFk INT UNSIGNED NOT NULL, - cost DECIMAL(10,4) NOT NULL, - INDEX itemWarehouse USING BTREE (itemFk ASC, warehouseFk ASC), - UNIQUE INDEX itemWarehouseComponent (itemFk ASC, warehouseFk ASC, componentFk ASC)) - `; - - stmts.push(createTicketComponentTable); - - let insertTicketComponentTable = ` - INSERT INTO tmp.ticketComponent (warehouseFk, itemFk, componentFk, cost) - VALUES - (1 , 2 , 29 , 999.00), - (1 , 2 , 28 , 2.00), - (1 , 4 , 29 , 999.00), - (1 , 4 , 28 , 1.00) - `; - - stmts.push(insertTicketComponentTable); - - let updateComponentTwentyEight = ` - UPDATE vn.saleComponent - SET value = '5' - WHERE saleFk = 1 AND componentFk = 28 - `; - - stmts.push(updateComponentTwentyEight); - - let updateComponentTwentyNine = ` - UPDATE vn.saleComponent - SET value = '5' - WHERE saleFk = 1 AND componentFk = 29 - `; - - stmts.push(updateComponentTwentyNine); - - let priceFixtedToZero = ` - UPDATE vn.sale - SET priceFixed = 0 - WHERE id = 1 - `; - - stmts.push(priceFixtedToZero); - - let firstSalePriceIndexBefore = stmts.push('SELECT price FROM vn.sale WHERE id = 1') - 1; - - stmts.push('CALL vn.ticketComponentUpdateSale(7)'); - - let componentTwentyEightIndex = stmts.push('SELECT * FROM vn.saleComponent WHERE saleFk = 1 AND componentFk = 28') - 1; - let componentTwentyNineIndex = stmts.push('SELECT * FROM vn.saleComponent WHERE saleFk = 1 AND componentFk = 29') - 1; - let firstSalePriceIndexAfter = stmts.push('SELECT price FROM vn.sale WHERE id = 1') - 1; - - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - let result = await app.models.Ticket.rawStmt(sql); - - expect(result[componentTwentyEightIndex][0].value).toEqual(79.517); - expect(result[componentTwentyNineIndex][0].value).toEqual(19.879); - expect(result[firstSalePriceIndexBefore][0].price).toEqual(result[firstSalePriceIndexAfter][0].price); - }); -}); - diff --git a/db/tests/vn/ticketCreateWithUser.spec.js b/db/tests/vn/ticketCreateWithUser.spec.js deleted file mode 100644 index 5dd84d397..000000000 --- a/db/tests/vn/ticketCreateWithUser.spec.js +++ /dev/null @@ -1,203 +0,0 @@ -const app = require('vn-loopback/server/server'); -const ParameterizedSQL = require('loopback-connector').ParameterizedSQL; - -describe('ticket ticket_add()', () => { - const today = Date.vnNew(); - it('should confirm the procedure creates the expected ticket', async() => { - let stmts = []; - let stmt; - - stmts.push('START TRANSACTION'); - - let params = { - clientFk: 1101, - shipped: today, - warehouseFk: 1, - companyFk: 442, - addressFk: 121, - agencyModeFk: 1, - routeFk: null, - landed: today, - userId: 18 - }; - - stmt = new ParameterizedSQL(`CALL vn.ticket_add(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, @newTicketId)`, [ - params.clientFk, - params.shipped, - params.warehouseFk, - params.companyFk, - params.addressFk, - params.agencyModeFk, - params.routeFk, - params.landed, - params.userId, - true - ]); - stmts.push(stmt); - - let ticketResultIndex = stmts.push(`SELECT * FROM vn.ticket WHERE id = @newTicketId`) - 1; - - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - let result = await app.models.Ticket.rawStmt(sql); - - let ticketResult = result[ticketResultIndex][0]; - - expect(ticketResult.id).toBeGreaterThan(21); - expect(ticketResult.clientFk).toEqual(params.clientFk); - expect(ticketResult.warehouseFk).toEqual(params.warehouseFk); - expect(ticketResult.companyFk).toEqual(params.companyFk); - expect(ticketResult.addressFk).toEqual(params.addressFk); - expect(ticketResult.agencyModeFk).toEqual(params.agencyModeFk); - expect(ticketResult.routeFk).toEqual(params.routeFk); - }); - - it('should confirm the procedure creates the expected observations in the ticket', async() => { - let stmts = []; - let stmt; - - stmts.push('START TRANSACTION'); - - let params = { - clientFk: 1101, - shipped: today, - warehouseFk: 1, - companyFk: 442, - addressFk: 121, - agencyModeFk: 1, - routeFk: null, - landed: today, - userId: 18 - }; - - stmt = new ParameterizedSQL('CALL vn.ticket_add(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, @newTicketId)', [ - params.clientFk, - params.shipped, - params.warehouseFk, - params.companyFk, - params.addressFk, - params.agencyModeFk, - params.routeFk, - params.landed, - params.userId, - true - ]); - stmts.push(stmt); - - let ticketObsevationsIndex = stmts.push(`SELECT * FROM vn.ticketObservation WHERE ticketFk = @newTicketId`) - 1; - - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - let result = await app.models.Ticket.rawStmt(sql); - - let firstTicketObservation = result[ticketObsevationsIndex][0]; - let secondTicketObservation = result[ticketObsevationsIndex][1]; - let thirdTicketObservation = result[ticketObsevationsIndex][2]; - - expect(firstTicketObservation.observationTypeFk).toEqual(1); - expect(firstTicketObservation.description).toEqual('under the floor'); - expect(secondTicketObservation.observationTypeFk).toEqual(2); - expect(secondTicketObservation.description).toEqual('wears leather and goes out at night'); - expect(thirdTicketObservation.observationTypeFk).toEqual(3); - expect(thirdTicketObservation.description).toEqual('care with the dog'); - }); - - it('should confirm the procedure sets address if it received it null', async() => { - let stmts = []; - let stmt; - - stmts.push('START TRANSACTION'); - - let params = { - clientFk: 1101, - shipped: today, - warehouseFk: 1, - companyFk: 442, - addressFk: 0, - agencyModeFk: 1, - routeFk: null, - landed: today, - userId: 18 - }; - - stmt = new ParameterizedSQL(`CALL vn.ticket_add(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, @newTicketId)`, [ - params.clientFk, - params.shipped, - params.warehouseFk, - params.companyFk, - params.addressFk, - params.agencyModeFk, - params.routeFk, - params.landed, - params.userId, - true - ]); - - stmts.push(stmt); - - let ticketAddressIndex = stmts.push(`SELECT addressFk FROM vn.ticket WHERE id = @newTicketId`) - 1; - - stmt = new ParameterizedSQL(`SELECT id FROM vn.address WHERE clientFk = ? AND isDefaultAddress = 1`, [ - params.clientFk, - ]); - let clientDefaultAddressIndex = stmts.push(stmt) - 1; - stmts.push('ROLLBACK'); - let sql = ParameterizedSQL.join(stmts, ';'); - let result = await app.models.Ticket.rawStmt(sql); - let ticketAddress = result[ticketAddressIndex][0]; - let clientDefaultAddress = result[clientDefaultAddressIndex][0]; - - expect(ticketAddress.addressFk).toEqual(clientDefaultAddress.id); - }); - - it('should confirm the procedure creates the state as delivered if the client has isCreatedAsServed TRUE', async() => { - let stmts = []; - let stmt; - - stmts.push('START TRANSACTION'); - - let params = { - clientFk: 1101, - shipped: today, - warehouseFk: 1, - companyFk: 442, - addressFk: 121, - agencyModeFk: 1, - routeFk: null, - landed: today, - userId: 18 - }; - - stmt = new ParameterizedSQL(`UPDATE vn.client SET isCreatedAsServed = 1 WHERE id = ?`, [ - params.clientFk, - ]); - stmts.push(stmt); - - stmt = new ParameterizedSQL(`CALL vn.ticket_add(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, @newTicketId)`, [ - params.clientFk, - params.shipped, - params.warehouseFk, - params.companyFk, - params.addressFk, - params.agencyModeFk, - params.routeFk, - params.landed, - params.userId, - true - ]); - stmts.push(stmt); - stmts.push(`select @newTicketId`); - let ticketStateCodeIndex = stmts.push(`SELECT code FROM vn.ticketState WHERE ticketFk = @newTicketId`) - 1; - - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - let result = await app.models.Ticket.rawStmt(sql); - - let ticketStateCode = result[ticketStateCodeIndex][0].code; - - expect(ticketStateCode).toEqual('FREE'); - }); -}); diff --git a/db/tests/vn/ticket_componentMakeUpdate.spec.js b/db/tests/vn/ticket_componentMakeUpdate.spec.js deleted file mode 100644 index a059f1060..000000000 --- a/db/tests/vn/ticket_componentMakeUpdate.spec.js +++ /dev/null @@ -1,123 +0,0 @@ -const app = require('vn-loopback/server/server'); -const ParameterizedSQL = require('loopback-connector').ParameterizedSQL; - -// 2277 solucionar problema al testear procedimiento con start transaction / rollback -xdescribe('ticket_componentMakeUpdate()', () => { - it('should recalculate the ticket components without make modifications', async() => { - let stmts = []; - let stmt; - - let params = { - ticketId: 11, - clientId: 1102, - agencyModeId: 2, - addressId: 122, - zoneId: 3, - warehouseId: 1, - companyId: 442, - isDeleted: 0, - hasToBeUnrouted: 0, - componentOption: 1 - }; - - stmts.push('START TRANSACTION'); - - stmt = new ParameterizedSQL('SELECT * FROM vn.ticket WHERE id = ?', [ - params.ticketId - ]); - stmts.push(stmt); - - let originalTicketIndex = stmts.push(stmt) - 1; - - stmt = new ParameterizedSQL('CALL vn.ticket_componentMakeUpdate(?, ?, ?, ?, ?, ?, ?, DATE_ADD(CURDATE(), INTERVAL +1 DAY), DATE_ADD(CURDATE(), INTERVAL +1 DAY), ?, ?, ?)', [ - params.ticketId, - params.clientId, - params.agencyModeId, - params.addressId, - params.zoneId, - params.warehouseId, - params.companyId, - params.isDeleted, - params.hasToBeUnrouted, - params.componentOption - ]); - stmts.push(stmt); - - stmt = new ParameterizedSQL('SELECT * FROM vn.ticket WHERE id = ?', [ - params.ticketId - ]); - stmts.push(stmt); - - let updatedTicketIndex = stmts.push(stmt) - 1; - - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - let result = await app.models.Ticket.rawStmt(sql); - - let originalTicketData = result[originalTicketIndex]; - let updatedTicketData = result[updatedTicketIndex]; - - expect(originalTicketData[0].isDeleted).toEqual(updatedTicketData[0].isDeleted); - expect(originalTicketData[0].routeFk).toEqual(updatedTicketData[0].routeFk); - }); - - it('should delete and unroute a ticket and recalculate the components', async() => { - let stmts = []; - let stmt; - - let params = { - ticketId: 11, - clientId: 1102, - agencyModeId: 2, - addressId: 122, - zoneId: 3, - warehouseId: 1, - companyId: 442, - isDeleted: 1, - hasToBeUnrouted: 1, - componentOption: 1 - }; - - stmts.push('START TRANSACTION'); - - stmt = new ParameterizedSQL('SELECT * FROM vn.ticket WHERE id = ?', [ - params.ticketId - ]); - stmts.push(stmt); - - let originalTicketIndex = stmts.push(stmt) - 1; - - stmt = new ParameterizedSQL('CALL vn.ticket_componentMakeUpdate(?, ?, ?, ?, ?, ?, ?, DATE_ADD(CURDATE(), INTERVAL +1 DAY), DATE_ADD(CURDATE(), INTERVAL +1 DAY), ?, ?, ?)', [ - params.ticketId, - params.clientId, - params.agencyModeId, - params.addressId, - params.zoneId, - params.warehouseId, - params.companyId, - params.isDeleted, - params.hasToBeUnrouted, - params.componentOption - ]); - stmts.push(stmt); - - stmt = new ParameterizedSQL('SELECT * FROM vn.ticket WHERE id = ?', [ - params.ticketId - ]); - stmts.push(stmt); - - let updatedTicketIndex = stmts.push(stmt) - 1; - - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - let result = await app.models.Ticket.rawStmt(sql); - - let originalTicketData = result[originalTicketIndex]; - let updatedTicketData = result[updatedTicketIndex]; - - expect(originalTicketData[0].isDeleted).not.toEqual(updatedTicketData[0].isDeleted); - expect(originalTicketData[0].routeFk).not.toEqual(updatedTicketData[0].routeFk); - }); -}); diff --git a/db/tests/vn/ticket_recalcComponents.spec.js b/db/tests/vn/ticket_recalcComponents.spec.js deleted file mode 100644 index 1256528e6..000000000 --- a/db/tests/vn/ticket_recalcComponents.spec.js +++ /dev/null @@ -1,62 +0,0 @@ -const app = require('vn-loopback/server/server'); -const ParameterizedSQL = require('loopback-connector').ParameterizedSQL; - -describe('ticket_recalcComponents()', () => { - it('should recalculate the components in a ticket and check it', async() => { - let stmts = []; - let stmt; - const ticketId = 11; - - stmts.push('START TRANSACTION'); - - let sales = await app.models.Sale.find({where: {ticketFk: ticketId}}); - - stmt = new ParameterizedSQL('UPDATE vn.sale SET price=100 WHERE id IN(?,?)', [ - sales[0].id, - sales[1].id - ]); - stmts.push(stmt); - - stmt = new ParameterizedSQL('SELECT * FROM vn.sale WHERE ticketFk = ?', [ - ticketId - ]); - stmts.push(stmt); - - let modifiedSales = stmts.push(stmt) - 1; - - stmt = new ParameterizedSQL('CALL vn.ticket_recalcComponents(?, NULL)', [ - ticketId, - ]); - stmts.push(stmt); - - stmt = new ParameterizedSQL('SELECT * FROM vn.sale WHERE ticketFk = ?', [ - ticketId - ]); - stmts.push(stmt); - - let expectedSales = stmts.push(stmt) - 1; - - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - let result = await app.models.Ticket.rawStmt(sql); - - // original data - const firstPrice = sales[0].price; - const secondPrice = sales[1].price; - - // alteratons for test purposes - const modifiedFirstPrice = result[modifiedSales][0].price; - const modifiedSecondPrice = result[modifiedSales][1].price; - - // expected data after recalc - const expectedSalesFirstPrice = result[expectedSales][0].price; - const expectedSalesSecondPrice = result[expectedSales][1].price; - - expect(firstPrice).not.toEqual(modifiedFirstPrice); - expect(secondPrice).not.toEqual(modifiedSecondPrice); - - expect(firstPrice).toEqual(expectedSalesFirstPrice); - expect(secondPrice).toEqual(expectedSalesSecondPrice); - }); -}); diff --git a/db/tests/vn/timeBusiness_calculateByUser.spec.js b/db/tests/vn/timeBusiness_calculateByUser.spec.js deleted file mode 100644 index 5fe51d8f8..000000000 --- a/db/tests/vn/timeBusiness_calculateByUser.spec.js +++ /dev/null @@ -1,40 +0,0 @@ -const app = require('vn-loopback/server/server'); -const ParameterizedSQL = require('loopback-connector').ParameterizedSQL; - -describe('timeBusiness_calculateByUser()', () => { - it('should return the expected hours for today', async() => { - let start = Date.vnNew(); - start.setHours(0, 0, 0, 0); - let end = Date.vnNew(); - end.setHours(0, 0, 0, 0); - - let stmts = []; - let stmt; - - stmts.push('START TRANSACTION'); - - let params = { - workerID: 1106, - start: start, - end: end - }; - - stmt = new ParameterizedSQL('CALL vn.timeBusiness_calculateByUser(?, ?, ?)', [ - params.workerID, - params.start, - params.end - ]); - stmts.push(stmt); - - let tableIndex = stmts.push('SELECT * FROM tmp.timeBusinessCalculate') - 1; - - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - let result = await app.models.Ticket.rawStmt(sql); - - let [timeBusinessCalculateTable] = result[tableIndex]; - - expect(timeBusinessCalculateTable.timeBusinessSeconds).toEqual(28800); - }); -}); diff --git a/db/tests/vn/timeControl_calculateByUser.spec.js b/db/tests/vn/timeControl_calculateByUser.spec.js deleted file mode 100644 index 0b385d2c9..000000000 --- a/db/tests/vn/timeControl_calculateByUser.spec.js +++ /dev/null @@ -1,91 +0,0 @@ -const app = require('vn-loopback/server/server'); -const ParameterizedSQL = require('loopback-connector').ParameterizedSQL; - -describe('timeControl_calculateByUser()', () => { - it(`should return today's worked hours`, async() => { - let start = Date.vnNew(); - start.setHours(0, 0, 0, 0); - start.setDate(start.getDate() - 1); - - let end = Date.vnNew(); - end.setHours(0, 0, 0, 0); - end.setDate(end.getDate() + 1); - - let stmts = []; - let stmt; - - let params = { - workerID: 1106, - start: start, - end: end - }; - - stmt = new ParameterizedSQL('CALL vn.timeControl_calculateByUser(?, ?, ?)', [ - params.workerID, - params.start, - params.end - ]); - stmts.push(stmt); - - let tableIndex = stmts.push('SELECT * FROM tmp.timeControlCalculate') - 1; - - let sql = ParameterizedSQL.join(stmts, ';'); - let result = await app.models.Ticket.rawStmt(sql); - - let [timeControlCalculateTable] = result[tableIndex]; - - expect(timeControlCalculateTable.timeWorkSeconds).toEqual(28200); - }); - // #2261 - xit(`should return the worked hours between last sunday and monday`, async() => { - let lastSunday = Date.vnNew(); - let daysSinceSunday = lastSunday.getDay(); - if (daysSinceSunday === 0) // this means today is sunday but you need the previous sunday :) - daysSinceSunday = 7; - lastSunday.setHours(23, 0, 0, 0); - lastSunday.setDate(lastSunday.getDate() - daysSinceSunday); - - let monday = Date.vnNew(); - let daysSinceMonday = daysSinceSunday - 1; // aiming for monday (today could be monday) - monday.setHours(7, 0, 0, 0); - monday.setDate(monday.getDate() - daysSinceMonday); - - let stmts = []; - let stmt; - - stmts.push('START TRANSACTION'); - - const workerID = 1108; - - stmt = new ParameterizedSQL(` - INSERT INTO vn.workerTimeControl(userFk, timed, manual, direction) - VALUES - (?, ?, 1, 'in'), - (?, ?, 1, 'out') - `, [ - workerID, - lastSunday, - workerID, - monday - ]); - stmts.push(stmt); - - stmt = new ParameterizedSQL('CALL vn.timeControl_calculateByUser(?, ?, ?)', [ - workerID, - lastSunday, - monday - ]); - stmts.push(stmt); - - let tableIndex = stmts.push('SELECT * FROM tmp.timeControlCalculate') - 1; - - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - let result = await app.models.Ticket.rawStmt(sql); - - let [timeControlCalculateTable] = result[tableIndex]; - - expect(timeControlCalculateTable.timeWorkSeconds).toEqual(30000); - }); -}); diff --git a/db/tests/vn/workerTimeControlCheck.spec.js b/db/tests/vn/workerTimeControlCheck.spec.js deleted file mode 100644 index 0ca1429d4..000000000 --- a/db/tests/vn/workerTimeControlCheck.spec.js +++ /dev/null @@ -1,580 +0,0 @@ -const app = require('vn-loopback/server/server'); -const ParameterizedSQL = require('loopback-connector').ParameterizedSQL; - -// #2261 xdescribe dbtest workerTimeControl_check() -xdescribe('worker workerTimeControl_check()', () => { - it(`should throw an error if the worker can't sign on that tablet`, async() => { - let stmts = []; - let stmt; - const workerId = 1110; - const tabletId = 2; - let err; - stmts.push('START TRANSACTION'); - try { - stmt = new ParameterizedSQL('CALL vn.workerTimeControl_check(?, ?, NULL)', [ - workerId, - tabletId - ]); - stmts.push(stmt); - - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - await app.models.Worker.rawStmt(sql); - } catch (e) { - err = e; - } - - expect(err.sqlMessage).toEqual('No perteneces a este departamento.'); - }); - - it('should check that the worker can sign on that tablet', async() => { - let stmts = []; - let stmt; - const workerId = 1110; - const tabletId = 1; - let err; - stmts.push('START TRANSACTION'); - try { - stmt = new ParameterizedSQL('CALL vn.workerTimeControl_check(?, ?, NULL)', [ - workerId, - tabletId - ]); - stmts.push(stmt); - - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - await app.models.Worker.rawStmt(sql); - } catch (e) { - err = e; - } - - expect(err).not.toBeDefined(); - }); - - it('should throw an error if the worker with a special category has not finished the 9h break', async() => { - const workerId = 1110; - const tabletId = 1; - let stmts = []; - let stmt; - let sql; - let error; - - stmts.push('START TRANSACTION'); - stmt = new ParameterizedSQL(`INSERT INTO vn.workerTimeControl(userFk,timed,manual,direction) - VALUES - (?,TIMESTAMPADD(HOUR,-17,NOW()),0,"in"), - (?,TIMESTAMPADD(SECOND,-32399,NOW()),0,"out")`, [ - workerId, - workerId - ]); - stmts.push(stmt); - - stmt = new ParameterizedSQL('CALL vn.workerTimeControl_check(?, ?, NULL)', [ - workerId, - tabletId - ]); - stmts.push(stmt); - stmts.push('ROLLBACK'); - sql = ParameterizedSQL.join(stmts, ';'); - - try { - await app.models.Worker.rawStmt(sql); - } catch (e) { - await app.models.Worker.rawSql('ROLLBACK'); - error = e; - } - - expect(error.sqlMessage).toEqual('Descansos 9 h'); - }); - - it('should check f the worker with a special category has finished the 9h break', async() => { - const workerId = 1110; - const tabletId = 1; - let stmts = []; - let stmt; - let err; - stmts.push('START TRANSACTION'); - stmt = new ParameterizedSQL(`INSERT INTO vn.workerTimeControl(userFk,timed,manual,direction) - VALUES - (?,TIMESTAMPADD(HOUR,-17,NOW()),0,"in"), - (?,TIMESTAMPADD(SECOND,-32401,NOW()),0,"out")`, [ - workerId, - workerId - ]); - stmts.push(stmt); - - stmt = new ParameterizedSQL('CALL vn.workerTimeControl_check(?, ?, NULL)', [ - workerId, - tabletId - ]); - stmts.push(stmt); - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - - try { - await app.models.Worker.rawStmt(sql); - } catch (e) { - await app.models.Worker.rawSql('ROLLBACK'); - err = e; - } - - expect(err).not.toBeDefined(); - }); - - it('should throw an error if the worker has not finished the 12h break', async() => { - const workerId = 1109; - const tabletId = 1; - let stmts = []; - let stmt; - let sql; - let error; - - stmts.push('START TRANSACTION'); - stmt = new ParameterizedSQL(`INSERT INTO vn.workerTimeControl(userFk,timed,manual,direction) - VALUES - (?,TIMESTAMPADD(HOUR,-20,NOW()),0,"in"), - (?,TIMESTAMPADD(SECOND,-43199,NOW()),0,"out")`, [ - workerId, - workerId - ]); - stmts.push(stmt); - - stmt = new ParameterizedSQL('CALL vn.workerTimeControl_check(?, ?, NULL)', [ - workerId, - tabletId - ]); - stmts.push(stmt); - stmts.push('ROLLBACK'); - sql = ParameterizedSQL.join(stmts, ';'); - - try { - await app.models.Worker.rawStmt(sql); - } catch (e) { - await app.models.Worker.rawSql('ROLLBACK'); - error = e; - } - - expect(error.sqlMessage).toEqual('Descansos 12 h'); - }); - - it('should throw an error if the worker has finished the 12h break', async() => { - const workerId = 1109; - const tabletId = 1; - let stmts = []; - let stmt; - let err; - stmts.push('START TRANSACTION'); - stmt = new ParameterizedSQL(`INSERT INTO vn.workerTimeControl(userFk,timed,manual,direction) - VALUES - (?,TIMESTAMPADD(HOUR,-20,NOW()),0,"in"), - (?,TIMESTAMPADD(SECOND,-43201,NOW()),0,"out")`, [ - workerId, - workerId - ]); - stmts.push(stmt); - - stmt = new ParameterizedSQL('CALL vn.workerTimeControl_check(?, ?, NULL)', [ - workerId, - tabletId - ]); - stmts.push(stmt); - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - - try { - await app.models.Worker.rawStmt(sql); - } catch (e) { - await app.models.Worker.rawSql('ROLLBACK'); - err = e; - } - - expect(err).not.toBeDefined(); - }); - - it('should throw an error if the worker has odd entry records', async() => { - const workerId = 1109; - const tabletId = 1; - let stmts = []; - let stmt; - let err; - stmts.push('START TRANSACTION'); - stmt = new ParameterizedSQL(`INSERT INTO vn.workerTimeControl(userFk,timed,manual,direction) - VALUES - (?,TIMESTAMPADD(HOUR,-24,NOW()),0,"in")`, [ - workerId - ]); - stmts.push(stmt); - - stmt = new ParameterizedSQL('CALL vn.workerTimeControl_check(?, ?, NULL)', [ - workerId, - tabletId - ]); - stmts.push(stmt); - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - - try { - await app.models.Worker.rawStmt(sql); - } catch (e) { - await app.models.Worker.rawSql('ROLLBACK'); - err = e; - } - - expect(err.sqlMessage).toEqual('Dias con fichadas impares'); - }); - - it('should throw an error if the worker try to sign on a holiday day', async() => { - const workerId = 1109; - const tabletId = 1; - let stmts = []; - let stmt; - let err; - - stmts.push('START TRANSACTION'); - - stmt = new ParameterizedSQL(`INSERT INTO vn.workerTimeControl(userFk,timed,manual,direction) - VALUES - (?,TIMESTAMPADD(HOUR,-24,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-20,NOW()),0,"out")`, [ - workerId, - workerId - ]); - stmts.push(stmt); - - stmt = new ParameterizedSQL('CALL vn.workerTimeControl_check(?, ?, NULL)', [ - workerId, - tabletId - ]); - stmts.push(stmt); - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - - try { - await app.models.Worker.rawStmt(sql); - } catch (e) { - await app.models.Worker.rawSql('ROLLBACK'); - err = e; - } - - expect(err.sqlMessage).toEqual('Holidays'); - }); - - it('should throw an error if the worker try to sign with your contract ended', async() => { - const workerId = 1109; - const tabletId = 1; - let stmts = []; - let stmt; - let err; - - stmts.push('START TRANSACTION'); - - stmt = new ParameterizedSQL(`UPDATE vn.business SET ended = DATE_ADD(CURDATE(), INTERVAL -1 DAY) WHERE id = ?`, [ - workerId - ]); - stmts.push(stmt); - - stmt = new ParameterizedSQL(`INSERT INTO vn.workerTimeControl(userFk,timed,manual,direction) - VALUES - (?,TIMESTAMPADD(HOUR,-24,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-20,NOW()),0,"out")`, [ - workerId, - workerId - ]); - stmts.push(stmt); - - stmt = new ParameterizedSQL('CALL vn.workerTimeControl_check(?, ?, NULL)', [ - workerId, - tabletId - ]); - stmts.push(stmt); - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - - try { - await app.models.Worker.rawStmt(sql); - } catch (e) { - await app.models.Worker.rawSql('ROLLBACK'); - err = e; - } - - expect(err.sqlMessage).toEqual('No hay un contrato en vigor'); - }); - - it('should throw an error if the worker has not finished the 36h weekly break', async() => { - const workerId = 1109; - const tabletId = 1; - let stmts = []; - let stmt; - - stmts.push('SET @warn := NULL'); - - stmts.push('START TRANSACTION'); - - stmt = new ParameterizedSQL(`INSERT INTO vn.workerTimeControl(userFk,timed,manual,direction) - VALUES - (?,TIMESTAMPADD(HOUR,-24,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-16,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-48,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-40,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-72,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-64,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-96,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-88,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-120,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-112,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-144,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-136,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-168,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-160,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-192,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-184,NOW()),0,"out")`, [ - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId - ]); - stmts.push(stmt); - - stmt = new ParameterizedSQL('CALL vn.workerTimeControl_check(?, ?, NULL)', [ - workerId, - tabletId - ]); - stmts.push(stmt); - - let warningMessageIndex = stmts.push('SELECT @warn AS warning') - 1; - stmts.push('ROLLBACK'); - let sql = ParameterizedSQL.join(stmts, ';'); - let result = await app.models.Worker.rawStmt(sql); - - expect(result[warningMessageIndex][0].warning).toEqual('Descansos 36 h'); - }); - - it('should check if the worker has finished the 36h weekly break', async() => { - const workerId = 1109; - const tabletId = 1; - let stmts = []; - let stmt; - - stmts.push('SET @warn := NULL'); - - stmts.push('START TRANSACTION'); - - stmt = new ParameterizedSQL(`INSERT INTO vn.workerTimeControl(userFk,timed,manual,direction) - VALUES - (?,TIMESTAMPADD(HOUR,-24,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-16,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-48,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-40,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-72,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-64,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-96,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-88,NOW()),0,"out")`, [ - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId - ]); - stmts.push(stmt); - - stmt = new ParameterizedSQL('CALL vn.workerTimeControl_check(?, ?, NULL)', [ - workerId, - tabletId - ]); - stmts.push(stmt); - stmts.push('ROLLBACK'); - - let warningMessageIndex = stmts.push('SELECT @warn AS warning') - 1; - - let sql = ParameterizedSQL.join(stmts, ';'); - let result = await app.models.Worker.rawStmt(sql); - - expect(result[warningMessageIndex][0].warning).toBe(null); - }); - - it('should throw an error if the worker has not finished the 72h biweekly break', async() => { - const workerId = 1109; - const tabletId = 1; - let stmts = []; - let stmt; - let err; - stmts.push('START TRANSACTION'); - - stmt = new ParameterizedSQL(`INSERT INTO vn.workerTimeControl(userFk,timed,manual,direction) - VALUES - (?,TIMESTAMPADD(HOUR,-24,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-16,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-48,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-40,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-72,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-64,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-96,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-88,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-120,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-112,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-144,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-136,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-168,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-160,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-192,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-184,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-216,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-208,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-240,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-232,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-264,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-256,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-289,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-280,NOW()),0,"out")`, [ - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId - ]); - stmts.push(stmt); - - stmt = new ParameterizedSQL('CALL vn.workerTimeControl_check(?, ?, NULL)', [ - workerId, - tabletId - ]); - stmts.push(stmt); - stmts.push('ROLLBACK'); - - stmts.push('SELECT @warn AS warning') - 1; - - let sql = ParameterizedSQL.join(stmts, ';'); - - try { - await app.models.Worker.rawStmt(sql); - } catch (e) { - await app.models.Worker.rawSql('ROLLBACK'); - err = e; - } - - expect(err.sqlMessage).toEqual('Descansos 72 h'); - }); - - it('should check if the worker has finished the 72h biweekly break', async() => { - const workerId = 1109; - const tabletId = 1; - let stmts = []; - let stmt; - let err; - stmts.push('START TRANSACTION'); - - stmt = new ParameterizedSQL(`INSERT INTO vn.workerTimeControl(userFk,timed,manual,direction) - VALUES - (?,TIMESTAMPADD(HOUR,-24,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-16,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-48,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-40,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-72,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-64,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-96,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-88,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-120,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-112,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-144,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-136,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-168,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-160,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-192,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-184,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-216,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-208,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-240,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-232,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-264,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-256,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-288,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-280,NOW()),0,"out")`, [ - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId - ]); - stmts.push(stmt); - - stmt = new ParameterizedSQL('CALL vn.workerTimeControl_check(?, ?, NULL)', [ - workerId, - tabletId - ]); - stmts.push(stmt); - stmts.push('ROLLBACK'); - - stmts.push('SELECT @warn AS warning') - 1; - - let sql = ParameterizedSQL.join(stmts, ';'); - - try { - await app.models.Worker.rawStmt(sql); - } catch (e) { - await app.models.Worker.rawSql('ROLLBACK'); - err = e; - } - - expect(err).not.toBeDefined(); - }); -}); diff --git a/db/tests/vn/zone_getEvents.spec.js b/db/tests/vn/zone_getEvents.spec.js deleted file mode 100644 index fe49b60be..000000000 --- a/db/tests/vn/zone_getEvents.spec.js +++ /dev/null @@ -1,31 +0,0 @@ -const app = require('vn-loopback/server/server'); -const ParameterizedSQL = require('loopback-connector').ParameterizedSQL; - -describe('zone zone_getEvents()', () => { - it(`should return data for a agencyMode with deliveryMethod pickup`, async() => { - let stmts = []; - let stmt; - - stmts.push('START TRANSACTION'); - - let params = { - zoneGeoFk: 1, - agencyModeFk: 1}; - - stmt = new ParameterizedSQL('CALL zone_getEvents(?, ?)', [ - params.zoneGeoFk, - params.agencyModeFk, - - ]); - stmts.push(stmt); - - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - let result = await app.models.Ticket.rawStmt(sql); - - let zonesEvents = result[1]; - - expect(zonesEvents.length).toBeGreaterThan(0); - }); -}); diff --git a/db/tests/vn/zone_getFromGeo.spec.js b/db/tests/vn/zone_getFromGeo.spec.js deleted file mode 100644 index 74b6e00cc..000000000 --- a/db/tests/vn/zone_getFromGeo.spec.js +++ /dev/null @@ -1,28 +0,0 @@ -const app = require('vn-loopback/server/server'); -const ParameterizedSQL = require('loopback-connector').ParameterizedSQL; - -describe('zone zone_getFromGeo()', () => { - it(`should check that there are some results in table zone`, async() => { - let stmts = []; - let stmt; - - stmts.push('START TRANSACTION'); - let geoFk = 16; - - stmt = new ParameterizedSQL('CALL zone_getFromGeo(?)', [ - geoFk, - ]); - stmts.push(stmt); - - let tableIndex = stmts.push('SELECT count(*) countZone FROM tmp.zone WHERE id IN (1, 2, 3, 4, 5, 6, 7, 8)') - 1; - - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - let result = await app.models.Ticket.rawStmt(sql); - - let [zoneTable] = result[tableIndex]; - - expect(zoneTable.countZone).toBe(8); - }); -}); diff --git a/db/tests/vn/zone_getLanded.spec.js b/db/tests/vn/zone_getLanded.spec.js deleted file mode 100644 index 888d7c132..000000000 --- a/db/tests/vn/zone_getLanded.spec.js +++ /dev/null @@ -1,75 +0,0 @@ -const app = require('vn-loopback/server/server'); -const ParameterizedSQL = require('loopback-connector').ParameterizedSQL; - -describe('zone zone_getLanded()', () => { - it(`should return data for a shipped in the past`, async() => { - let stmts = []; - let stmt; - stmts.push('START TRANSACTION'); - const date = Date.vnNew(); - date.setHours(0, 0, 0, 0); - - let params = { - addressFk: 121, - agencyModeFk: 7, - warehouseFk: 1, - showExpiredZones: true}; - - stmt = new ParameterizedSQL('CALL zone_getLanded(DATE_ADD(?, INTERVAL -1 DAY), ?, ?, ?, ?)', [ - date, - params.addressFk, - params.agencyModeFk, - params.warehouseFk, - params.showExpiredZones - - ]); - stmts.push(stmt); - - let tableIndex = stmts.push('SELECT count(*) countZone FROM tmp.zoneGetLanded') - 1; - - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - let result = await app.models.Ticket.rawStmt(sql); - - let [zoneTable] = result[tableIndex]; - - expect(zoneTable.countZone).toBe(1); - }); - - it(`should return data for a shipped tomorrow`, async() => { - let stmts = []; - let stmt; - const date = Date.vnNew(); - date.setHours(0, 0, 0, 0); - - stmts.push('START TRANSACTION'); - - let params = { - addressFk: 121, - agencyModeFk: 7, - warehouseFk: 1, - showExpiredZones: false}; - - stmt = new ParameterizedSQL('CALL zone_getLanded(DATE_ADD(?, INTERVAL +2 DAY), ?, ?, ?, ?)', [ - date, - params.addressFk, - params.agencyModeFk, - params.warehouseFk, - params.showExpiredZones - - ]); - stmts.push(stmt); - - let tableIndex = stmts.push('SELECT count(*) countZone FROM tmp.zoneGetLanded') - 1; - - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - let result = await app.models.Ticket.rawStmt(sql); - - let [zoneTable] = result[tableIndex]; - - expect(zoneTable.countZone).toBe(1); - }); -}); diff --git a/db/versions/.archive/10107-pinkPaniculata/00-firstScript.sql b/db/versions/.archive/10107-pinkPaniculata/00-firstScript.sql new file mode 100644 index 000000000..a5e4dd843 --- /dev/null +++ b/db/versions/.archive/10107-pinkPaniculata/00-firstScript.sql @@ -0,0 +1,3 @@ +-- Place your SQL code here +ALTER TABLE vn.productionConfig ADD defaultZone INT DEFAULT 697 NOT NULL; +ALTER TABLE vn.productionConfig ADD defautlAgencyMode INT DEFAULT 1328 NOT NULL COMMENT 'SENDING'; diff --git a/db/versions/.archive/10112-wheatAnthurium/00-firstScript.sql b/db/versions/.archive/10112-wheatAnthurium/00-firstScript.sql new file mode 100644 index 000000000..bc4b383b9 --- /dev/null +++ b/db/versions/.archive/10112-wheatAnthurium/00-firstScript.sql @@ -0,0 +1 @@ +ALTER TABLE `vn2008`.`Tickets_dits` RENAME TO `vn2008`.`Tickets_dits__` ; diff --git a/db/versions/.archive/10113-blueMonstera/00-firstScript.sql b/db/versions/.archive/10113-blueMonstera/00-firstScript.sql new file mode 100644 index 000000000..c437d076b --- /dev/null +++ b/db/versions/.archive/10113-blueMonstera/00-firstScript.sql @@ -0,0 +1,3 @@ +ALTER TABLE vn.specialPrice DROP FOREIGN KEY `{01A99AF1-3D3F-4B15-AC0C-C7A834F319A3}`; +ALTER TABLE vn.specialPrice DROP FOREIGN KEY `{EE4ADEF6-0AC6-401F-B7C4-D797972FC065}`; + \ No newline at end of file diff --git a/db/versions/.archive/10114-maroonOrchid/00-updateConfig.sql b/db/versions/.archive/10114-maroonOrchid/00-updateConfig.sql new file mode 100644 index 000000000..919c6269a --- /dev/null +++ b/db/versions/.archive/10114-maroonOrchid/00-updateConfig.sql @@ -0,0 +1 @@ +ALTER TABLE srt.config ADD isBalanced BOOL DEFAULT 1 NOT NULL; \ No newline at end of file diff --git a/db/versions/.archive/10116-pinkOak/00-firstScript.sql b/db/versions/.archive/10116-pinkOak/00-firstScript.sql new file mode 100644 index 000000000..682f9772b --- /dev/null +++ b/db/versions/.archive/10116-pinkOak/00-firstScript.sql @@ -0,0 +1,3 @@ +ALTER TABLE vn.propertyNotes DROP FOREIGN KEY propertyNotes_FK; +ALTER TABLE vn.propertyNotes MODIFY COLUMN propertyFk int(11) NOT NULL; +ALTER TABLE vn.propertyNotes ADD CONSTRAINT propertyNotes_FK FOREIGN KEY (propertyFk) REFERENCES vn.property(id); diff --git a/db/versions/.archive/10118-blueFern/00-firstScript.sql b/db/versions/.archive/10118-blueFern/00-firstScript.sql new file mode 100644 index 000000000..12de63f4b --- /dev/null +++ b/db/versions/.archive/10118-blueFern/00-firstScript.sql @@ -0,0 +1 @@ +ALTER TABLE vn.cmrConfig ADD landingDays TINYINT DEFAULT 1 NOT NULL; \ No newline at end of file diff --git a/db/versions/.archive/10119-navyGerbera/00-AfegirFKPart1.sql b/db/versions/.archive/10119-navyGerbera/00-AfegirFKPart1.sql new file mode 100644 index 000000000..bfff1133b --- /dev/null +++ b/db/versions/.archive/10119-navyGerbera/00-AfegirFKPart1.sql @@ -0,0 +1,18 @@ +/*ALTER TABLE bi.rutasBoard ADD CONSTRAINT rutasBoard_FK FOREIGN KEY (warehouse_id) REFERENCES vn.warehouse(id); +ALTER TABLE bi.tarifa_warehouse MODIFY COLUMN warehouse_id smallint(6) UNSIGNED NOT NULL; +ALTER TABLE bi.tarifa_warehouse ADD CONSTRAINT tarifa_warehouse_FK FOREIGN KEY (warehouse_id) REFERENCES vn.warehouse(id); +ALTER TABLE bi.XDiario_ALL MODIFY COLUMN empresa_id SMALLINT (5) UNSIGNED NOT NULL; +ALTER TABLE bi.XDiario_ALL ADD CONSTRAINT XDiario_ALL_FK FOREIGN KEY (empresa_id) REFERENCES vn.company(id); +ALTER TABLE bs.defaulter ADD CONSTRAINT defaulter_FK FOREIGN KEY (clientFk) REFERENCES vn.client(id); +ALTER TABLE bs.inspeccionSS_2021 ADD CONSTRAINT inspeccionSS_2021_FK FOREIGN KEY (business_id) REFERENCES postgresql.business(business_id); +DELETE FROM bs.m3 WHERE id=589880; +DELETE FROM bs.m3 WHERE id=639521; +DELETE FROM bs.m3 WHERE id=639984; +ALTER TABLE bs.m3 ADD CONSTRAINT m3_FK FOREIGN KEY (provinceFk) REFERENCES vn.province(id); +ALTER TABLE bs.m3 ADD CONSTRAINT m3Warehouse_FK FOREIGN KEY (warehouseFk) REFERENCES vn.warehouse(id) ON UPDATE CASCADE; +ALTER TABLE bs.ventas_contables MODIFY COLUMN empresa_id smallint(5) unsigned NOT NULL; +ALTER TABLE bs.ventas_contables ADD CONSTRAINT ventas_contables_FK FOREIGN KEY (empresa_id) REFERENCES vn.company(id); +DELETE FROM bs.ventas_contables WHERE tipo_id = 97; -- BORRE PER QUE ESTE TIPO JA NO EXISTEIX +ALTER TABLE cache.cache_calc ADD CONSTRAINT cache_calc_FK FOREIGN KEY (cache_id) REFERENCES cache.cache(id) ON DELETE CASCADE ON UPDATE CASCADE; +ALTER TABLE cache.last_buy MODIFY COLUMN item_id int(11) NOT NULL; +comente per que ja s'ha executat esta part*/ \ No newline at end of file diff --git a/db/versions/.archive/10119-navyGerbera/01-AfegirFkPart2.sql b/db/versions/.archive/10119-navyGerbera/01-AfegirFkPart2.sql new file mode 100644 index 000000000..c129b2c76 --- /dev/null +++ b/db/versions/.archive/10119-navyGerbera/01-AfegirFkPart2.sql @@ -0,0 +1,17 @@ +/* +ALTER TABLE cache.last_buy ADD CONSTRAINT last_buy_FK_1 FOREIGN KEY (warehouse_id) REFERENCES vn.warehouse(id) ON DELETE CASCADE ON UPDATE CASCADE; +ALTER TABLE cache.last_buy MODIFY COLUMN buy_id int(11) NULL; +-- Aplicado hasta aquí +ALTER TABLE cache.last_buy ADD CONSTRAINT last_buy_FK_2 FOREIGN KEY (buy_id) REFERENCES vn.buy(id) ON DELETE CASCADE ON UPDATE CASCADE; +ALTER TABLE cache.prod_graphic_source MODIFY COLUMN warehouse_id smallint(6) unsigned NOT NULL; +ALTER TABLE cache.prod_graphic_source ADD CONSTRAINT prod_graphic_source_FK FOREIGN KEY (warehouse_id) REFERENCES vn.warehouse(id) ON DELETE CASCADE ON UPDATE CASCADE; +DELETE FROM dipole.expedition_PrintOut WHERE expeditionFk NOT IN (SELECT id FROM vn.expedition); +ALTER TABLE dipole.expedition_PrintOut ADD CONSTRAINT expedition_PrintOut_FK_1 FOREIGN KEY (expeditionFk) REFERENCES vn.expedition(id); +ALTER TABLE dipole.expedition_PrintOut ADD CONSTRAINT expedition_PrintOut_FK_2 FOREIGN KEY (addressFk) REFERENCES vn.address(id); +ALTER TABLE dipole.expedition_PrintOut ADD CONSTRAINT expedition_PrintOut_FK_3 FOREIGN KEY (clientFk) REFERENCES vn.client(id); +ALTER TABLE dipole.expedition_PrintOut MODIFY COLUMN routeFk int(11) DEFAULT 0 NOT NULL COMMENT '3 ultimos caracteres de la ruta'; +ALTER TABLE dipole.expedition_PrintOut ADD CONSTRAINT expedition_PrintOut_FK_4 FOREIGN KEY (ticketFk) REFERENCES vn.ticket(id); +ALTER TABLE dipole.expedition_Read ADD CONSTRAINT expedition_Read_FK_1 FOREIGN KEY (expeditionFk) REFERENCES vn.expedition(id); +ALTER TABLE edi.bucket ADD CONSTRAINT bucket_FK FOREIGN KEY (bucket_type_id) REFERENCES edi.bucket_type(bucket_type_id) ON UPDATE CASCADE; +ALTER TABLE edi.clientFHAdminNumber ADD CONSTRAINT clientFHAdminNumber_FK_1 FOREIGN KEY (clientFk) REFERENCES vn.client(id) ON UPDATE CASCADE; +*/ \ No newline at end of file diff --git a/db/versions/.archive/10125-grayRose/00-firstScript.sql b/db/versions/.archive/10125-grayRose/00-firstScript.sql new file mode 100644 index 000000000..e37209b83 --- /dev/null +++ b/db/versions/.archive/10125-grayRose/00-firstScript.sql @@ -0,0 +1,45 @@ +ALTER TABLE hedera.restPriv MODIFY COLUMN `role` int(10) unsigned NULL; + +UPDATE hedera.restPriv + SET `role`=104 + WHERE id=5; +UPDATE hedera.restPriv + SET `role`=5 + WHERE id=7; +DELETE FROM hedera.restPriv + WHERE id=2; +DELETE FROM hedera.restPriv + WHERE id=6; +DELETE FROM hedera.restPriv + WHERE id=8; +INSERT INTO hedera.restPriv (methodPath) + VALUES ('core/captcha'); +INSERT INTO hedera.restPriv (methodPath) + VALUES ('core/log'); +INSERT INTO hedera.restPriv (methodPath) + VALUES ('core/login'); +INSERT INTO hedera.restPriv (methodPath) + VALUES ('core/logout'); +INSERT INTO hedera.restPriv (methodPath) + VALUES ('core/query'); +INSERT INTO hedera.restPriv (methodPath) + VALUES ('core/recover-password'); +INSERT INTO hedera.restPriv (methodPath) + VALUES ('core/restore-password'); +INSERT INTO hedera.restPriv (methodPath,`role`) + VALUES ('dms/invoice',2); +INSERT INTO hedera.restPriv (methodPath) + VALUES ('image/thumb'); +INSERT INTO hedera.restPriv (methodPath) + VALUES ('misc/concact'); +INSERT INTO hedera.restPriv (methodPath) + VALUES ('misc/production'); +INSERT INTO hedera.restPriv (methodPath) + VALUES ('tpv/confirm-post'); +INSERT INTO hedera.restPriv (methodPath) + VALUES ('tpv/confirm-soap'); +INSERT INTO hedera.restPriv (methodPath,`role`) + VALUES ('client/supplant',18); + +UPDATE vn.`itemCategory` SET `display` = '0' WHERE `itemCategory`.`id` = 9; +DELETE FROM hedera.`menu` WHERE `menu`.`id` = 16 diff --git a/db/versions/.archive/10127-purpleMedeola/00-firstScript.sql b/db/versions/.archive/10127-purpleMedeola/00-firstScript.sql new file mode 100644 index 000000000..e64ccf9cb --- /dev/null +++ b/db/versions/.archive/10127-purpleMedeola/00-firstScript.sql @@ -0,0 +1,28 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Trabajadores` +AS SELECT `w`.`id` AS `Id_Trabajador`, + `w`.`firstName` AS `Nombre`, + `w`.`userFk` AS `user_id`, + `w`.`phone` AS `phone`, + `w`.`bossFk` AS `boss`, + NULL AS `Foto`, + `w`.`fiDueDate` AS `DniExpiration`, + `w`.`code` AS `CodigoTrabajador`, + `w`.`lastName` AS `Apellidos`, + `w`.`hasMachineryAuthorized` AS `hasMachineryAuthorized`, + `w`.`password__` AS `Password__`, + `w`.`email__` AS `email__`, + `w`.`extension__` AS `extension__`, + `w`.`sub` AS `sub`, + `w`.`user__` AS `user__`, + `w`.`typeBussines__` AS `Contrato_Tipo__`, + `w`.`laborCategory__` AS `Categoria_Laboral__`, + `w`.`started__` AS `Fecha_Inicio__`, + `w`.`ended__` AS `Fecha_Fin__`, + `w`.`notes__` AS `Notas__`, + `w`.`address__` AS `address__`, + `w`.`birthed__` AS `date_birth__`, + `w`.`maritalStatus` AS `marital_status`, + `w`.`clientFk__` AS `Id_Cliente_Interno__` +FROM `vn`.`worker` `w` diff --git a/db/versions/.archive/10128-tealGerbera/00-firstScript.sql b/db/versions/.archive/10128-tealGerbera/00-firstScript.sql new file mode 100644 index 000000000..3904fcdcf --- /dev/null +++ b/db/versions/.archive/10128-tealGerbera/00-firstScript.sql @@ -0,0 +1 @@ +ALTER TABLE srt.config ADD testMode BOOL DEFAULT 0 NOT NULL; diff --git a/db/versions/.archive/10129-maroonChrysanthemum/00-firstScript.sql b/db/versions/.archive/10129-maroonChrysanthemum/00-firstScript.sql new file mode 100644 index 000000000..d10ca22fa --- /dev/null +++ b/db/versions/.archive/10129-maroonChrysanthemum/00-firstScript.sql @@ -0,0 +1,4 @@ +ALTER TABLE vn.itemShelving CHANGE deep deep__ int(11) unsigned DEFAULT 1 NOT NULL; +ALTER TABLE vn.itemShelving CHANGE quantity quantity__ int(11) DEFAULT 0 NOT NULL; +ALTER TABLE vn.itemShelving CHANGE `level` level__ varchar(45) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT '1' NOT NULL; +ALTER TABLE vn.itemShelving CHANGE available available__ int(11) DEFAULT 0 NOT NULL; \ No newline at end of file diff --git a/db/versions/.archive/10132-blackChrysanthemum/00-firstScript.sql b/db/versions/.archive/10132-blackChrysanthemum/00-firstScript.sql new file mode 100644 index 000000000..3d9ce2922 --- /dev/null +++ b/db/versions/.archive/10132-blackChrysanthemum/00-firstScript.sql @@ -0,0 +1,3 @@ +ALTER TABLE vn.item CHANGE compression compression__ decimal(5,2) +DEFAULT 1.00 NOT NULL +COMMENT 'Relacion de compresividad entre el volumen de las entradas en Silla y el empaquetado en los envios a clientes.'; diff --git a/db/versions/.archive/10133-crimsonLaurel/00-firstScript.sql b/db/versions/.archive/10133-crimsonLaurel/00-firstScript.sql new file mode 100644 index 000000000..caaad1e40 --- /dev/null +++ b/db/versions/.archive/10133-crimsonLaurel/00-firstScript.sql @@ -0,0 +1 @@ +ALTER TABLE `vn`.`item` CHANGE compression__ compression decimal(5,2) DEFAULT 1.00 NOT NULL COMMENT 'Relacion de compresividad entre el volumen de las entradas en Silla y el empaquetado en los envios a clientes.'; diff --git a/db/versions/.archive/10134-limeAnthurium/00-firstScript.sql b/db/versions/.archive/10134-limeAnthurium/00-firstScript.sql new file mode 100644 index 000000000..f32521d8f --- /dev/null +++ b/db/versions/.archive/10134-limeAnthurium/00-firstScript.sql @@ -0,0 +1,35 @@ +ALTER TABLE `vn`.`commissionConfig` ADD executionDay SMALLINT NULL; +ALTER TABLE `vn`.`commissionConfig` ADD salesPersonWithPlusNewClient INT NULL; +ALTER TABLE `vn`.`commissionConfig` ADD maxPlusNewClient INT NULL; +ALTER TABLE `vn`.`commissionConfig` ADD plusDifference INT NULL; +ALTER TABLE `vn`.`commissionConfig` ADD maxScoreNewClient INT NULL; +ALTER TABLE `vn`.`commissionConfig` ADD scoreDifference INT NULL; + +UPDATE `vn`.`commissionConfig` +SET plusDifference=5,executionDay=5,scoreDifference=1,maxScoreNewClient=100,maxPlusNewClient=100,salesPersonWithPlusNewClient=20 +WHERE rate=0.0080; + +UPDATE `vn`.`department` +SET workerFk=4661 +WHERE id=96; +UPDATE `vn`.`department` +SET workerFk=4667 +WHERE id=95; +UPDATE `vn`.`department` +SET workerFk=3810 +WHERE id=115; +UPDATE `vn`.`department` +SET workerFk=7102 +WHERE id=123; +UPDATE `vn`.`department` +SET workerFk=3797 +WHERE id=94; +UPDATE `vn`.`department` +SET workerFk=4250 +WHERE id=80; +UPDATE `vn`.`department` +SET workerFk=1118 +WHERE id=125; +UPDATE `vn`.`department` +SET workerFk=1203 +WHERE id=92; \ No newline at end of file diff --git a/db/versions/.archive/10135-brownMonstera/00-firstScript.sql b/db/versions/.archive/10135-brownMonstera/00-firstScript.sql new file mode 100644 index 000000000..cce5f0521 --- /dev/null +++ b/db/versions/.archive/10135-brownMonstera/00-firstScript.sql @@ -0,0 +1,12 @@ +Use `vn`; + +CREATE TABLE `vn`.`zoneExclusionGeo` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `zoneExclusionFk` int(11) NOT NULL, + `geoFk` int(11) NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `zoneExclusionGeo_UN` (`zoneExclusionFk`,`geoFk`), + KEY `zoneExclusionGeo2_FK_1` (`geoFk`), + CONSTRAINT `zoneExclusionGeo_FK` FOREIGN KEY (`geoFk`) REFERENCES `zoneGeo` (`id`) ON UPDATE CASCADE, + CONSTRAINT `zoneExclusionGeo_FK_1` FOREIGN KEY (`zoneExclusionFk`) REFERENCES `zoneExclusion` (`id`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8; diff --git a/db/versions/.archive/10136-turquoiseGerbera/00-workerTimeControl.sql b/db/versions/.archive/10136-turquoiseGerbera/00-workerTimeControl.sql new file mode 100644 index 000000000..f5b6e046a --- /dev/null +++ b/db/versions/.archive/10136-turquoiseGerbera/00-workerTimeControl.sql @@ -0,0 +1,9 @@ +USE vn; +ALTER TABLE `vn`.`workerTimeControl` +ADD INDEX `timed_idx` (`timed` ASC); + +ALTER TABLE `vn`.`workerTimeControlConfig` +ADD COLUMN `shortWeekDays` INT(11) NULL COMMENT 'Días a tener en cuenta para calcular el descanso corto' AFTER `dayMaxTime`, +ADD COLUMN `longWeekDays` INT(11) NULL COMMENT 'Días a tener en cuenta para calcular el descanso largo' AFTER `shortWeekDays`; + +UPDATE `vn`.`workerTimeControlConfig` SET `shortWeekDays` = '6', `longWeekDays` = '13' WHERE (`id` = '1'); diff --git a/db/versions/.archive/10138-limeBirch/00-firstScript.sql b/db/versions/.archive/10138-limeBirch/00-firstScript.sql new file mode 100644 index 000000000..40dee2261 --- /dev/null +++ b/db/versions/.archive/10138-limeBirch/00-firstScript.sql @@ -0,0 +1,14 @@ +TRUNCATE vn.beach; +ALTER TABLE vn.beach CHANGE name name varchar(45) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL AFTER id; +ALTER TABLE vn.beach DROP COLUMN x; +ALTER TABLE vn.beach DROP COLUMN y; +ALTER TABLE vn.beach DROP COLUMN isShowed; +ALTER TABLE vn.beach DROP COLUMN name; +ALTER TABLE vn.beach CHANGE id code varchar(45) NOT NULL; +ALTER TABLE vn.beach MODIFY COLUMN code varchar(45) NOT NULL; +ALTER TABLE vn.beach MODIFY COLUMN warehouseFk smallint(6) DEFAULT 60 NOT NULL; +ALTER TABLE vn.routesMonitor ADD CONSTRAINT routesMonitor_FK_2 FOREIGN KEY (beachFk) REFERENCES vn.beach(code) ON DELETE RESTRICT ON UPDATE CASCADE; +INSERT INTO vn.beach (code) VALUES ('p1'); +INSERT INTO vn.beach (code) VALUES ('p2'); +INSERT INTO vn.beach (code) VALUES ('p3'); +INSERT INTO vn.beach (code) VALUES ('p4'); diff --git a/db/versions/.archive/10139-grayAspidistra/00-firstScript.sql b/db/versions/.archive/10139-grayAspidistra/00-firstScript.sql new file mode 100644 index 000000000..1a0584851 --- /dev/null +++ b/db/versions/.archive/10139-grayAspidistra/00-firstScript.sql @@ -0,0 +1,63 @@ +USE vn; +ALTER TABLE `vn`.`labelReport` + RENAME TO `vn`.`report` ; + +UPDATE `vn`.`report` SET `name` = 'invoice' WHERE (`id` = '3'); +UPDATE `vn`.`report` SET `name` = 'cleanDMS' WHERE (`id` = '11'); +UPDATE `vn`.`report` SET `name` = 'invoicePdf' WHERE (`id` = '40'); + + +CREATE TABLE `printQueue` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `printerFk` tinyint(3) unsigned DEFAULT NULL, + `priorityFk` tinyint(3) unsigned DEFAULT NULL, + `reportFk` tinyint(3) unsigned DEFAULT NULL, + `statusCode` enum('queued','error','printing') COLLATE utf8_unicode_ci NOT NULL DEFAULT 'queued', + `started` datetime DEFAULT NULL, + `finished` datetime DEFAULT NULL, + `workerFk` int(11) DEFAULT NULL, + `error` text COLLATE utf8_unicode_ci, + `errorNumber` int(11) DEFAULT NULL, + `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + KEY `statusCode` (`statusCode`), + KEY `printerFk` (`printerFk`), + KEY `priorityFk` (`priorityFk`), + KEY `workerFk` (`workerFk`), + KEY `printQueue_report` (`reportFk`), + CONSTRAINT `printQueue_priorityFk` FOREIGN KEY (`priorityFk`) REFERENCES `queuePriority` (`id`) ON UPDATE CASCADE, + CONSTRAINT `printQueue_printerFk` FOREIGN KEY (`printerFk`) REFERENCES `printer` (`id`) ON UPDATE CASCADE, + CONSTRAINT `printQueue_report` FOREIGN KEY (`reportFk`) REFERENCES `report` (`id`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB AUTO_INCREMENT = 1 DEFAULT CHARSET = utf8 COLLATE = utf8_unicode_ci; + + + + +CREATE TABLE `printQueueArgs` ( + `printQueueFk` int(10) unsigned NOT NULL, + `name` varchar(255) COLLATE utf8_unicode_ci NOT NULL, + `value` varchar(255) COLLATE utf8_unicode_ci NOT NULL, + KEY `printQueueArgs_printQueueFk_idx` (`printQueueFk`), + CONSTRAINT `printQueueArgs_printQueueFk` FOREIGN KEY (`printQueueFk`) REFERENCES `printQueue` (`id`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Argumentos que se pasarán al informe para generarlos'; + + + +ALTER TABLE `vn`.`sector` + DROP FOREIGN KEY `sector_labelReport`; + +ALTER TABLE `vn`.`sector` + CHANGE COLUMN `labelReportFk` `reportFk` TINYINT(3) UNSIGNED NULL DEFAULT NULL ; + +ALTER TABLE `vn`.`sector` + ADD CONSTRAINT `sector_report` + FOREIGN KEY (`reportFk`) + REFERENCES `vn`.`report` (`id`); + +ALTER TABLE `vn`.`queuePriority` +ADD COLUMN `code` VARCHAR(6) NULL AFTER `priority`; + +UPDATE `vn`.`queuePriority` SET `code` = 'normal' WHERE (`id` = '2'); +UPDATE `vn`.`queuePriority` SET `code` = 'low' WHERE (`id` = '3'); +UPDATE `vn`.`queuePriority` SET `code` = 'high' WHERE (`id` = '1'); + diff --git a/db/versions/.archive/10139-grayAspidistra/01-secondScript.sql b/db/versions/.archive/10139-grayAspidistra/01-secondScript.sql new file mode 100644 index 000000000..57d90337a --- /dev/null +++ b/db/versions/.archive/10139-grayAspidistra/01-secondScript.sql @@ -0,0 +1,18 @@ +USE vn; + +CREATE TABLE `vn`.`printQueueConfig` ( + `networkDrive` VARCHAR(10) NOT NULL DEFAULT 'X:\\', + `dmsPath` VARCHAR(45) NOT NULL DEFAULT ' \\\\server\\dms'); + + +ALTER TABLE `vn`.`printQueue` + DROP FOREIGN KEY `printQueue_priorityFk`; + +ALTER TABLE `vn`.`printQueue` + CHANGE COLUMN `priorityFk` `priorityFk` TINYINT(3) UNSIGNED NOT NULL DEFAULT 3 COMMENT '1 - high, 2 - normal, 3 - low' ; + +ALTER TABLE `vn`.`printQueue` + ADD CONSTRAINT `printQueue_priorityFk` + FOREIGN KEY (`priorityFk`) + REFERENCES `vn`.`queuePriority` (`id`) + ON UPDATE CASCADE; \ No newline at end of file diff --git a/db/versions/.archive/10141-turquoiseCordyline/00-firstScript.sql b/db/versions/.archive/10141-turquoiseCordyline/00-firstScript.sql new file mode 100644 index 000000000..7c7d05b56 --- /dev/null +++ b/db/versions/.archive/10141-turquoiseCordyline/00-firstScript.sql @@ -0,0 +1 @@ +RENAME TABLE vn.itemPlacement TO vn.itemPlacement__; \ No newline at end of file diff --git a/db/versions/.archive/10142-silverMedeola/00-firstScript.sql b/db/versions/.archive/10142-silverMedeola/00-firstScript.sql new file mode 100644 index 000000000..0f960efe8 --- /dev/null +++ b/db/versions/.archive/10142-silverMedeola/00-firstScript.sql @@ -0,0 +1,11 @@ +UPDATE hedera.orderRow or2 + LEFT JOIN vn.sale s ON s.id = or2.saleFk + SET or2.saleFk = NULL + WHERE s.id IS NULL AND or2.saleFk IS NOT NULL; + +ALTER TABLE `hedera`.`orderRow` +ADD CONSTRAINT `orderRow_ibfk_4` + FOREIGN KEY (`saleFk`) + REFERENCES `vn`.`sale` (`id`) + ON DELETE SET NULL + ON UPDATE CASCADE; \ No newline at end of file diff --git a/db/versions/.archive/10143-whiteFern/00-firstScript.sql b/db/versions/.archive/10143-whiteFern/00-firstScript.sql new file mode 100644 index 000000000..18f7762c1 --- /dev/null +++ b/db/versions/.archive/10143-whiteFern/00-firstScript.sql @@ -0,0 +1 @@ +RENAME TABLE postgresql.periodos TO postgresql.periodos__; \ No newline at end of file diff --git a/db/versions/.archive/10144-silverAralia/00-AfegirFKPArt1.sql b/db/versions/.archive/10144-silverAralia/00-AfegirFKPArt1.sql new file mode 100644 index 000000000..c71c66699 --- /dev/null +++ b/db/versions/.archive/10144-silverAralia/00-AfegirFKPArt1.sql @@ -0,0 +1,62 @@ + +-- vn mail recipientFk +ALTER TABLE vn.mail MODIFY COLUMN recipientFk int(10) unsigned NULL; +ALTER TABLE vn.mail ADD CONSTRAINT mail_FK_1 FOREIGN KEY (recipientFk) REFERENCES account.user(id) ON UPDATE CASCADE; + +-- vn mail senderFk +ALTER TABLE vn.mail MODIFY COLUMN senderFk int(10) unsigned NULL; +ALTER TABLE vn.mail ADD CONSTRAINT mail_FK FOREIGN KEY (senderFk) REFERENCES account.user(id) ON UPDATE CASCADE; + +-- vn packaging packagingReturnFk +ALTER TABLE vn.packaging ADD CONSTRAINT packaging_FK_1 FOREIGN KEY (packagingReturnFk) REFERENCES vn2008.Cubos_Retorno(idCubos_Retorno) ON UPDATE CASCADE; + +-- vn printServerQueue2 +ALTER TABLE vn.printServerQueue2 ADD CONSTRAINT printServerQueue2_FK_1 FOREIGN KEY (printerFk) REFERENCES vn.printer(id); +ALTER TABLE vn.printServerQueue2 ADD CONSTRAINT printServerQueue2_FK_2 FOREIGN KEY (priorityFk) REFERENCES vn.queuePriority(id); + +-- vn recipe inkFk +ALTER TABLE vn.recipe ADD CONSTRAINT recipe_FK FOREIGN KEY (inkFk) REFERENCES vn.ink(id) ON UPDATE CASCADE; + +-- vn recipe_log recipe_ItemFk +ALTER TABLE vn.recipe_log ADD CONSTRAINT recipe_log_FK FOREIGN KEY (recipe_ItemFk) REFERENCES vn.item(id) ON UPDATE CASCADE; +-- vn recipe_log selected_ItemFk +ALTER TABLE vn.recipe_log ADD CONSTRAINT recipe_log_FK_1 FOREIGN KEY (selected_ItemFk) REFERENCES vn.item(id) ON UPDATE CASCADE; + +-- vn routesMonitor dockFk +ALTER TABLE vn.routesMonitor MODIFY COLUMN dockFk varchar(10) NULL; +ALTER TABLE vn.routesMonitor ADD CONSTRAINT routesMonitor_FK_1 FOREIGN KEY (dockFk) REFERENCES vn.dock(code) ON UPDATE CASCADE; + +-- vn saleTracking actionFk +ALTER TABLE vn.saleTracking MODIFY COLUMN actionFk int(11) NULL; +UPDATE vn.saleTracking SET actionFk = NULL WHERE actionFk = 0; +ALTER TABLE vn.saleTracking ADD CONSTRAINT saleTracking_FK_1 FOREIGN KEY (actionFk) REFERENCES vncontrol.accion(accion_id) ON UPDATE CASCADE; + +-- vn sector sonFk +ALTER TABLE vn.sector ADD CONSTRAINT sector_FK FOREIGN KEY (sonFk,warehouseFk) REFERENCES vn.sector(id,warehouseFk) ON UPDATE CASCADE; + +-- vn sms senderFk +ALTER TABLE vn.sms MODIFY COLUMN senderFk int(10) unsigned NOT NULL; +ALTER TABLE vn.sms ADD CONSTRAINT sms_FK FOREIGN KEY (senderFk) REFERENCES account.`user`(id) ON UPDATE CASCADE; + +-- vn state nextStateFk +ALTER TABLE vn.state MODIFY COLUMN nextStateFk tinyint(3) unsigned NOT NULL COMMENT 'Estado al que tiene que cambiar el ticket despues de preparacion previa'; +ALTER TABLE vn.state ADD CONSTRAINT state_FK FOREIGN KEY (nextStateFk) REFERENCES vn.state(id) ON UPDATE CASCADE; + +-- vn supplierAccount bankEntityFk +ALTER TABLE vn.supplierAccount MODIFY COLUMN bankEntityFk int(10) unsigned NULL; +ALTER TABLE vn.supplierAccount ADD CONSTRAINT supplierAccount_FK_1 FOREIGN KEY (bankEntityFk) REFERENCES vn.bankEntity(id) ON UPDATE CASCADE; + +-- suplier +ALTER TABLE vn.supplierAccount MODIFY COLUMN supplierFk int(11) NULL; +UPDATE vn.supplierAccount SET supplierFk = null WHERE supplierFk NOT IN (SELECT id FROM vn.supplier s); +ALTER TABLE vn.supplierAccount ADD CONSTRAINT supplierAccount_FK FOREIGN KEY (supplierFk) REFERENCES vn.supplier(id) ON UPDATE CASCADE; + +-- vn ticketCollection smartTagFk +ALTER TABLE vn.ticketCollection MODIFY COLUMN smartTagFk varchar(12) CHARACTER SET utf8 COLLATE utf8_general_ci NULL; +ALTER TABLE vn.ticketCollection ADD CONSTRAINT ticketCollection_FK FOREIGN KEY (smartTagFk) REFERENCES vn.smartTag(code) ON UPDATE CASCADE; + +-- vn workCenter payrollCenterFk +ALTER TABLE vn.workCenter MODIFY COLUMN payrollCenterFk int(11) NULL COMMENT 'Campo workcenter en A3'; + +-- vn warehouse pickUpAgencyModeFk +ALTER TABLE vn.warehouse ADD CONSTRAINT warehouse_FK_1 FOREIGN KEY (pickUpAgencyModeFk) REFERENCES vn.agencyMode(id) ON UPDATE CASCADE; diff --git a/db/versions/.archive/10144-silverAralia/00-AfegirFKPArt1.undo.sql b/db/versions/.archive/10144-silverAralia/00-AfegirFKPArt1.undo.sql new file mode 100644 index 000000000..cb6fb8d5d --- /dev/null +++ b/db/versions/.archive/10144-silverAralia/00-AfegirFKPArt1.undo.sql @@ -0,0 +1,34 @@ +ALTER TABLE vn.mail + DROP CONSTRAINT mail_FK_1; +ALTER TABLE vn.mail + DROP CONSTRAINT mail_FK; +ALTER TABLE vn.packaging + DROP CONSTRAINT packaging_FK_1; +ALTER TABLE vn.printServerQueue2 + DROP CONSTRAINT printServerQueue2_FK_1; +ALTER TABLE vn.printServerQueue2 + DROP CONSTRAINT printServerQueue2_FK_2; +ALTER TABLE vn.recipe + DROP CONSTRAINT recipe_FK; +ALTER TABLE vn.recipe_log + DROP CONSTRAINT recipe_log_FK; +ALTER TABLE vn.recipe_log + DROP CONSTRAINT recipe_log_FK_1; +ALTER TABLE vn.routesMonitor + DROP CONSTRAINT routesMonitor_FK_1; +ALTER TABLE vn.saleTracking + DROP CONSTRAINT saleTracking_FK_1; +ALTER TABLE vn.sector + DROP CONSTRAINT sector_FK; +ALTER TABLE vn.sms + DROP CONSTRAINT sms_FK; +ALTER TABLE vn.state + DROP CONSTRAINT state_FK; +ALTER TABLE vn.supplierAccount + DROP CONSTRAINT supplierAccount_FK_1; +ALTER TABLE vn.supplierAccount + DROP CONSTRAINT supplierAccount_FK; +ALTER TABLE vn.ticketCollection + DROP CONSTRAINT ticketCollection_FK; +ALTER TABLE vn.warehouse + DROP CONSTRAINT warehouse_FK_1; diff --git a/db/versions/.archive/10147-tealRuscus/00-firstScript.sql b/db/versions/.archive/10147-tealRuscus/00-firstScript.sql new file mode 100644 index 000000000..74a9047ee --- /dev/null +++ b/db/versions/.archive/10147-tealRuscus/00-firstScript.sql @@ -0,0 +1,2 @@ +-- Place your SQL code here +ALTER TABLE vn.person CHANGE readerId readerId__ int(11) DEFAULT NULL NULL; diff --git a/db/versions/.archive/10149-whiteMonstera/00-firstScript.sql b/db/versions/.archive/10149-whiteMonstera/00-firstScript.sql new file mode 100644 index 000000000..29108403a --- /dev/null +++ b/db/versions/.archive/10149-whiteMonstera/00-firstScript.sql @@ -0,0 +1,9 @@ +ALTER TABLE vn.config CHANGE bookFk bookFk__ int(11) DEFAULT 0 NULL; +ALTER TABLE vn.config CHANGE serialAFk serialAFk__ int(11) DEFAULT 0 NULL; +ALTER TABLE vn.config CHANGE serialEFk serialEFk__ int(11) DEFAULT 0 NULL; +ALTER TABLE vn.config CHANGE serialRFk serialRFk__ int(11) DEFAULT 0 NULL; +ALTER TABLE vn.config CHANGE serialCFk serialCFk__ int(11) DEFAULT 0 NULL; +ALTER TABLE vn.config CHANGE serialHFk serialHFk__ int(11) NOT NULL; +ALTER TABLE vn.config CHANGE serialPFk serialPFk__ int(11) DEFAULT 0 NULL; +ALTER TABLE vn.config CHANGE serialTFk serialTFk__ int(11) DEFAULT 0 NULL; +ALTER TABLE vn.config CHANGE serialMFk serialMFk__ int(11) DEFAULT 0 NULL; diff --git a/db/versions/.archive/10150-4062isLaid/00-firstScript.sql b/db/versions/.archive/10150-4062isLaid/00-firstScript.sql new file mode 100644 index 000000000..30f5a1e1f --- /dev/null +++ b/db/versions/.archive/10150-4062isLaid/00-firstScript.sql @@ -0,0 +1,4 @@ +-- Place your SQL code here +ALTER TABLE vn.item ADD isLaid BOOL DEFAULT FALSE NOT NULL COMMENT 'Indica si el producto se puede tumbar a efectos del transporte desde Holanda'; + +ALTER TABLE vn.itemType ADD isLaid BOOL DEFAULT FALSE NOT NULL COMMENT 'Indica si el producto se puede tumbar a efectos del transporte desde Holanda'; diff --git a/db/versions/.archive/10152-bluePalmetto/00-firstScript.sql b/db/versions/.archive/10152-bluePalmetto/00-firstScript.sql new file mode 100644 index 000000000..d3175a4cb --- /dev/null +++ b/db/versions/.archive/10152-bluePalmetto/00-firstScript.sql @@ -0,0 +1,19 @@ +-- Place your SQL code here +USE vn; + +DROP TABLE IF EXISTS workerAppTester; + +CREATE TABLE `workerAppTester` ( + `workerFk` int(10) unsigned NOT NULL, + PRIMARY KEY (`workerFk`), + KEY `workerAppTester_FK` (`workerFk`), + CONSTRAINT `workerAppTester_FK_1` FOREIGN KEY (`workerFk`) REFERENCES `worker` (`id`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='La tabla incluye usuarios testers que actualizarán a una versión diferente que el resto para testear los cambios nuevos en las app'; + +-- vn.mobileAppVersionControl definition + +ALTER TABLE vn.mobileAppVersionControl ADD urlProduction varchar(100) NULL; +ALTER TABLE vn.mobileAppVersionControl ADD urlBeta varchar(100) NULL; +ALTER TABLE vn.mobileAppVersionControl ADD versionBeta varchar(45) NULL; +ALTER TABLE vn.mobileAppVersionControl ADD isVersionBetaCritical tinyint(1) DEFAULT 0 NULL; +ALTER TABLE vn.mobileAppVersionControl CHANGE IsVersionCritical isVersionCritical tinyint(1) DEFAULT 0 NULL; \ No newline at end of file diff --git a/db/versions/.archive/10153-maroonAralia/00-firstScript.sql b/db/versions/.archive/10153-maroonAralia/00-firstScript.sql new file mode 100644 index 000000000..2a160b841 --- /dev/null +++ b/db/versions/.archive/10153-maroonAralia/00-firstScript.sql @@ -0,0 +1 @@ +ALTER TABLE `vn`.`sms` CHANGE destinationFk destinationFk__ int(11) DEFAULT NULL NULL; \ No newline at end of file diff --git a/db/versions/.archive/10154-blackSalal/00-compressionKk.sql b/db/versions/.archive/10154-blackSalal/00-compressionKk.sql new file mode 100644 index 000000000..5d9358515 --- /dev/null +++ b/db/versions/.archive/10154-blackSalal/00-compressionKk.sql @@ -0,0 +1,3 @@ +-- Place your SQL code here +ALTER TABLE vn.item CHANGE compression compression__ decimal(5,2) DEFAULT 1.00 NOT NULL + COMMENT 'Relacion de compresividad entre el volumen de las entradas en Silla y el empaquetado en los envios a clientes.'; diff --git a/db/versions/.archive/10157-goldenCyca/00-firstScript.sql b/db/versions/.archive/10157-goldenCyca/00-firstScript.sql new file mode 100644 index 000000000..d8fa592bd --- /dev/null +++ b/db/versions/.archive/10157-goldenCyca/00-firstScript.sql @@ -0,0 +1,3 @@ +ALTER TABLE postgresql.business_labour DROP FOREIGN KEY workcenter_labour; +ALTER TABLE postgresql.business_labour ADD CONSTRAINT business_labour_FK FOREIGN KEY (workcenter_id) REFERENCES vn.workCenter(id) ON DELETE RESTRICT ON UPDATE CASCADE; +RENAME TABLE postgresql.workcenter TO postgresql.workcenter__; \ No newline at end of file diff --git a/db/versions/.archive/10158-grayCordyline/00-firstScript.sql b/db/versions/.archive/10158-grayCordyline/00-firstScript.sql new file mode 100644 index 000000000..33e83a81f --- /dev/null +++ b/db/versions/.archive/10158-grayCordyline/00-firstScript.sql @@ -0,0 +1,31 @@ +CREATE TABLE bs.`salesByItemTypeDay` ( + `itemTypeFk` smallint(5) unsigned NOT NULL, + `itemCategoryFk` int(10) unsigned NOT NULL, + `dated` date NOT NULL, + `netSale` int(11) NOT NULL DEFAULT 0, + `stems` int(11) NOT NULL DEFAULT 0, + `references` int(11) NOT NULL DEFAULT 0, + `trash` int(11) NOT NULL DEFAULT 0, + `faults` int(11) NOT NULL DEFAULT 0, + `claimed` decimal(10,2) NOT NULL DEFAULT 0.00, + `accepted` decimal(10,2) NOT NULL DEFAULT 0.00, + `sale` decimal(10,2) NOT NULL DEFAULT 0.00, + `buy` decimal(10,2) NOT NULL DEFAULT 0.00, + `saleComponent` decimal(10,2) NOT NULL DEFAULT 0.00, + `costComponent` decimal(10,2) NOT NULL DEFAULT 0.00, + `marginComponent` decimal(10,2) NOT NULL DEFAULT 0.00, + PRIMARY KEY (`itemTypeFk`,`dated`), + KEY `itemTypeSalesByweek_itemCategoryFk_idx` (`itemCategoryFk`), + KEY `itemTypeSalesByweek_period_idx` (`dated`), + CONSTRAINT `itemTypeSalesByweek_itemCategoryFk` FOREIGN KEY (`itemCategoryFk`) REFERENCES `vn`.`itemCategory` (`id`) ON UPDATE CASCADE, + CONSTRAINT `itemTypeSalesByweek_itemTypeFk` FOREIGN KEY (`itemTypeFk`) REFERENCES `vn`.`itemType` (`id`) ON UPDATE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Ventas diarias agrupadas por reino y familia'; + +ALTER TABLE `vn`.`claimConfig` ADD maxResponsibility INT NULL; + +UPDATE `vn`.`claimConfig` + SET maxResponsibility=5 + WHERE id=1; + +INSERT INTO `bs`.`nightTask` (`order`,`schema`,`procedure`) + VALUES (1005,'bs','salesByItemTypeDay_addLauncher'); diff --git a/db/versions/.archive/10160-limePalmetto/00-firstScript.sql b/db/versions/.archive/10160-limePalmetto/00-firstScript.sql new file mode 100644 index 000000000..26ceaf40f --- /dev/null +++ b/db/versions/.archive/10160-limePalmetto/00-firstScript.sql @@ -0,0 +1,7 @@ +CREATE INDEX greuge_shipped_IDX USING BTREE ON `vn`.`greuge` (shipped); + +INSERT INTO `bs`.`nightTask` (`order`,`schema`,`procedure`) + VALUES (1006,'vn','greuge_add'); + +ALTER TABLE `vn`.`greugeConfig` ADD yearsToDelete INT NULL; +UPDATE `vn`.`greugeConfig` SET yearsToDelete=5 WHERE id=1; diff --git a/db/versions/.archive/10163-tealErica/00-firstScript.sql b/db/versions/.archive/10163-tealErica/00-firstScript.sql new file mode 100644 index 000000000..2a9042144 --- /dev/null +++ b/db/versions/.archive/10163-tealErica/00-firstScript.sql @@ -0,0 +1,2 @@ +-- Place your SQL code here +ALTER TABLE vn.expedition ADD hasNewRoute BIT DEFAULT 0 NOT NULL; diff --git a/db/versions/.archive/10164-pinkMastic/00-borrarSectorsDesus.sql b/db/versions/.archive/10164-pinkMastic/00-borrarSectorsDesus.sql new file mode 100644 index 000000000..7c64fc588 --- /dev/null +++ b/db/versions/.archive/10164-pinkMastic/00-borrarSectorsDesus.sql @@ -0,0 +1,2 @@ +DELETE FROM vn.parking WHERE sectorFk IN (2,42,43,46,47,54); +DELETE FROM vn.sector WHERE id IN (2,42,43,46,47,54); \ No newline at end of file diff --git a/db/versions/.archive/10165-yellowMastic/00-firstScript.sql b/db/versions/.archive/10165-yellowMastic/00-firstScript.sql new file mode 100644 index 000000000..54d1e9ae3 --- /dev/null +++ b/db/versions/.archive/10165-yellowMastic/00-firstScript.sql @@ -0,0 +1,5 @@ +ALTER TABLE `vn2008`.`Contactos` +RENAME TO `vn2008`.`Contactos__` ; + +ALTER TABLE `vn2008`.`Relaciones` +RENAME TO `vn2008`.`Relaciones__` ; \ No newline at end of file diff --git a/db/versions/.archive/10166-grayArborvitae/00-firstScript.sql b/db/versions/.archive/10166-grayArborvitae/00-firstScript.sql new file mode 100644 index 000000000..88544a1cd --- /dev/null +++ b/db/versions/.archive/10166-grayArborvitae/00-firstScript.sql @@ -0,0 +1,5 @@ + +USE vn; + +ALTER TABLE `vn`.`printQueueConfig` +ADD COLUMN `printQueueLimit` INT NOT NULL DEFAULT 30 COMMENT 'Número máximo de filas de la cola de impresión a mostrar al enviar correo a través del evento vn.printQueue_check' AFTER `dmsPath`; diff --git a/db/versions/.archive/10167-limeRoebelini/00-renameVnActiveContrat.sql b/db/versions/.archive/10167-limeRoebelini/00-renameVnActiveContrat.sql new file mode 100644 index 000000000..c74247c06 --- /dev/null +++ b/db/versions/.archive/10167-limeRoebelini/00-renameVnActiveContrat.sql @@ -0,0 +1 @@ +RENAME TABLE vn.activeContrat TO vn.activeContrat__; \ No newline at end of file diff --git a/db/versions/.archive/10167-limeRoebelini/01-renameVnActiveContrat.undo.sql b/db/versions/.archive/10167-limeRoebelini/01-renameVnActiveContrat.undo.sql new file mode 100644 index 000000000..9289cbc2f --- /dev/null +++ b/db/versions/.archive/10167-limeRoebelini/01-renameVnActiveContrat.undo.sql @@ -0,0 +1 @@ +RENAME TABLE vn.activeContrat__ TO vn.activeContrat; \ No newline at end of file diff --git a/db/versions/.archive/10168-orangeAnthurium/00-firstScript.sql b/db/versions/.archive/10168-orangeAnthurium/00-firstScript.sql new file mode 100644 index 000000000..bc461bfc0 --- /dev/null +++ b/db/versions/.archive/10168-orangeAnthurium/00-firstScript.sql @@ -0,0 +1,2 @@ +ALTER TABLE `vn`.`routeGate` +RENAME TO `vn`.`routeGate__` ; diff --git a/db/versions/.archive/10169-greenMonstera/00-createTableBankEntityConfig.sql b/db/versions/.archive/10169-greenMonstera/00-createTableBankEntityConfig.sql new file mode 100644 index 000000000..6d56edc36 --- /dev/null +++ b/db/versions/.archive/10169-greenMonstera/00-createTableBankEntityConfig.sql @@ -0,0 +1,10 @@ +CREATE TABLE vn.bankEntityConfig ( + id INT auto_increment NULL, + bicLength TINYINT DEFAULT 11 NULL COMMENT 'Tamaño del campo bic', + CONSTRAINT bankEntityConfig_PK PRIMARY KEY (id) +) +ENGINE=InnoDB +DEFAULT CHARSET=utf8mb3 +COLLATE=utf8mb3_unicode_ci; + +INSERT INTO vn.bankEntityConfig (id, bicLength) VALUES(1, 11); \ No newline at end of file diff --git a/db/versions/.archive/10169-greenMonstera/01-createTableBankEntityConfig.undo.sql b/db/versions/.archive/10169-greenMonstera/01-createTableBankEntityConfig.undo.sql new file mode 100644 index 000000000..76dacb203 --- /dev/null +++ b/db/versions/.archive/10169-greenMonstera/01-createTableBankEntityConfig.undo.sql @@ -0,0 +1 @@ +DROP TABLE vn.bankEntityConfig; \ No newline at end of file diff --git a/db/versions/.archive/10169-greenMonstera/02-addNotNullToBankEntityBic.sql b/db/versions/.archive/10169-greenMonstera/02-addNotNullToBankEntityBic.sql new file mode 100644 index 000000000..1f12efd8d --- /dev/null +++ b/db/versions/.archive/10169-greenMonstera/02-addNotNullToBankEntityBic.sql @@ -0,0 +1 @@ +ALTER TABLE vn.bankEntity MODIFY COLUMN bic varchar(11) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL; \ No newline at end of file diff --git a/db/versions/.archive/10171-crimsonCarnation/00-volumeConfig.sql b/db/versions/.archive/10171-crimsonCarnation/00-volumeConfig.sql new file mode 100644 index 000000000..df189acbc --- /dev/null +++ b/db/versions/.archive/10171-crimsonCarnation/00-volumeConfig.sql @@ -0,0 +1,2 @@ +ALTER TABLE vn.volumeConfig ADD aerealVolumetricDensity DECIMAL(10,1) DEFAULT 167 NULL +COMMENT 'factor de conversión para calcular el peso tasable aereo'; diff --git a/db/versions/.archive/10171-crimsonCarnation/01-itemWeight.sql b/db/versions/.archive/10171-crimsonCarnation/01-itemWeight.sql new file mode 100644 index 000000000..052c5259c --- /dev/null +++ b/db/versions/.archive/10171-crimsonCarnation/01-itemWeight.sql @@ -0,0 +1,27 @@ +ALTER TABLE vn.item ADD weightByPiece int unsigned NULL +COMMENT 'peso por defecto para un articulo por tallo/unidad'; +/* +-- actualizamos con los valores del itemCost, o de la ultima compra, o de la densidad * volumen +UPDATE vn.itemCost ic + JOIN cache.last_buy lb ON lb.item_id = ic.itemFk and lb.warehouse_id = ic.warehouseFk + JOIN vn.buy b ON b.id = lb.buy_id + JOIN vn.item i ON i.id = ic.itemFk + SET ic.grams = COALESCE( + (b.weight * 1000) / b.packing, + i.density * (cm3delivery / 1000000) * 1000); + +UPDATE vn.item i + JOIN vn.itemCost ic ON ic.itemFk = i.id and ic.warehouseFk = 60 + SET i.weightByPiece = ic.grams + WHERE i.weightByPiece IS NULL; + +UPDATE vn.item i + JOIN vn.itemCost ic ON ic.itemFk = i.id and ic.warehouseFk = 7 + SET i.weightByPiece = ic.grams + WHERE weightByPiece IS NULL; + +UPDATE vn.item i + JOIN vn.itemCost ic ON ic.itemFk = i.id + SET i.weightByPiece = ic.grams + WHERE i.weightByPiece IS NULL + AND ic.warehouseFk NOT IN (60,7);*/ \ No newline at end of file diff --git a/db/versions/.archive/10171-crimsonCarnation/02-agencymode.sql b/db/versions/.archive/10171-crimsonCarnation/02-agencymode.sql new file mode 100644 index 000000000..28413f789 --- /dev/null +++ b/db/versions/.archive/10171-crimsonCarnation/02-agencymode.sql @@ -0,0 +1 @@ +ALTER TABLE vn.agencyMode ADD hasWeightVolumetric INT DEFAULT 0 NOT NULL COMMENT 'Tiene en cuenta el peso volumetrico para los calculos'; diff --git a/db/versions/.archive/10172-brownMedeola/00-firstScript.sql b/db/versions/.archive/10172-brownMedeola/00-firstScript.sql new file mode 100644 index 000000000..b5ed114a2 --- /dev/null +++ b/db/versions/.archive/10172-brownMedeola/00-firstScript.sql @@ -0,0 +1,4 @@ +ALTER TABLE `vn`.`ticket` +CHANGE COLUMN `notes` `notes__` LONGTEXT COLLATE 'utf8mb3_unicode_ci' NULL DEFAULT NULL , +CHANGE COLUMN `invoiceOutFk` `invoiceOutFk__` INT(10) UNSIGNED NULL DEFAULT NULL COMMENT 'eliminar' , +CHANGE COLUMN `isBooked` `isBooked__` TINYINT(1) NOT NULL DEFAULT 0 ; diff --git a/db/versions/.archive/10174-silverOrchid/00-firstScript.sql b/db/versions/.archive/10174-silverOrchid/00-firstScript.sql new file mode 100644 index 000000000..23aa7bfca --- /dev/null +++ b/db/versions/.archive/10174-silverOrchid/00-firstScript.sql @@ -0,0 +1,25 @@ +USE vn; + +ALTER TABLE `vn`.`printer` +ADD COLUMN `sectorFk` INT(11) NULL DEFAULT NULL AFTER `isLabeler`, +ADD INDEX `printer_sectorFk_idx` (`id` ASC, `sectorFk` ASC) ; + +ALTER TABLE `vn`.`printer` +ADD CONSTRAINT `printer_sectorFk` + FOREIGN KEY (`sectorFk`) + REFERENCES `vn`.`sector` (`id`) + ON DELETE RESTRICT + ON UPDATE CASCADE; + + +DELETE FROM `vn`.`sector` WHERE (`id` = '61') and (`warehouseFk` = '60'); +UPDATE `vn`.`sector` SET `description` = 'Zona Palletizado', `code` = 'pallet1' WHERE (`id` = '60') and (`warehouseFk` = '60'); + +UPDATE `vn`.`printer` SET `sectorFk` = '60' WHERE (`id` = '68'); +UPDATE `vn`.`printer` SET `sectorFk` = '60' WHERE (`id` = '54'); +UPDATE `vn`.`printer` SET `sectorFk` = '60' WHERE (`id` = '58'); +UPDATE `vn`.`printer` SET `sectorFk` = '60' WHERE (`id` = '60'); +UPDATE `vn`.`printer` SET `sectorFk` = '40' WHERE (`id` = '89'); +UPDATE `vn`.`printer` SET `sectorFk` = '40' WHERE (`id` = '66'); +UPDATE `vn`.`printer` SET `sectorFk` = '41' WHERE (`id` = '88'); +UPDATE `vn`.`printer` SET `sectorFk` = '41' WHERE (`id` = '36'); diff --git a/db/versions/.archive/10175-bluePaniculata/00-firstScript.sql b/db/versions/.archive/10175-bluePaniculata/00-firstScript.sql new file mode 100644 index 000000000..c492182a1 --- /dev/null +++ b/db/versions/.archive/10175-bluePaniculata/00-firstScript.sql @@ -0,0 +1,40 @@ +CREATE TABLE `vn`.`mdbBranch` ( + `name` VARCHAR(255), + PRIMARY KEY(`name`) +); + +CREATE TABLE `vn`.`mdbVersion` ( + `app` VARCHAR(255) NOT NULL, + `branchFk` VARCHAR(255) NOT NULL, + `version` INT, + CONSTRAINT `mdbVersion_branchFk` FOREIGN KEY (`branchFk`) REFERENCES `vn`.`mdbBranch` (`name`) ON DELETE CASCADE ON UPDATE CASCADE +); + +INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) + VALUES('MdbVersion', '*', '*', 'ALLOW', 'ROLE', 'developer'); + +INSERT INTO `vn`.`mdbBranch` (`name`) + VALUES + ('test'), + ('master'); + +INSERT INTO `vn`.`mdbVersion` (`app`, `branchFk`, `version`) + SELECT programa, 'master', version + FROM vn2008.versiones; + +INSERT INTO `vn`.`mdbVersion` (`app`, `branchFk`, `version`) + SELECT programa, 'test', version + FROM vn2008.versiones; + +RENAME TABLE vn2008.versiones TO vn2008.versiones__; + +CREATE OR REPLACE +ALGORITHM = UNDEFINED VIEW `vn2008`.`versiones` AS +SELECT + `m`.`app` AS `programa`, + `m`.`version` AS `version`, + 0 AS `critical` +FROM + `vn`.`mdbVersion` `m` +WHERE + (`m`.`branchFk` = 'master'); diff --git a/db/versions/.archive/10177-pinkArborvitae/00-crearTablaSpecialLabels.sql b/db/versions/.archive/10177-pinkArborvitae/00-crearTablaSpecialLabels.sql new file mode 100644 index 000000000..ad0d326da --- /dev/null +++ b/db/versions/.archive/10177-pinkArborvitae/00-crearTablaSpecialLabels.sql @@ -0,0 +1,11 @@ +CREATE TABLE vn.specialLabels ( + id INT auto_increment NOT NULL, + description varchar(100) NOT NULL, + reportName varchar(100) NOT NULL, + isVisible BOOL DEFAULT 0 NOT NULL, + image BLOB NULL, + CONSTRAINT specialLabels_PK PRIMARY KEY (id) +) +ENGINE=InnoDB +DEFAULT CHARSET=utf8mb3 +COLLATE=utf8mb3_unicode_ci; \ No newline at end of file diff --git a/db/versions/.archive/10178-tealMoss/00-firstScript.sql b/db/versions/.archive/10178-tealMoss/00-firstScript.sql new file mode 100644 index 000000000..f96dc41be --- /dev/null +++ b/db/versions/.archive/10178-tealMoss/00-firstScript.sql @@ -0,0 +1,6 @@ +DROP VIEW vn.absenceType; +ALTER TABLE vn.calendar DROP FOREIGN KEY calendar_employee_state_id; +RENAME TABLE postgresql.calendar_state TO vn.absenceType; +ALTER TABLE vn.absenceType CHANGE calendar_state_id id int(11) auto_increment NOT NULL; +ALTER TABLE vn.absenceType CHANGE `type` name varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL; +ALTER TABLE vn.calendar ADD CONSTRAINT calendar_FK FOREIGN KEY (dayOffTypeFk) REFERENCES vn.absenceType(id) ON DELETE RESTRICT ON UPDATE CASCADE; \ No newline at end of file diff --git a/db/versions/.archive/10179-goldenMonstera/00-firstScript.sql b/db/versions/.archive/10179-goldenMonstera/00-firstScript.sql new file mode 100644 index 000000000..76089284c --- /dev/null +++ b/db/versions/.archive/10179-goldenMonstera/00-firstScript.sql @@ -0,0 +1,2 @@ +ALTER TABLE `vn`.`payment` +CHANGE COLUMN `exchangeInsuranceFk` `exchangeInsuranceFk__` INT(11) NULL DEFAULT NULL ; diff --git a/db/versions/.archive/10183-navyBamboo/00-firstScript.sql b/db/versions/.archive/10183-navyBamboo/00-firstScript.sql new file mode 100644 index 000000000..37c5d05e3 --- /dev/null +++ b/db/versions/.archive/10183-navyBamboo/00-firstScript.sql @@ -0,0 +1,6 @@ +ALTER TABLE vn.expedition CHANGE checked checked__ tinyint(4) DEFAULT 0 NOT NULL COMMENT 'Deprecado 01/06/2022'; +ALTER TABLE vn.expedition MODIFY COLUMN checked__ tinyint(4) DEFAULT 0 NOT NULL COMMENT 'Deprecado 01/06/2022'; +ALTER TABLE vn.expedition CHANGE isRefund isRefund__ bit(1) DEFAULT b'0' NULL COMMENT 'Deprecado 01/06/2022'; +ALTER TABLE vn.expedition MODIFY COLUMN isRefund__ bit(1) DEFAULT b'0' NULL COMMENT 'Deprecado 01/06/2022'; +ALTER TABLE vn.expedition CHANGE isPickUp isPickUp__ bit(1) DEFAULT b'0' NULL COMMENT 'Deprecado 01/06/2022'; +ALTER TABLE vn.expedition MODIFY COLUMN isPickUp__ bit(1) DEFAULT b'0' NULL COMMENT 'Deprecado 01/06/2022'; \ No newline at end of file diff --git a/db/versions/.archive/10184-azureLaurel/00-firstScript.sql b/db/versions/.archive/10184-azureLaurel/00-firstScript.sql new file mode 100644 index 000000000..94900d44d --- /dev/null +++ b/db/versions/.archive/10184-azureLaurel/00-firstScript.sql @@ -0,0 +1 @@ +ALTER TABLE vn.itemType ADD maxRefs INT UNSIGNED NULL COMMENT 'Indica el número máximo de referencias'; \ No newline at end of file diff --git a/db/versions/.archive/10185-greenGalax/00-firstScript.sql b/db/versions/.archive/10185-greenGalax/00-firstScript.sql new file mode 100644 index 000000000..03a46e785 --- /dev/null +++ b/db/versions/.archive/10185-greenGalax/00-firstScript.sql @@ -0,0 +1,3 @@ +-- Place your SQL code here + +ALTER TABLE vn.clientConfig ADD maxPriceIncreasingRatio DECIMAL(2,2) DEFAULT 0.25 NOT NULL COMMENT 'máximo recobro permitido'; diff --git a/db/versions/.archive/10186-silverGerbera/00-desactivar_trigger.sql b/db/versions/.archive/10186-silverGerbera/00-desactivar_trigger.sql new file mode 100644 index 000000000..d32e8299d --- /dev/null +++ b/db/versions/.archive/10186-silverGerbera/00-desactivar_trigger.sql @@ -0,0 +1,2 @@ +-- desactivem trigger per a canviar el camp +DROP TRIGGER IF EXISTS `vn`.`buy_afterUpdate`; \ No newline at end of file diff --git a/db/versions/.archive/10186-silverGerbera/01-alter_Table_buy.sql b/db/versions/.archive/10186-silverGerbera/01-alter_Table_buy.sql new file mode 100644 index 000000000..090fd4a4f --- /dev/null +++ b/db/versions/.archive/10186-silverGerbera/01-alter_Table_buy.sql @@ -0,0 +1,3 @@ +-- buy.sticker not null, por defecto valor cero +ALTER TABLE vn.buy MODIFY COLUMN stickers int(11) DEFAULT 0 NOT NULL; +ALTER TABLE vn.buy MODIFY COLUMN printedStickers int(11) DEFAULT 0 NOT NULL; \ No newline at end of file diff --git a/db/versions/.archive/10186-silverGerbera/02-alter_table_entryConfig.sql b/db/versions/.archive/10186-silverGerbera/02-alter_table_entryConfig.sql new file mode 100644 index 000000000..8a350d656 --- /dev/null +++ b/db/versions/.archive/10186-silverGerbera/02-alter_table_entryConfig.sql @@ -0,0 +1 @@ +ALTER TABLE `vn`.`entryConfig` ADD COLUMN `inventorySupplierFk` INT(11) NULL DEFAULT 4 AFTER `mailToNotify`; \ No newline at end of file diff --git a/db/versions/.archive/10186-silverGerbera/04-regularizar_Sticker_Inventario.sql b/db/versions/.archive/10186-silverGerbera/04-regularizar_Sticker_Inventario.sql new file mode 100644 index 000000000..3cfd57d3c --- /dev/null +++ b/db/versions/.archive/10186-silverGerbera/04-regularizar_Sticker_Inventario.sql @@ -0,0 +1,6 @@ +-- recorrer los inventarios y verificar que no tengan el campo sticker > 0 en caso contrario regularizar a zero +UPDATE vn.buy b +JOIN vn.entry e ON e.id = b.entryFk +JOIN vn.entryConfig ec ON ec.inventorySupplierFk = e.supplierFk +SET printedStickers = 0 +WHERE printedStickers <> 0; \ No newline at end of file diff --git a/db/versions/.archive/10186-silverGerbera/09-reactivar_trigger.sql b/db/versions/.archive/10186-silverGerbera/09-reactivar_trigger.sql new file mode 100644 index 000000000..9f37fa5af --- /dev/null +++ b/db/versions/.archive/10186-silverGerbera/09-reactivar_trigger.sql @@ -0,0 +1,94 @@ +-- reactivem trigger +DROP TRIGGER IF EXISTS `vn`.`buy_afterUpdate`; +DELIMITER $$ +CREATE DEFINER=`root`@`localhost` TRIGGER `vn`.`buy_afterUpdate` + AFTER UPDATE ON `buy` + FOR EACH ROW +trig: BEGIN + DECLARE vLanded DATE; + DECLARE vBuyerFk INT; + DECLARE vIsBuyerToBeEmailed BOOL; + DECLARE vItemName VARCHAR(50); + DECLARE vIsInventory BOOL; + DECLARE vEmail VARCHAR(255); + + IF !(NEW.id <=> OLD.id) + OR !(NEW.entryFk <=> OLD.entryFk) + OR !(NEW.itemFk <=> OLD.itemFk) + OR !(NEW.quantity <=> OLD.quantity) + OR !(NEW.created <=> OLD.created) THEN + CALL stock.log_add('buy', NEW.id, OLD.id); + END IF; + + IF @isModeInventory THEN + LEAVE trig; + END IF; + + CALL buy_afterUpsert(NEW.id); + + IF !(NEW.weight <=> OLD.weight) AND NEW.weight THEN + UPDATE item + SET density = NEW.weight / (item_getVolume(NEW.itemFk, NEW.packageFk) / 1000000) + WHERE id = NEW.itemFk; + END IF; + + SELECT w.isBuyerToBeEmailed, t.landed + INTO vIsBuyerToBeEmailed, vLanded + FROM entry e + JOIN travel t ON t.id = e.travelFk + JOIN warehouse w ON w.id = t.warehouseInFk + WHERE e.id = NEW.entryFk; + + SELECT it.workerFk, i.longName + INTO vBuyerFk, vItemName + FROM itemCategory k + JOIN itemType it ON it.categoryFk = k.id + JOIN item i ON i.typeFk = it.id + WHERE i.id = OLD.itemFk; + + IF vIsBuyerToBeEmailed AND + vBuyerFk != account.myUser_getId() AND + vLanded = util.CURDATE() THEN + IF !(NEW.itemFk <=> OLD.itemFk) OR + !(NEW.quantity <=> OLD.quantity) OR + !(NEW.packing <=> OLD.packing) OR + !(NEW.grouping <=> OLD.grouping) OR + !(NEW.packageFk <=> OLD.packageFk) OR + !(NEW.weight <=> OLD.weight) THEN + CALL vn.mail_insert( + CONCAT(account.user_getNameFromId(vBuyerFk),'@verdnatura.es'), + CONCAT(account.myUser_getName(),'@verdnatura.es'), + CONCAT('E ', NEW.entryFk ,' Se ha modificado item ', NEW.itemFk, ' ', vItemName), + 'Este email se ha generado automáticamente' + ); + END IF; + END IF; + + SELECT e.isInventory INTO vIsInventory + FROM entry e + WHERE e.id = NEW.entryFk; + + SELECT e.mailToNotify INTO vEmail + FROM entryConfig e + LIMIT 1; + + IF vIsInventory AND + (!(NEW.quantity <=> OLD.quantity) + OR !(NEW.price1<=>OLD.price1) + OR !(NEW.price2<=>OLD.price2) + OR !(NEW.price3<=>OLD.price3)) THEN + + CALL mail_insert( + vEmail, + NULL, + CONCAT('Se ha modificado la entrada ', NEW.entryFk ,' del Artículo ', NEW.itemFk, ' siendo inventario'), + CONCAT( + 'Antes: Cantidad: ', OLD.quantity, ' Precio1: ', OLD.price1, ' Precio2: ', OLD.price2, ' Precio3: ', OLD.price3, + '
', + 'Despues: Cantidad: ', NEW.quantity, ' Precio1: ', NEW.price1, ' Precio2: ', NEW.price2, ' Precio3: ', NEW.price3 + ) + ); + END IF; + +END$$ +DELIMITER ; \ No newline at end of file diff --git a/db/versions/.archive/10187-pinkAspidistra/00-firstScript.sql b/db/versions/.archive/10187-pinkAspidistra/00-firstScript.sql new file mode 100644 index 000000000..1fa97095e --- /dev/null +++ b/db/versions/.archive/10187-pinkAspidistra/00-firstScript.sql @@ -0,0 +1,4 @@ +-- Place your SQL code here +ALTER TABLE vn.agency CHANGE isVolumetric isVolumetric__ tinyint(4) DEFAULT 0 NOT NULL COMMENT 'Si el calculo del porte se hacer por volumen'; +ALTER TABLE vn.agency CHANGE bankFk bankFk__ int(11) DEFAULT 8 NOT NULL COMMENT 'para realizar los reembolsos'; +ALTER TABLE vn.agency CHANGE labelZone labelZone__ tinyint(4) DEFAULT 0 NOT NULL; diff --git a/db/versions/.archive/10188-limeMedeola/00-firstScript.sql b/db/versions/.archive/10188-limeMedeola/00-firstScript.sql new file mode 100644 index 000000000..f3a153748 --- /dev/null +++ b/db/versions/.archive/10188-limeMedeola/00-firstScript.sql @@ -0,0 +1,5 @@ +-- Place your SQL code here +ALTER TABLE vn.client CHANGE cc cc__ varchar(23) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL COMMENT 'obsoleta (comprobar)'; +ALTER TABLE vn.client CHANGE cyc cyc__ double NULL COMMENT 'obsoleta (comprobar)'; +ALTER TABLE vn.client CHANGE discount discount__ tinyint(3) unsigned DEFAULT 0 NOT NULL COMMENT 'obsoleta (comprobar)'; +ALTER TABLE vn.client CHANGE notes notes__ text CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL COMMENT 'obsoleta (comprobar)'; diff --git a/db/versions/.archive/10189-aquaDendro/00-firstScript.sql b/db/versions/.archive/10189-aquaDendro/00-firstScript.sql new file mode 100644 index 000000000..222cd9986 --- /dev/null +++ b/db/versions/.archive/10189-aquaDendro/00-firstScript.sql @@ -0,0 +1,2 @@ +ALTER TABLE `vn`.`itemType` CHANGE gramsMin gramsMin__ int(11) DEFAULT NULL NULL; +ALTER TABLE `vn`.`itemType` CHANGE f11 f11__ tinyint(4) DEFAULT 0 NOT NULL; \ No newline at end of file diff --git a/db/versions/.archive/10191-orangeRoebelini/00-firstScript.sql b/db/versions/.archive/10191-orangeRoebelini/00-firstScript.sql new file mode 100644 index 000000000..58674b9e5 --- /dev/null +++ b/db/versions/.archive/10191-orangeRoebelini/00-firstScript.sql @@ -0,0 +1,3 @@ +-- Place your SQL code here +ALTER TABLE vn.item DROP FOREIGN KEY item_ibfk_6; +ALTER TABLE vn.item CHANGE sectorFk sectorFk__ int(11) DEFAULT NULL NULL; \ No newline at end of file diff --git a/db/versions/.archive/10193-navyHydrangea/00-delete.sql b/db/versions/.archive/10193-navyHydrangea/00-delete.sql new file mode 100644 index 000000000..23d8ee4e7 --- /dev/null +++ b/db/versions/.archive/10193-navyHydrangea/00-delete.sql @@ -0,0 +1,46 @@ +use vn; +-- Auto-generated SQL script. Actual values for binary/complex data types may differ - what you see is the default string representation of values. +DELETE FROM vn.taxClassCode + WHERE taxClassFk=1 AND effectived='2014-01-01' AND taxCodeFk=108; +DELETE FROM vn.taxClassCode + WHERE taxClassFk=2 AND effectived='2014-01-01' AND taxCodeFk=108; +DELETE FROM vn.taxClassCode + WHERE taxClassFk=3 AND effectived='2014-01-01' AND taxCodeFk=108; +DELETE FROM vn.taxClassCode + WHERE taxClassFk=5 AND effectived='2014-01-01' AND taxCodeFk=108; +DELETE FROM vn.taxClassCode + WHERE taxClassFk=3 AND effectived='2016-01-01' AND taxCodeFk=109; +DELETE FROM vn.taxClassCode + WHERE taxClassFk=5 AND effectived='2016-01-01' AND taxCodeFk=109; +DELETE FROM vn.taxClassCode + WHERE taxClassFk=1 AND effectived='2019-01-01' AND taxCodeFk=122; +DELETE FROM vn.taxClassCode + WHERE taxClassFk=2 AND effectived='2019-01-01' AND taxCodeFk=122; +DELETE FROM vn.taxClassCode + WHERE taxClassFk=3 AND effectived='2019-01-01' AND taxCodeFk=122; +DELETE FROM vn.taxClassCode + WHERE taxClassFk=5 AND effectived='2019-01-01' AND taxCodeFk=122; +-- Auto-generated SQL script. Actual values for binary/complex data types may differ - what you see is the default string representation of values. +DELETE FROM vn.taxCode + WHERE id=108; +DELETE FROM vn.taxCode + WHERE id=109; +DELETE FROM vn.taxCode + WHERE id=110; +DELETE FROM vn.taxCode + WHERE id=122; +-- Auto-generated SQL script. Actual values for binary/complex data types may differ - what you see is the default string representation of values. +DELETE FROM vn.bookingPlanner + WHERE countryFk = 30; + +DELETE FROM vn.botanicExport where restriction = 'Importacion Prohibida'; + +DELETE FROM vn.itemTaxCountry WHERE countryFk = 30; +DELETE FROM vn.botanicExport WHERE countryFk = 30; +UPDATE vn.client SET countryFk = 1 WHERE countryFk = 30; +UPDATE vn.supplier SET countryFk = 1 WHERE countryFk = 30; +UPDATE province SET countryFk = 1 WHERE countryFk = 30; +UPDATE autonomy SET countryFk = 1 WHERE countryFk = 30; +DELETE FROM vn.taxCode WHERE taxTypeFk = 24; +DELETE FROM vn.taxClassCode WHERE taxCodeFk IN (108, 109,110,122); +DELETE FROM vn.country WHERE code = 'EX'; \ No newline at end of file diff --git a/db/versions/.archive/10193-navyHydrangea/01-botanicExport.sql b/db/versions/.archive/10193-navyHydrangea/01-botanicExport.sql new file mode 100644 index 000000000..f36f7fa9b --- /dev/null +++ b/db/versions/.archive/10193-navyHydrangea/01-botanicExport.sql @@ -0,0 +1 @@ +ALTER TABLE vn.botanicExport CHANGE countryFk countryFk__ mediumint(8) unsigned DEFAULT NULL NULL; diff --git a/db/versions/.archive/10193-navyHydrangea/02-item.sql b/db/versions/.archive/10193-navyHydrangea/02-item.sql new file mode 100644 index 000000000..8694e6d15 --- /dev/null +++ b/db/versions/.archive/10193-navyHydrangea/02-item.sql @@ -0,0 +1 @@ +ALTER TABLE vn.item MODIFY COLUMN comment varchar(150) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL COMMENT 'referencia del proveedor'; diff --git a/db/versions/.archive/10193-navyHydrangea/03-autonomy.sql b/db/versions/.archive/10193-navyHydrangea/03-autonomy.sql new file mode 100644 index 000000000..32771ef05 --- /dev/null +++ b/db/versions/.archive/10193-navyHydrangea/03-autonomy.sql @@ -0,0 +1,17 @@ +ALTER TABLE vn.autonomy ADD isUeeMember BOOL DEFAULT NULL NULL; +ALTER TABLE vn.autonomy ADD hasDailyInvoice tinyint(4) DEFAULT NULL; + +UPDATE vn.autonomy + SET isUeeMember = FALSE, + hasDailyInvoice = TRUE + WHERE name = 'Canarias'; + +UPDATE vn.autonomy + SET isUeeMember = FALSE, + hasDailyInvoice = TRUE + WHERE name = 'Ciudad de Ceuta'; + +UPDATE vn.autonomy + SET isUeeMember = FALSE, + hasDailyInvoice = TRUE + WHERE name = 'Ciudad de Melilla'; diff --git a/db/versions/.archive/10193-navyHydrangea/03-turn.sql b/db/versions/.archive/10193-navyHydrangea/03-turn.sql new file mode 100644 index 000000000..eb48cbdea --- /dev/null +++ b/db/versions/.archive/10193-navyHydrangea/03-turn.sql @@ -0,0 +1 @@ +RENAME TABLE vn2008.turn TO vn2008.turn__; diff --git a/db/versions/.archive/10193-navyHydrangea/04-country.sql b/db/versions/.archive/10193-navyHydrangea/04-country.sql new file mode 100644 index 000000000..fe57cf1b0 --- /dev/null +++ b/db/versions/.archive/10193-navyHydrangea/04-country.sql @@ -0,0 +1,2 @@ +ALTER TABLE vn.country CHANGE politicalCountryFk politicalCountryFk__ mediumint(8) unsigned NULL + COMMENT 'Pais Real(apaño por culpa del España Exento)'; \ No newline at end of file diff --git a/db/versions/.archive/10194-redRose/00-firstScript.sql b/db/versions/.archive/10194-redRose/00-firstScript.sql new file mode 100644 index 000000000..213423dbb --- /dev/null +++ b/db/versions/.archive/10194-redRose/00-firstScript.sql @@ -0,0 +1,3 @@ +-- Place your SQL code here +ALTER TABLE vn.sector CHANGE `path` path__ int(11) DEFAULT NULL NULL; +ALTER TABLE vn.sector CHANGE pickingPlacement pickingPlacement__ varchar(15) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL; diff --git a/db/versions/.archive/10195-redPhormium/00-firstScript.sql b/db/versions/.archive/10195-redPhormium/00-firstScript.sql new file mode 100644 index 000000000..532f8a4f8 --- /dev/null +++ b/db/versions/.archive/10195-redPhormium/00-firstScript.sql @@ -0,0 +1,24 @@ +CREATE TABLE `vn`.`itemCleanConfig` ( + `id` int(11) NOT NULL, + `step` int(11) NOT NULL COMMENT 'Indica los items que procesa en cada ciclo', + `quantity` int(11) NOT NULL COMMENT 'Indica el número de items que va a procesar', + `isStop` tinyint(1) DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +INSERT INTO vn.itemCleanConfig (id,step,quantity,isStop) + VALUES (1,500,100000,0); + +CREATE TABLE vn.itemCleanCount ( + id int(11) auto_increment NOT NULL, + itemFrom int(11) NULL COMMENT 'Indica el item por donde ha empezado', + itemDeleted int(11) NULL COMMENT 'Indica la cantidad de items que ha eliminado', + created TIMESTAMP DEFAULT current_timestamp() NULL, + PRIMARY KEY (id) +) +ENGINE=InnoDB +DEFAULT CHARSET=utf8 +COLLATE=utf8_unicode_ci; + +INSERT INTO bs.nightTask (`order`,`schema`,`procedure`) + VALUES (1008,'vn','item_cleanLauncher'); \ No newline at end of file diff --git a/db/versions/.archive/10200-bronzeCyca/00-firstScript.sql b/db/versions/.archive/10200-bronzeCyca/00-firstScript.sql new file mode 100644 index 000000000..d18c9f57a --- /dev/null +++ b/db/versions/.archive/10200-bronzeCyca/00-firstScript.sql @@ -0,0 +1,5 @@ +ALTER TABLE vn.itemConfig ADD monthToDeactivate int(3) DEFAULT 24 NOT NULL; +ALTER TABLE vn.item ADD lastUsed datetime DEFAULT CURRENT_TIMESTAMP; +CREATE INDEX item_lastUsed_IDX USING BTREE ON vn.item (lastUsed); +INSERT INTO bs.nightTask (`order`,`schema`,`procedure`) + VALUES (1007,'vn','item_deactivateUnused'); \ No newline at end of file diff --git a/db/versions/.archive/10201-whiteRaphis/00-firstScript.sql b/db/versions/.archive/10201-whiteRaphis/00-firstScript.sql new file mode 100644 index 000000000..ff254a6d1 --- /dev/null +++ b/db/versions/.archive/10201-whiteRaphis/00-firstScript.sql @@ -0,0 +1,4 @@ +-- Place your SQL code here +ALTER TABLE `vn`.`origin` +CHANGE COLUMN `flag` `flag__` BLOB NULL DEFAULT NULL , +CHANGE COLUMN `nl` `nl__` TINYINT(4) NOT NULL DEFAULT '0' ; \ No newline at end of file diff --git a/db/versions/.archive/10202-redCamellia/00-Remove_FK_to_ediGenus.sql b/db/versions/.archive/10202-redCamellia/00-Remove_FK_to_ediGenus.sql new file mode 100644 index 000000000..c92cd9de5 --- /dev/null +++ b/db/versions/.archive/10202-redCamellia/00-Remove_FK_to_ediGenus.sql @@ -0,0 +1,2 @@ +ALTER TABLE vn.botanicExport DROP FOREIGN KEY botanicExport_FK4; +ALTER TABLE vn.botanicExport DROP FOREIGN KEY botanicExport_FK; \ No newline at end of file diff --git a/db/versions/.archive/10203-redMedeola/00-firstScript.sql b/db/versions/.archive/10203-redMedeola/00-firstScript.sql new file mode 100644 index 000000000..1e6bfa49e --- /dev/null +++ b/db/versions/.archive/10203-redMedeola/00-firstScript.sql @@ -0,0 +1 @@ +ALTER TABLE vn.supplier MODIFY COLUMN postCode char(8) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL; \ No newline at end of file diff --git a/db/versions/.archive/10204-bronzeCarnation/00-firstScript.sql b/db/versions/.archive/10204-bronzeCarnation/00-firstScript.sql new file mode 100644 index 000000000..6c4885bc0 --- /dev/null +++ b/db/versions/.archive/10204-bronzeCarnation/00-firstScript.sql @@ -0,0 +1 @@ +ALTER TABLE vn.state MODIFY COLUMN name varchar(20) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL; -- codi de Sergio \ No newline at end of file diff --git a/db/versions/.archive/10205-bronzeAnthurium/00-firstScript.sql b/db/versions/.archive/10205-bronzeAnthurium/00-firstScript.sql new file mode 100644 index 000000000..d281dbd42 --- /dev/null +++ b/db/versions/.archive/10205-bronzeAnthurium/00-firstScript.sql @@ -0,0 +1,32 @@ +DROP TEMPORARY TABLE IF EXISTS tmp.priority; +CREATE TEMPORARY TABLE tmp.priority + ENGINE = MEMORY + SELECT itemTagId, MaxPriority + FROM (SELECT it.id itemTagId, priorityChange.MaxPriority, i.id + FROM vn.itemTag it + JOIN vn.item i ON i.id = it.itemFk + JOIN vn.itemType ity ON ity.id = i.typeFk + JOIN (SELECT it.itemFk, max(it.priority) + 1 as MaxPriority + FROM vn.itemTag it + GROUP BY it.`itemFk` + ) priorityChange ON priorityChange.itemFk = i.id + JOIN(SELECT it.itemFk,it.priority, min(it.id) as minId + FROM vn.itemTag it + GROUP BY it.`itemFk`,it.`priority` + ) minId ON minId.itemFk = i.id + AND minId.priority = it.priority + WHERE i.isActive + GROUP BY it.itemFk, it.priority + HAVING COUNT(it.priority) > 1)sub + GROUP BY sub.id; + +SET @isTriggerDisabled := TRUE; + UPDATE vn.itemTag it + JOIN tmp.priority tmp ON tmp.itemTagId = it.id + SET it.priority = tmp.MaxPriority; +SET @isTriggerDisabled := FALSE; + +DROP TEMPORARY TABLE IF EXISTS tmp.priority; + +ALTER TABLE `vn`.`itemTag` +ADD UNIQUE INDEX `itemTagItemPriority` (`itemFk` ASC, `priority` ASC); diff --git a/db/versions/.archive/10207-greenRose/00-Alter_table_entry.sql b/db/versions/.archive/10207-greenRose/00-Alter_table_entry.sql new file mode 100644 index 000000000..d562e3f3b --- /dev/null +++ b/db/versions/.archive/10207-greenRose/00-Alter_table_entry.sql @@ -0,0 +1,3 @@ +ALTER TABLE vn.entry ADD invoiceAmount DECIMAL(10,2) DEFAULT NULL; +ALTER TABLE vn.entry ADD buyerFk INT(10) unsigned NULL; +ALTER TABLE vn.entry ADD CONSTRAINT entry_FK FOREIGN KEY (buyerFk) REFERENCES vn.worker(id) ON UPDATE CASCADE; \ No newline at end of file diff --git a/db/versions/.archive/10207-greenRose/00-Alter_table_entry.undo.sql b/db/versions/.archive/10207-greenRose/00-Alter_table_entry.undo.sql new file mode 100644 index 000000000..c39a01c9b --- /dev/null +++ b/db/versions/.archive/10207-greenRose/00-Alter_table_entry.undo.sql @@ -0,0 +1,3 @@ +ALTER TABLE vn.entry DROP invoiceAmount; +ALTER TABLE vn.entry DROP CONSTRAINT entry_FK; +ALTER TABLE vn.entry DROP buyerFk; \ No newline at end of file diff --git a/db/versions/.archive/10207-greenRose/01-Update_invoiceAmount.sql b/db/versions/.archive/10207-greenRose/01-Update_invoiceAmount.sql new file mode 100644 index 000000000..1dc2c8836 --- /dev/null +++ b/db/versions/.archive/10207-greenRose/01-Update_invoiceAmount.sql @@ -0,0 +1,4 @@ + UPDATE IGNORE vn.entry e + JOIN vn.worker w ON w.code = TRIM(Right(REPLACE(e.notes, Char(10), ""), 4)) + SET invoiceAmount = CAST(REPLACE(notes, ',', '.') as DECIMAL (10,2)), + buyerFk = w.id; \ No newline at end of file diff --git a/db/versions/.archive/10208-goldenRuscus/00-firstScript.sql b/db/versions/.archive/10208-goldenRuscus/00-firstScript.sql new file mode 100644 index 000000000..05aaa9b48 --- /dev/null +++ b/db/versions/.archive/10208-goldenRuscus/00-firstScript.sql @@ -0,0 +1,131 @@ +-- Crear tabla en caso de necesitar recuperar + +CREATE TABLE vn.expence__ LIKE vn.expence; +INSERT INTO vn.expence__ SELECT * FROM vn.expence; + +-- Eliminar las Fk en expence + +ALTER TABLE `vn`.`invoiceOutExpence` +DROP FOREIGN KEY `invoiceOutExpence_expenceFk`; +ALTER TABLE `vn`.`invoiceOutExpence` +DROP INDEX `invoiceOutExpence_FK_2_idx` ; + +ALTER TABLE `vn`.`item` +DROP FOREIGN KEY `item_expenceFk`; +ALTER TABLE `vn`.`item` +DROP INDEX `item_expenceFk` ; + +ALTER TABLE `vn`.`invoiceInTax` +DROP FOREIGN KEY `recibida_iva_gastos_id`; +ALTER TABLE `vn`.`invoiceInTax` +DROP INDEX `recibida_iva_gastos_id` ; + +ALTER TABLE `vn`.`invoiceInSage` +DROP FOREIGN KEY `invoiceInSage_expenceFk`; +ALTER TABLE `vn`.`invoiceInSage` +DROP INDEX `invoiceInSage_expenceFk` ; + +ALTER TABLE `vn`.`invoiceIn` +DROP FOREIGN KEY `invoiceIn_expenceFkDeductible`; +ALTER TABLE `vn`.`invoiceIn` +DROP INDEX `invoiceIn_expenceFkDeductible` ; + +ALTER TABLE `vn`.`ticketServiceType` +DROP FOREIGN KEY `ticketServiceType_expenceFk`; +ALTER TABLE `vn`.`ticketServiceType` +DROP INDEX `ticketServiceType_expenceFk` ; + +-- Actualizar tabla expence + +ALTER TABLE `vn`.`expence` +DROP INDEX `iva_tipo_id`; + +ALTER TABLE `vn`.`expence` +DROP COLUMN `isForSale`, +DROP COLUMN `isConbase`; + +CREATE TEMPORARY TABLE tmp.expence +SELECT * + FROM vn.expence + GROUP BY id; + +TRUNCATE vn.expence; + +ALTER TABLE `vn`.`expence` + CHANGE COLUMN `taxTypeFk` `taxTypeFk` TINYINT(4) NULL , + DROP PRIMARY KEY, + ADD PRIMARY KEY (`id`); + +ALTER TABLE `vn`.`expence` + DROP COLUMN `taxTypeFk`; + + +INSERT INTO vn.expence (id, name ,isWithheld) + SELECT id, name ,isWithheld + FROM tmp.expence; + + +-- Volver a poner las Fk en expence + +ALTER TABLE `vn`.`invoiceOutExpence` + ADD INDEX `invoiceOutExpence_expenceFk_idx` (`expenceFk` ASC) ; + +ALTER TABLE `vn`.`invoiceOutExpence` + ADD CONSTRAINT `invoiceOutExpence_expenceFk` + FOREIGN KEY (`expenceFk`) + REFERENCES `vn`.`expence` (`id`) + ON DELETE RESTRICT + ON UPDATE CASCADE; + +ALTER TABLE `vn`.`item` + ADD INDEX `item_expenceFk_idx` (`expenceFk` ASC) ; + +ALTER TABLE `vn`.`item` + ADD CONSTRAINT `item_expenceFk` + FOREIGN KEY (`expenceFk`) + REFERENCES `vn`.`expence` (`id`) + ON DELETE RESTRICT + ON UPDATE CASCADE; + + +ALTER TABLE `vn`.`invoiceInTax` + ADD INDEX `invoiceInTax_idx` (`expenceFk` ASC) ; + +ALTER TABLE `vn`.`invoiceInTax` + ADD CONSTRAINT `invoiceInTax_expenceFk` + FOREIGN KEY (`expenceFk`) + REFERENCES `vn`.`expence` (`id`) + ON DELETE RESTRICT + ON UPDATE CASCADE; + + +ALTER TABLE `vn`.`invoiceInSage` + ADD INDEX `invoiceInSage_idx` (`expenceFk` ASC) ; + +ALTER TABLE `vn`.`invoiceInSage` + ADD CONSTRAINT `invoiceInSage_expenceFk` + FOREIGN KEY (`expenceFk`) + REFERENCES `vn`.`expence` (`id`) + ON DELETE RESTRICT + ON UPDATE CASCADE; + +ALTER TABLE `vn`.`invoiceIn` + ADD INDEX `invoiceIn_expenceFkDeductible_idx` (`expenceFkDeductible` ASC) ; + +ALTER TABLE `vn`.`invoiceIn` + ADD CONSTRAINT `invoiceIn_expenceFkDeductible` + FOREIGN KEY (`expenceFkDeductible`) + REFERENCES `vn`.`expence` (`id`) + ON DELETE RESTRICT + ON UPDATE CASCADE; + +ALTER TABLE `vn`.`ticketServiceType` + ADD INDEX `ticketServiceType_expenceFk_idx` (`expenceFk` ASC) ; + +ALTER TABLE `vn`.`ticketServiceType` + ADD CONSTRAINT `ticketServiceType_expenceFk` + FOREIGN KEY (`expenceFk`) + REFERENCES `vn`.`expence` (`id`) + ON DELETE RESTRICT + ON UPDATE CASCADE; + \ No newline at end of file diff --git a/db/versions/.archive/10209-bronzeBirch/00-firstScript.sql b/db/versions/.archive/10209-bronzeBirch/00-firstScript.sql new file mode 100644 index 000000000..681faa1b1 --- /dev/null +++ b/db/versions/.archive/10209-bronzeBirch/00-firstScript.sql @@ -0,0 +1 @@ +ALTER TABLE account.`user` ADD CONSTRAINT mail UNIQUE KEY (email); \ No newline at end of file diff --git a/db/versions/.archive/10211-greenDendro/01-firstScript.sql b/db/versions/.archive/10211-greenDendro/01-firstScript.sql new file mode 100644 index 000000000..ebea1865e --- /dev/null +++ b/db/versions/.archive/10211-greenDendro/01-firstScript.sql @@ -0,0 +1,24 @@ +USE `vn`; + +DROP TABLE IF EXISTS vn.splitFilter; +CREATE TABLE `vn`.`splitFilter` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `autonomyFk` int(11) DEFAULT NULL, + `clientFk` int(11) DEFAULT NULL, + `nickname` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `splitFilter_UN` (`autonomyFk`), + UNIQUE KEY `splitFilter_UN1` (`clientFk`), + KEY `splitFilter_FK` (`autonomyFk`), + KEY `splitFilter_FK_1` (`clientFk`), + CONSTRAINT `splitFilter_FK` FOREIGN KEY (`autonomyFk`) REFERENCES `autonomy` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `splitFilter_FK_1` FOREIGN KEY (`clientFk`) REFERENCES `client` (`id`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='define los clientes que tienen split y el nombre a mostrar en la etiqueta'; + +INSERT INTO vn.splitFilter +(id, autonomyFk, clientFk, nickname) +VALUES(1, 7, NULL, '<>');
+
+INSERT INTO vn.splitFilter
+(id, autonomyFk, clientFk, nickname)
+VALUES(2, NULL, 93, 'DIONI');
diff --git a/db/versions/.archive/10215-yellowAnthurium/00-renameIsInventory.sql b/db/versions/.archive/10215-yellowAnthurium/00-renameIsInventory.sql
new file mode 100644
index 000000000..aeb072de5
--- /dev/null
+++ b/db/versions/.archive/10215-yellowAnthurium/00-renameIsInventory.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.entry CHANGE isInventory isExcludedFromAvailable tinyint(1) DEFAULT 0 NOT NULL;
diff --git a/db/versions/.archive/10215-yellowAnthurium/00-renameIsInventory.undo.sql b/db/versions/.archive/10215-yellowAnthurium/00-renameIsInventory.undo.sql
new file mode 100644
index 000000000..786d31887
--- /dev/null
+++ b/db/versions/.archive/10215-yellowAnthurium/00-renameIsInventory.undo.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.entry CHANGE isExcludedFromAvailable isInventory tinyint(1) DEFAULT 0 NOT NULL;
diff --git a/db/versions/.archive/10216-pinkMedeola/00-firstScript.sql b/db/versions/.archive/10216-pinkMedeola/00-firstScript.sql
new file mode 100644
index 000000000..91e500f20
--- /dev/null
+++ b/db/versions/.archive/10216-pinkMedeola/00-firstScript.sql
@@ -0,0 +1,36 @@
+ALTER TABLE edi.ekt
+ ADD batchNumber BIGINT(20) UNSIGNED NULL COMMENT 'RFF+BT' AFTER entryYear;
+
+ALTER TABLE edi.`param` ADD UNIQUE(`code`);
+
+INSERT IGNORE INTO edi.`param` (`id`, `code`, `name`, `subname`, `position`, `type`, `required`)
+ VALUES ('0', 'batchNumber', 'RFF', 'BT', '2', 'INTEGER', '0');
+
+ALTER TABLE edi.ekt
+ MODIFY COLUMN id int(11) auto_increment NOT NULL COMMENT 'Id',
+ MODIFY COLUMN barcode char(15) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL NULL COMMENT 'Generated auction barcode',
+ MODIFY COLUMN entryYear smallint(5) unsigned NOT NULL COMMENT 'Transaction year',
+ MODIFY COLUMN deliveryNumber bigint(20) unsigned DEFAULT NULL NULL COMMENT 'RFF+AAJ',
+ MODIFY COLUMN fec date DEFAULT NULL NULL COMMENT 'DTM+97',
+ MODIFY COLUMN hor time DEFAULT NULL NULL COMMENT 'UNB',
+ MODIFY COLUMN now timestamp DEFAULT current_timestamp() NULL COMMENT 'Creation time',
+ MODIFY COLUMN ptj mediumint(8) unsigned DEFAULT NULL NULL COMMENT 'NAD+BY',
+ MODIFY COLUMN `ref` int(11) NOT NULL COMMENT 'LIN',
+ MODIFY COLUMN item varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL NULL COMMENT 'IMD+S99',
+ MODIFY COLUMN pac int(11) DEFAULT 0 NULL COMMENT 'QTY+52',
+ MODIFY COLUMN qty int(10) NOT NULL COMMENT 'QTY+66',
+ MODIFY COLUMN ori varchar(3) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT 'NL' NULL COMMENT 'IMD+S62',
+ MODIFY COLUMN cat varchar(2) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL NULL COMMENT 'IMD+S98',
+ MODIFY COLUMN agj int(11) DEFAULT NULL NULL COMMENT 'RFF+AGJ',
+ MODIFY COLUMN kop int(11) DEFAULT NULL NULL COMMENT 'RFF+ADZ',
+ MODIFY COLUMN ptd varchar(6) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL NULL COMMENT 'RFF+ACE',
+ MODIFY COLUMN sub mediumint(8) unsigned DEFAULT NULL NULL COMMENT 'RFF+CTS',
+ MODIFY COLUMN pro mediumint(8) unsigned NOT NULL COMMENT 'NAD+MF',
+ MODIFY COLUMN pri double NOT NULL COMMENT 'PRI+INV',
+ MODIFY COLUMN package int(10) unsigned DEFAULT NULL NULL COMMENT 'PAC',
+ MODIFY COLUMN auction smallint(5) unsigned DEFAULT NULL NULL COMMENT 'NAD+FLA',
+ MODIFY COLUMN klo smallint(5) unsigned DEFAULT NULL NULL COMMENT 'RFF+FAC',
+ MODIFY COLUMN k1 smallint(5) unsigned DEFAULT NULL NULL COMMENT 'IMD+K01',
+ MODIFY COLUMN k2 smallint(5) unsigned DEFAULT NULL NULL COMMENT 'IMD+K02',
+ MODIFY COLUMN putOrderFk bigint(20) unsigned DEFAULT NULL NULL COMMENT 'RFF+ON',
+ MODIFY COLUMN scanned tinyint(1) DEFAULT 0 NOT NULL COMMENT 'Whether it''s been scanned';
diff --git a/db/versions/.archive/10216-pinkMedeola/00-firstScript.undo.sql b/db/versions/.archive/10216-pinkMedeola/00-firstScript.undo.sql
new file mode 100644
index 000000000..5424e10fa
--- /dev/null
+++ b/db/versions/.archive/10216-pinkMedeola/00-firstScript.undo.sql
@@ -0,0 +1,35 @@
+ALTER TABLE edi.ekt
+ DROP COLUMN batchNumber;
+
+ALTER TABLE `param` DROP INDEX `code`;
+
+DELETE FROM edi.`param` WHERE code = 'batchNumber'
+
+ALTER TABLE edi.ekt
+ MODIFY COLUMN id int(11) auto_increment NOT NULL,
+ MODIFY COLUMN barcode char(15) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL NULL,
+ MODIFY COLUMN entryYear smallint(5) unsigned NOT NULL,
+ MODIFY COLUMN deliveryNumber bigint(20) unsigned DEFAULT NULL NULL,
+ MODIFY COLUMN fec date DEFAULT NULL NULL,
+ MODIFY COLUMN hor time DEFAULT NULL NULL,
+ MODIFY COLUMN now timestamp DEFAULT current_timestamp() NULL,
+ MODIFY COLUMN ptj mediumint(8) unsigned DEFAULT NULL NULL,
+ MODIFY COLUMN `ref` int(11) NOT NULL,
+ MODIFY COLUMN item varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL NULL,
+ MODIFY COLUMN pac int(11) DEFAULT 0 NULL,
+ MODIFY COLUMN qty int(10) NOT NULL,
+ MODIFY COLUMN ori varchar(3) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT 'NL' NULL,
+ MODIFY COLUMN cat varchar(2) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL NULL,
+ MODIFY COLUMN agj int(11) DEFAULT NULL NULL,
+ MODIFY COLUMN kop int(11) DEFAULT NULL NULL,
+ MODIFY COLUMN ptd varchar(6) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL NULL,
+ MODIFY COLUMN sub mediumint(8) unsigned DEFAULT NULL NULL,
+ MODIFY COLUMN pro mediumint(8) unsigned NOT NULL,
+ MODIFY COLUMN pri double NOT NULL,
+ MODIFY COLUMN package int(10) unsigned DEFAULT NULL NULL,
+ MODIFY COLUMN auction smallint(5) unsigned DEFAULT NULL NULL,
+ MODIFY COLUMN klo smallint(5) unsigned DEFAULT NULL NULL,
+ MODIFY COLUMN k1 smallint(5) unsigned DEFAULT NULL NULL,
+ MODIFY COLUMN k2 smallint(5) unsigned DEFAULT NULL NULL,
+ MODIFY COLUMN putOrderFk bigint(20) unsigned DEFAULT NULL NULL,
+ MODIFY COLUMN scanned tinyint(1) DEFAULT 0 NOT NULL;
diff --git a/db/versions/.archive/10216-pinkMedeola/01-batchIndex.sql b/db/versions/.archive/10216-pinkMedeola/01-batchIndex.sql
new file mode 100644
index 000000000..536526c22
--- /dev/null
+++ b/db/versions/.archive/10216-pinkMedeola/01-batchIndex.sql
@@ -0,0 +1,15 @@
+CREATE INDEX ekt_batchNumber USING BTREE ON edi.ekt (batchNumber);
+
+ALTER TABLE edi.ekt
+ MODIFY COLUMN k3 tinyint(3) unsigned DEFAULT NULL NULL COMMENT 'IMD+P01',
+ MODIFY COLUMN k4 tinyint(3) unsigned DEFAULT NULL NULL COMMENT 'IMD+P02';
+
+ALTER TABLE edi.mail ADD source TEXT DEFAULT NULL NULL;
+
+ALTER TABLE edi.ekt
+ ADD vendorOrderNumber BIGINT(20) unsigned DEFAULT NULL NULL COMMENT 'RFF+VN' AFTER deliveryNumber;
+
+CREATE INDEX ekt_vendorOrderNumber USING BTREE ON edi.ekt (vendorOrderNumber);
+
+INSERT INTO edi.param (code,name,subname,`position`,`type`,required) VALUES
+ ('vendorOrderNumber','RFF','VN',2,'INTEGER',0);
diff --git a/db/versions/.archive/10216-pinkMedeola/01-batchIndex.undo.sql b/db/versions/.archive/10216-pinkMedeola/01-batchIndex.undo.sql
new file mode 100644
index 000000000..a62ced45d
--- /dev/null
+++ b/db/versions/.archive/10216-pinkMedeola/01-batchIndex.undo.sql
@@ -0,0 +1,11 @@
+ALTER TABLE edi.ekt DROP INDEX ekt_batchNumber;
+
+ALTER TABLE edi.ekt
+ MODIFY COLUMN k3 tinyint(3) unsigned DEFAULT NULL NULL,
+ MODIFY COLUMN k4 tinyint(3) unsigned DEFAULT NULL NULL;
+
+ALTER TABLE edi.mail DROP COLUMN source;
+
+ALTER TABLE edi.ekt DROP COLUMN vendorOrderNumber;
+
+DELETE FROM edi.param WHERE code = 'vendorOrderNumber';
diff --git a/db/versions/.archive/10219-orangeRuscus/00-AddCollectionFkOnPackingSite.sql b/db/versions/.archive/10219-orangeRuscus/00-AddCollectionFkOnPackingSite.sql
new file mode 100644
index 000000000..1e5b4b9b8
--- /dev/null
+++ b/db/versions/.archive/10219-orangeRuscus/00-AddCollectionFkOnPackingSite.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.packingSite ADD collectionFk INT(11) NULL COMMENT 'Last collection packed on this site';
\ No newline at end of file
diff --git a/db/versions/.archive/10219-orangeRuscus/01-AddFkToCollectionFk.sql b/db/versions/.archive/10219-orangeRuscus/01-AddFkToCollectionFk.sql
new file mode 100644
index 000000000..249b21d87
--- /dev/null
+++ b/db/versions/.archive/10219-orangeRuscus/01-AddFkToCollectionFk.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.packingSite ADD CONSTRAINT packingSite_FK_2 FOREIGN KEY (collectionFk) REFERENCES vn.collection(id) ON DELETE SET NULL ON UPDATE CASCADE;
diff --git a/db/versions/.archive/10220-chocolateCymbidium/00-createPersonalProtectionEquipment.sql b/db/versions/.archive/10220-chocolateCymbidium/00-createPersonalProtectionEquipment.sql
new file mode 100644
index 000000000..e4eceb924
--- /dev/null
+++ b/db/versions/.archive/10220-chocolateCymbidium/00-createPersonalProtectionEquipment.sql
@@ -0,0 +1,8 @@
+DROP TABLE IF EXISTS `vn`.`personalProtectionEquipment`;
+CREATE TABLE `vn`.`personalProtectionEquipment` (
+ `id` INT(11) Primary Key auto_increment NOT NULL,
+ `name` varchar(255) NOT NULL
+)
+ENGINE=InnoDB
+DEFAULT CHARSET=utf8
+COLLATE=utf8_unicode_ci;
diff --git a/db/versions/.archive/10222-redEucalyptus/00-firstScript.sql b/db/versions/.archive/10222-redEucalyptus/00-firstScript.sql
new file mode 100644
index 000000000..f78b18ec7
--- /dev/null
+++ b/db/versions/.archive/10222-redEucalyptus/00-firstScript.sql
@@ -0,0 +1,226 @@
+USE vn;
+
+ALTER TABLE `vn`.`route`
+CHANGE COLUMN `kmStart` `kmStart` MEDIUMINT(9) NULL DEFAULT NULL ,
+CHANGE COLUMN `kmEnd` `kmEnd` MEDIUMINT(9) NULL DEFAULT NULL ;
+
+DROP TABLE IF EXISTS `vn`.`routeCommission`;
+CREATE TABLE `vn`.`routeCommission` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `routeFk` int(10) unsigned NOT NULL,
+ `workCenterFk` int(11) DEFAULT NULL,
+ `km` decimal(5,2) DEFAULT NULL,
+ `m3` decimal(5,2) DEFAULT NULL,
+ `yearlyKm` decimal(5,2) DEFAULT NULL,
+ `yearlyM3` decimal(5,2) DEFAULT NULL,
+ `cat4m3` decimal(5,2) DEFAULT NULL,
+ `cat5m3` decimal(5,2) DEFAULT NULL,
+ `freelanceYearlyM3` decimal(5,2) DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `routeCommission_routeFk_idx` (`routeFk`),
+ KEY `routeCommission_workCenterFk_idx` (`workCenterFk`),
+ CONSTRAINT `routeCommission_routeFk` FOREIGN KEY (`routeFk`) REFERENCES `route` (`id`) ON UPDATE CASCADE,
+ CONSTRAINT `routeCommission_workCenterFk` FOREIGN KEY (`workCenterFk`) REFERENCES `workCenter` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+ALTER TABLE `vn`.`routeConfig`
+ADD COLUMN `kmHeavy` decimal(5,2) DEFAULT NULL COMMENT 'Comisión por kilometro vehículo pesado',
+ADD COLUMN `kmLight` decimal(5,2) DEFAULT NULL COMMENT 'Comisión por kilometro vehículo ligero',
+ADD COLUMN `kmYearly` decimal(5,2) DEFAULT NULL COMMENT 'Comisión por kilometro objetivo anual',
+ADD COLUMN `m3Yearly` decimal(5,2) DEFAULT NULL COMMENT 'Comisión por m3 objetivo anual',
+ADD COLUMN `deliveryM3Cat4` decimal(5,2) DEFAULT NULL COMMENT 'Comisión por m3 repartido Cat.IV',
+ADD COLUMN `deliveryM3Cat5` decimal(5,2) DEFAULT NULL COMMENT 'Comisión por m3 repartido Cat. V',
+ADD COLUMN `plusCat2Fixed` decimal(5,2) DEFAULT NULL COMMENT 'Plus fijo Cat.II vehículo ligero',
+ADD COLUMN `plusCat2Variable` decimal(5,2) DEFAULT NULL COMMENT 'Plus variable Cat.II vehículo ligero',
+ADD COLUMN `plusCat3Fixed` decimal(5,2) DEFAULT NULL COMMENT 'Plus fijo Cat.III vehículo pesado',
+ADD COLUMN `plusCat3Variable` decimal(5,2) DEFAULT NULL COMMENT 'Plus variable Cat.III vehículo pesado',
+ADD COLUMN `distributionCat4M3` decimal(5,2) DEFAULT NULL COMMENT 'Comisión por gestión de la distribución Cat IV',
+ADD COLUMN `distributionCat5M3` decimal(5,2) DEFAULT NULL COMMENT 'Comisión por gestión de la distribución Cat V',
+ADD COLUMN `rateCat4` decimal(5,2) DEFAULT NULL COMMENT 'Ratio aplicado a la media de venta de los repartidores para el cálculo de las comisiones de enrutadores Cat IV',
+ADD COLUMN `rateCat5` decimal(5,2) DEFAULT NULL COMMENT 'Ratio aplicado a la media de venta de los repartidores para el cálculo de las comisiones de enrutadores Cat V',
+ADD COLUMN `freelanceM3` decimal(5,2) DEFAULT NULL COMMENT 'Comisión para enrutadores sobre rutas de autónomos',
+ADD COLUMN `freelanceMinM3` decimal(5,2) DEFAULT NULL COMMENT 'Metros mínimos para considerar las rutas de autónomos',
+ADD COLUMN `mainlineDelivered` decimal(5,2) DEFAULT NULL COMMENT 'Comisión para entregas troncales',
+ADD COLUMN `cutoffDated` DATE DEFAULT NULL COMMENT 'Fecha a partir de la cual se autoriza calcular la comisión',
+ADD COLUMN `defaultWorkCenterFk` INT DEFAULT 9 COMMENT 'Para el cálculo de las comisiones, en caso de el creador de la ruta no tenga workCenter',
+ADD COLUMN `kmMax` INT NULL DEFAULT 4000 COMMENT 'Máximo número de km validos para una ruta';
+
+
+ALTER TABLE `vn`.`route`
+ADD COLUMN `commissionWorkCenterFk` INT(11) NULL COMMENT 'WorkerCenter que gestiona la ruta' AFTER `beachFk`,
+ADD INDEX `route_WorkCenterFk_idx` (`commissionWorkCenterFk` ASC);
+
+ALTER TABLE `vn`.`route`
+ADD CONSTRAINT `route_WorkCenterFk`
+ FOREIGN KEY (`commissionWorkCenterFk`)
+ REFERENCES `vn`.`workCenter` (`id`)
+ ON DELETE RESTRICT
+ ON UPDATE CASCADE;
+
+UPDATE `vn`.`routeConfig`
+ SET `kmHeavy` = '0.12',
+ `kmLight` = '0.11',
+ `kmYearly` = '0.01',
+ `m3Yearly` = '0.25',
+ `deliveryM3Cat4` = '6.54',
+ `deliveryM3Cat5` = '6.54',
+ `plusCat2Fixed` = '75',
+ `plusCat2Variable` = '75',
+ `plusCat3Fixed` = '150',
+ `plusCat3Variable` = '150',
+ `distributionCat4M3` = '1.53',
+ `distributionCat5M3` = '1.7',
+ `rateCat4` = '3',
+ `rateCat5` = '4.66',
+ `freelanceM3` = '0.10',
+ `freelanceMinM3` = '1.5',
+ `mainlineDelivered` = '1',
+ `cutoffDated` = '2021-12-01'
+ WHERE (`id` = '1');
+
+
+ UPDATE vn.route r
+ JOIN(SELECT r.id, wl.workcenterFk
+ FROM vn.route r
+ JOIN vn.routeLog rl ON rl.originFk = r.id
+ JOIN vn.workerLabour wl ON wl.workerFk = rl.userFk
+ AND r.created BETWEEN wl.started AND IFNULL(wl.ended, r.created)
+ WHERE r.created BETWEEN '2021-12-01' AND util.CURDATE()
+ AND rl.action = 'insert'
+ )sub ON sub.id = r.id
+ SET r.commissionWorkCenterFk = sub.workcenterFk;
+
+ UPDATE vn.route
+ SET commissionWorkCenterFk = 9
+ WHERE id = 125360; -- la ruta no tiene valor de insert en la tabla vn.routeLog
+
+ALTER TABLE `vn`.`absenceType`
+ ADD COLUMN `isNaturalDay` TINYINT(1) NULL DEFAULT 0 COMMENT 'Para el cálculo de los salarios de los repartidores' AFTER `holidayEntitlementRate`,
+ ADD COLUMN `isCalculate` TINYINT(1) NULL DEFAULT 0 COMMENT 'Para el cálculo de los salarios de los repartidores' AFTER `isNaturalDay`;
+
+UPDATE `vn`.`absenceType` SET `isNaturalDay` = '1' WHERE (`id` = '1');
+UPDATE `vn`.`absenceType` SET `isNaturalDay` = '1' WHERE (`id` = '6');
+
+UPDATE `vn`.`absenceType` SET `isCalculate` = '1' WHERE (`id` = '1');
+UPDATE `vn`.`absenceType` SET `isCalculate` = '1' WHERE (`id` = '2');
+UPDATE `vn`.`absenceType` SET `isCalculate` = '1' WHERE (`id` = '6');
+UPDATE `vn`.`absenceType` SET `isCalculate` = '0' WHERE (`id` = '7');
+UPDATE `vn`.`absenceType` SET `isCalculate` = '1' WHERE (`id` = '10');
+UPDATE `vn`.`absenceType` SET `isCalculate` = '1' WHERE (`id` = '11');
+UPDATE `vn`.`absenceType` SET `isCalculate` = '0' WHERE (`id` = '12');
+UPDATE `vn`.`absenceType` SET `isCalculate` = '0' WHERE (`id` = '14');
+UPDATE `vn`.`absenceType` SET `isCalculate` = '1' WHERE (`id` = '15');
+UPDATE `vn`.`absenceType` SET `isCalculate` = '0' WHERE (`id` = '16');
+UPDATE `vn`.`absenceType` SET `isCalculate` = '0' WHERE (`id` = '17');
+UPDATE `vn`.`absenceType` SET `isCalculate` = '0' WHERE (`id` = '13');
+UPDATE `vn`.`absenceType` SET `isCalculate` = '0' WHERE (`id` = '22');
+UPDATE `vn`.`absenceType` SET `isCalculate` = '0' WHERE (`id` = '21');
+UPDATE `vn`.`absenceType` SET `isCalculate` = '0' WHERE (`id` = '20');
+UPDATE `vn`.`absenceType` SET `isCalculate` = '0' WHERE (`id` = '19');
+UPDATE `vn`.`absenceType` SET `isCalculate` = '0' WHERE (`id` = '18');
+
+DROP PROCEDURE IF EXISTS `vn`.`route_calcCommission`;
+DELIMITER $$
+CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`route_calcCommission`(vSelf INT)
+proc: BEGIN
+/**
+ * Calcula las comisión para una ruta y guarda los valores en la tabla routeCommission
+ *
+ * @param vSelf id de ruta
+ */
+ DECLARE vIsUpdatable BOOL;
+ DECLARE vIsFreelance BOOL;
+
+ SELECT r.created >= rc.cutoffDated INTO vIsUpdatable
+ FROM route r
+ JOIN routeConfig rc
+ WHERE r.id = vSelf;
+
+ IF vIsUpdatable THEN
+
+ DELETE FROM routeCommission
+ WHERE routeFk = vSelf;
+
+ SELECT wl.workerFk IS NULL INTO vIsFreelance
+ FROM route r
+ LEFT JOIN workerLabour wl ON wl.workerFk = r.workerFk
+ WHERE r.id = vSelf
+ LIMIT 1;
+
+ IF vIsFreelance THEN
+ INSERT INTO routeCommission (routeFk, workCenterFk, freelanceYearlyM3)
+ SELECT vSelf,
+ r.commissionWorkCenterFk,
+ rc.freelanceM3 * IF(IFNULL(r.m3, 0) >= rc.freelanceMinM3, IFNULL(r.m3, 0), 0)
+ FROM route r
+ JOIN vehicle v ON v.id = r.vehicleFk
+ JOIN routeConfig rc
+ WHERE r.id = vSelf
+ AND r.workerFk
+ AND r.commissionWorkCenterFk
+ AND r.m3;
+ ELSE
+ INSERT INTO routeCommission (routeFk, workCenterFk, km, m3, yearlyKm, yearlyM3, cat4m3, cat5m3)
+ SELECT vSelf,
+ r.commissionWorkCenterFk,
+ FORMAT((r.kmEnd - r.kmStart) * IF(v.isKmTruckRate, rc.kmHeavy, rc.kmLight), 2),
+ FORMAT(IFNULL(r.m3, 0) * IF(v.isKmTruckRate, rc.deliveryM3Cat5, rc.deliveryM3Cat4), 2),
+ FORMAT((r.kmEnd - r.kmStart) * rc.kmYearly, 2),
+ FORMAT(IFNULL(r.m3, 0) * rc.m3Yearly, 2),
+ FORMAT(distributionCat4M3 * IFNULL(r.m3, 0), 2),
+ FORMAT(rc.distributionCat5M3 * IFNULL(r.m3, 0), 2)
+ FROM route r
+ JOIN vehicle v ON v.id = r.vehicleFk
+ JOIN routeConfig rc
+ WHERE r.id = vSelf
+ AND r.kmStart
+ AND r.kmEnd
+ AND r.workerFk
+ AND r.commissionWorkCenterFk
+ AND r.m3;
+ END IF;
+ END IF;
+END$$
+DELIMITER ;
+
+DROP PROCEDURE IF EXISTS `vn`.`routeCommission_loadData`;
+
+DELIMITER $$
+CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`routeCommission_loadData`()
+BEGIN
+/**
+ * Procedimiento temporal para realizar primera carga de datos de la comisiones de las rutas
+ */
+ DECLARE vDone INT DEFAULT FALSE;
+ DECLARE vRouteFk INT;
+ DECLARE vCursor CURSOR FOR
+ SELECT r.id
+ FROM route r
+ JOIN routeConfig rc
+ WHERE r.created BETWEEN rc.cutoffDated AND util.CURDATE()
+ AND r.kmEnd - r.kmStart <= rc.kmMax;
+
+ DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
+
+ OPEN vCursor;
+
+ read_loop: LOOP
+
+ FETCH vCursor INTO vRouteFk;
+
+ IF vDone THEN
+ LEAVE read_loop;
+ END IF;
+
+ CALL route_calcCommission(vRouteFk);
+
+ END LOOP;
+
+ CLOSE vCursor;
+
+END$$
+DELIMITER ;
+
+CALL vn.routeCommission_loadData();
+
+DROP PROCEDURE `vn`.`routeCommission_loadData`;
diff --git a/db/versions/.archive/10223-azureRuscus/00-firstScript.sql b/db/versions/.archive/10223-azureRuscus/00-firstScript.sql
new file mode 100644
index 000000000..56aef8cc7
--- /dev/null
+++ b/db/versions/.archive/10223-azureRuscus/00-firstScript.sql
@@ -0,0 +1,17 @@
+USE `vn`;
+
+-- Añadir campo en la tabla ticket
+
+ALTER TABLE `vn`.`ticket`
+ADD COLUMN `weight` DECIMAL(10,2) NULL DEFAULT NULL COMMENT 'En caso de informar, se utilizará su valor para calcular el peso de la factura' AFTER `totalWithoutVat`;
+
+-- Actualizar campo con los valores de ticketObservation
+
+UPDATE
+ vn.ticket t
+ JOIN (SELECT t.ticketFk, CAST(t.description AS DECIMAL(10,2)) weight
+ FROM vn.ticketObservation t
+ LEFT JOIN vn.observationType ot ON ot.id = t.observationTypeFk
+ WHERE ot.code ='weight'
+ having weight > 0)sub ON sub.ticketFk = t.id
+ SET t.weight = sub.weight;
\ No newline at end of file
diff --git a/db/versions/.archive/10224-orangeEucalyptus/00-cosetes.sql b/db/versions/.archive/10224-orangeEucalyptus/00-cosetes.sql
new file mode 100644
index 000000000..a67f0133a
--- /dev/null
+++ b/db/versions/.archive/10224-orangeEucalyptus/00-cosetes.sql
@@ -0,0 +1,20 @@
+use vn;
+
+CREATE TABLE `vn`.`mrwService` (
+ `agencyModeCodeFk` varchar(45) COLLATE utf8mb3_unicode_ci NOT NULL,
+ `clientType` int(11) unsigned NOT NULL,
+ `serviceType` int(11) unsigned DEFAULT NULL,
+ PRIMARY KEY (`agencyModeCodeFk`),
+ CONSTRAINT `mrwService_agencyModeCodeFk` FOREIGN KEY (`agencyModeCodeFk`) REFERENCES `agencyMode` (`code`)ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='Configuración de los servicios de MRW';
+
+CREATE TABLE `vn`.`mrwServiceWeekday` (
+ `agencyModeCodeFk` VARCHAR(45) NOT NULL,
+ `weekdays` SET('mon','tue','wed','thu','fri','sat','sun') NOT NULL,
+ `serviceType` INT(11) UNSIGNED NOT NULL,
+ `params` VARCHAR(255) NULL DEFAULT NULL,
+ PRIMARY KEY (`agencyModeCodeFk`),
+ CONSTRAINT `mrwServiceWeekday_agencyModeCodeFk` FOREIGN KEY (agencyModeCodeFk)
+ REFERENCES `vn`.`agencyMode` (`code`) ON DELETE CASCADE
+ ON UPDATE CASCADE)
+COMMENT = 'Configuración de los servicios en relación con el día de la semana para MRW';
diff --git a/db/versions/.archive/10229-salmonDendro/00-firstScript.sql b/db/versions/.archive/10229-salmonDendro/00-firstScript.sql
new file mode 100644
index 000000000..6bc6a59fc
--- /dev/null
+++ b/db/versions/.archive/10229-salmonDendro/00-firstScript.sql
@@ -0,0 +1,9 @@
+-- Place your SQL code here
+ALTER TABLE vn.deviceProductionUser DROP FOREIGN KEY deviceProductionUser_FK;
+ALTER TABLE vn.deviceProductionUser DROP FOREIGN KEY deviceProductionUser_PK;
+ALTER TABLE vn.deviceProductionUser ADD CONSTRAINT deviceProductionUser_FK FOREIGN KEY (deviceProductionFk) REFERENCES vn.deviceProduction(id)ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE vn.deviceProductionUser ADD CONSTRAINT deviceProductionUser_PK FOREIGN KEY (userFk) REFERENCES account.`user`(id) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE vn.deviceProductionUser ADD CONSTRAINT deviceProductionUser_CK PRIMARY KEY (deviceProductionFk);
+ALTER TABLE vn.deviceProductionUser ADD CONSTRAINT deviceProductionUser_UN UNIQUE KEY (userFk);
+ALTER TABLE vn.deviceProductionUser ADD created TIMESTAMP NULL;
+ALTER TABLE vn.deviceProductionUser MODIFY COLUMN created timestamp DEFAULT current_timestamp() NULL;
\ No newline at end of file
diff --git a/db/versions/.archive/10231-buyScanPAK/01-tablaEktConfig.sql b/db/versions/.archive/10231-buyScanPAK/01-tablaEktConfig.sql
new file mode 100644
index 000000000..90390f3f7
--- /dev/null
+++ b/db/versions/.archive/10231-buyScanPAK/01-tablaEktConfig.sql
@@ -0,0 +1,16 @@
+USE edi;
+
+-- edi.ektConfig definition
+CREATE TABLE `ektConfig` (
+ `usefulAuctionLeftSegmentLength` int(11) NOT NULL DEFAULT 13 COMMENT 'Segmento aprovechable del codigo de barras de Floricode',
+ `standardBarcodeLength` int(11) NOT NULL DEFAULT 20 COMMENT 'Longitud del código de barras standard de Floricode',
+ `floridayBarcodeLength` int(11) NOT NULL DEFAULT 6,
+ `floramondoBarcodeLength` int(11) NOT NULL DEFAULT 13 COMMENT 'Longitud del código de los albaranes múltiples de Floramondo',
+ `defaultKlo` int(11) NOT NULL DEFAULT 99 COMMENT 'Reloj por defecto'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+INSERT INTO ektConfig (usefulAuctionLeftSegmentLength)
+ VALUES (DEFAULT);
+
+DROP TABLE IF EXISTS testData;
+
diff --git a/db/versions/.archive/10233-aquaCymbidium/00-firstScript.sql b/db/versions/.archive/10233-aquaCymbidium/00-firstScript.sql
new file mode 100644
index 000000000..79088b273
--- /dev/null
+++ b/db/versions/.archive/10233-aquaCymbidium/00-firstScript.sql
@@ -0,0 +1,5 @@
+USE `vn`;
+
+ALTER TABLE `vn`.`awb` ADD invoiceInPaletizedFk INT NULL;
+ALTER TABLE `vn`.`awb` MODIFY COLUMN invoiceInPaletizedFk mediumint(8) unsigned NULL;
+ALTER TABLE `vn`.`awb` ADD CONSTRAINT awb_FK_3 FOREIGN KEY (invoiceInPaletizedFk) REFERENCES vn.invoiceIn(id) ON DELETE RESTRICT ON UPDATE CASCADE;
\ No newline at end of file
diff --git a/db/versions/.archive/10235-limeDracena/00-firstScript.sql b/db/versions/.archive/10235-limeDracena/00-firstScript.sql
new file mode 100644
index 000000000..d755117ec
--- /dev/null
+++ b/db/versions/.archive/10235-limeDracena/00-firstScript.sql
@@ -0,0 +1,4 @@
+ALTER TABLE `bs`.`produccion`
+RENAME TO `bs`.`produccion__` ;
+
+DELETE FROM `bs`.`nightTask` WHERE (`id` = '45');
diff --git a/db/versions/.archive/10236-limeArborvitae/00-firstScript.sql b/db/versions/.archive/10236-limeArborvitae/00-firstScript.sql
new file mode 100644
index 000000000..545f0b813
--- /dev/null
+++ b/db/versions/.archive/10236-limeArborvitae/00-firstScript.sql
@@ -0,0 +1,93 @@
+CREATE TABLE vn.ppeLocation (
+ code varchar(10) NULL,
+ description varchar(100) NULL,
+ CONSTRAINT ppeLocation_PK PRIMARY KEY (code)
+)
+ENGINE=InnoDB
+DEFAULT CHARSET=utf8
+COLLATE=utf8_unicode_ci;
+
+INSERT INTO vn.ppeLocation (code, description) VALUES('B01', 'VILASSAR');
+INSERT INTO vn.ppeLocation (code, description) VALUES('H01', 'MERCA HOL');
+INSERT INTO vn.ppeLocation (code, description) VALUES('M01', 'TORREJON DE ARDOZ');
+INSERT INTO vn.ppeLocation (code, description) VALUES('M02', 'MADRID SAN FERNANDO DE HENA');
+INSERT INTO vn.ppeLocation (code, description) VALUES('V01', 'VALENCIA');
+INSERT INTO vn.ppeLocation (code, description) VALUES('V02', 'ALGEMESI P.I. PEPE MIQUEL');
+INSERT INTO vn.ppeLocation (code, description) VALUES('V03', 'Terme d''Alginet');
+INSERT INTO vn.ppeLocation (code, description) VALUES('V04', 'VALENCIA-ALGEMESI (ZONA PULPIS)');
+INSERT INTO vn.ppeLocation (code, description) VALUES('V05', 'MARJAL');
+INSERT INTO vn.ppeLocation (code, description) VALUES('V06', 'Finca Rustica Alzira');
+INSERT INTO vn.ppeLocation (code, description) VALUES('V07', 'NAVE EN SILLA');
+INSERT INTO vn.ppeLocation (code, description) VALUES('V08', 'PICASSENT');
+INSERT INTO vn.ppeLocation (code, description) VALUES('V09', 'Mercavalencia');
+
+UPDATE vn.ppe p
+ JOIN (SELECT p.id,
+ p.location,
+ pl.code
+ FROM vn.ppe p
+ JOIN vn.ppeLocation pl ON pl.description = p.location) sub ON sub.id = p.id
+ SET p.location = sub.code;
+
+UPDATE vn.ppe
+ SET location='V05'
+ WHERE id=530;
+UPDATE vn.ppe
+ SET location='V05'
+ WHERE id=631;
+UPDATE vn.ppe
+ SET location='V03'
+ WHERE id=643;
+
+UPDATE vn.ppeLocation
+ SET description='BARCELONA-VILASSAR'
+ WHERE code='B01';
+UPDATE vn.ppeLocation
+ SET description='HOLANDA-MERCA HOL'
+ WHERE code='H01';
+UPDATE vn.ppeLocation
+ SET description='MADRID-TORREJON DE ARDOZ'
+ WHERE code='M01';
+UPDATE vn.ppeLocation
+ SET description='MADRID-SAN FERNANDO DE HENA'
+ WHERE code='M02';
+UPDATE vn.ppeLocation
+ SET description='VALENCIA-ALGEMESI CL FENOLLAR'
+ WHERE code='V02';
+UPDATE vn.ppeLocation
+ SET description='VALENCIA-CARLET (ZONA ARENAL)'
+ WHERE code='V03';
+UPDATE vn.ppeLocation
+ SET description='VALENCIA-ALGEMESI (ZONA MARJA)'
+ WHERE code='V05';
+UPDATE vn.ppeLocation
+ SET description='VALENCIA-ALZIRA (CUADRA)'
+ WHERE code='V06';
+UPDATE vn.ppeLocation
+ SET description='VALENCIA-NAVE EN SILLA'
+ WHERE code='V07';
+UPDATE vn.ppeLocation
+ SET description='VALENCIA-PICASSENT'
+ WHERE code='V08';
+UPDATE vn.ppeLocation
+ SET description='VALENCIA-MERCAVALENCIA'
+ WHERE code='V09';
+
+UPDATE vn.ppeLocation
+ SET description='HOLANDA-MERCA HOL [BAJA/VENTA]'
+ WHERE code='H01';
+UPDATE vn.ppeLocation
+ SET description='MADRID-SAN FERNANDO DE HENA [BAJA/VENTA]'
+ WHERE code='M02';
+UPDATE vn.ppeLocation
+ SET description='VALENCIA-NAVE EN SILLA [BAJA/VENTA]'
+ WHERE code='V07';
+UPDATE vn.ppeLocation
+ SET description='VALENCIA-PICASSENT [BAJA/VENTA]'
+ WHERE code='V08';
+UPDATE vn.ppeLocation
+ SET description='VALENCIA-MERCAVALENCIA [BAJA/VENTA]'
+ WHERE code='V09';
+
+ALTER TABLE vn.ppe MODIFY COLUMN location varchar(10) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL;
+ALTER TABLE vn.ppe ADD CONSTRAINT ppe_FK FOREIGN KEY (location) REFERENCES vn.ppeLocation(code) ON DELETE RESTRICT ON UPDATE CASCADE;
\ No newline at end of file
diff --git a/db/versions/.archive/10237-greenRoebelini/00-firstScript.sql b/db/versions/.archive/10237-greenRoebelini/00-firstScript.sql
new file mode 100644
index 000000000..e35bdee4d
--- /dev/null
+++ b/db/versions/.archive/10237-greenRoebelini/00-firstScript.sql
@@ -0,0 +1,6 @@
+-- Place your SQL code here
+ALTER TABLE vn.tagAbbreviation ADD tagFk int(11) DEFAULT NULL;
+ALTER TABLE vn.tagAbbreviation ADD CONSTRAINT tagAbbreviation_FK FOREIGN KEY (tagFk) REFERENCES vn.tag(id);
+UPDATE vn.tagAbbreviation
+ SET tagFk=56
+ WHERE value='Rosa';
diff --git a/db/versions/.archive/10238-azureMastic/00-worker_mobileExtension.sql b/db/versions/.archive/10238-azureMastic/00-worker_mobileExtension.sql
new file mode 100644
index 000000000..54f94e4ae
--- /dev/null
+++ b/db/versions/.archive/10238-azureMastic/00-worker_mobileExtension.sql
@@ -0,0 +1,6 @@
+ALTER TABLE vn.worker ADD mobileExtension INT(4) NULL;
+ALTER TABLE vn.worker CHANGE mobileExtension mobileExtension int(4) DEFAULT NULL NULL AFTER phone;
+ALTER TABLE vn.worker MODIFY COLUMN phone varchar(9) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL;
+
+UPDATE vn.worker
+ SET phone = NULL;
diff --git a/db/versions/.archive/10239-redAsparagus/00-firstScript.sql b/db/versions/.archive/10239-redAsparagus/00-firstScript.sql
new file mode 100644
index 000000000..45a7d1f9c
--- /dev/null
+++ b/db/versions/.archive/10239-redAsparagus/00-firstScript.sql
@@ -0,0 +1,23 @@
+
+ALTER TABLE edi.imapConfig
+ ADD environment varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL AFTER id,
+ ADD CONSTRAINT imapConfig_environment UNIQUE KEY (environment);
+
+UPDATE edi.imapConfig
+ SET environment='production'
+ WHERE id=1;
+
+UPDATE edi.param SET code='item'
+ WHERE id=2;
+UPDATE edi.param SET code='k3'
+ WHERE id=21;
+UPDATE edi.param SET code='k4'
+ WHERE id=22;
+UPDATE edi.param SET code='deliveryNumber'
+ WHERE id=25;
+
+INSERT INTO edi.param (code,name,`position`,`type`,`required`)
+ VALUES ('cps','CPS',1,'STRING', FALSE);
+
+ALTER TABLE edi.ekt
+ ADD cps varchar(7) NULL COMMENT 'Código alfanumérico de Floriday';
diff --git a/db/versions/.archive/10239-redAsparagus/00-firstScript.undo.sql b/db/versions/.archive/10239-redAsparagus/00-firstScript.undo.sql
new file mode 100644
index 000000000..0a6f89960
--- /dev/null
+++ b/db/versions/.archive/10239-redAsparagus/00-firstScript.undo.sql
@@ -0,0 +1,16 @@
+
+DELETE FROM edi.imapConfig WHERE environment = 'test';
+ALTER TABLE edi.imapConfig DROP COLUMN environment;
+
+UPDATE edi.param SET code='art'
+ WHERE id=2;
+UPDATE edi.param SET code='p1'
+ WHERE id=21;
+UPDATE edi.param SET code='p2'
+ WHERE id=22;
+UPDATE edi.param SET code='aaj'
+ WHERE id=25;
+
+DELETE FROM edi.param WHERE code = 'cps';
+
+ALTER TABLE edi.ekt DROP COLUMN cps;
diff --git a/db/versions/.archive/10241-whiteTulip/00-firstScript.sql b/db/versions/.archive/10241-whiteTulip/00-firstScript.sql
new file mode 100644
index 000000000..19082f65c
--- /dev/null
+++ b/db/versions/.archive/10241-whiteTulip/00-firstScript.sql
@@ -0,0 +1,161 @@
+USE vn;
+
+ALTER TABLE vn.worker
+ ADD COLUMN `fi` varchar(15) COLLATE utf8_unicode_ci DEFAULT NULL,
+ ADD COLUMN `birth` date DEFAULT NULL,
+ ADD COLUMN `isDisable` tinyint(1) NOT NULL DEFAULT '0',
+ ADD COLUMN `isFreelance` tinyint(1) NOT NULL DEFAULT '0',
+ ADD COLUMN `isSsDiscounted` tinyint(1) NOT NULL DEFAULT '0',
+ ADD COLUMN `sex` enum('M','F') COLLATE utf8_unicode_ci NOT NULL DEFAULT 'F' COMMENT 'M Masculino F Femenino';
+
+UPDATE vn.worker w
+ JOIN vn.person p ON p.workerFk = w.id
+ SET w.fi = p.fi,
+ w.birth = p.birth,
+ w.isDisable = p.isDisable,
+ w.isFreelance = p.isFreelance,
+ w.isSsDiscounted = p.isSsDiscounted,
+ w.sex = p.sex;
+
+ALTER TABLE `vn`.`person`
+ RENAME TO `vn`.`person__` ;
+
+ALTER TABLE `vn`.`worker`
+ DROP FOREIGN KEY `Clientes`;
+
+ALTER TABLE `vn`.`worker`
+ DROP COLUMN `clientFk__`,
+ DROP COLUMN `birthed__`,
+ DROP COLUMN `address__`,
+ DROP COLUMN `fi__`,
+ DROP COLUMN `notes__`,
+ DROP COLUMN `ended__`,
+ DROP COLUMN `started__`,
+ DROP COLUMN `laborCategory__`,
+ DROP COLUMN `typeBussines__`,
+ DROP COLUMN `user__`,
+ DROP COLUMN `extension__`,
+ DROP COLUMN `email__`,
+ DROP COLUMN `password__`,
+ DROP INDEX `Id_Cliente_Interno` ,
+ DROP INDEX `user` ;
+
+
+ALTER TABLE `postgresql`.`bank_account`
+ DROP FOREIGN KEY `bank_account_client_id`;
+
+ALTER TABLE `postgresql`.`profile`
+ DROP FOREIGN KEY `profile_FK`;
+
+ALTER TABLE `postgresql`.`bank_account`
+ CHANGE COLUMN `client_id` `client_id__` INT(11) NULL DEFAULT NULL ,
+ DROP INDEX `fki_bank_profile`;
+
+ALTER TABLE `postgresql`.`profile`
+ ADD COLUMN `workerFk` INT(10) UNSIGNED NULL DEFAULT NULL AFTER `profile_type_id`;
+
+UPDATE postgresql.profile pr
+ JOIN vn.person__ p ON p.id = pr.person_id
+ SET pr.workerFk = p.workerFk;
+
+ALTER TABLE `postgresql`.`profile`
+ ADD INDEX `profile_workerFk_idx` (`workerFk` ASC);
+
+ALTER TABLE `postgresql`.`profile`
+ CHANGE COLUMN `person_id` `person_id__` INT(11) NULL DEFAULT NULL ;
+
+ALTER TABLE `postgresql`.`profile`
+ ADD CONSTRAINT `profile_workerFk`
+ FOREIGN KEY (`workerFk`)
+ REFERENCES `vn`.`worker` (`id`)
+ ON DELETE RESTRICT
+ ON UPDATE CASCADE;
+
+-- Hay que revisar 2 contratos con provider null
+ALTER TABLE `postgresql`.`business`
+ ADD COLUMN `companyCodeFk` CHAR(3) COLLATE utf8mb3_unicode_ci DEFAULT NULL AFTER `provider_id`;
+
+UPDATE postgresql.business b
+ SET b.companyCodeFk ='VNH'
+ WHERE b.provider_id = 187;
+
+UPDATE postgresql.business b
+ SET b.companyCodeFk ='FTH'
+ WHERE b.provider_id = 194;
+
+UPDATE postgresql.business b
+ SET b.companyCodeFk ='EFL'
+ WHERE b.provider_id = 201;
+
+UPDATE postgresql.business b
+ SET b.companyCodeFk ='ORN'
+ WHERE b.provider_id = 305;
+
+UPDATE postgresql.business b
+ SET b.companyCodeFk ='ORN'
+ WHERE b.provider_id = 305;
+
+ALTER TABLE `postgresql`.`business`
+ DROP FOREIGN KEY `bussiness_provider`;
+
+ALTER TABLE `postgresql`.`business`
+ CHANGE COLUMN `provider_id` `provider_id__` INT(11) NULL DEFAULT NULL ,
+ DROP INDEX `bussiness_provider` ;
+
+
+ALTER TABLE `vn2008`.`payroll_employee`
+ ADD COLUMN `workerFk` INT(11) UNSIGNED NULL AFTER `ContratoTemporal`;
+
+ALTER TABLE `vn2008`.`payroll_employee`
+ ADD INDEX `payroll_employee_workerFk_idx` (`workerFk` ASC);
+
+UPDATE vn2008.payroll_employee pe
+ JOIN vn.person__ p ON p.id = pe.person_id
+ SET pe.workerFk = p.workerFk;
+
+ALTER TABLE `vn2008`.`payroll_employee`
+ ADD CONSTRAINT `payroll_employee_workerFk`
+ FOREIGN KEY (`workerFk`)
+ REFERENCES `vn`.`worker` (`id`)
+ ON DELETE RESTRICT
+ ON UPDATE CASCADE;
+
+ALTER TABLE `vn2008`.`payroll_employee`
+ CHANGE COLUMN `Person_id` `Person_id__` INT(11) NOT NULL ;
+
+ALTER TABLE `postgresql`.`income_employee`
+ ADD COLUMN `workerFk` INT(11) UNSIGNED NULL AFTER `odbc_date`,
+ ADD INDEX `income_employee_workerFk_idx` (`workerFk` ASC) ;
+
+UPDATE postgresql.income_employee ie
+ JOIN vn.person__ p ON p.id = ie.person_id
+ SET ie.workerFk = p.workerFk;
+
+DELETE FROM postgresql.income_employee
+ WHERE workerFk IS NULL; -- 1 registro de 2005 a 0
+
+ALTER TABLE `postgresql`.`income_employee`
+ CHANGE COLUMN `workerFk` `workerFk` INT(11) UNSIGNED NOT NULL ;
+
+ALTER TABLE `postgresql`.`income_employee`
+ ADD CONSTRAINT `income_employee_workerFk`
+ FOREIGN KEY (`workerFk`)
+ REFERENCES `vn`.`worker` (`id`)
+ ON UPDATE CASCADE;
+
+ALTER TABLE `postgresql`.`income_employee`
+ DROP FOREIGN KEY `income_employee_FK`;
+
+ALTER TABLE `postgresql`.`income_employee`
+ CHANGE COLUMN `person_id` `person_id__` INT(11) NULL DEFAULT NULL ,
+ DROP INDEX `fperson_id` ;
+
+ALTER TABLE `vn`.`company`
+ ADD UNIQUE INDEX `companyCode_UNIQUE` (`code` ASC);
+
+ALTER TABLE `postgresql`.`business`
+ ADD CONSTRAINT `business_companyCodeFk`
+ FOREIGN KEY (companyCodeFk)
+ REFERENCES `vn`.`company` (`code`)
+ ON DELETE RESTRICT
+ ON UPDATE CASCADE;
\ No newline at end of file
diff --git a/db/versions/.archive/10242-grayChico/00-firstScript.sql b/db/versions/.archive/10242-grayChico/00-firstScript.sql
new file mode 100644
index 000000000..ff9d31787
--- /dev/null
+++ b/db/versions/.archive/10242-grayChico/00-firstScript.sql
@@ -0,0 +1,2 @@
+-- Place your SQL code here
+ALTER TABLE edi.ekt ADD dp INT NULL COMMENT 'NAD+DP';
diff --git a/db/versions/.archive/10243-wheatErica/00-firstScript.sql b/db/versions/.archive/10243-wheatErica/00-firstScript.sql
new file mode 100644
index 000000000..a1d5442d9
--- /dev/null
+++ b/db/versions/.archive/10243-wheatErica/00-firstScript.sql
@@ -0,0 +1,7 @@
+-- Cambios que me ha pedido Sergio que añada
+INSERT INTO vn.silexACL
+(id, module, `method`, `role`)
+VALUES(139, 'delivery', 'get_expeditionsSummary', 'employee');
+INSERT INTO vn.silexACL
+(id, module, `method`, `role`)
+VALUES(140, 'almacennew', 'cmrExpeditionPallet_add', 'employee');
\ No newline at end of file
diff --git a/db/versions/.archive/10245-yellowRaphis/00-firstScript.sql b/db/versions/.archive/10245-yellowRaphis/00-firstScript.sql
new file mode 100644
index 000000000..8358d8f86
--- /dev/null
+++ b/db/versions/.archive/10245-yellowRaphis/00-firstScript.sql
@@ -0,0 +1,7 @@
+ALTER TABLE `vn`.`travel` ADD agencyModeFk INT DEFAULT NULL NULL;
+ALTER TABLE `vn`.`travel` ADD CONSTRAINT travel_FK FOREIGN KEY (agencyModeFk) REFERENCES `vn`.`agencyMode`(id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE `vn`.`travel` ADD CONSTRAINT shipment_1 UNIQUE KEY (shipped,landed,warehouseInFk,warehouseOutFk,agencyFk,agencyModeFk,`ref`);
+ALTER TABLE `vn`.`travel` DROP KEY shipment_2;
+
+UPDATE `vn`.`travel`
+ SET agencyModeFk = agencyFk;
\ No newline at end of file
diff --git a/db/versions/.archive/10247-whiteAsparagus/00-firstScript.sql b/db/versions/.archive/10247-whiteAsparagus/00-firstScript.sql
new file mode 100644
index 000000000..d8153074b
--- /dev/null
+++ b/db/versions/.archive/10247-whiteAsparagus/00-firstScript.sql
@@ -0,0 +1,13 @@
+-- Place your SQL code here
+USE vn;
+DROP TABLE IF EXISTS vn.accountingConfig;
+CREATE TABLE vn.accountingConfig (
+ id INT primary key,
+ minDate DATE NOT NULL,
+ maxDate DATE NOT NULL
+);
+
+ALTER TABLE `vn`.`accountingConfig`
+CHANGE COLUMN `id` `id` INT(11) NOT NULL AUTO_INCREMENT ;
+
+INSERT INTO `vn`.`accountingConfig` (`minDate`, `maxDate`) VALUES ('2021-12-01', '2023-01-01');
diff --git a/db/versions/.archive/10248-azureCordyline/00-firstScript.sql b/db/versions/.archive/10248-azureCordyline/00-firstScript.sql
new file mode 100644
index 000000000..f7e15c089
--- /dev/null
+++ b/db/versions/.archive/10248-azureCordyline/00-firstScript.sql
@@ -0,0 +1,30 @@
+USE `vn`;
+DROP VIEW IF EXISTS vn.comparativeFilter;
+
+CREATE TABLE IF NOT EXISTS vn.`comparativeFilter` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `userFk` int(10) unsigned NOT NULL,
+ `name` varchar(100) COLLATE utf8mb3_unicode_ci NOT NULL,
+ `buyer` int(11) DEFAULT NULL,
+ `itemFilter` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+ `isFloramondo` tinyint(4) DEFAULT NULL,
+ `warehouseFk` smallint(6) unsigned DEFAULT NULL,
+ `tintaFk` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+ `hasType` tinyint(1) DEFAULT 0,
+ `producerFilter` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+ `supplierFk` int(11) DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `comparativeFilter_FK` (`userFk`),
+ KEY `comparativeFilter_FK_1` (`warehouseFk`),
+ KEY `comparativeFilter_FK_2` (`supplierFk`),
+ CONSTRAINT `comparativeFilter_FK` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`),
+ CONSTRAINT `comparativeFilter_FK_1` FOREIGN KEY (`warehouseFk`) REFERENCES `warehouse` (`id`),
+ CONSTRAINT `comparativeFilter_FK_2` FOREIGN KEY (`supplierFk`) REFERENCES `supplier` (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=15 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS vn.`comparativeFilterType` (
+ `comparativeFilterFk` int(11) NOT NULL,
+ `itemTypeFk` int(11) NOT NULL,
+ PRIMARY KEY (`comparativeFilterFk`,`itemTypeFk`),
+ CONSTRAINT `comparativeFilterType_FK` FOREIGN KEY (`comparativeFilterFk`) REFERENCES `comparativeFilter` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
diff --git a/db/versions/.archive/10250-wheatBamboo/00-firstScript.sql b/db/versions/.archive/10250-wheatBamboo/00-firstScript.sql
new file mode 100644
index 000000000..6a83cb5d1
--- /dev/null
+++ b/db/versions/.archive/10250-wheatBamboo/00-firstScript.sql
@@ -0,0 +1,6 @@
+-- Place your SQL code here
+/*
+INSERT INTO vn.silexACL
+(id, module, `method`, `role`)
+VALUES(141, 'almacennew', 'item_saveStems', 'employee');
+*/
diff --git a/db/versions/.archive/10253-whiteAnthurium/00-firstScript.sql b/db/versions/.archive/10253-whiteAnthurium/00-firstScript.sql
new file mode 100644
index 000000000..5a49ad4e0
--- /dev/null
+++ b/db/versions/.archive/10253-whiteAnthurium/00-firstScript.sql
@@ -0,0 +1,2 @@
+-- Place your SQL code here
+ALTER TABLE edi.ekt ADD sender INT NULL COMMENT 'NAD+SE';
diff --git a/db/versions/.archive/10254-whiteOak/00-firstScript.sql b/db/versions/.archive/10254-whiteOak/00-firstScript.sql
new file mode 100644
index 000000000..9d277778d
--- /dev/null
+++ b/db/versions/.archive/10254-whiteOak/00-firstScript.sql
@@ -0,0 +1,4 @@
+-- Place your SQL code here
+ALTER TABLE vn.ektEntryAssign ADD COLUMN auction INT NULL AFTER pro;
+
+ALTER TABLE vn.entry ADD COLUMN auction INT NULL AFTER pro;
diff --git a/db/versions/.archive/10256-orangeFern/00-firstScript.sql b/db/versions/.archive/10256-orangeFern/00-firstScript.sql
new file mode 100644
index 000000000..84b2ae4b3
--- /dev/null
+++ b/db/versions/.archive/10256-orangeFern/00-firstScript.sql
@@ -0,0 +1,16 @@
+-- Place your SQL code here
+ALTER TABLE `vn`.`ticketRecalc`
+DROP FOREIGN KEY `ticketRecalc_ibfk_1`;
+
+ALTER TABLE `vn`.`ticketRecalc`
+ADD COLUMN `id` INT(11) NOT NULL AUTO_INCREMENT FIRST,
+DROP PRIMARY KEY,
+ADD PRIMARY KEY (`id`);
+
+
+ALTER TABLE `vn`.`ticketRecalc`
+ADD CONSTRAINT `ticketRecalc_ibfk_1`
+ FOREIGN KEY (`ticketFk`)
+ REFERENCES `vn`.`ticket` (`id`)
+ ON DELETE CASCADE
+ ON UPDATE CASCADE;
\ No newline at end of file
diff --git a/db/versions/.archive/10258-azureOak/00-firstScript.sql b/db/versions/.archive/10258-azureOak/00-firstScript.sql
new file mode 100644
index 000000000..cc54269fb
--- /dev/null
+++ b/db/versions/.archive/10258-azureOak/00-firstScript.sql
@@ -0,0 +1,21 @@
+-- Place your SQL code here
+USE vn;
+
+ALTER TABLE vn.vehicleEvent DROP FOREIGN KEY vehicleEvent_FK;
+ALTER TABLE vn.vehicleState MODIFY COLUMN id int(11) NOT NULL;
+ALTER TABLE vn.vehicleState DROP PRIMARY KEY;
+ALTER TABLE vn.vehicleState ADD CONSTRAINT vehicleState_PK PRIMARY KEY (id);
+ALTER TABLE vn.vehicleState MODIFY COLUMN id int(11) auto_increment NOT NULL;
+ALTER TABLE vn.vehicleState ADD hasToNotify INT DEFAULT NULL NULL;
+ALTER TABLE vn.vehicleEvent ADD CONSTRAINT vehicleEvent_FK FOREIGN KEY (vehicleStateFk) REFERENCES vn.vehicleState(id);
+
+ALTER TABLE vn.vehicleEvent ADD notified DATETIME NULL;
+
+CREATE OR REPLACE TABLE vn.vehicleConfig (
+ eventEarlyDays int NULL
+)
+ENGINE=InnoDB
+DEFAULT CHARSET=utf8mb3
+COLLATE=utf8mb3_unicode_ci;
+
+ALTER TABLE vn.vehicleConfig MODIFY COLUMN eventEarlyDays int(11) DEFAULT 15 COMMENT 'Previous days on which the expiration of an event must be notified';
diff --git a/db/versions/.archive/10259-limeMonstera/00-firstScript.sql b/db/versions/.archive/10259-limeMonstera/00-firstScript.sql
new file mode 100644
index 000000000..420b382d6
--- /dev/null
+++ b/db/versions/.archive/10259-limeMonstera/00-firstScript.sql
@@ -0,0 +1,15 @@
+-- Place your SQL code here
+ALTER TABLE `hedera`.`orderRecalc`
+DROP FOREIGN KEY `orderRecalc_ibfk_1`;
+
+ALTER TABLE `hedera`.`orderRecalc`
+ADD COLUMN `id` INT(11) NOT NULL AUTO_INCREMENT FIRST,
+DROP PRIMARY KEY,
+ADD PRIMARY KEY (`id`);
+
+ALTER TABLE `hedera`.`orderRecalc`
+ADD CONSTRAINT `orderRecalc_ibfk_1`
+ FOREIGN KEY (`orderFk`)
+ REFERENCES `hedera`.`order` (`id`)
+ ON DELETE CASCADE
+ ON UPDATE CASCADE;
\ No newline at end of file
diff --git a/db/versions/.archive/10261-maroonArborvitae/00-firstScript.sql b/db/versions/.archive/10261-maroonArborvitae/00-firstScript.sql
new file mode 100644
index 000000000..8313415b9
--- /dev/null
+++ b/db/versions/.archive/10261-maroonArborvitae/00-firstScript.sql
@@ -0,0 +1,10 @@
+CREATE TABLE srt.photocell (
+ bufferFk INT NOT NULL,
+ `position` INT NOT NULL COMMENT 'Posición relativa al celluveyor de dentro a fuera, siendo 1 la más cercana a este',
+ isActive BOOL NULL,
+ CONSTRAINT photocell_PK PRIMARY KEY (bufferFk,`position`),
+ CONSTRAINT photocell_FK FOREIGN KEY (bufferFk) REFERENCES srt.buffer(id) ON DELETE CASCADE ON UPDATE CASCADE
+)
+ENGINE=InnoDB
+DEFAULT CHARSET=utf8mb3
+COLLATE=utf8mb3_unicode_ci;
\ No newline at end of file
diff --git a/db/versions/.archive/10262-salmonTulip/00-createTablepackagingWithFreight.sql b/db/versions/.archive/10262-salmonTulip/00-createTablepackagingWithFreight.sql
new file mode 100644
index 000000000..48d620be6
--- /dev/null
+++ b/db/versions/.archive/10262-salmonTulip/00-createTablepackagingWithFreight.sql
@@ -0,0 +1,9 @@
+DROP TABLE IF EXISTS vn.packagingWithFreight;
+
+CREATE TABLE vn.`packagingWithFreight` (
+ `packagingFk` varchar(10) COLLATE utf8mb3_unicode_ci NOT NULL,
+ `priority` int(11) NOT NULL,
+ PRIMARY KEY (`packagingFk`),
+ UNIQUE KEY `packagingWithFreight_UN` (`priority`),
+ CONSTRAINT `packagingWithFreight_FK` FOREIGN KEY (`packagingFk`) REFERENCES `packaging` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='Embalajes con porte para encajado';
\ No newline at end of file
diff --git a/db/versions/.archive/10262-salmonTulip/01-alterTablePackagingConfig.sql b/db/versions/.archive/10262-salmonTulip/01-alterTablePackagingConfig.sql
new file mode 100644
index 000000000..2a427bac0
--- /dev/null
+++ b/db/versions/.archive/10262-salmonTulip/01-alterTablePackagingConfig.sql
@@ -0,0 +1,3 @@
+ALTER TABLE vn.packagingConfig ADD palletPackaging varchar(10) default 'pallet USA' NULL;
+ALTER TABLE vn.packagingConfig ADD carryPackaging varchar(10) DEFAULT 'cc' NULL;
+ALTER TABLE vn.packagingConfig ADD freightItemPackaging INT(11) DEFAULT 71 NULL;
diff --git a/db/versions/.archive/10262-salmonTulip/02-insertsInicials.sql b/db/versions/.archive/10262-salmonTulip/02-insertsInicials.sql
new file mode 100644
index 000000000..dcb6449fe
--- /dev/null
+++ b/db/versions/.archive/10262-salmonTulip/02-insertsInicials.sql
@@ -0,0 +1,21 @@
+INSERT INTO vn.packagingWithFreight (packagingFk, priority) VALUES('94', 1);
+INSERT INTO vn.packagingWithFreight (packagingFk, priority) VALUES('94m', 2);
+INSERT INTO vn.packagingWithFreight (packagingFk, priority) VALUES('94p', 3);
+INSERT INTO vn.packagingWithFreight (packagingFk, priority) VALUES('cc', 4);
+INSERT INTO vn.packagingWithFreight (packagingFk, priority) VALUES('pallet usa', 5);
+INSERT INTO vn.packagingWithFreight (packagingFk, priority) VALUES('cactus200', 6);
+INSERT INTO vn.packagingWithFreight (packagingFk, priority) VALUES('kalan400', 7);
+INSERT INTO vn.packagingWithFreight (packagingFk, priority) VALUES('crisantemo', 8);
+INSERT INTO vn.packagingWithFreight (packagingFk, priority) VALUES('madre430', 9);
+INSERT INTO vn.packagingWithFreight (packagingFk, priority) VALUES('guzma650', 10);
+INSERT INTO vn.packagingWithFreight (packagingFk, priority) VALUES('madre700', 11);
+INSERT INTO vn.packagingWithFreight (packagingFk, priority) VALUES('madre800', 12);
+INSERT INTO vn.packagingWithFreight (packagingFk, priority) VALUES('madre900', 13);
+INSERT INTO vn.packagingWithFreight (packagingFk, priority) VALUES('guzma1200', 14);
+INSERT INTO vn.packagingWithFreight (packagingFk, priority) VALUES('guzma1400', 15);
+INSERT INTO vn.packagingWithFreight (packagingFk, priority) VALUES('dm120', 16);
+INSERT INTO vn.packagingWithFreight (packagingFk, priority) VALUES('HC', 17);
+INSERT INTO vn.packagingWithFreight (packagingFk, priority) VALUES('dm040', 18);
+INSERT INTO vn.packagingWithFreight (packagingFk, priority) VALUES('qb033', 19);
+INSERT INTO vn.packagingWithFreight (packagingFk, priority) VALUES('hb076', 20);
+INSERT INTO vn.packagingWithFreight (packagingFk, priority) VALUES('hb104', 21);
diff --git a/db/versions/.archive/10262-salmonTulip/03-createTablepackingWithoutFreight.sql b/db/versions/.archive/10262-salmonTulip/03-createTablepackingWithoutFreight.sql
new file mode 100644
index 000000000..b029ba652
--- /dev/null
+++ b/db/versions/.archive/10262-salmonTulip/03-createTablepackingWithoutFreight.sql
@@ -0,0 +1,9 @@
+DROP TABLE IF EXISTS vn.packagingWithoutFreight;
+
+CREATE TABLE vn.`packagingWithoutFreight` (
+ `packagingFk` varchar(10) COLLATE utf8mb3_unicode_ci NOT NULL,
+ `priority` int(11) NOT NULL,
+ PRIMARY KEY (`packagingFk`),
+ UNIQUE KEY `packagingWithoutFreight_UN` (`priority`),
+ CONSTRAINT `packagingWithoutFreight_FK` FOREIGN KEY (`packagingFk`) REFERENCES `packaging` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='Embalajes sin porte para encajar';
diff --git a/db/versions/.archive/10263-tealPaniculata/00-firstScript.sql b/db/versions/.archive/10263-tealPaniculata/00-firstScript.sql
new file mode 100644
index 000000000..371c2c358
--- /dev/null
+++ b/db/versions/.archive/10263-tealPaniculata/00-firstScript.sql
@@ -0,0 +1 @@
+-- Place your SQL code here
diff --git a/db/versions/.archive/10265-greenAspidistra/00-firstScript.sql b/db/versions/.archive/10265-greenAspidistra/00-firstScript.sql
new file mode 100644
index 000000000..aa0c97049
--- /dev/null
+++ b/db/versions/.archive/10265-greenAspidistra/00-firstScript.sql
@@ -0,0 +1,9 @@
+-- Place your SQL code here
+ALTER TABLE `vn`.`printServerQueue`
+RENAME TO `vn`.`printServerQueue__` ;
+
+ALTER TABLE `vn`.`printServerQueue2`
+RENAME TO `vn`.`printServerQueue2__` ;
+
+ALTER TABLE `vn2008`.`printServerQueue2`
+RENAME TO `vn2008`.`printServerQueue2__` ;
diff --git a/db/versions/.archive/10267-blueDracena/00-firstScript.sql b/db/versions/.archive/10267-blueDracena/00-firstScript.sql
new file mode 100644
index 000000000..3d95af886
--- /dev/null
+++ b/db/versions/.archive/10267-blueDracena/00-firstScript.sql
@@ -0,0 +1,4 @@
+-- Place your SQL code here
+ALTER TABLE vn.worker ADD businessFk int(11) DEFAULT NULL NULL;
+ALTER TABLE vn.worker ADD CONSTRAINT worker_business FOREIGN KEY (businessFk) REFERENCES postgresql.business(business_id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.worker ADD CONSTRAINT worker_business UNIQUE KEY (businessFk);
\ No newline at end of file
diff --git a/db/versions/.archive/10267-blueDracena/01-fixMerge.sql b/db/versions/.archive/10267-blueDracena/01-fixMerge.sql
new file mode 100644
index 000000000..88d7c68ed
--- /dev/null
+++ b/db/versions/.archive/10267-blueDracena/01-fixMerge.sql
@@ -0,0 +1,12 @@
+use vn;
+DROP TEMPORARY TABLE IF EXISTS tWorkerLabour ;
+CREATE TEMPORARY TABLE tWorkerLabour
+SELECT l.workerFk, l.businessFk
+FROM vn.workerLabour l
+WHERE util.CURDATE() BETWEEN l.started AND IFNULL(l.ended, util.CURDATE());
+
+UPDATE vn.worker w
+ JOIN tWorkerLabour l ON l.workerFk = w.id
+ SET w.businessFk = l.businessFk;
+
+DROP TEMPORARY TABLE tWorkerLabour;
\ No newline at end of file
diff --git a/db/versions/.archive/10275-maroonCataractarum/00-improvedGeneralLog.sql b/db/versions/.archive/10275-maroonCataractarum/00-improvedGeneralLog.sql
new file mode 100644
index 000000000..4f64f9d59
--- /dev/null
+++ b/db/versions/.archive/10275-maroonCataractarum/00-improvedGeneralLog.sql
@@ -0,0 +1,15 @@
+CREATE TABLE IF NOT EXISTS `vn`.`improvedGeneralLog` (
+ user char(128) DEFAULT NULL,
+ db char(64) DEFAULT NULL,
+ tables char(64) DEFAULT NULL,
+ type set('Select','Insert','Update','Delete'),
+ PRIMARY KEY(user, db, tables)
+) ENGINE=InnoDB;
+
+CREATE TABLE IF NOT EXISTS `vn`.`improvedGeneralLogProcedures` (
+ user char(128) DEFAULT NULL,
+ db varchar(250) DEFAULT NULL,
+ routine char(64) DEFAULT NULL,
+ type enum('FUNCTION','PROCEDURE') NOT NULL,
+ PRIMARY KEY(user, db, routine, type)
+) ENGINE=InnoDB;
diff --git a/db/versions/.archive/10277-azurePalmetto/00-firstScript.sql b/db/versions/.archive/10277-azurePalmetto/00-firstScript.sql
new file mode 100644
index 000000000..5823e2388
--- /dev/null
+++ b/db/versions/.archive/10277-azurePalmetto/00-firstScript.sql
@@ -0,0 +1,12 @@
+-- Place your SQL code here
+USE vn;
+CREATE OR REPLACE TABLE `operator` (
+ `workerFk` int(10) unsigned NOT NULL,
+ `numberOfWagons` int(11) DEFAULT 1,
+ PRIMARY KEY (`workerFk`),
+ KEY `operator_FK` (`workerFk`),
+ CONSTRAINT `operator_FK` FOREIGN KEY (`workerFk`) REFERENCES `worker` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+INSERT INTO vn.operator (workerFk, numberOfWagons)
+SELECT id, 2 FROM vn.worker WHERE sectorFk is not null;
diff --git a/db/versions/.archive/10278-silverRose/00-firstScript.sql b/db/versions/.archive/10278-silverRose/00-firstScript.sql
new file mode 100644
index 000000000..ba2ab4509
--- /dev/null
+++ b/db/versions/.archive/10278-silverRose/00-firstScript.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.mdbVersion ADD CONSTRAINT mdbVersion_PK PRIMARY KEY (app,branchFk);
\ No newline at end of file
diff --git a/db/versions/.archive/10279-purpleAsparagus/00-firstScript.sql b/db/versions/.archive/10279-purpleAsparagus/00-firstScript.sql
new file mode 100644
index 000000000..4dae32ddd
--- /dev/null
+++ b/db/versions/.archive/10279-purpleAsparagus/00-firstScript.sql
@@ -0,0 +1,7 @@
+INSERT INTO `vn`.`businessType` (`code`,`description`)
+ VALUES
+ ('individual','Particular'),
+ ('otherSector', 'Profesional de otro sector');
+
+INSERT INTO `vn`.`component` (`name`,`typeFk`,`classRate`,`isRenewable`,`code`,`isRequired`, `tax`)
+ VALUES ('recargo a particular',2,NULL,0,'individual',0, 0.25);
\ No newline at end of file
diff --git a/db/versions/.archive/10281-navyPalmetto/00-firstScript.sql b/db/versions/.archive/10281-navyPalmetto/00-firstScript.sql
new file mode 100644
index 000000000..6438c46ab
--- /dev/null
+++ b/db/versions/.archive/10281-navyPalmetto/00-firstScript.sql
@@ -0,0 +1,2 @@
+-- Place your SQL code here
+ALTER TABLE vn.supplier MODIFY COLUMN isActive tinyint(4) DEFAULT 1 NOT NULL;
\ No newline at end of file
diff --git a/db/versions/.archive/10282-brownAsparagus/00-firstScript.sql b/db/versions/.archive/10282-brownAsparagus/00-firstScript.sql
new file mode 100644
index 000000000..54b82cd89
--- /dev/null
+++ b/db/versions/.archive/10282-brownAsparagus/00-firstScript.sql
@@ -0,0 +1,10 @@
+TRUNCATE vn.itemCleanCount;
+ALTER TABLE vn.itemCleanConfig DROP COLUMN step;
+RENAME TABLE vn.itemCleanCount TO vn.itemCleanLog;
+ALTER TABLE vn.itemCleanConfig MODIFY COLUMN isStop tinyint(1) DEFAULT NULL NULL COMMENT 'Si está a TRUE para el proceso a tiempo real';
+INSERT INTO bs.nightTask (`order`,`schema`,`procedure`)
+ VALUES (1009,'vn','item_clean');
+UPDATE vn.itemCleanConfig
+ SET quantity=50000
+ WHERE id=1;
+
\ No newline at end of file
diff --git a/db/versions/.archive/10283-rm4375pak/00-alterTable.sql b/db/versions/.archive/10283-rm4375pak/00-alterTable.sql
new file mode 100644
index 000000000..7db2bacea
--- /dev/null
+++ b/db/versions/.archive/10283-rm4375pak/00-alterTable.sql
@@ -0,0 +1,3 @@
+-- Place your SQL code here
+ALTER TABLE srt.config ADD IF NOT EXISTS isAllowedUnloading bool DEFAULT 1 NOT NULL
+COMMENT 'Permite que se pueda cambiar el mode de los buffers a UNLOADING';
diff --git a/db/versions/.archive/10284-aquaErica/00-firstScript.sql b/db/versions/.archive/10284-aquaErica/00-firstScript.sql
new file mode 100644
index 000000000..8a287eead
--- /dev/null
+++ b/db/versions/.archive/10284-aquaErica/00-firstScript.sql
@@ -0,0 +1,11 @@
+-- Dejo el update para que quede relacionado con el cambio
+USE vn;
+
+UPDATE vn.XDiario x
+ JOIN (SELECT DISTINCT Asiento
+ FROM sage.movConta
+ WHERE enlazadoSage
+ AND CodigoEmpresa = 2) sub ON sub.Asiento = x.ASIEN
+ SET x.enlazadoSage = FALSE
+ WHERE x.enlazadoSage = TRUE
+ AND x.updated >= util.CURDATE();
diff --git a/db/versions/.archive/10285-aquaHydrangea/00-firstScript.sql b/db/versions/.archive/10285-aquaHydrangea/00-firstScript.sql
new file mode 100644
index 000000000..4c4a3454a
--- /dev/null
+++ b/db/versions/.archive/10285-aquaHydrangea/00-firstScript.sql
@@ -0,0 +1,2 @@
+-- Place your SQL code here
+DROP FUNCTION IF EXISTS `vn`.`company_getCode`;
\ No newline at end of file
diff --git a/db/versions/.archive/10287-turquoiseRose/00-firstScript.sql b/db/versions/.archive/10287-turquoiseRose/00-firstScript.sql
new file mode 100644
index 000000000..ea0142836
--- /dev/null
+++ b/db/versions/.archive/10287-turquoiseRose/00-firstScript.sql
@@ -0,0 +1,4 @@
+-- Place your SQL code here
+ALTER TABLE edi.ekt MODIFY COLUMN ptj BIGINT UNSIGNED DEFAULT NULL NULL COMMENT 'NAD+BY';
+ALTER TABLE edi.ekt MODIFY COLUMN dp BIGINT UNSIGNED DEFAULT NULL NULL COMMENT 'NAD+DP';
+ALTER TABLE edi.ekt MODIFY COLUMN sender BIGINT UNSIGNED DEFAULT NULL NULL COMMENT 'NAD+SE';
diff --git a/db/versions/.archive/10288-chocolateSalal/00-firstScript.sql b/db/versions/.archive/10288-chocolateSalal/00-firstScript.sql
new file mode 100644
index 000000000..ff2e2fb11
--- /dev/null
+++ b/db/versions/.archive/10288-chocolateSalal/00-firstScript.sql
@@ -0,0 +1,2 @@
+-- Place your SQL code here
+ALTER TABLE edi.ektConfig ADD ektRecentScopeDays INT DEFAULT 7 NOT NULL;
diff --git a/db/versions/.archive/10289-turquoiseCarnation/00-firstScript.sql b/db/versions/.archive/10289-turquoiseCarnation/00-firstScript.sql
new file mode 100644
index 000000000..96812f96c
--- /dev/null
+++ b/db/versions/.archive/10289-turquoiseCarnation/00-firstScript.sql
@@ -0,0 +1,4 @@
+-- Place your SQL code here
+ALTER TABLE `vn`.`packaging`
+CHANGE COLUMN `base` `base` DECIMAL(10,2) NOT NULL DEFAULT 0 ,
+CHANGE COLUMN `price` `price` DECIMAL(10,2) NOT NULL DEFAULT 0 ;
diff --git a/db/versions/.archive/10291-azureGalax/00-firstScript.sql b/db/versions/.archive/10291-azureGalax/00-firstScript.sql
new file mode 100644
index 000000000..8d0dfd5c3
--- /dev/null
+++ b/db/versions/.archive/10291-azureGalax/00-firstScript.sql
@@ -0,0 +1 @@
+ALTER TABLE `vn`.`item` MODIFY COLUMN description varchar(1000) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL;
diff --git a/db/versions/.archive/10293-salmonCamellia/00-firstScript.sql b/db/versions/.archive/10293-salmonCamellia/00-firstScript.sql
new file mode 100644
index 000000000..8ef4fa5ea
--- /dev/null
+++ b/db/versions/.archive/10293-salmonCamellia/00-firstScript.sql
@@ -0,0 +1,9 @@
+-- Place your SQL code here
+
+INSERT INTO vn.silexACL
+( module, `method`, `role`)
+VALUES('almacennew', 'operator_getNumberOfWagons', 'employee');
+
+INSERT INTO vn.silexACL
+( module, `method`, `role`)
+VALUES('almacennew', 'operator_add', 'employee');
\ No newline at end of file
diff --git a/db/versions/.archive/10297-redErica/00-firstScript.sql b/db/versions/.archive/10297-redErica/00-firstScript.sql
new file mode 100644
index 000000000..c8021ec8b
--- /dev/null
+++ b/db/versions/.archive/10297-redErica/00-firstScript.sql
@@ -0,0 +1,3 @@
+-- Place your SQL code here
+ALTER TABLE edi.ekt MODIFY COLUMN barcode char(25) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL COMMENT 'Generated auction barcode';
+ALTER TABLE edi.ekt DROP KEY barcode_year;
\ No newline at end of file
diff --git a/db/versions/.archive/10298-grayBamboo/00-firstScript.sql b/db/versions/.archive/10298-grayBamboo/00-firstScript.sql
new file mode 100644
index 000000000..6d4b5c215
--- /dev/null
+++ b/db/versions/.archive/10298-grayBamboo/00-firstScript.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.printQueueArgs ADD CONSTRAINT printQueueArgs_PK PRIMARY KEY (printQueueFk,name);
diff --git a/db/versions/.archive/10299-blueTulip/00-firstScript.sql b/db/versions/.archive/10299-blueTulip/00-firstScript.sql
new file mode 100644
index 000000000..0c52e4b45
--- /dev/null
+++ b/db/versions/.archive/10299-blueTulip/00-firstScript.sql
@@ -0,0 +1,10 @@
+
+ALTER TABLE hedera.orderRecalc DROP FOREIGN KEY orderRecalc_ibfk_1;
+ALTER TABLE vn.ticketRecalc DROP FOREIGN KEY ticketRecalc_ibfk_1;
+
+CREATE TABLE `util`.`binlogQueue`(
+ `code` VARCHAR(255) NOT NULL,
+ `logName` VARCHAR(255) NOT NULL,
+ `position` BIGINT UNSIGNED NOT NULL,
+ PRIMARY KEY (`code`)
+) ENGINE = InnoDB COMMENT='Binary log position of asynchronous queues';
diff --git a/db/versions/.archive/10299-blueTulip/00-firstScript.undo.sql b/db/versions/.archive/10299-blueTulip/00-firstScript.undo.sql
new file mode 100644
index 000000000..f0dbb8ba6
--- /dev/null
+++ b/db/versions/.archive/10299-blueTulip/00-firstScript.undo.sql
@@ -0,0 +1,7 @@
+
+ALTER TABLE hedera.orderRecalc
+ ADD CONSTRAINT orderRecalc_ibfk_1 FOREIGN KEY (orderFk) REFERENCES hedera.`order`(id) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE vn.ticketRecalc
+ ADD CONSTRAINT ticketRecalc_ibfk_1 FOREIGN KEY (ticketFk) REFERENCES vn.ticket(id) ON DELETE CASCADE ON UPDATE CASCADE;
+
+DROP TABLE IF EXISTS `util`.`binlogQueue`;
diff --git a/db/versions/.archive/10301-4415collectionNewPAK/00-productionConfig.sql b/db/versions/.archive/10301-4415collectionNewPAK/00-productionConfig.sql
new file mode 100644
index 000000000..ec8bb84a0
--- /dev/null
+++ b/db/versions/.archive/10301-4415collectionNewPAK/00-productionConfig.sql
@@ -0,0 +1,7 @@
+-- Place your SQL code here
+ALTER TABLE vn.productionConfig
+ ADD IF NOT EXISTS hasUniqueCollectionTime bool DEFAULT FALSE NOT NULL
+ COMMENT 'Determina si los tickets de una colección deben de tener la misma hora y minuto';
+
+ALTER TABLE vn.productionConfig ADD maxCollectionWithoutUser INT DEFAULT 1 NOT NULL
+COMMENT 'Número máximo de colecciones que pueden estar sin usuario, haciendo de caché....';
diff --git a/db/versions/.archive/10301-4415collectionNewPAK/01-drop.sql b/db/versions/.archive/10301-4415collectionNewPAK/01-drop.sql
new file mode 100644
index 000000000..c949f8dd0
--- /dev/null
+++ b/db/versions/.archive/10301-4415collectionNewPAK/01-drop.sql
@@ -0,0 +1,2 @@
+DROP PROCEDURE IF EXISTS vn.collection_get_;
+DROP PROCEDURE IF EXISTS vn.collection_newWithWagon_beta;
\ No newline at end of file
diff --git a/db/versions/.archive/10301-4415collectionNewPAK/02-collection.sql b/db/versions/.archive/10301-4415collectionNewPAK/02-collection.sql
new file mode 100644
index 000000000..eb3f598bb
--- /dev/null
+++ b/db/versions/.archive/10301-4415collectionNewPAK/02-collection.sql
@@ -0,0 +1,9 @@
+ALTER TABLE vn.collection ADD IF NOT EXISTS sectorFk INT NULL;
+ALTER TABLE vn.collection ADD IF NOT EXISTS wagons INT NULL;
+
+ALTER TABLE vn.collection
+ ADD CONSTRAINT collectionSector_FK
+ FOREIGN KEY (sectorFk)
+ REFERENCES vn.sector(id)
+ ON DELETE SET NULL
+ ON UPDATE CASCADE;
\ No newline at end of file
diff --git a/db/versions/.archive/10302-chocolateRoebelini/00-CreateTableEntryType.sql b/db/versions/.archive/10302-chocolateRoebelini/00-CreateTableEntryType.sql
new file mode 100644
index 000000000..a3c5f7ca8
--- /dev/null
+++ b/db/versions/.archive/10302-chocolateRoebelini/00-CreateTableEntryType.sql
@@ -0,0 +1,6 @@
+CREATE TABLE vn.entryType (
+ `code` varchar(100) COLLATE utf8mb3_unicode_ci NOT NULL,
+ `description` varchar(100) COLLATE utf8mb3_unicode_ci NOT NULL,
+ PRIMARY KEY (`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
diff --git a/db/versions/.archive/10302-chocolateRoebelini/01-insertDataEntryType.sql b/db/versions/.archive/10302-chocolateRoebelini/01-insertDataEntryType.sql
new file mode 100644
index 000000000..abe1fc66b
--- /dev/null
+++ b/db/versions/.archive/10302-chocolateRoebelini/01-insertDataEntryType.sql
@@ -0,0 +1,4 @@
+INSERT INTO vn.entryType (code, `description`) VALUES('product', 'Producto');
+INSERT INTO vn.entryType (code, `description`) VALUES('packaging', 'Embalaje');
+INSERT INTO vn.entryType (code, `description`) VALUES('payment', 'Abono');
+INSERT INTO vn.entryType (code, `description`) VALUES('regularization', 'Regularización');
diff --git a/db/versions/.archive/10302-chocolateRoebelini/02-alterTableEntry.sql b/db/versions/.archive/10302-chocolateRoebelini/02-alterTableEntry.sql
new file mode 100644
index 000000000..b51123775
--- /dev/null
+++ b/db/versions/.archive/10302-chocolateRoebelini/02-alterTableEntry.sql
@@ -0,0 +1,2 @@
+ALTER TABLE vn.entry ADD typeFk varchar(100) DEFAULT 'product' NULL COMMENT 'Tipo de entrada, por defecto PRODUCTO';
+ALTER TABLE vn.entry ADD CONSTRAINT entry_FK_1 FOREIGN KEY (typeFk) REFERENCES vn.entryType(code) ON DELETE RESTRICT ON UPDATE CASCADE;
diff --git a/db/versions/.archive/10303-tealRoebelini/00-firstScript.sql b/db/versions/.archive/10303-tealRoebelini/00-firstScript.sql
new file mode 100644
index 000000000..3ff1b4b75
--- /dev/null
+++ b/db/versions/.archive/10303-tealRoebelini/00-firstScript.sql
@@ -0,0 +1,3 @@
+ALTER TABLE vn2008.Reservas ADD buyFk INT(11) NOT NULL;
+ALTER TABLE vn2008.Reservas ADD `grouping` INT(11) NULL;
+ALTER TABLE vn2008.Reservas ADD packing INT(11) NULL;
diff --git a/db/versions/.archive/10304-limeAsparagus/00-firstScript.sql b/db/versions/.archive/10304-limeAsparagus/00-firstScript.sql
new file mode 100644
index 000000000..42a41402e
--- /dev/null
+++ b/db/versions/.archive/10304-limeAsparagus/00-firstScript.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.ticket CHANGE isLabeled isLabeled__ tinyint(1) DEFAULT 0 NOT NULL;
diff --git a/db/versions/.archive/10304-limeAsparagus/01-altertableticket.sql b/db/versions/.archive/10304-limeAsparagus/01-altertableticket.sql
new file mode 100644
index 000000000..8a8f9aea8
--- /dev/null
+++ b/db/versions/.archive/10304-limeAsparagus/01-altertableticket.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.ticket CHANGE isLabeled__ isLabeled tinyint(1) DEFAULT 0 NOT NULL;
\ No newline at end of file
diff --git a/db/versions/.archive/10305-brownFern/00-ektAssign.sql b/db/versions/.archive/10305-brownFern/00-ektAssign.sql
new file mode 100644
index 000000000..82bc795d8
--- /dev/null
+++ b/db/versions/.archive/10305-brownFern/00-ektAssign.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.ektEntryAssign ADD companyFk SMALLINT unsigned DEFAULT 442 NOT NULL;
diff --git a/db/versions/.archive/10306-turquoiseCyca/00-deliveryInformation.sql b/db/versions/.archive/10306-turquoiseCyca/00-deliveryInformation.sql
new file mode 100644
index 000000000..aa88dc103
--- /dev/null
+++ b/db/versions/.archive/10306-turquoiseCyca/00-deliveryInformation.sql
@@ -0,0 +1,3 @@
+ALTER TABLE edi.deliveryInformation DROP KEY deliveryInformation_UN;
+ALTER TABLE edi.deliveryInformation ADD CONSTRAINT deliveryInformation_UN
+ UNIQUE KEY (Location, LatestDeliveryDateTime, FirstOrderDateTime, LatestOrderDateTime, supplyResponseID, DeliveryType);
diff --git a/db/versions/.archive/10307-tealFern/00-firstScript.sql b/db/versions/.archive/10307-tealFern/00-firstScript.sql
new file mode 100644
index 000000000..8f31d43f8
--- /dev/null
+++ b/db/versions/.archive/10307-tealFern/00-firstScript.sql
@@ -0,0 +1,10 @@
+ALTER TABLE vn.awb ADD propertyNumber INT(11) NULL;
+
+ALTER TABLE vn2008.awb_component_template ADD CONSTRAINT awb_component_template_FK FOREIGN KEY (awb_component_type_id)
+REFERENCES vn2008.awb_component_type(awb_component_type_id) ON DELETE RESTRICT ON UPDATE CASCADE;
+
+ALTER TABLE vn2008.awb_component_template ADD CONSTRAINT awb_component_template_FK_1 FOREIGN KEY (airline_id)
+REFERENCES vn2008.airline(airline_id) ON DELETE RESTRICT ON UPDATE CASCADE;
+
+INSERT INTO vn2008.awb_unit (awb_unit_id,operation)
+ VALUES ('PN','LEAST(90, value + propertyNumber *10)');
\ No newline at end of file
diff --git a/db/versions/.archive/10308-grayAsparagus/00-firstScript.sql b/db/versions/.archive/10308-grayAsparagus/00-firstScript.sql
new file mode 100644
index 000000000..c7a2eeee9
--- /dev/null
+++ b/db/versions/.archive/10308-grayAsparagus/00-firstScript.sql
@@ -0,0 +1,2 @@
+ALTER TABLE vn.greuge ADD userFK int(10) unsigned DEFAULT NULL NULL;
+ALTER TABLE vn.greuge ADD CONSTRAINT greuge_FK FOREIGN KEY (userFK) REFERENCES account.`user`(id) ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/db/versions/.archive/10309-navyCordyline/00-firstScript.sql b/db/versions/.archive/10309-navyCordyline/00-firstScript.sql
new file mode 100644
index 000000000..81ba5d4ba
--- /dev/null
+++ b/db/versions/.archive/10309-navyCordyline/00-firstScript.sql
@@ -0,0 +1,5 @@
+-- Place your SQL code here
+USE vn;
+ALTER TABLE vn.worker DROP FOREIGN KEY worker_business;
+ALTER TABLE vn.worker ADD CONSTRAINT worker_business FOREIGN KEY (businessFk)
+REFERENCES postgresql.business(business_id) ON DELETE SET NULL ON UPDATE CASCADE;
\ No newline at end of file
diff --git a/db/versions/.archive/10310-azureCymbidium/00-firstScript.sql b/db/versions/.archive/10310-azureCymbidium/00-firstScript.sql
new file mode 100644
index 000000000..60489518c
--- /dev/null
+++ b/db/versions/.archive/10310-azureCymbidium/00-firstScript.sql
@@ -0,0 +1,10 @@
+-- UPDATE asociado a la tarea
+USE vn;
+UPDATE vn.worker w
+ JOIN(SELECT r.workerFk
+ FROM route r
+ LEFT JOIN workerLabour wl ON wl.workerFk = r.workerFk
+ WHERE wl.workerFk IS NULL
+ AND r.workerFk IS NOT NULL
+ GROUP BY r.workerFk) sub ON sub.workerFk = w.id
+ SET w.isFreelance = TRUE;
\ No newline at end of file
diff --git a/db/versions/.archive/10311-navyChico/00-firstScript.sql b/db/versions/.archive/10311-navyChico/00-firstScript.sql
new file mode 100644
index 000000000..bdfb80334
--- /dev/null
+++ b/db/versions/.archive/10311-navyChico/00-firstScript.sql
@@ -0,0 +1,3 @@
+USE postgresql;
+ALTER TABLE `postgresql`.`business`
+ CHANGE COLUMN `payedHolidays` `payedHolidays` DECIMAL(5,2) NOT NULL DEFAULT 0;
\ No newline at end of file
diff --git a/db/versions/.archive/10312-pinkCymbidium/00-firstScript.sql b/db/versions/.archive/10312-pinkCymbidium/00-firstScript.sql
new file mode 100644
index 000000000..3776dd971
--- /dev/null
+++ b/db/versions/.archive/10312-pinkCymbidium/00-firstScript.sql
@@ -0,0 +1 @@
+DROP TABLE bs.zone_ETD_byTime;
diff --git a/db/versions/.archive/10313-chocolateMastic/00-firstScript.sql b/db/versions/.archive/10313-chocolateMastic/00-firstScript.sql
new file mode 100644
index 000000000..39a7d0a0c
--- /dev/null
+++ b/db/versions/.archive/10313-chocolateMastic/00-firstScript.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.expedition CHANGE itemFk__ itemFk int(11) NULL COMMENT 'Si es necesario el itemFk del cubo, se obtiene mediante packagingFk, join packing.itemFk';
\ No newline at end of file
diff --git a/db/versions/.archive/10314-goldenGerbera/00-firstScript.sql b/db/versions/.archive/10314-goldenGerbera/00-firstScript.sql
new file mode 100644
index 000000000..933d2e7cd
--- /dev/null
+++ b/db/versions/.archive/10314-goldenGerbera/00-firstScript.sql
@@ -0,0 +1 @@
+USE vn;
diff --git a/db/versions/.archive/10315-purpleDracena/00-firstScript.sql b/db/versions/.archive/10315-purpleDracena/00-firstScript.sql
new file mode 100644
index 000000000..f63790aa5
--- /dev/null
+++ b/db/versions/.archive/10315-purpleDracena/00-firstScript.sql
@@ -0,0 +1,6 @@
+-- Place your SQL code here
+ALTER TABLE `postgresql`.`bank_account`
+RENAME TO `postgresql`.`bank_account__` ;
+
+ALTER TABLE `vn`.`client`
+DROP COLUMN `cc__`;
diff --git a/db/versions/.archive/10317-crimsonRuscus/00-firstScript.sql b/db/versions/.archive/10317-crimsonRuscus/00-firstScript.sql
new file mode 100644
index 000000000..94a5811e3
--- /dev/null
+++ b/db/versions/.archive/10317-crimsonRuscus/00-firstScript.sql
@@ -0,0 +1,8 @@
+-- Place your SQL code here
+
+USE vn;
+ALTER TABLE vn.productionConfig ADD pendingCollectionsOrder tinyint(3) unsigned DEFAULT 8 NULL;
+ALTER TABLE vn.productionConfig ADD pendingCollectionsAge TINYINT unsigned DEFAULT 6 NULL;
+
+
+
diff --git a/db/versions/.archive/10318-greenPaniculata/00-firstScript.sql b/db/versions/.archive/10318-greenPaniculata/00-firstScript.sql
new file mode 100644
index 000000000..c61bb9851
--- /dev/null
+++ b/db/versions/.archive/10318-greenPaniculata/00-firstScript.sql
@@ -0,0 +1,25 @@
+-- Place your SQL code here
+RENAME TABLE `vn`.`returnBuckets` TO `vn`.`returnBuckets__`;
+
+ALTER TABLE `vn2008`.`Cubos_Retorno` RENAME `vn`.`returnBuckets`;
+
+
+ALTER TABLE `vn`.`returnBuckets`
+CHANGE COLUMN `idCubos_Retorno` `id` int(11) NOT NULL AUTO_INCREMENT,
+CHANGE COLUMN `Soporte` `freightContainerType` varchar(15) COLLATE utf8mb3_unicode_ci NOT NULL,
+CHANGE COLUMN `Vacio` `freightPackagingEmpty` DOUBLE NOT NULL DEFAULT 0,
+CHANGE COLUMN `Lleno` `freightPackagingFull` DOUBLE NOT NULL DEFAULT 0;
+
+
+CREATE
+ ALGORITHM = UNDEFINED
+ DEFINER = `root`@`localhost`
+ SQL SECURITY DEFINER
+VIEW `vn2008`.`Cubos_Retorno` AS
+ SELECT
+ `rb`.`id` AS `idCubos_Retorno`,
+ `rb`.`freightContainerType` AS `Soporte`,
+ `rb`.`freightPackagingEmpty` AS `Vacio`,
+ `rb`.`freightPackagingFull` AS `Lleno`
+ FROM
+ `vn`.`returnBuckets` `rb`;
diff --git a/db/versions/.archive/10319-orangeLaurel/00-firstScript.sql b/db/versions/.archive/10319-orangeLaurel/00-firstScript.sql
new file mode 100644
index 000000000..1e77497a6
--- /dev/null
+++ b/db/versions/.archive/10319-orangeLaurel/00-firstScript.sql
@@ -0,0 +1,244 @@
+USE vn;
+
+ALTER TABLE `postgresql`.`business`
+ADD COLUMN `workerFk` INT(10) UNSIGNED NOT NULL AFTER `occupationCodeFk`;
+
+UPDATE postgresql.business b
+ JOIN postgresql.profile p ON p.profile_id = b.client_id
+ SET b.workerFk = p.workerFk
+ WHERE p.workerFk IS NOT NULL;
+
+-- 5 líneas afectadas contratos 2014 (info en A3)
+DELETE FROM postgresql.business
+ WHERE NOT workerFk;
+
+ALTER TABLE `postgresql`.`business`
+ ADD INDEX `business_workerFk_idx` (`workerFk` ASC) ;
+
+ALTER TABLE `postgresql`.`business`
+ ADD CONSTRAINT `business_workerFk`
+ FOREIGN KEY (`workerFk`)
+ REFERENCES `vn`.`worker` (`id`)
+ ON DELETE RESTRICT
+ ON UPDATE CASCADE;
+
+CREATE TABLE `business` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `companyCodeFk` char(3) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+ `started` date DEFAULT NULL,
+ `ended` date DEFAULT NULL,
+ `workerBusiness` longtext DEFAULT NULL,
+ `reasonEndFk` int(11) DEFAULT NULL,
+ `payedHolidays` decimal(5,2) NOT NULL DEFAULT 0.00,
+ `occupationCodeFk` varchar(1) DEFAULT NULL,
+ `workerFk` int(10) unsigned NOT NULL,
+ PRIMARY KEY (`id`),
+ KEY `business_occupationCodeFk` (`occupationCodeFk`),
+ KEY `business_companyCodeFk` (`companyCodeFk`),
+ KEY `business_workerFk_idx` (`workerFk`),
+ CONSTRAINT `business_companyCodeFk` FOREIGN KEY (`companyCodeFk`) REFERENCES `vn`.`company` (`code`) ON UPDATE CASCADE,
+ CONSTRAINT `business_occupationCodeFk` FOREIGN KEY (`occupationCodeFk`) REFERENCES `vn`.`occupationCode` (`code`) ON UPDATE CASCADE,
+ CONSTRAINT `business_workerFk` FOREIGN KEY (`workerFk`) REFERENCES `vn`.`worker` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
+
+INSERT INTO vn.business (id,
+ companyCodeFk,
+ started,
+ ended,
+ workerBusiness,
+ reasonEndFk,
+ payedHolidays,
+ occupationCodeFk,
+ workerFk )
+ SELECT business_id,
+ companyCodeFk,
+ date_start,
+ date_end,
+ workerBusiness,
+ reasonEndFk,
+ IFNULL(payedHolidays, 0),
+ occupationCodeFk,
+ workerFk
+ FROM postgresql.business;
+
+ALTER TABLE `vn`.`worker`
+ DROP FOREIGN KEY `worker_business`;
+
+ALTER TABLE `vn`.`worker`
+ADD CONSTRAINT `worker_businessFk`
+ FOREIGN KEY (`businessFk`)
+ REFERENCES `vn`.`business` (`id`)
+ ON DELETE SET NULL
+ ON UPDATE CASCADE;
+
+ALTER TABLE `postgresql`.`business_labour_payroll`
+ DROP FOREIGN KEY `business_labour_payroll_fk1`;
+
+ALTER TABLE `postgresql`.`business_labour_payroll`
+ADD CONSTRAINT `business_labour_payroll_business_id`
+ FOREIGN KEY (`business_id`)
+ REFERENCES `vn`.`business` (`id`)
+ ON DELETE CASCADE
+ ON UPDATE CASCADE;
+
+ALTER TABLE `postgresql`.`business_labour`
+DROP FOREIGN KEY `bus_restriction`;
+
+ALTER TABLE `postgresql`.`business_labour`
+ADD CONSTRAINT `business_labour_business_id`
+ FOREIGN KEY (`business_id`)
+ REFERENCES `vn`.`business` (`id`)
+ ON DELETE CASCADE
+ ON UPDATE CASCADE;
+
+-- Es necesario hacerlo aquí porque falla en otras vistas donde se utiliza esta
+CREATE
+ OR REPLACE ALGORITHM = UNDEFINED
+ DEFINER = `root`@`localhost`
+ SQL SECURITY DEFINER
+VIEW `postgresql`.`calendar_employee` AS
+ SELECT
+ `ce`.`id` AS `id`,
+ `ce`.`businessFk` AS `businessFk`,
+ `ce`.`dayOffTypeFk` AS `calendar_state_id`,
+ `ce`.`dated` AS `date`
+ FROM
+ `vn`.`calendar` `ce`;
+
+DROP TABLE `vn`.`profile`;
+
+ALTER TABLE `vn`.`business`
+ADD COLUMN `notes` LONGTEXT NULL DEFAULT NULL AFTER `workerFk`,
+ADD COLUMN `departmentFk` INT(11) NULL DEFAULT NULL AFTER `notes`,
+ADD COLUMN `workerBusinessProfessionalCategoryFk` INT(11) NULL DEFAULT NULL AFTER `departmentFk`,
+ADD COLUMN `calendarTypeFk` INT(11) NULL DEFAULT 1 AFTER `workerBusinessProfessionalCategoryFk`,
+ADD COLUMN `isHourlyLabor` tinyint(1) NOT NULL DEFAULT FALSE COMMENT 'Contrato por horas' AFTER `calendarTypeFk`,
+ADD COLUMN `workcenterFk` INT(11) NOT NULL AFTER `isHourlyLabor`,
+ADD COLUMN `rate` INT(11) NULL DEFAULT NULL AFTER `workcenterFk`,
+ADD COLUMN `workerBusinessCategoryFk` INT(11) NULL DEFAULT NULL AFTER `rate`,
+ADD COLUMN `workerBusinessTypeFk` INT(11) NULL DEFAULT NULL AFTER `workerBusinessCategoryFk`,
+ADD COLUMN `amount` DECIMAL(10,2) NOT NULL DEFAULT 0 COMMENT 'Importe pactado' AFTER `workerBusinessTypeFk`,
+ADD COLUMN `workerBusinessAgreementFk` INT(11) NULL DEFAULT NULL AFTER `amount`;
+
+UPDATE vn.business b
+ LEFT JOIN postgresql.business_labour bl ON bl.business_id = b.id
+ LEFT JOIN postgresql.business_labour_payroll blp ON blp.business_id = b.id
+ SET b.notes = bl.notes,
+ b.departmentFk = bl.department_id,
+ b.workerBusinessProfessionalCategoryFk = bl.professional_category_id,
+ b.calendarTypeFk = bl.calendar_labour_type_id,
+ b.isHourlyLabor = bl.porhoras,
+ b.workcenterFk = bl.workcenter_id,
+ b.rate = blp.cod_tarifa,
+ b.workerBusinessCategoryFk = blp.cod_categoria,
+ b.workerBusinessTypeFk = blp.cod_contrato,
+ b.amount = blp.importepactado,
+ b.workerBusinessAgreementFk = bl.labour_agreement_id;
+
+ ALTER TABLE `vn`.`business`
+ ADD INDEX `business_departmentFk_idx` (`departmentFk` ASC);
+
+ ALTER TABLE `vn`.`business`
+ ADD CONSTRAINT `business_departmentFk`
+ FOREIGN KEY (`departmentFk`)
+ REFERENCES `vn`.`department` (`id`)
+ ON DELETE RESTRICT
+ ON UPDATE CASCADE;
+
+ ALTER TABLE `vn`.`business`
+ ADD INDEX `business_workerBusinessProfessionalCategoryFk_idx` (`workerBusinessProfessionalCategoryFk` ASC) ;
+
+ ALTER TABLE `vn`.`business`
+ ADD CONSTRAINT `business_workerBusinessProfessionalCategoryFk`
+ FOREIGN KEY (`workerBusinessProfessionalCategoryFk`)
+ REFERENCES `postgresql`.`professional_category` (`professional_category_id`)
+ ON DELETE RESTRICT
+ ON UPDATE CASCADE;
+
+ ALTER TABLE `vn`.`business`
+ ADD INDEX `business_calendarTypeFk_idx` (`calendarTypeFk` ASC);
+
+ ALTER TABLE `vn`.`business`
+ ADD CONSTRAINT `business_calendarTypeFk`
+ FOREIGN KEY (`calendarTypeFk`)
+ REFERENCES `postgresql`.`calendar_labour_type` (`calendar_labour_type_id`)
+ ON DELETE RESTRICT
+ ON UPDATE CASCADE;
+
+ ALTER TABLE `vn`.`business`
+ ADD CONSTRAINT `business_workerBusinessCategoryFk`
+ FOREIGN KEY (`workerBusinessCategoryFk`)
+ REFERENCES `vn2008`.`payroll_categorias` (`codcategoria`)
+ ON DELETE RESTRICT
+ ON UPDATE CASCADE;
+
+ ALTER TABLE `vn`.`business`
+ ADD INDEX `business_workerBusinessTypeFk_idx` (`workerBusinessTypeFk` ASC);
+
+ ALTER TABLE `vn`.`business`
+ ADD CONSTRAINT `business_workerBusinessTypeFk`
+ FOREIGN KEY (`workerBusinessTypeFk`)
+ REFERENCES `vn`.`workerBusinessType` (`id`)
+ ON DELETE RESTRICT
+ ON UPDATE CASCADE;
+
+ ALTER TABLE `vn`.`business`
+ ADD INDEX `business_workerBusinessAgreementFk_idx` (`workerBusinessAgreementFk` ASC);
+
+ ALTER TABLE `vn`.`business`
+ ADD CONSTRAINT `business_workerBusinessAgreementFk`
+ FOREIGN KEY (`workerBusinessAgreementFk`)
+ REFERENCES `postgresql`.`labour_agreement` (`labour_agreement_id`)
+ ON DELETE RESTRICT
+ ON UPDATE CASCADE;
+
+ALTER TABLE `postgresql`.`profile`
+ RENAME TO `postgresql`.`profile__` ;
+
+ALTER TABLE `postgresql`.`business`
+ RENAME TO `postgresql`.`business__` ;
+
+ALTER TABLE `postgresql`.`business_labour`
+ RENAME TO `postgresql`.`business_labour__` ;
+
+ALTER TABLE `postgresql`.`business_labour_payroll`
+ RENAME TO `postgresql`.`business_labour_payroll__` ;
+
+ALTER TABLE `postgresql`.`journey`
+ DROP FOREIGN KEY `business_journey`;
+ALTER TABLE `postgresql`.`journey`
+ ADD INDEX `journey_business_id_idx` (`business_id` ASC) ,
+ DROP INDEX `fki_business_journey` ;
+
+ALTER TABLE `postgresql`.`journey`
+ ADD CONSTRAINT `journey_business_id`
+ FOREIGN KEY (`business_id`)
+ REFERENCES `vn`.`business` (`id`)
+ ON DELETE RESTRICT
+ ON UPDATE CASCADE;
+
+ALTER TABLE `vn`.`calendar`
+ DROP FOREIGN KEY `calendar_businessFk`;
+
+ALTER TABLE `vn`.`calendar`
+DROP INDEX `business_id_date` ;
+
+ALTER TABLE `vn`.`calendar`
+ ADD CONSTRAINT `calendar_businessFk`
+ FOREIGN KEY (`businessFk`)
+ REFERENCES `vn`.`business` (`id`)
+ ON DELETE RESTRICT
+ ON UPDATE CASCADE;
+
+ALTER TABLE `vn`.`workerJourney`
+ DROP FOREIGN KEY `workerJourney_businessFk`;
+
+ALTER TABLE `vn`.`workerJourney`
+ DROP INDEX `workerJourney_businessFk_idx` ;
+
+ALTER TABLE `vn`.`workerJourney`
+ ADD CONSTRAINT `workerJourney_businessFk`
+ FOREIGN KEY (`businessFk`)
+ REFERENCES `vn`.`business` (`id`)
+ ON DELETE RESTRICT
+ ON UPDATE CASCADE;
\ No newline at end of file
diff --git a/db/versions/.archive/10320-4130collectionnewPAK/00-operator.sql b/db/versions/.archive/10320-4130collectionnewPAK/00-operator.sql
new file mode 100644
index 000000000..7c3f07f83
--- /dev/null
+++ b/db/versions/.archive/10320-4130collectionnewPAK/00-operator.sql
@@ -0,0 +1,7 @@
+-- Place your SQL code here
+ALTER TABLE vn.operator ADD IF NOT EXISTS trainFk INT DEFAULT 1 NOT NULL;
+ALTER TABLE vn.operator ADD IF NOT EXISTS itemPackingTypeFk VARCHAR(1) NULL;
+ALTER TABLE vn.operator ADD IF NOT EXISTS warehouseFk SMALLINT(6) UNSIGNED DEFAULT 60 NOT NULL;
+ALTER TABLE vn.operator ADD CONSTRAINT operator_FK_1 FOREIGN KEY (trainFk) REFERENCES vn.train(id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.operator ADD CONSTRAINT operator_FK_2 FOREIGN KEY (itemPackingTypeFk) REFERENCES vn.itemPackingType(code) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE vn.operator ADD CONSTRAINT operator_FK_3 FOREIGN KEY (warehouseFk) REFERENCES vn.warehouse(id) ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/db/versions/.archive/10320-4130collectionnewPAK/01-collection.sql b/db/versions/.archive/10320-4130collectionnewPAK/01-collection.sql
new file mode 100644
index 000000000..f1b70cac6
--- /dev/null
+++ b/db/versions/.archive/10320-4130collectionnewPAK/01-collection.sql
@@ -0,0 +1,3 @@
+ALTER TABLE vn.collection ADD warehouseFk smallint(6) unsigned DEFAULT 60 NOT NULL;
+
+ALTER TABLE vn.collection ADD CONSTRAINT collection_FK2 FOREIGN KEY (warehouseFk) REFERENCES vn.warehouse(id) ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/db/versions/.archive/10320-4130collectionnewPAK/02-productionConfig.sql b/db/versions/.archive/10320-4130collectionnewPAK/02-productionConfig.sql
new file mode 100644
index 000000000..59080f4f6
--- /dev/null
+++ b/db/versions/.archive/10320-4130collectionnewPAK/02-productionConfig.sql
@@ -0,0 +1,3 @@
+ALTER TABLE vn.productionConfig
+ ADD maxNotAssignedCollectionLifeTime TIME DEFAULT '00:10:00' NOT NULL
+ COMMENT 'Tiempo de vida de las colecciones sin asignar. Cuando se supera son eliminadas';
diff --git a/db/versions/.archive/10321-yellowDendro/00-firstScript.sql b/db/versions/.archive/10321-yellowDendro/00-firstScript.sql
new file mode 100644
index 000000000..80fc2a6c6
--- /dev/null
+++ b/db/versions/.archive/10321-yellowDendro/00-firstScript.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.expedition CHANGE itemFk__ itemFk int(11) NULL COMMENT 'Si es necesario el itemFk del cubo, se obtiene mediante packagingFk, join packing.itemFk';
diff --git a/db/versions/.archive/10322-maroonFern/00-firstScript.sql b/db/versions/.archive/10322-maroonFern/00-firstScript.sql
new file mode 100644
index 000000000..fbb1dd569
--- /dev/null
+++ b/db/versions/.archive/10322-maroonFern/00-firstScript.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.entry MODIFY COLUMN typeFk varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL COMMENT 'Tipo de entrada';
\ No newline at end of file
diff --git a/db/versions/.archive/10326-crimsonCyca/00-firstScript.sql b/db/versions/.archive/10326-crimsonCyca/00-firstScript.sql
new file mode 100644
index 000000000..718a32f9b
--- /dev/null
+++ b/db/versions/.archive/10326-crimsonCyca/00-firstScript.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.buy CHANGE producer producer__ varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL;
\ No newline at end of file
diff --git a/db/versions/.archive/10328-whiteMedeola/00-firstScript.sql b/db/versions/.archive/10328-whiteMedeola/00-firstScript.sql
new file mode 100644
index 000000000..5fb22fdf2
--- /dev/null
+++ b/db/versions/.archive/10328-whiteMedeola/00-firstScript.sql
@@ -0,0 +1,10 @@
+CREATE TABLE sage.config (
+ id INT auto_increment NULL,
+ pendingTaxAccount varchar(100) NULL COMMENT 'Cuenta contable IVA pendiente',
+ CONSTRAINT config_PK PRIMARY KEY (id)
+)
+ENGINE=InnoDB
+DEFAULT CHARSET=utf8mb3
+COLLATE=utf8mb3_general_ci;
+
+INSERT INTO sage.config SET id = 1,pendingTaxAccount = '4700000999';
\ No newline at end of file
diff --git a/db/versions/.archive/10329-aquaRose/00-firstScript.sql b/db/versions/.archive/10329-aquaRose/00-firstScript.sql
new file mode 100644
index 000000000..43e17a951
--- /dev/null
+++ b/db/versions/.archive/10329-aquaRose/00-firstScript.sql
@@ -0,0 +1,10 @@
+-- Place your SQL code here
+ALTER TABLE `vn`.`routeCommission`
+ DROP FOREIGN KEY `routeCommission_routeFk`;
+
+ALTER TABLE `vn`.`routeCommission`
+ ADD CONSTRAINT `routeCommission_routeFk`
+ FOREIGN KEY (`routeFk`)
+ REFERENCES `vn`.`route` (`id`)
+ ON DELETE CASCADE
+ ON UPDATE CASCADE;
diff --git a/db/versions/.archive/10330-pinkCataractarum/00-firstScript.sql b/db/versions/.archive/10330-pinkCataractarum/00-firstScript.sql
new file mode 100644
index 000000000..eb665c5c3
--- /dev/null
+++ b/db/versions/.archive/10330-pinkCataractarum/00-firstScript.sql
@@ -0,0 +1,9 @@
+-- Place your SQL code here
+ALTER TABLE `vn`.`worker`
+ADD COLUMN `balance` DECIMAL(10,2) NULL AFTER `businessFk`;
+
+UPDATE `vn`.`worker` w
+JOIN(SELECT workerFk, SUM(i.debe) - SUM(i.haber) balance
+FROM postgresql.income_employee i
+GROUP BY i.workerFk) sub ON sub.workerFk = w.id
+SET w.balance = sub.balance;
\ No newline at end of file
diff --git a/db/versions/.archive/10332-greenMedeola/00-firstScript.sql b/db/versions/.archive/10332-greenMedeola/00-firstScript.sql
new file mode 100644
index 000000000..bdeb9240d
--- /dev/null
+++ b/db/versions/.archive/10332-greenMedeola/00-firstScript.sql
@@ -0,0 +1,10 @@
+ALTER TABLE vn.itemShelving DROP COLUMN deep__;
+ALTER TABLE vn.itemShelving DROP COLUMN quantity__;
+ALTER TABLE vn.itemShelving DROP COLUMN available__;
+ALTER TABLE vn.itemShelving DROP COLUMN level__;
+
+ -- deprecar shelve, priority, stars
+ALTER TABLE vn.itemShelving RENAME COLUMN shelve TO shelve__;
+ALTER TABLE vn.itemShelving RENAME COLUMN `priority` TO priority__;
+ALTER TABLE vn.itemShelving RENAME COLUMN stars TO stars__;
+
diff --git a/db/versions/.archive/10334-4310collectionAssignPAK/00-collectionHotbed.sql b/db/versions/.archive/10334-4310collectionAssignPAK/00-collectionHotbed.sql
new file mode 100644
index 000000000..43b85a106
--- /dev/null
+++ b/db/versions/.archive/10334-4310collectionAssignPAK/00-collectionHotbed.sql
@@ -0,0 +1,7 @@
+-- Place your SQL code here
+CREATE OR REPLACE TABLE vn.collectionHotbed (
+ `userFk` int(10) unsigned NOT NULL,
+ `created` timestamp NULL DEFAULT current_timestamp(),
+ PRIMARY KEY (`userFk`),
+ CONSTRAINT `collectionHotbed_FK` FOREIGN KEY (`userFk`) REFERENCES `worker` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
\ No newline at end of file
diff --git a/db/versions/.archive/10334-4310collectionAssignPAK/01-saleGroupDetail.sql b/db/versions/.archive/10334-4310collectionAssignPAK/01-saleGroupDetail.sql
new file mode 100644
index 000000000..9f4c2deac
--- /dev/null
+++ b/db/versions/.archive/10334-4310collectionAssignPAK/01-saleGroupDetail.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.saleGroupDetail ADD CONSTRAINT saleGroupDetail_UN UNIQUE KEY (saleFk,saleGroupFk);
diff --git a/db/versions/.archive/10335-silverCyca/00-firstScript.sql b/db/versions/.archive/10335-silverCyca/00-firstScript.sql
new file mode 100644
index 000000000..85385f8fb
--- /dev/null
+++ b/db/versions/.archive/10335-silverCyca/00-firstScript.sql
@@ -0,0 +1,3 @@
+-- Place your SQL code here
+ALTER TABLE `vn`.`supplierAccount`
+CHANGE COLUMN `bicSufix` `bicSufix__` VARCHAR(3) NOT NULL DEFAULT '' ;
diff --git a/db/versions/.archive/10336-grayMoss/00-firstScript.sql b/db/versions/.archive/10336-grayMoss/00-firstScript.sql
new file mode 100644
index 000000000..c2a69e09c
--- /dev/null
+++ b/db/versions/.archive/10336-grayMoss/00-firstScript.sql
@@ -0,0 +1,9 @@
+USE vn;
+
+ALTER TABLE vn.ticketRefund
+ DROP FOREIGN KEY ticketRefund_FK;
+
+ALTER TABLE vn.ticketRefund
+ ADD CONSTRAINT ticketRefund_FK
+ FOREIGN KEY (refundTicketFk)
+ REFERENCES vn.ticket(id) ON DELETE CASCADE ON UPDATE CASCADE;
\ No newline at end of file
diff --git a/db/versions/.archive/10337-orangePalmetto/00-firstScript.sql b/db/versions/.archive/10337-orangePalmetto/00-firstScript.sql
new file mode 100644
index 000000000..a772caaa8
--- /dev/null
+++ b/db/versions/.archive/10337-orangePalmetto/00-firstScript.sql
@@ -0,0 +1,3 @@
+ALTER TABLE vn.ledgerConfig ADD maxTolerance decimal(10,2) NOT NULL;
+UPDATE vn.ledgerConfig
+ SET maxTolerance=0.05;
\ No newline at end of file
diff --git a/db/versions/.archive/10339-goldenCarnation/00-firstScript.sql b/db/versions/.archive/10339-goldenCarnation/00-firstScript.sql
new file mode 100644
index 000000000..7ee0d95cb
--- /dev/null
+++ b/db/versions/.archive/10339-goldenCarnation/00-firstScript.sql
@@ -0,0 +1,6 @@
+-- Place your SQL code here
+use vn;
+CREATE TABLE vn.workerConfig (
+ id INT PRIMARY KEY AUTO_INCREMENT NOT NULL,
+ businessUpdated DATE NULL
+);
\ No newline at end of file
diff --git a/db/versions/.archive/10340-maroonCordyline/00-firstScript.sql b/db/versions/.archive/10340-maroonCordyline/00-firstScript.sql
new file mode 100644
index 000000000..1d7e64e8c
--- /dev/null
+++ b/db/versions/.archive/10340-maroonCordyline/00-firstScript.sql
@@ -0,0 +1,5 @@
+-- Place your SQL code here
+
+USE vn;
+
+RENAME TABLE vn.cmr_expeditionPallet TO vn.cmrPallet;
diff --git a/db/versions/.archive/10341-redDendro/00-firstScript.sql b/db/versions/.archive/10341-redDendro/00-firstScript.sql
new file mode 100644
index 000000000..b2c4fd35c
--- /dev/null
+++ b/db/versions/.archive/10341-redDendro/00-firstScript.sql
@@ -0,0 +1,20 @@
+ALTER TABLE vn.project ADD stateFk varchar(25) DEFAULT 'open';
+
+CREATE TABLE vn.projectState (
+ code varchar(25) NOT NULL,
+ description varchar(100) NOT NULL,
+ CONSTRAINT projectState_PK PRIMARY KEY (code)
+)
+ENGINE=InnoDB
+DEFAULT CHARSET=utf8mb3
+COLLATE=utf8mb3_unicode_ci;
+
+INSERT INTO vn.projectState (code,description)
+ VALUES ('open','Abierto');
+INSERT INTO vn.projectState (code,description)
+ VALUES ('inProgress','En progreso');
+INSERT INTO vn.projectState (code,description)
+ VALUES ('closed','Cerrado');
+
+ALTER TABLE vn.project ADD CONSTRAINT project_FK_3 FOREIGN KEY (stateFk) REFERENCES vn.projectState(code);
+
diff --git a/db/versions/.archive/10342-limeChico/00-firstScript.sql b/db/versions/.archive/10342-limeChico/00-firstScript.sql
new file mode 100644
index 000000000..5055a5011
--- /dev/null
+++ b/db/versions/.archive/10342-limeChico/00-firstScript.sql
@@ -0,0 +1,33 @@
+-- Place your SQL code here
+
+USE vn;
+
+ALTER TABLE vn.collectionColors ADD rgb char(7) DEFAULT NULL NULL;
+
+ALTER TABLE vn.collectionColors ADD CONSTRAINT collectionColors_UN UNIQUE KEY (shelve,wagon,trainFk);
+
+UPDATE vn.collectionColors
+SET rgb='#ff0000'
+WHERE id=1;
+
+UPDATE vn.collectionColors
+SET rgb='#ffce30'
+ WHERE id=2;
+
+UPDATE vn.collectionColors
+SET rgb='#008000'
+ WHERE id=3;
+
+UPDATE vn.collectionColors
+SET rgb='#0000ff'
+ WHERE id=4;
+
+UPDATE vn.collectionColors
+SET rgb='#ffffff'
+ WHERE id=5;
+
+UPDATE vn.collectionColors
+SET rgb='#000000'
+ WHERE id=6;
+
+
diff --git a/db/versions/.archive/10343-azureOak/00-firstScript.sql b/db/versions/.archive/10343-azureOak/00-firstScript.sql
new file mode 100644
index 000000000..aa01e1533
--- /dev/null
+++ b/db/versions/.archive/10343-azureOak/00-firstScript.sql
@@ -0,0 +1,6 @@
+-- Place your SQL code here
+ALTER TABLE `vn`.`buy`
+CHANGE COLUMN `buyingValue` `buyingValue` DECIMAL(10,3) NOT NULL DEFAULT 0.000 ,
+CHANGE COLUMN `freightValue` `freightValue` DECIMAL(10,3) NOT NULL DEFAULT 0.000 ,
+CHANGE COLUMN `comissionValue` `comissionValue` DECIMAL(10,3) NOT NULL DEFAULT 0.000 ,
+CHANGE COLUMN `packageValue` `packageValue` DECIMAL(10,3) NOT NULL DEFAULT 0.000 ;
\ No newline at end of file
diff --git a/db/versions/.archive/10345-wheatRaphis/00-firstScript.sql b/db/versions/.archive/10345-wheatRaphis/00-firstScript.sql
new file mode 100644
index 000000000..13cec2f16
--- /dev/null
+++ b/db/versions/.archive/10345-wheatRaphis/00-firstScript.sql
@@ -0,0 +1,15 @@
+use vn;
+CREATE OR REPLACE TABLE `paperSize` (
+ `code` varchar(100) COLLATE utf8mb3_unicode_ci NOT NULL,
+ `color` varchar(100) COLLATE utf8mb3_unicode_ci NOT NULL,
+ `alias` varchar(100) COLLATE utf8mb3_unicode_ci NOT NULL,
+ PRIMARY KEY (`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+ALTER TABLE vn.report ADD paperSizeFk varchar(100) DEFAULT NULL NULL;
+ALTER TABLE vn.report ADD CONSTRAINT report_FK FOREIGN KEY (paperSizeFk) REFERENCES vn.paperSize(code);
+
+ALTER TABLE vn.printer ADD paperSizeFk varchar(100) DEFAULT NULL NULL;
+ALTER TABLE vn.printer ADD CONSTRAINT printer_FK_1 FOREIGN KEY (paperSizeFk) REFERENCES vn.paperSize(code);
+
+
diff --git a/db/versions/.archive/10347-wheatDracena/00-firstScript.sql b/db/versions/.archive/10347-wheatDracena/00-firstScript.sql
new file mode 100644
index 000000000..31446ee37
--- /dev/null
+++ b/db/versions/.archive/10347-wheatDracena/00-firstScript.sql
@@ -0,0 +1,3 @@
+ALTER TABLE vn.expedition CHANGE isBox freightItemFk int(11) DEFAULT 1 NULL COMMENT 'itemFk del artículo que nos va a facturar el proveedor de transporte.';
+
+UPDATE vn.expedition SET freightItemFk = NULL WHERE freightItemFk = 0;
\ No newline at end of file
diff --git a/db/versions/.archive/10347-wheatDracena/01-addVirtualField.sql b/db/versions/.archive/10347-wheatDracena/01-addVirtualField.sql
new file mode 100644
index 000000000..7085c0ecd
--- /dev/null
+++ b/db/versions/.archive/10347-wheatDracena/01-addVirtualField.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.expedition ADD isBox INT(11) GENERATED ALWAYS AS (freightItemFk) VIRTUAL COMMENT 'Columna virtual provisional para Salix';
\ No newline at end of file
diff --git a/db/versions/.archive/10349-greenOak/00-firstScript.sql b/db/versions/.archive/10349-greenOak/00-firstScript.sql
new file mode 100644
index 000000000..36d9079aa
--- /dev/null
+++ b/db/versions/.archive/10349-greenOak/00-firstScript.sql
@@ -0,0 +1,9 @@
+-- Place your SQL code here
+ALTER TABLE `vn`.`itemType`
+ADD COLUMN `isMergeable` TINYINT(1) NOT NULL DEFAULT 1 AFTER `maxRefs`;
+
+ALTER TABLE `vn`.`itemType`
+CHANGE COLUMN `isMergeable` `isMergeable` TINYINT(1) NOT NULL DEFAULT 1 COMMENT 'Articulos que al mergear los tickets se fusionara la linea' ;
+
+UPDATE `vn`.`itemType` SET `isMergeable` = '0' WHERE (`code` = 'GEN');
+
diff --git a/db/versions/.archive/10350-azureAnthurium/00-firstScript.sql b/db/versions/.archive/10350-azureAnthurium/00-firstScript.sql
new file mode 100644
index 000000000..dbe80c35a
--- /dev/null
+++ b/db/versions/.archive/10350-azureAnthurium/00-firstScript.sql
@@ -0,0 +1,2 @@
+-- Place your SQL code here
+ALTER TABLE vn.tag DROP FOREIGN KEY fgnTag;
diff --git a/db/versions/.archive/10352-maroonHydrangea/00-firstScript.sql b/db/versions/.archive/10352-maroonHydrangea/00-firstScript.sql
new file mode 100644
index 000000000..ab1540fd6
--- /dev/null
+++ b/db/versions/.archive/10352-maroonHydrangea/00-firstScript.sql
@@ -0,0 +1,3 @@
+ALTER TABLE vn.entry CHANGE `ref` invoiceNumber varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL;
+ALTER TABLE vn.entry ADD reference varchar(50) NULL COMMENT 'Referencia para eti';
+ALTER TABLE vn.entry ADD ref VARCHAR(50) GENERATED ALWAYS AS (invoiceNumber) VIRTUAL COMMENT 'Columna virtual provisional para Salix';
\ No newline at end of file
diff --git a/db/versions/.archive/10353-silverRoebelini/00-firstScript.sql b/db/versions/.archive/10353-silverRoebelini/00-firstScript.sql
new file mode 100644
index 000000000..e4cfbe5c0
--- /dev/null
+++ b/db/versions/.archive/10353-silverRoebelini/00-firstScript.sql
@@ -0,0 +1,9 @@
+-- Place your SQL code here
+
+USE vn;
+
+INSERT INTO vn.silexACL
+( module, `method`, `role`)
+VALUES('almacennew', 'shelvingLog_add', 'employee');
+
+ALTER TABLE vn.shelvingLog MODIFY COLUMN `action` set('insert','update','delete','select') CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL;
diff --git a/db/versions/.archive/10354-wheatMedeola/00-firstScript.sql b/db/versions/.archive/10354-wheatMedeola/00-firstScript.sql
new file mode 100644
index 000000000..143183830
--- /dev/null
+++ b/db/versions/.archive/10354-wheatMedeola/00-firstScript.sql
@@ -0,0 +1,2 @@
+ALTER TABLE vn.ticket CHANGE isLabeled isLabeled__ tinyint(1) DEFAULT 0 NOT NULL;
+
diff --git a/db/versions/.archive/10356-turquoiseAnthurium/00-firstScript.sql b/db/versions/.archive/10356-turquoiseAnthurium/00-firstScript.sql
new file mode 100644
index 000000000..9c2d7280a
--- /dev/null
+++ b/db/versions/.archive/10356-turquoiseAnthurium/00-firstScript.sql
@@ -0,0 +1,20 @@
+
+-- Menú options
+
+DELETE FROM hedera.menu
+ WHERE id=27;
+
+-- Rest privileges
+
+UPDATE hedera.restPriv
+ SET methodPath='user/supplant'
+ WHERE id=5;
+UPDATE hedera.restPriv
+ SET methodPath='misc/captcha'
+ WHERE id=10;
+UPDATE hedera.restPriv
+ SET methodPath='user/recover-password'
+ WHERE id=15;
+UPDATE hedera.restPriv
+ SET methodPath='user/restore-password'
+ WHERE id=16;
diff --git a/db/versions/.archive/10356-turquoiseAnthurium/01-orderConfigFk.sql b/db/versions/.archive/10356-turquoiseAnthurium/01-orderConfigFk.sql
new file mode 100644
index 000000000..d29f56ce9
--- /dev/null
+++ b/db/versions/.archive/10356-turquoiseAnthurium/01-orderConfigFk.sql
@@ -0,0 +1 @@
+ALTER TABLE hedera.orderConfig DROP FOREIGN KEY orderConfig_ibfk_5;
diff --git a/db/versions/.archive/10356-turquoiseAnthurium/02-orderConfigDrop.sql b/db/versions/.archive/10356-turquoiseAnthurium/02-orderConfigDrop.sql
new file mode 100644
index 000000000..e3ce6afe9
--- /dev/null
+++ b/db/versions/.archive/10356-turquoiseAnthurium/02-orderConfigDrop.sql
@@ -0,0 +1 @@
+ALTER TABLE `hedera`.`orderConfig` DROP `guestAddressFk`;
diff --git a/db/versions/.archive/10357-blackAnthurium/00-firstScript.sql b/db/versions/.archive/10357-blackAnthurium/00-firstScript.sql
new file mode 100644
index 000000000..8a2bd8b41
--- /dev/null
+++ b/db/versions/.archive/10357-blackAnthurium/00-firstScript.sql
@@ -0,0 +1,2 @@
+ALTER TABLE vn.ticket CHANGE isLabeled__ isLabeled tinyint(1) DEFAULT 0 NOT NULL;
+
diff --git a/db/versions/.archive/10359-turquoiseAnthurium/00-improvedGeneralLog_collate.sql b/db/versions/.archive/10359-turquoiseAnthurium/00-improvedGeneralLog_collate.sql
new file mode 100644
index 000000000..5f354ba6f
--- /dev/null
+++ b/db/versions/.archive/10359-turquoiseAnthurium/00-improvedGeneralLog_collate.sql
@@ -0,0 +1,2 @@
+ALTER TABLE vn.improvedGeneralLog CONVERT TO CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci;
+ALTER TABLE vn.improvedGeneralLogProcedures CONVERT TO CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci;
diff --git a/db/versions/.archive/10360-tealLaurel/00-firstScript.sql b/db/versions/.archive/10360-tealLaurel/00-firstScript.sql
new file mode 100644
index 000000000..8d0506b74
--- /dev/null
+++ b/db/versions/.archive/10360-tealLaurel/00-firstScript.sql
@@ -0,0 +1,6 @@
+-- Place your SQL code here
+USE vn;
+
+INSERT INTO vn.silexACL
+(module, `method`, `role`)
+VALUES('almacennew', 'collection_get', 'employee');
diff --git a/db/versions/.archive/10361-redTulip/00-firstScript.sql b/db/versions/.archive/10361-redTulip/00-firstScript.sql
new file mode 100644
index 000000000..1a46ef57a
--- /dev/null
+++ b/db/versions/.archive/10361-redTulip/00-firstScript.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `vn`.`printQueue`
+CHANGE COLUMN `statusCode` `statusCode`
+ ENUM('queued', 'error', 'printing', 'printed') NOT NULL DEFAULT 'queued' ;
diff --git a/db/versions/.archive/10362-azureMoss/00-dropUdfs.sql b/db/versions/.archive/10362-azureMoss/00-dropUdfs.sql
new file mode 100644
index 000000000..e64e75586
--- /dev/null
+++ b/db/versions/.archive/10362-azureMoss/00-dropUdfs.sql
@@ -0,0 +1,3 @@
+DROP FUNCTION IF EXISTS minacum;
+DROP FUNCTION IF EXISTS multimax;
+DROP FUNCTION IF EXISTS sql_printf;
diff --git a/db/versions/.archive/10362-azureMoss/00-dropUdfs.undo.sql b/db/versions/.archive/10362-azureMoss/00-dropUdfs.undo.sql
new file mode 100644
index 000000000..4d469ed79
--- /dev/null
+++ b/db/versions/.archive/10362-azureMoss/00-dropUdfs.undo.sql
@@ -0,0 +1,3 @@
+CREATE AGGREGATE FUNCTION minacum RETURNS INT SONAME 'minacum.so';
+CREATE AGGREGATE FUNCTION multimax RETURNS INT SONAME 'multimax.so';
+CREATE FUNCTION sql_printf RETURNS STRING SONAME 'sql_printf.so';
diff --git a/db/versions/.archive/10363-azureLilium/00-firstScript.sql b/db/versions/.archive/10363-azureLilium/00-firstScript.sql
new file mode 100644
index 000000000..6c2edbb2d
--- /dev/null
+++ b/db/versions/.archive/10363-azureLilium/00-firstScript.sql
@@ -0,0 +1,2 @@
+-- Place your SQL code here
+ALTER TABLE bi.rutasBoard ADD m3 decimal(10,1) unsigned NULL;
diff --git a/db/versions/.archive/10365-hfCollectionPAK/00-firstScript.sql b/db/versions/.archive/10365-hfCollectionPAK/00-firstScript.sql
new file mode 100644
index 000000000..86a045524
--- /dev/null
+++ b/db/versions/.archive/10365-hfCollectionPAK/00-firstScript.sql
@@ -0,0 +1,2 @@
+-- Place your SQL code here
+ALTER TABLE vn.operator MODIFY COLUMN itemPackingTypeFk varchar(1) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT 'H' NOT NULL;
diff --git a/db/versions/.archive/10368-maroonErica/00-firstScript.sql b/db/versions/.archive/10368-maroonErica/00-firstScript.sql
new file mode 100644
index 000000000..46c3a1cc1
--- /dev/null
+++ b/db/versions/.archive/10368-maroonErica/00-firstScript.sql
@@ -0,0 +1,2 @@
+USE vn;
+ALTER TABLE vn.business ADD basicSalary decimal(10,2) DEFAULT NULL NULL;
\ No newline at end of file
diff --git a/db/versions/.archive/10369-hfProductionControlPAK/00-firstScript.sql b/db/versions/.archive/10369-hfProductionControlPAK/00-firstScript.sql
new file mode 100644
index 000000000..78a388f07
--- /dev/null
+++ b/db/versions/.archive/10369-hfProductionControlPAK/00-firstScript.sql
@@ -0,0 +1,2 @@
+-- Place your SQL code here
+ALTER IGNORE TABLE vn.productionConfig ADD maxProductionScopeDays INT DEFAULT 1 NOT NULL COMMENT 'maximo numero de dias en F11';
diff --git a/db/versions/.archive/10370-pinkBirch/00-deleteForeignKey.sql b/db/versions/.archive/10370-pinkBirch/00-deleteForeignKey.sql
new file mode 100644
index 000000000..ecebeaf90
--- /dev/null
+++ b/db/versions/.archive/10370-pinkBirch/00-deleteForeignKey.sql
@@ -0,0 +1,45 @@
+ALTER TABLE `vn`.`item`
+DROP FOREIGN KEY IF EXISTS `item_ibfk_4`;
+
+ALTER TABLE `vn`.`address`
+DROP FOREIGN KEY IF EXISTS `address_ibfk_1`;
+
+ALTER TABLE `vn`.`agency`
+DROP FOREIGN KEY IF EXISTS `agency_ibfk_2`;
+
+ALTER TABLE `vn`.`claim`
+DROP FOREIGN KEY IF EXISTS `claim_ibfk_4`;
+
+ALTER TABLE `vn`.`host`
+DROP FOREIGN KEY IF EXISTS `configHost_FK_1`;
+
+ALTER TABLE `vn`.`ticket`
+DROP FOREIGN KEY IF EXISTS `tickets_fk11`;
+
+ALTER TABLE `vn`.`zone`
+DROP FOREIGN KEY IF EXISTS `fk_zone_1`;
+
+ALTER TABLE `vn`.`floramondoConfig`
+DROP FOREIGN KEY IF EXISTS `floramondoConfigWarehouseOutFk`,
+DROP FOREIGN KEY IF EXISTS `floramondoConfigAgencyModeFk`;
+
+ALTER TABLE `postgresql`.`province`
+DROP FOREIGN KEY IF EXISTS `fk_province_nation1`;
+
+ALTER TABLE `vn`.`person__`
+DROP FOREIGN KEY `Person_ibfk_1`;
+
+ALTER TABLE `postgresql`.`profile__`
+DROP FOREIGN KEY IF EXISTS `profile_workerFk`;
+
+ALTER TABLE `postgresql`.`profile_media`
+DROP FOREIGN KEY IF EXISTS `media_ibfk_20`;
+
+ALTER TABLE `postgresql`.`erte_COVID19`
+DROP FOREIGN KEY IF EXISTS `erte_COVID19_FK`;
+
+ALTER TABLE `vn`.`contratos_subvencion_270619`
+DROP FOREIGN KEY IF EXISTS `contratos_subvencion_270619_fk3`;
+
+
+
diff --git a/db/versions/.archive/10370-pinkBirch/01-firstScript.sql b/db/versions/.archive/10370-pinkBirch/01-firstScript.sql
new file mode 100644
index 000000000..eaa1190ec
--- /dev/null
+++ b/db/versions/.archive/10370-pinkBirch/01-firstScript.sql
@@ -0,0 +1,193 @@
+-- Place your SQL code here
+DROP DATABASE IF EXISTS `roundcube__`;
+DROP DATABASE IF EXISTS `mediawiki__`;
+DROP DATABASE IF EXISTS `wordpress__`;
+DROP DATABASE IF EXISTS `ps_helper__`;
+
+ALTER TABLE `vn`.`invoiceOut`
+DROP COLUMN IF EXISTS `workerFk__`,
+DROP COLUMN IF EXISTS `vat16__`,
+DROP COLUMN IF EXISTS `vat7__`,
+DROP COLUMN IF EXISTS `equ4__`,
+DROP COLUMN IF EXISTS `equ1__`,
+DROP COLUMN IF EXISTS `taxableBase16__`,
+DROP COLUMN IF EXISTS `taxableBase7__`,
+DROP INDEX IF EXISTS `Id_Trabajador` ;
+
+ALTER TABLE `vn`.`item`
+DROP COLUMN IF EXISTS `sectorFk__`,
+DROP COLUMN IF EXISTS `compression__`,
+DROP COLUMN IF EXISTS `isBargain__`,
+DROP COLUMN IF EXISTS `isOnOffer__`,
+DROP COLUMN IF EXISTS `niche__`,
+DROP COLUMN IF EXISTS `taxClassFk__`,
+DROP COLUMN IF EXISTS `isDeliveryNote__`,
+DROP INDEX IF EXISTS `item_ibfk_6_idx` ,
+DROP INDEX IF EXISTS `iva_group_id`;
+
+ALTER TABLE `vn`.`address`
+DROP COLUMN IF EXISTS `isVilassarBuyer__`,
+DROP COLUMN IF EXISTS `codPosOld__`,
+DROP COLUMN IF EXISTS `postcodeOLD__`,
+DROP COLUMN IF EXISTS `porte__`,
+DROP COLUMN IF EXISTS `hasInsurance__`,
+DROP COLUMN IF EXISTS `notes__`,
+DROP COLUMN IF EXISTS `warehouseFk__`,
+DROP INDEX IF EXISTS `warehouse_id` ;
+
+ALTER TABLE `vn`.`config`
+DROP COLUMN IF EXISTS `serialMFk__`,
+DROP COLUMN IF EXISTS `serialTFk__`,
+DROP COLUMN IF EXISTS `serialPFk__`,
+DROP COLUMN IF EXISTS `serialHFk__`,
+DROP COLUMN IF EXISTS `serialCFk__`,
+DROP COLUMN IF EXISTS `serialRFk__`,
+DROP COLUMN IF EXISTS `serialEFk__`,
+DROP COLUMN IF EXISTS `serialAFk__`,
+DROP COLUMN IF EXISTS `bookFk__`;
+
+ALTER TABLE `vn`.`client`
+DROP COLUMN IF EXISTS `cplusTerIdNifFk__`,
+DROP COLUMN IF EXISTS `codposOLD__`,
+DROP COLUMN IF EXISTS `postcodeOld__`,
+DROP COLUMN IF EXISTS `coreFth__`,
+DROP COLUMN IF EXISTS `sepaFth__`,
+DROP COLUMN IF EXISTS `splitHolland__`,
+DROP COLUMN IF EXISTS `cyc__`,
+DROP COLUMN IF EXISTS `hold__`,
+DROP COLUMN IF EXISTS `invoiceCopy__`,
+DROP COLUMN IF EXISTS `administrativeNotes__`,
+DROP COLUMN IF EXISTS `notes__`,
+DROP COLUMN IF EXISTS `isReExpedition__`,
+DROP COLUMN IF EXISTS `wholesaler__`,
+DROP COLUMN IF EXISTS `isOfficial__`,
+DROP COLUMN IF EXISTS `receipt__`,
+DROP COLUMN IF EXISTS `fax__`,
+DROP COLUMN IF EXISTS `discount__`,
+DROP INDEX IF EXISTS `codpos` ,
+ADD INDEX `codpos` (`postcode` ASC) VISIBLE;
+
+ALTER TABLE `vn`.`claimBeginning`
+DROP COLUMN IF EXISTS `claimRequestFk__`,
+DROP COLUMN IF EXISTS `claimComplaintFk__`;
+
+ALTER TABLE `vn`.`department`
+DROP COLUMN IF EXISTS `y__`,
+DROP COLUMN IF EXISTS `x__`,
+DROP COLUMN IF EXISTS `bossFk__`;
+
+ALTER TABLE `vn`.`claim`
+DROP COLUMN IF EXISTS `claimDepartmentFk__`,
+DROP INDEX IF EXISTS `cl_dep_id` ;
+
+ALTER TABLE `vn`.`supplierAccount`
+DROP COLUMN IF EXISTS `bicSufix__`;
+
+ALTER TABLE `vn`.`travelThermograph`
+DROP COLUMN IF EXISTS `temperature__`;
+
+ALTER TABLE `vn`.`origin`
+DROP COLUMN IF EXISTS `nl__`,
+DROP COLUMN IF EXISTS `flag__`;
+
+ALTER TABLE `vn`.`itemShelving`
+DROP COLUMN IF EXISTS `stars__`,
+DROP COLUMN IF EXISTS `priority__`,
+DROP COLUMN IF EXISTS `shelve__`;
+
+ALTER TABLE `vn`.`receipt`
+DROP COLUMN IF EXISTS `amountUnpaid__`;
+
+ALTER TABLE `vn`.`agency`
+DROP COLUMN IF EXISTS `supplierFk__`,
+DROP COLUMN IF EXISTS `labelZone__`,
+DROP COLUMN IF EXISTS `bankFk__`,
+DROP COLUMN IF EXISTS `isVolumetric__`,
+DROP INDEX IF EXISTS `agency_ibfk_4_idx` ,
+DROP INDEX IF EXISTS `Id_Banco` ;
+
+ALTER TABLE `vn`.`sector`
+DROP COLUMN IF EXISTS `labelReport__`,
+DROP COLUMN IF EXISTS `path__`,
+DROP COLUMN IF EXISTS `pickingPlacement__`;
+
+ALTER TABLE `vn`.`ticket`
+DROP COLUMN IF EXISTS `collectionFk__`,
+DROP COLUMN IF EXISTS `isBooked__`,
+DROP COLUMN IF EXISTS `invoiceOutFk__`,
+DROP COLUMN IF EXISTS `notes__`,
+DROP INDEX IF EXISTS `tickets_fk11_idx` ;
+
+ALTER TABLE `vn`.`agencyMode`
+DROP COLUMN IF EXISTS `cod71__`;
+
+ALTER TABLE `vn`.`itemType`
+DROP COLUMN IF EXISTS `f11__`,
+DROP COLUMN IF EXISTS `gramsMin__`;
+
+ALTER TABLE `vn`.`ticketRequest`
+DROP COLUMN IF EXISTS `ko__`,
+DROP COLUMN IF EXISTS `ok__`,
+DROP COLUMN IF EXISTS `price__`;
+
+ALTER TABLE `vn`.`supplier`
+DROP COLUMN IF EXISTS `Fax__`;
+
+ALTER TABLE `vn`.`clientProtected`
+DROP COLUMN IF EXISTS `isValidated__`;
+
+ALTER TABLE `vn`.`payment`
+DROP COLUMN IF EXISTS `exchangeInsuranceFk__`,
+DROP INDEX IF EXISTS `fk_pago_pago_sdc1_idx` ;
+
+ALTER TABLE `vn`.`buy`
+DROP COLUMN IF EXISTS `producer__`;
+
+ALTER TABLE `vn`.`host`
+DROP COLUMN IF EXISTS `packingSite__`,
+DROP COLUMN IF EXISTS `itemPackingTypeFk__`,
+DROP INDEX IF EXISTS `configHost_FK_1` ;
+
+ALTER TABLE `vn`.`zone`
+DROP COLUMN IF EXISTS `warehouseFk__`,
+DROP INDEX IF EXISTS `fk_zone_1_idx`;
+
+ALTER TABLE `vn`.`floramondoConfig`
+DROP COLUMN IF EXISTS `agencyModeFk__`,
+DROP COLUMN IF EXISTS `warehouseOutFk__`,
+DROP INDEX IF EXISTS `floramondoConfigAgencyModeFk_idx` ,
+DROP INDEX IF EXISTS `floramondoConfigWarehouseOut_idx` ;
+
+ALTER TABLE `vn`.`sms`
+DROP COLUMN IF EXISTS `destinationFk__`;
+
+ALTER TABLE `vn`.`itemBotanical`
+DROP COLUMN IF EXISTS `botanical__`;
+
+ALTER TABLE `vn`.`smsConfig`
+DROP COLUMN IF EXISTS `password__`,
+DROP COLUMN IF EXISTS `user__`;
+
+ALTER TABLE `vn`.`expedition`
+DROP COLUMN IF EXISTS `checked__`,
+DROP COLUMN IF EXISTS `isPickUp__`,
+DROP COLUMN IF EXISTS `isRefund__`;
+
+ALTER TABLE `vn`.`intrastat`
+DROP COLUMN IF EXISTS `import__`;
+
+ALTER TABLE `bs`.`indicators`
+DROP COLUMN IF EXISTS `salesWorkersCostRate__`,
+DROP COLUMN IF EXISTS `workerCostM3__`,
+DROP COLUMN IF EXISTS `hoursM3__`,
+DROP COLUMN IF EXISTS `valueM3__`,
+DROP COLUMN IF EXISTS `salesValue__`,
+DROP COLUMN IF EXISTS `volumeM3__`,
+DROP COLUMN IF EXISTS `dailyWorkersCost__`,
+DROP COLUMN IF EXISTS `productionHours__`;
+
+ALTER TABLE `vn2008`.`payroll_employee`
+DROP COLUMN IF EXISTS `Person_id__`;
+
+ALTER TABLE `postgresql`.`income_employee`
+DROP COLUMN IF EXISTS `person_id__`;
\ No newline at end of file
diff --git a/db/versions/.archive/10370-pinkBirch/02-deleteTable.sql b/db/versions/.archive/10370-pinkBirch/02-deleteTable.sql
new file mode 100644
index 000000000..850c93789
--- /dev/null
+++ b/db/versions/.archive/10370-pinkBirch/02-deleteTable.sql
@@ -0,0 +1,116 @@
+DROP TABLE IF EXISTS `bi`.`Last_buy_id__`;
+DROP TABLE IF EXISTS `bi`.`lastaction__`;
+
+DROP TABLE IF EXISTS `bs`.`clientNewBorn__`;
+DROP TABLE IF EXISTS `bs`.`mermasCache__`;
+DROP TABLE IF EXISTS `bs`.`produccion__`;
+DROP TABLE IF EXISTS `bs`.`salePersonEvolution__`;
+DROP TABLE IF EXISTS `bs`.`salesMonthlySnapshot__`;
+DROP TABLE IF EXISTS `bs`.`salesPersonClient__`;
+DROP TABLE IF EXISTS `bs`.`workerSpeed__`;
+DROP TABLE IF EXISTS `bs`.`zone_ETD__`;
+
+DROP TABLE IF EXISTS `edi`.`ektEntryAssign__`;
+
+DROP TABLE IF EXISTS `postgresql`.`bank_account__`;
+DROP TABLE IF EXISTS `postgresql`.`bank_bic__`;
+DROP TABLE IF EXISTS `postgresql`.`business__`;
+DROP TABLE IF EXISTS `postgresql`.`business_labour__`;
+DROP TABLE IF EXISTS `postgresql`.`business_labour_payroll__`;
+DROP TABLE IF EXISTS `postgresql`.`calendar_labour__`;
+DROP TABLE IF EXISTS `postgresql`.`calendar_free__`;
+DROP TABLE IF EXISTS `postgresql`.`calendar_labour_legend__`;
+
+ALTER TABLE IF EXISTS `postgresql`.`province`
+ DROP INDEX IF EXISTS `province_nation_id_idx` ;
+
+DROP TABLE IF EXISTS `postgresql`.`nation__`;
+DROP TABLE IF EXISTS `postgresql`.`currency__`;
+DROP TABLE IF EXISTS `postgresql`.`periodos__`;
+DROP TABLE IF EXISTS `postgresql`.`person__`;
+
+ALTER TABLE IF EXISTS `postgresql`.`profile__`
+ DROP INDEX IF EXISTS `profile_workerFk_idx` ;
+
+ALTER TABLE IF EXISTS `postgresql`.`profile_media`
+ DROP INDEX IF EXISTS `profile_media_profile_id_idx` ;
+
+DROP TABLE IF EXISTS `postgresql`.`profile__`;
+DROP TABLE IF EXISTS `postgresql`.`workcenter__`;
+DROP TABLE IF EXISTS `postgresql`.`workerTimeControlConfig__`;
+
+DROP TABLE IF EXISTS `vn`.`activeContrat__`;
+DROP TABLE IF EXISTS `vn`.`autonomousRegion__`;
+DROP TABLE IF EXISTS `vn`.`config__`;
+DROP TABLE IF EXISTS `vn`.`entrySplit__`;
+DROP TABLE IF EXISTS `vn`.`errorProduction__`;
+DROP TABLE IF EXISTS `vn`.`expence__`;
+DROP TABLE IF EXISTS `vn`.`floramondoNotOfferDay__`;
+DROP TABLE IF EXISTS `vn`.`glsExpedition__`;
+DROP TABLE IF EXISTS `vn`.`invoiceInIntrastat__`;
+DROP TABLE IF EXISTS `vn`.`itemConversor__`;
+DROP TABLE IF EXISTS `vn`.`itemPlacement__`;
+DROP TABLE IF EXISTS `vn`.`itemRepo__`;
+DROP TABLE IF EXISTS `vn`.`itemVerdecora__`;
+
+ALTER TABLE IF EXISTS `vn`.`person__`
+DROP INDEX IF EXISTS `workerFk_idx` ;
+
+DROP TABLE IF EXISTS `vn`.`person__`;
+
+DROP TABLE IF EXISTS `vn`.`printServerQueue2__`;
+DROP TABLE IF EXISTS `vn`.`printServerQueue__`;
+DROP TABLE IF EXISTS `vn`.`routeGate__`;
+DROP TABLE IF EXISTS `vn`.`saleItemShelving__`;
+DROP TABLE IF EXISTS `vn`.`saleParking__`;
+DROP TABLE IF EXISTS `vn`.`workerConfig__`;
+DROP TABLE IF EXISTS `vn`.`zonePromo__`;
+DROP VIEW IF EXISTS `vn`.`returnBuckets__`;
+
+DROP TABLE IF EXISTS `vn2008`.`accumulatorsReadingDate__`;
+DROP TABLE IF EXISTS `vn2008`.`Agencias_dits__`;
+DROP TABLE IF EXISTS `vn2008`.`Articles_dits__`;
+DROP TABLE IF EXISTS `vn2008`.`awb_cargo__`;
+DROP TABLE IF EXISTS `vn2008`.`awb_coordinacion__`;
+DROP TABLE IF EXISTS `vn2008`.`business_labour_payrroll__`;
+DROP TABLE IF EXISTS `vn2008`.`Clientes_cedidos__`;
+DROP TABLE IF EXISTS `vn2008`.`clientes_regalos_enc__`;
+DROP TABLE IF EXISTS `vn2008`.`clientes_regalos_lista_enc__`;
+DROP TABLE IF EXISTS `vn2008`.`Compres_mark__`;
+DROP TABLE IF EXISTS `vn2008`.`config_host__`;
+DROP TABLE IF EXISTS `vn2008`.`Contactos__`;
+DROP TABLE IF EXISTS `vn2008`.`equipos__`;
+DROP TABLE IF EXISTS `vn2008`.`Extractos__`;
+DROP TABLE IF EXISTS `vn2008`.`Impresoras__`;
+DROP TABLE IF EXISTS `vn2008`.`log_articles__`;
+
+
+ALTER TABLE IF EXISTS `vn`.`contratos_subvencion_270619`
+ DROP INDEX IF EXISTS `contratos_subvencion_270619_fk3_idx` ;
+
+DROP TABLE IF EXISTS `vn2008`.`payroll_contratos__`;
+
+DROP TABLE IF EXISTS `vn2008`.`payroll_pagarini__`;
+DROP TABLE IF EXISTS `vn2008`.`payroll_pais__`;
+DROP TABLE IF EXISTS `vn2008`.`printServerQueue2__`;
+DROP TABLE IF EXISTS `vn2008`.`profile_labour_payroll__`;
+DROP TABLE IF EXISTS `vn2008`.`Relaciones__`;
+DROP TABLE IF EXISTS `vn2008`.`ruta_location__`;
+DROP TABLE IF EXISTS `vn2008`.`Rutas_dits__`;
+DROP TABLE IF EXISTS `vn2008`.`Rutas_monitor__`;
+DROP TABLE IF EXISTS `vn2008`.`Stockcontrol__`;
+DROP TABLE IF EXISTS `vn2008`.`Tickets_dits__`;
+DROP TABLE IF EXISTS `vn2008`.`travel_dits__`;
+DROP TABLE IF EXISTS `vn2008`.`versiones__`;
+
+DROP TABLE IF EXISTS `geo`.`autonomias`;
+DROP TABLE IF EXISTS `geo`.`postalcodes`;
+DROP TABLE IF EXISTS `geo`.`vn_rutas`;
+DROP VIEW IF EXISTS `geo`.`table_list`;
+DROP DATABASE IF EXISTS `geo`;
+
+DROP TABLE IF EXISTS `nst`.`balance`;
+DROP TABLE IF EXISTS `nst`.`geo`;
+DROP TABLE IF EXISTS `nst`.`labourTree`;
+DROP TABLE IF EXISTS `nst`.`nst`;
+DROP DATABASE IF EXISTS `nst`;
\ No newline at end of file
diff --git a/db/versions/.archive/10370-pinkBirch/03-accion.sql b/db/versions/.archive/10370-pinkBirch/03-accion.sql
new file mode 100644
index 000000000..51df27fcc
--- /dev/null
+++ b/db/versions/.archive/10370-pinkBirch/03-accion.sql
@@ -0,0 +1,8 @@
+ALTER TABLE `vncontrol`.`accion` RENAME `vn`.`ticketTrackingState`;
+
+-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Rename columns
+
+ALTER TABLE `vn`.`ticketTrackingState`
+CHANGE COLUMN `accion_id` `id` int(11) NOT NULL AUTO_INCREMENT,
+CHANGE COLUMN `accion` `action` varchar(15) COLLATE utf8mb3_unicode_ci NOT NULL;
+
diff --git a/db/versions/.archive/10370-pinkBirch/04-inter.sql b/db/versions/.archive/10370-pinkBirch/04-inter.sql
new file mode 100644
index 000000000..124acc4cf
--- /dev/null
+++ b/db/versions/.archive/10370-pinkBirch/04-inter.sql
@@ -0,0 +1,35 @@
+RENAME TABLE `vn`.`ticketTracking` TO `vn`.`ticketTracking__`;
+
+DROP TRIGGER IF EXISTS `vncontrol`.`ticketTracking_beforeInsert`;
+DROP TRIGGER IF EXISTS `vncontrol`.`ticketTracking_afterInsert`;
+DROP TRIGGER IF EXISTS `vncontrol`.`ticketTracking_afterUpdate`;
+DROP TRIGGER IF EXISTS `vncontrol`.`ticketTracking_afterDelete`;
+
+
+ALTER TABLE `vncontrol`.`inter` RENAME `vn`.`ticketTracking`;
+
+ALTER TABLE vn.ticketTracking CHANGE nota notes varchar(255) DEFAULT NULL NULL;
+ALTER TABLE vn.ticketTracking CHANGE inter_id id int(11) auto_increment NOT NULL;
+ALTER TABLE vn.ticketTracking CHANGE state_id stateFk tinyint(3) unsigned NOT NULL;
+ALTER TABLE vn.ticketTracking CHANGE fallo_id failFk int(10) unsigned DEFAULT 21 NOT NULL;
+ALTER TABLE vn.ticketTracking CHANGE odbc_date created timestamp DEFAULT current_timestamp() NULL;
+ALTER TABLE vn.ticketTracking CHANGE Id_Ticket ticketFk int(11) DEFAULT NULL NULL;
+ALTER TABLE vn.ticketTracking CHANGE Id_Trabajador workerFk int(11) DEFAULT NULL NULL;
+ALTER TABLE vn.ticketTracking CHANGE Id_Supervisor supervisorFk int(10) unsigned DEFAULT NULL NULL;
+
+CREATE
+ ALGORITHM = UNDEFINED
+ DEFINER = `root`@`localhost`
+ SQL SECURITY DEFINER
+VIEW `vncontrol`.`inter` AS
+ SELECT
+ `tt`.`id` AS `inter_id`,
+ `tt`.`stateFk` AS `state_id`,
+ `tt`.`failFk` AS `fallo_id`,
+ `tt`.`notes` AS `nota`,
+ `tt`.`created` AS `odbc_date`,
+ `tt`.`ticketFk` AS `Id_Ticket`,
+ `tt`.`workerFk` AS `Id_Trabajador`,
+ `tt`.`supervisorFk` AS `Id_Supervisor`
+ FROM
+ `vn`.`ticketTracking` `tt`;
\ No newline at end of file
diff --git a/db/versions/.archive/10371-crimsonChico/00-firstScript.sql b/db/versions/.archive/10371-crimsonChico/00-firstScript.sql
new file mode 100644
index 000000000..608576c2c
--- /dev/null
+++ b/db/versions/.archive/10371-crimsonChico/00-firstScript.sql
@@ -0,0 +1,47 @@
+use vn;
+-- Crear columna en deviceProduction
+ALTER TABLE vn.deviceProduction ADD stateFk varchar(50) DEFAULT 'idle';
+-- Crear columna en deviceLog
+ALTER TABLE vn.deviceLog ADD deviceProductionFk INT(10) NULL;
+-- vn.deviceProductionLog definition
+CREATE TABLE `deviceProductionLog` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `originFk` int(11) NOT NULL,
+ `userFk` int(10) unsigned DEFAULT NULL,
+ `deviceProduction` int(10) unsigned NOT NULL,
+ `action` set('insert','update','delete','retired') COLLATE utf8mb3_unicode_ci NOT NULL,
+ `created` timestamp NULL DEFAULT current_timestamp(),
+ `oldInstance` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+ `newInstance` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+ `changedModel` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+ `changedModelId` int(11) DEFAULT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+-- Preguntar sobre elimnar estos campos
+ALTER TABLE vn.deviceProduction DROP FOREIGN KEY departmentFgn;
+ALTER TABLE vn.deviceProduction DROP COLUMN departmentFk;
+ALTER TABLE vn.deviceProduction DROP COLUMN isOutOfService;
+-- Crear tabla
+CREATE TABLE vn.deviceProductionState (
+ code varchar(50) NOT NULL,
+ description varchar(50) NOT NULL,
+ CONSTRAINT deviceProductionState_PK PRIMARY KEY (code)
+)
+ENGINE=InnoDB
+DEFAULT CHARSET=utf8mb3
+COLLATE=utf8mb3_unicode_ci;
+-- Rellenar tabla
+INSERT INTO vn.deviceProductionState
+(code, description)
+VALUES('idle', 'inactivo');
+INSERT INTO vn.deviceProductionState
+(code, description)
+VALUES('active', 'activo');
+INSERT INTO vn.deviceProductionState
+(code, description)
+VALUES('maintenance', 'mantenimiento');
+INSERT INTO vn.deviceProductionState
+(code, description)
+VALUES('retired', 'retirada');
+-- FK deviceProductionStateFk
+ALTER TABLE vn.deviceProduction ADD CONSTRAINT deviceProduction_FK FOREIGN KEY (stateFk) REFERENCES vn.deviceProductionState(code);
\ No newline at end of file
diff --git a/db/versions/.archive/10372-grayIvy/00-firstScript.sql b/db/versions/.archive/10372-grayIvy/00-firstScript.sql
new file mode 100644
index 000000000..0a4b962f2
--- /dev/null
+++ b/db/versions/.archive/10372-grayIvy/00-firstScript.sql
@@ -0,0 +1,15 @@
+USE bs;
+
+ALTER TABLE bs.salesMonthlySnapshot
+ COMMENT = '@deprecated 2022-11' ,
+ RENAME TO bs.salesMonthlySnapshot___ ;
+
+ALTER TABLE bs.salesPerson
+ COMMENT = '@deprecated 2022-11' ,
+ RENAME TO bs.salesPerson__ ;
+
+ALTER TABLE bs.vendedores_evolution
+ COMMENT = '@deprecated 2022-11' ,
+ RENAME TO bs.vendedores_evolution__ ;
+
+TRUNCATE bs.salesPersonEvolution;
\ No newline at end of file
diff --git a/db/versions/.archive/10373-salmonHydrangea/00-firstScript.sql b/db/versions/.archive/10373-salmonHydrangea/00-firstScript.sql
new file mode 100644
index 000000000..4c78fb783
--- /dev/null
+++ b/db/versions/.archive/10373-salmonHydrangea/00-firstScript.sql
@@ -0,0 +1,30 @@
+CREATE TABLE vn.expeditionMistakeType (
+ code VARCHAR(15) NOT NULL,
+ description varchar(45) NOT NULL,
+ CONSTRAINT packagingTypeMistake_PK PRIMARY KEY (code)
+)
+ENGINE=InnoDB
+DEFAULT CHARSET=utf8mb3
+COLLATE=utf8mb3_unicode_ci;
+
+
+CREATE TABLE vn.expeditionMistake (
+ expeditionFk INT NOT NULL,
+ workerFk INT(10) unsigned NOT NULL COMMENT 'Quien marca el error',
+ typeFk VARCHAR(15) NOT NULL,
+ created TIMESTAMP DEFAULT current_timestamp() NOT NULL,
+ CONSTRAINT expeditionMistake_PK PRIMARY KEY (expeditionFk ),
+ CONSTRAINT expeditionMistake_FK FOREIGN KEY (expeditionFk) REFERENCES vn.expedition(id) ON DELETE RESTRICT ON UPDATE CASCADE,
+ CONSTRAINT expeditionMistake_FK_1 FOREIGN KEY (workerfk) REFERENCES vn.worker(id) ON DELETE RESTRICT ON UPDATE CASCADE,
+ CONSTRAINT expeditionMistake_FK_2 FOREIGN KEY (typeFk) REFERENCES vn.expeditionMistakeType(code) ON DELETE RESTRICT ON UPDATE CASCADE
+)
+ENGINE=InnoDB
+DEFAULT CHARSET=utf8mb3
+COLLATE=utf8mb3_unicode_ci
+COMMENT='Errores de encajadores';
+
+INSERT INTO vn.expeditionMistakeType (code, description) VALUES('bpc', 'Mal encajado');
+INSERT INTO vn.expeditionMistakeType (code, description) VALUES('mex', 'Mezcla de pedidos');
+
+INSERT INTO vn.silexACL ( module, `method`, `role`) VALUES( 'almacennew', 'expeditionMistakeType_get', 'employee');
+INSERT INTO vn.silexACL ( module, `method`, `role`) VALUES( 'almacennew', 'expeditionMistake_add', 'employee');
\ No newline at end of file
diff --git a/db/versions/.archive/10378-blueCarnation/00-rename_routeUserPercentage.sql b/db/versions/.archive/10378-blueCarnation/00-rename_routeUserPercentage.sql
new file mode 100644
index 000000000..327b35625
--- /dev/null
+++ b/db/versions/.archive/10378-blueCarnation/00-rename_routeUserPercentage.sql
@@ -0,0 +1 @@
+RENAME TABLE vn.routeUserPercentage TO vn.routeUserPercentage__;
\ No newline at end of file
diff --git a/db/versions/.archive/10379-turquoiseOrchid/00-firstScript.sql b/db/versions/.archive/10379-turquoiseOrchid/00-firstScript.sql
new file mode 100644
index 000000000..f77733ba5
--- /dev/null
+++ b/db/versions/.archive/10379-turquoiseOrchid/00-firstScript.sql
@@ -0,0 +1,8 @@
+-- Place your SQL code here
+USE vn;
+
+ALTER TABLE vn.ticketConfig ADD packingDelay int(11) DEFAULT 1 NULL COMMENT 'Horas que marcará el retraso respecto hora de cierre web del ticket';
+
+INSERT INTO vn.silexACL
+(module, `method`, `role`)
+VALUES( 'almacennew', 'ticket_isOutClosureZone', 'employee');
\ No newline at end of file
diff --git a/db/versions/.archive/10382-4777itemShelvingPAK/00-firstScript.sql b/db/versions/.archive/10382-4777itemShelvingPAK/00-firstScript.sql
new file mode 100644
index 000000000..9d2d25be6
--- /dev/null
+++ b/db/versions/.archive/10382-4777itemShelvingPAK/00-firstScript.sql
@@ -0,0 +1,2 @@
+-- Place your SQL code here
+ALTER TABLE vn.itemShelving ADD IF NOT EXISTS isChecked bool NULL COMMENT 'Este valor cambia al escanear un carro. True: Existe. False: Nuevo. Null: No escaneado';
diff --git a/db/versions/.archive/10383-navyBirch/00-firstScript.sql b/db/versions/.archive/10383-navyBirch/00-firstScript.sql
new file mode 100644
index 000000000..9e128aa5b
--- /dev/null
+++ b/db/versions/.archive/10383-navyBirch/00-firstScript.sql
@@ -0,0 +1,2 @@
+-- Place your SQL code here
+ALTER TABLE vn.clientConfig ADD riskScope INT DEFAULT 2 NOT NULL COMMENT 'Time range in months to calculating a customer''s risk';
diff --git a/db/versions/.archive/10384-limeLaurel/00-business_workcenterFk.sql b/db/versions/.archive/10384-limeLaurel/00-business_workcenterFk.sql
new file mode 100644
index 000000000..036092b46
--- /dev/null
+++ b/db/versions/.archive/10384-limeLaurel/00-business_workcenterFk.sql
@@ -0,0 +1,15 @@
+ALTER TABLE `vn`.`business` MODIFY COLUMN workcenterFk int(11) NULL;
+
+UPDATE `vn`.`business` b
+ SET b.workcenterFk = NULL
+ WHERE b.workcenterFk = 0;
+
+ALTER TABLE `vn`.`business`
+ ADD INDEX IF NOT EXISTS `business_workcenterFk_idx` (`workcenterFk` ASC);
+
+ALTER TABLE `vn`.`business`
+ ADD CONSTRAINT `business_workcenterFk`
+ FOREIGN KEY IF NOT EXISTS (`workcenterFk`)
+ REFERENCES `vn`.`workCenter` (`id`)
+ ON DELETE RESTRICT
+ ON UPDATE CASCADE;
diff --git a/db/versions/.archive/10385-chocolateMonstera/00-firstScript.sql b/db/versions/.archive/10385-chocolateMonstera/00-firstScript.sql
new file mode 100644
index 000000000..60adcb429
--- /dev/null
+++ b/db/versions/.archive/10385-chocolateMonstera/00-firstScript.sql
@@ -0,0 +1,2 @@
+ALTER TABLE vn.report ADD `method` varchar(255) DEFAULT NULL NULL COMMENT 'Salix method';
+UPDATE vn.report SET `method` = 'Tickets/{id}/collection-label' WHERE `name` = 'LabelCollection';
diff --git a/db/versions/.archive/10386-tealTulip/00-firstScript.sql b/db/versions/.archive/10386-tealTulip/00-firstScript.sql
new file mode 100644
index 000000000..be41a4a2d
--- /dev/null
+++ b/db/versions/.archive/10386-tealTulip/00-firstScript.sql
@@ -0,0 +1,5 @@
+-- Place your SQL code here
+USE vn;
+INSERT INTO vn.silexACL
+( module, `method`, `role`)
+VALUES( 'almacennew', 'itemShelving_addList', 'employee');
diff --git a/db/versions/.archive/10387-wheatRuscus/00-firstScript.sql b/db/versions/.archive/10387-wheatRuscus/00-firstScript.sql
new file mode 100644
index 000000000..3686138b0
--- /dev/null
+++ b/db/versions/.archive/10387-wheatRuscus/00-firstScript.sql
@@ -0,0 +1,18 @@
+USE vn;
+
+ALTER TABLE `vn`.`routeAction`
+ ADD COLUMN `isMainlineDelivered` TINYINT NOT NULL DEFAULT 0 AFTER `price`;
+
+ALTER TABLE `vn`.`routeConfig`
+ ADD COLUMN `truckerBusinessProfessionalCategoryFk` INT NOT NULL DEFAULT 42 AFTER `kmMax`;
+
+UPDATE vn.routeCommission rc
+ JOIN (SELECT rc.routeFk, r.m3
+ FROM routeCommission rc
+ JOIN vn.route r ON r.id = rc.routeFk
+ WHERE (cat4m3 IS NULL OR cat5m3 IS NULL)
+ AND r.m3 IS NOT NULL)sub ON sub.routeFk = rc.routeFk
+ JOIN routeConfig rcon
+ SET rc.m3 = sub.m3,
+ rc.cat4m3 = sub.m3 * rcon.distributionCat4M3,
+ rc.cat5m3 = sub.m3 * rcon.distributionCat5M3;
\ No newline at end of file
diff --git a/db/versions/.archive/10388-bronzePaniculata/00-resizeUtilVerionLogCode.sql b/db/versions/.archive/10388-bronzePaniculata/00-resizeUtilVerionLogCode.sql
new file mode 100644
index 000000000..4b9b5faa1
--- /dev/null
+++ b/db/versions/.archive/10388-bronzePaniculata/00-resizeUtilVerionLogCode.sql
@@ -0,0 +1 @@
+ALTER TABLE util.versionLog MODIFY COLUMN code varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL;
\ No newline at end of file
diff --git a/db/versions/.archive/10388-bronzePaniculata/01-resizeUtilVersionCode.sql b/db/versions/.archive/10388-bronzePaniculata/01-resizeUtilVersionCode.sql
new file mode 100644
index 000000000..208e5aa7b
--- /dev/null
+++ b/db/versions/.archive/10388-bronzePaniculata/01-resizeUtilVersionCode.sql
@@ -0,0 +1 @@
+ALTER TABLE util.version MODIFY COLUMN code varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL;
\ No newline at end of file
diff --git a/db/versions/.archive/10390-chocolateAnthurium/00-firstScript.sql b/db/versions/.archive/10390-chocolateAnthurium/00-firstScript.sql
new file mode 100644
index 000000000..0a00fdd0e
--- /dev/null
+++ b/db/versions/.archive/10390-chocolateAnthurium/00-firstScript.sql
@@ -0,0 +1,2 @@
+UPDATE vn.sale SET price = 0 WHERE price IS NULL;
+ALTER TABLE vn.sale MODIFY COLUMN price decimal(10,2) DEFAULT 0 NOT NULL;
diff --git a/db/versions/.archive/10391-orangeCyca/00-firstScript.sql b/db/versions/.archive/10391-orangeCyca/00-firstScript.sql
new file mode 100644
index 000000000..c761cd08d
--- /dev/null
+++ b/db/versions/.archive/10391-orangeCyca/00-firstScript.sql
@@ -0,0 +1,9 @@
+-- Place your SQL code here
+use vn;
+
+CREATE OR REPLACE TABLE `auctionConfig` (
+ `conversionCoefficient` double NOT NULL DEFAULT 1 COMMENT 'value used to calculate the used space of an item in a container',
+ `warehosueFk` smallint(6) unsigned NOT NULL DEFAULT 7 COMMENT 'default warehouse used for the calculation',
+ KEY `auctionConfig_FK` (`warehosueFk`),
+ CONSTRAINT `auctionConfig_FK` FOREIGN KEY (`warehosueFk`) REFERENCES `warehouse` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
diff --git a/db/versions/.archive/10394-brownHydrangea/00-firstScript.sql b/db/versions/.archive/10394-brownHydrangea/00-firstScript.sql
new file mode 100644
index 000000000..0e888db5f
--- /dev/null
+++ b/db/versions/.archive/10394-brownHydrangea/00-firstScript.sql
@@ -0,0 +1,2 @@
+ALTER TABLE vn.workerJourney DROP FOREIGN KEY workerJourney_businessFk;
+ALTER TABLE vn.workerJourney ADD CONSTRAINT workerJourney_businessFk FOREIGN KEY (businessFk) REFERENCES vn.business(id) ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/db/versions/.archive/10395-blueGalax/00-firstScript.sql b/db/versions/.archive/10395-blueGalax/00-firstScript.sql
new file mode 100644
index 000000000..c6c666144
--- /dev/null
+++ b/db/versions/.archive/10395-blueGalax/00-firstScript.sql
@@ -0,0 +1,2 @@
+UPDATE vn.client SET businessTypeFk = 'florist' WHERE businessTypeFk IS NULL;
+ALTER TABLE vn.client MODIFY COLUMN businessTypeFk varchar(20) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT 'florist' NOT NULL;
diff --git a/db/versions/.archive/10396-grayRoebelini/00-firstScript.sql b/db/versions/.archive/10396-grayRoebelini/00-firstScript.sql
new file mode 100644
index 000000000..43eb6d38d
--- /dev/null
+++ b/db/versions/.archive/10396-grayRoebelini/00-firstScript.sql
@@ -0,0 +1,5 @@
+USE vn;
+
+ALTER TABLE `vn`.`workCenter`
+ ADD COLUMN `deliveryManAdjustment` DECIMAL(4,2) NULL DEFAULT NULL
+ COMMENT 'Número de trabajadores para equilibrar los repartidores de diferentes centros. Utilizado en repartidores de grafana' AFTER `geoFk`;
diff --git a/db/versions/.archive/10397-4848TicketsFloramondo/00-firstScript.sql b/db/versions/.archive/10397-4848TicketsFloramondo/00-firstScript.sql
new file mode 100644
index 000000000..098330da8
--- /dev/null
+++ b/db/versions/.archive/10397-4848TicketsFloramondo/00-firstScript.sql
@@ -0,0 +1,5 @@
+-- Place your SQL code here
+ALTER TABLE vn.ektEntryAssign MODIFY COLUMN warehouseInFk int(11) NOT NULL;
+ALTER TABLE vn.ektEntryAssign MODIFY COLUMN agencyModeFk int(11) NOT NULL;
+ALTER TABLE vn.ektEntryAssign MODIFY COLUMN warehouseOutFk int(11) NOT NULL;
+ALTER TABLE vn.ektEntryAssign MODIFY COLUMN supplierFk int(11) NOT NULL;
diff --git a/db/versions/.archive/10399-blueErica/00-firstScript.sql b/db/versions/.archive/10399-blueErica/00-firstScript.sql
new file mode 100644
index 000000000..d9992443f
--- /dev/null
+++ b/db/versions/.archive/10399-blueErica/00-firstScript.sql
@@ -0,0 +1,5 @@
+USE vn;
+
+UPDATE vn.buy b
+ JOIN vn.entryConfig e ON e.defaultEntry = b.entryFk
+ SET b.printedStickers = 0;
\ No newline at end of file
diff --git a/db/versions/.archive/10400-brownEucalyptus/00-firstScript.sql b/db/versions/.archive/10400-brownEucalyptus/00-firstScript.sql
new file mode 100644
index 000000000..ed315d9f4
--- /dev/null
+++ b/db/versions/.archive/10400-brownEucalyptus/00-firstScript.sql
@@ -0,0 +1,2 @@
+ALTER TABLE vn.itemCleanLog DROP COLUMN itemFrom;
+DROP TABLE vn.itemCleanConfig;
diff --git a/db/versions/.archive/10402-orangeTulip/00-firstScript.sql b/db/versions/.archive/10402-orangeTulip/00-firstScript.sql
new file mode 100644
index 000000000..90f61183d
--- /dev/null
+++ b/db/versions/.archive/10402-orangeTulip/00-firstScript.sql
@@ -0,0 +1,5 @@
+ALTER TABLE vn.workerJourney DROP FOREIGN KEY workerJourney_businessFk;
+ALTER TABLE vn.workerJourney ADD CONSTRAINT workerJourney_businessFk FOREIGN KEY (businessFk) REFERENCES vn.business(id) ON DELETE CASCADE ON UPDATE CASCADE;
+
+ALTER TABLE vn.calendar DROP FOREIGN KEY calendar_businessFk;
+ALTER TABLE vn.calendar ADD CONSTRAINT calendar_businessFk FOREIGN KEY (businessFk) REFERENCES vn.business(id) ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/db/versions/.archive/10404-grayMedeola/00-firstScript.sql b/db/versions/.archive/10404-grayMedeola/00-firstScript.sql
new file mode 100644
index 000000000..c1f5461b0
--- /dev/null
+++ b/db/versions/.archive/10404-grayMedeola/00-firstScript.sql
@@ -0,0 +1,2 @@
+USE vn;
+ALTER TABLE vn.calendar ADD CONSTRAINT calendar_UN UNIQUE KEY (businessFk,dated);
diff --git a/db/versions/.archive/10405-orangeGalax/00-firstScript.sql b/db/versions/.archive/10405-orangeGalax/00-firstScript.sql
new file mode 100644
index 000000000..b4eb7425c
--- /dev/null
+++ b/db/versions/.archive/10405-orangeGalax/00-firstScript.sql
@@ -0,0 +1,3 @@
+-- Place your SQL code here
+ALTER TABLE vn.property ADD purchased DATE DEFAULT util.CURDATE() NOT NULL COMMENT 'date of purchase of the property';
+ALTER TABLE vn.property ADD booked DATE NULL COMMENT 'date of completion of property registration';
diff --git a/db/versions/.archive/10407-blueOak/00-firstScript.sql b/db/versions/.archive/10407-blueOak/00-firstScript.sql
new file mode 100644
index 000000000..478258d8a
--- /dev/null
+++ b/db/versions/.archive/10407-blueOak/00-firstScript.sql
@@ -0,0 +1,5 @@
+use vn;
+CREATE TABLE `supplierDebtConfig` (
+ `dated` DATE NOT NULL DEFAULT '2014-12-31' COMMENT 'date from which we start counting',
+ `invalidBalances` DOUBLE NOT NULL DEFAULT 0.5 COMMENT 'balances not to be paid'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
diff --git a/db/versions/.archive/10408-purpleIvy/00-firstScript.sql b/db/versions/.archive/10408-purpleIvy/00-firstScript.sql
new file mode 100644
index 000000000..a564b70aa
--- /dev/null
+++ b/db/versions/.archive/10408-purpleIvy/00-firstScript.sql
@@ -0,0 +1,31 @@
+CREATE TABLE IF NOT EXISTS vn.roadmap (
+ id int(10) unsigned auto_increment NOT NULL,
+ tractorPlate varchar(10) DEFAULT NULL NULL,
+ trailerPlate varchar(12) DEFAULT NULL NULL,
+ phone varchar(15) DEFAULT NULL NULL,
+ supplierFk int(11) DEFAULT NULL NULL,
+ etd datetime DEFAULT NULL NULL,
+ observations varchar(255) DEFAULT NULL NULL,
+ created timestamp DEFAULT current_timestamp() NULL,
+ userFk int(10) unsigned DEFAULT NULL NULL,
+ CONSTRAINT PRIMARY KEY (id),
+
+ FOREIGN KEY (supplierFk) REFERENCES vn.supplier(id) ON DELETE RESTRICT ON UPDATE CASCADE,
+ FOREIGN KEY (userFk) REFERENCES account.`user`(id) ON DELETE RESTRICT ON UPDATE CASCADE
+)
+ENGINE=InnoDB
+DEFAULT CHARSET=utf8mb3
+COLLATE=utf8mb3_unicode_ci;
+
+ALTER TABLE vn.expeditionTruck ADD IF NOT EXISTS roadmapFk int(10) unsigned NULL,
+ ADD IF NOT EXISTS warehouseFk smallint(6) unsigned NULL,
+ ADD IF NOT EXISTS created timestamp DEFAULT current_timestamp() NULL,
+ ADD IF NOT EXISTS userFk int(10) unsigned NULL,
+ CHANGE roadmapFk roadmapFk int(10) unsigned NULL AFTER id,
+ CHANGE warehouseFk warehouseFk smallint(6) unsigned NULL AFTER roadmapFk;
+
+ALTER TABLE vn.expeditionTruck ADD CONSTRAINT expeditionTruck_FK_1 FOREIGN KEY (warehouseFk) REFERENCES vn.warehouse(id) ON DELETE RESTRICT ON UPDATE CASCADE,
+ ADD CONSTRAINT expeditionTruck_FK_2 FOREIGN KEY (roadmapFk) REFERENCES vn.roadmap(id) ON DELETE RESTRICT ON UPDATE CASCADE,
+ ADD CONSTRAINT expeditionTruck_FK_3 FOREIGN KEY (userFk) REFERENCES account.`user`(id) ON DELETE RESTRICT ON UPDATE CASCADE;
+
+ALTER TABLE vn.warehouse ADD IF NOT EXISTS isHalt tinyint(1) DEFAULT 0 NOT NULL COMMENT 'Almacén en el que descargan nuestros troncales';
diff --git a/db/versions/.archive/10409-brownSalal/00-firstScript.sql b/db/versions/.archive/10409-brownSalal/00-firstScript.sql
new file mode 100644
index 000000000..8373aa3d1
--- /dev/null
+++ b/db/versions/.archive/10409-brownSalal/00-firstScript.sql
@@ -0,0 +1,5 @@
+ALTER TABLE `vn`.`itemType` CHANGE `transaction` transaction__ tinyint(4) DEFAULT 0 NOT NULL;
+ALTER TABLE `vn`.`itemType` CHANGE location location__ varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL;
+ALTER TABLE `vn`.`itemType` CHANGE hasComponents hasComponents__ tinyint(1) DEFAULT 1 NOT NULL;
+ALTER TABLE `vn`.`itemType` CHANGE warehouseFk warehouseFk__ smallint(6) unsigned DEFAULT 60 NOT NULL;
+ALTER TABLE `vn`.`itemType` CHANGE compression compression__ decimal(5,2) DEFAULT 1.00 NULL;
diff --git a/db/.archive/224702/00-zipConfig.sql b/db/versions/.archive/10412-yellowCarnation/00-firstScript.sql
similarity index 53%
rename from db/.archive/224702/00-zipConfig.sql
rename to db/versions/.archive/10412-yellowCarnation/00-firstScript.sql
index 134ce7770..a3c41b527 100644
--- a/db/.archive/224702/00-zipConfig.sql
+++ b/db/versions/.archive/10412-yellowCarnation/00-firstScript.sql
@@ -3,7 +3,3 @@ CREATE TABLE `vn`.`zipConfig` (
`maxSize` int(11) DEFAULT NULL COMMENT 'in MegaBytes',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
-
-INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
- VALUES
- ('ZipConfig', '*', '*', 'ALLOW', 'ROLE', 'employee');
\ No newline at end of file
diff --git a/db/versions/.archive/10413-whiteCymbidium/00-firstScript.sql b/db/versions/.archive/10413-whiteCymbidium/00-firstScript.sql
new file mode 100644
index 000000000..bd382fdf7
--- /dev/null
+++ b/db/versions/.archive/10413-whiteCymbidium/00-firstScript.sql
@@ -0,0 +1,3 @@
+-- Place your SQL code here
+ALTER TABLE `vn`.`referenceCurrent`
+CHANGE COLUMN `dated` `dated` DATE NOT NULL DEFAULT CURRENT_TIMESTAMP();
\ No newline at end of file
diff --git a/db/versions/.archive/10416-blueAsparagus/00-firstScript.sql b/db/versions/.archive/10416-blueAsparagus/00-firstScript.sql
new file mode 100644
index 000000000..f96145156
--- /dev/null
+++ b/db/versions/.archive/10416-blueAsparagus/00-firstScript.sql
@@ -0,0 +1,25 @@
+-- Place your SQL code here
+ALTER TABLE vn2008.Rutas_Master DROP FOREIGN KEY fk_rutas_warehouse_id;
+
+ALTER TABLE `vn2008`.`Rutas_Master` RENAME `vn`.`routeMaster`;
+
+ALTER TABLE `vn`.`routeMaster`
+CHANGE COLUMN `warehouse_id` `warehoseFk` SMALLINT(6) unsigned DEFAULT NULL,
+CHANGE COLUMN `km` `km` INT(11) NOT NULL DEFAULT 0,
+CHANGE COLUMN `bultos` `packages` INT(11) NOT NULL DEFAULT 0,
+CHANGE COLUMN `vehiculos_coste` `vehicleCost` DECIMAL(10,2) NOT NULL DEFAULT 0.00,
+CHANGE COLUMN `personal_coste` `staffCost` DECIMAL(10,2) NOT NULL DEFAULT 0.00,
+CHANGE COLUMN `vehiculos_numero` `vehicle` DECIMAL(10,2) NOT NULL DEFAULT 0.00,
+CHANGE COLUMN `personal_numero` `staff` DECIMAL(10,2) NOT NULL DEFAULT 0.00,
+CHANGE COLUMN `gasoil` `fuel` INT(11) NOT NULL DEFAULT 0,
+CHANGE COLUMN `autonomos` `freelancers` DECIMAL(10,2) NOT NULL DEFAULT 0.00,
+CHANGE COLUMN `año` `year` INT(11) NOT NULL DEFAULT 0,
+CHANGE COLUMN `mes` `mounth` INT(11) NOT NULL DEFAULT 0,
+CHANGE COLUMN `gastos` `expense` DECIMAL(10,2) NOT NULL DEFAULT 0.00,
+CHANGE COLUMN `bultos_autonomos` `freelancersPackages` INT(11) NOT NULL DEFAULT 0,
+CHANGE COLUMN `coste_km` `kmCost` DECIMAL(10,2) NOT NULL DEFAULT 0.00,
+CHANGE COLUMN `coste_bulto` `packageCost` DECIMAL(10,2) NOT NULL DEFAULT 0.00,
+CHANGE COLUMN `coste_bulto_autonomo` `freelancerPackageCost` DECIMAL(10,2) NOT NULL DEFAULT 0.00,
+CHANGE COLUMN `odbc_date` `created` TIMESTAMP NULL DEFAULT current_timestamp();
+
+ALTER TABLE vn.routeMaster ADD CONSTRAINT routeMaster_FK FOREIGN KEY (warehoseFk) REFERENCES vn.warehouse(id);
diff --git a/db/versions/.archive/10420-goldenCataractarum/00-firstScript.sql b/db/versions/.archive/10420-goldenCataractarum/00-firstScript.sql
new file mode 100644
index 000000000..3d36c2737
--- /dev/null
+++ b/db/versions/.archive/10420-goldenCataractarum/00-firstScript.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.printQueue ADD serverId int(10) UNSIGNED NULL COMMENT 'Indica el id del servidor de impresión';
diff --git a/db/versions/.archive/10421-navyMonstera/00-firstScript.sql b/db/versions/.archive/10421-navyMonstera/00-firstScript.sql
new file mode 100644
index 000000000..d097e9b49
--- /dev/null
+++ b/db/versions/.archive/10421-navyMonstera/00-firstScript.sql
@@ -0,0 +1,6 @@
+-- Place your SQL code here
+UPDATE vn.client
+ SET provinceFk = 1
+ WHERE provinceFk IS NULL;
+
+ALTER TABLE vn.client MODIFY COLUMN provinceFk smallint(5) unsigned NOT NULL;
diff --git a/db/versions/.archive/10426-silverAsparagus/00-firstScript.sql b/db/versions/.archive/10426-silverAsparagus/00-firstScript.sql
new file mode 100644
index 000000000..ae7f8c189
--- /dev/null
+++ b/db/versions/.archive/10426-silverAsparagus/00-firstScript.sql
@@ -0,0 +1,7 @@
+USE vn;
+ALTER TABLE vn.config
+ ADD IF NOT EXISTS mainWarehouseFk SMALLINT(6) UNSIGNED DEFAULT 60 NOT NULL;
+
+ALTER TABLE `vn`.`auctionConfig`
+ ADD COLUMN `id` INT NOT NULL FIRST,
+ ADD PRIMARY KEY (`id`);
diff --git a/db/versions/.archive/10428-wheatRose/00-firstScript.sql b/db/versions/.archive/10428-wheatRose/00-firstScript.sql
new file mode 100644
index 000000000..bdc3ef085
--- /dev/null
+++ b/db/versions/.archive/10428-wheatRose/00-firstScript.sql
@@ -0,0 +1,14 @@
+USE vn;
+CREATE TABLE `mdbVersionTree` (
+ `app` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
+ `version` int(10) unsigned NOT NULL,
+ `branchFk` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
+ `fromVersion` int(10) unsigned NOT NULL,
+ `userFk` int(10) unsigned NOT NULL,
+ `created` timestamp NOT NULL DEFAULT current_timestamp(),
+ PRIMARY KEY (`app`,`version`),
+ KEY `mdbVersionTree_FK` (`userFk`),
+ KEY `mdbVersionTree_FK_2` (`branchFk`),
+ CONSTRAINT `mdbVersionTree_FK` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON UPDATE CASCADE,
+ CONSTRAINT `mdbVersionTree_FK_2` FOREIGN KEY (`branchFk`) REFERENCES `mdbBranch` (`name`) ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
diff --git a/db/versions/.archive/10431-redCordyline/00-firstScript.sql b/db/versions/.archive/10431-redCordyline/00-firstScript.sql
new file mode 100644
index 000000000..0847c4ad8
--- /dev/null
+++ b/db/versions/.archive/10431-redCordyline/00-firstScript.sql
@@ -0,0 +1,9 @@
+ALTER TABLE vn.workerMana DROP COLUMN minRate;
+ALTER TABLE vn.workerMana DROP COLUMN maxRate;
+
+CREATE TABLE `vn`.`salespersonConfig` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `manaMaxRate` decimal(3,2) DEFAULT 0.05 COMMENT 'Valor máximo a recficar en una línea por el maná de un comercial',
+ `manaMinRate` decimal(3,2) DEFAULT -0.05 COMMENT 'Valor mínimo a recficar en una línea por el maná de un comercial',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
\ No newline at end of file
diff --git a/db/versions/.archive/10433-salmonAnthurium/00-firstScript.sql b/db/versions/.archive/10433-salmonAnthurium/00-firstScript.sql
new file mode 100644
index 000000000..2dd142d68
--- /dev/null
+++ b/db/versions/.archive/10433-salmonAnthurium/00-firstScript.sql
@@ -0,0 +1,3 @@
+UPDATE IGNORE vn.report
+ SET `method`='Tickets/{collectionOrTicketFk}/collection-label'
+ WHERE id=28;
diff --git a/db/versions/.archive/10434-grayTulip/00-firstScript.sql b/db/versions/.archive/10434-grayTulip/00-firstScript.sql
new file mode 100644
index 000000000..f2f3200a3
--- /dev/null
+++ b/db/versions/.archive/10434-grayTulip/00-firstScript.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.deviceProduction ADD isInScalefusion BOOL DEFAULT 0 NULL COMMENT 'Para saber si esta en Scalefusion';
diff --git a/db/versions/.archive/10435-aquaGalax/00-firstScript.sql b/db/versions/.archive/10435-aquaGalax/00-firstScript.sql
new file mode 100644
index 000000000..3228d1fcb
--- /dev/null
+++ b/db/versions/.archive/10435-aquaGalax/00-firstScript.sql
@@ -0,0 +1,2 @@
+ALTER TABLE vn.mdbApp DROP PRIMARY KEY;
+ALTER TABLE vn.mdbApp ADD CONSTRAINT mdbApp_PK PRIMARY KEY (app);
diff --git a/db/versions/.archive/10436-tealPalmetto/00-createFkWorker.sql b/db/versions/.archive/10436-tealPalmetto/00-createFkWorker.sql
new file mode 100644
index 000000000..356bb8a90
--- /dev/null
+++ b/db/versions/.archive/10436-tealPalmetto/00-createFkWorker.sql
@@ -0,0 +1,3 @@
+ALTER TABLE vn.saleTracking MODIFY COLUMN workerFk int(10) unsigned NOT NULL;
+DELETE FROM vn.saleTracking WHERE workerFk = 0;
+ALTER TABLE vn.saleTracking ADD CONSTRAINT saleTracking_FK_2 FOREIGN KEY (workerFk) REFERENCES vn.worker(id) ON UPDATE CASCADE;
diff --git a/db/versions/.archive/10436-tealPalmetto/01-addStateToWorkerProductivity.sql b/db/versions/.archive/10436-tealPalmetto/01-addStateToWorkerProductivity.sql
new file mode 100644
index 000000000..560de4e73
--- /dev/null
+++ b/db/versions/.archive/10436-tealPalmetto/01-addStateToWorkerProductivity.sql
@@ -0,0 +1,2 @@
+ALTER TABLE bs.workerProductivity ADD stateFk TINYINT UNSIGNED NULL;
+ALTER TABLE bs.workerProductivity ADD CONSTRAINT workerProductivity_FK_1 FOREIGN KEY (stateFk) REFERENCES vn.state(id) ON UPDATE CASCADE;
diff --git a/db/versions/.archive/10436-tealPalmetto/02-DeprecateVnSaleTrackingState.sql b/db/versions/.archive/10436-tealPalmetto/02-DeprecateVnSaleTrackingState.sql
new file mode 100644
index 000000000..d4942ba20
--- /dev/null
+++ b/db/versions/.archive/10436-tealPalmetto/02-DeprecateVnSaleTrackingState.sql
@@ -0,0 +1 @@
+RENAME TABLE vn.ticketTrackingState TO vn.ticketTrackingState__;
\ No newline at end of file
diff --git a/db/versions/.archive/10436-tealPalmetto/03-DeprecateColumnVnSaleTrackingActionFk.sql b/db/versions/.archive/10436-tealPalmetto/03-DeprecateColumnVnSaleTrackingActionFk.sql
new file mode 100644
index 000000000..c27b48e70
--- /dev/null
+++ b/db/versions/.archive/10436-tealPalmetto/03-DeprecateColumnVnSaleTrackingActionFk.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.saleTracking CHANGE actionFk actionFk__ int(11) DEFAULT NULL NULL;
\ No newline at end of file
diff --git a/db/versions/.archive/10436-tealPalmetto/04-DropSchemaVnControl.sql b/db/versions/.archive/10436-tealPalmetto/04-DropSchemaVnControl.sql
new file mode 100644
index 000000000..01f9a9853
--- /dev/null
+++ b/db/versions/.archive/10436-tealPalmetto/04-DropSchemaVnControl.sql
@@ -0,0 +1 @@
+DROP SCHEMA IF EXISTS vncontrol;
\ No newline at end of file
diff --git a/db/versions/.archive/10436-tealPalmetto/05-RemoveFkWorkerProductivity.sql b/db/versions/.archive/10436-tealPalmetto/05-RemoveFkWorkerProductivity.sql
new file mode 100644
index 000000000..099f02f19
--- /dev/null
+++ b/db/versions/.archive/10436-tealPalmetto/05-RemoveFkWorkerProductivity.sql
@@ -0,0 +1,2 @@
+ALTER TABLE bs.workerProductivity DROP FOREIGN KEY workerProductivity_FK;
+ALTER TABLE bs.workerProductivity MODIFY COLUMN actionFk int(11) NULL;
\ No newline at end of file
diff --git a/db/versions/.archive/10439-greenTulip/00-fixRole.sql b/db/versions/.archive/10439-greenTulip/00-fixRole.sql
new file mode 100644
index 000000000..67f802c6f
--- /dev/null
+++ b/db/versions/.archive/10439-greenTulip/00-fixRole.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `account`.`role` MODIFY COLUMN name varchar(79) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL COMMENT 'MariaDB doesn''t support more than 79 chars for proxied user names';
+
diff --git a/db/versions/.archive/10440-grayDendro/00-firstScript.sql b/db/versions/.archive/10440-grayDendro/00-firstScript.sql
new file mode 100644
index 000000000..f7069e9a6
--- /dev/null
+++ b/db/versions/.archive/10440-grayDendro/00-firstScript.sql
@@ -0,0 +1,3 @@
+
+INSERT INTO hedera.menu (id, description, `path`, roleFk, parentFk, displayOrder)
+ VALUES (31,'Pending orders','ecomerce/pending',11,2,1);
diff --git a/db/versions/.archive/10444-crimsonBamboo/00-firstScript.sql b/db/versions/.archive/10444-crimsonBamboo/00-firstScript.sql
new file mode 100644
index 000000000..aac896046
--- /dev/null
+++ b/db/versions/.archive/10444-crimsonBamboo/00-firstScript.sql
@@ -0,0 +1,7 @@
+-- Place your SQL code here
+CREATE TABLE `vn`.`timeControlDevice` (
+ `id` INT(10) PRIMARY KEY AUTO_INCREMENT,
+ `name` VARCHAR(255) NULL,
+ `key` VARCHAR(255) NULL,
+ UNIQUE INDEX `name_UNIQUE` (`name` ASC) VISIBLE);
+
\ No newline at end of file
diff --git a/db/versions/.archive/10445-orangeMoss/00-firstScript.sql b/db/versions/.archive/10445-orangeMoss/00-firstScript.sql
new file mode 100644
index 000000000..d46154aa4
--- /dev/null
+++ b/db/versions/.archive/10445-orangeMoss/00-firstScript.sql
@@ -0,0 +1,27 @@
+USE vn;
+
+ALTER TABLE vn.itemType MODIFY COLUMN id smallint(5) unsigned NOT NULL;
+
+-- id drop references
+ALTER TABLE vn.item DROP FOREIGN KEY item_ibfk_5;
+ALTER TABLE vn.itemTypeRestriction DROP FOREIGN KEY itemTypeRestriction_itemType_id_fk;
+ALTER TABLE vn.itemTypeTag DROP FOREIGN KEY itemTypeTagTipos;
+ALTER TABLE vn.zoneFilter DROP FOREIGN KEY zoneFilter_FK_1;
+
+-- code drop references
+ALTER TABLE vn.clientItemType DROP FOREIGN KEY clientItemType_FK_1;
+
+-- drop and add constraint
+ALTER TABLE vn.itemType DROP PRIMARY KEY;
+ALTER TABLE vn.itemType ADD CONSTRAINT itemType_PK PRIMARY KEY (id);
+ALTER TABLE vn.itemType DROP KEY tipo_id_UNIQUE;
+ALTER TABLE vn.itemType ADD CONSTRAINT itemType_UN UNIQUE KEY (code);
+
+-- code add references
+ALTER TABLE vn.clientItemType ADD CONSTRAINT clientItemType_FK_1 FOREIGN KEY (itemTypeFk) REFERENCES vn.itemType(code);
+
+-- id add references
+ALTER TABLE vn.item ADD CONSTRAINT item_FK_1 FOREIGN KEY (typeFk) REFERENCES vn.itemType(id);
+ALTER TABLE vn.itemTypeRestriction ADD CONSTRAINT itemTypeRestriction_FK FOREIGN KEY (itemTypeFk) REFERENCES vn.itemType(id);
+ALTER TABLE vn.itemTypeTag ADD CONSTRAINT itemTypeTag_FK FOREIGN KEY (itemTypeFk) REFERENCES vn.itemType(id);
+ALTER TABLE vn.zoneFilter ADD CONSTRAINT zoneFilter_FK_1 FOREIGN KEY (itemTypeFk) REFERENCES vn.itemType(id);
diff --git a/db/versions/.archive/10448-wheatChrysanthemum/00-firstScript.sql b/db/versions/.archive/10448-wheatChrysanthemum/00-firstScript.sql
new file mode 100644
index 000000000..15fb6d339
--- /dev/null
+++ b/db/versions/.archive/10448-wheatChrysanthemum/00-firstScript.sql
@@ -0,0 +1,10 @@
+USE vn;
+
+ALTER TABLE `vn`.`ticketConfig`
+ ADD COLUMN `packagingInvoicingDated` DATE NOT NULL DEFAULT '2017-11-21'
+ COMMENT 'Fecha desde la cual se gestiona el registro de embalajes de tickets (tabla vn.ticketPackaging)'
+ AFTER `pickingDelay`;
+
+UPDATE `vn`.`warehouse`
+ SET `code` = 'inv'
+ WHERE (`id` = '13');
diff --git a/db/versions/.archive/10450-blackIvy/00-firstScript.sql b/db/versions/.archive/10450-blackIvy/00-firstScript.sql
new file mode 100644
index 000000000..0a6d76580
--- /dev/null
+++ b/db/versions/.archive/10450-blackIvy/00-firstScript.sql
@@ -0,0 +1,7 @@
+USE vn;
+CREATE TABLE vn.`arcRead` (
+ `id` smallint(2) unsigned NOT NULL AUTO_INCREMENT,
+ `printerFk` tinyint(3) unsigned,
+ PRIMARY KEY (`id`),
+ CONSTRAINT `worker_printer_FK` FOREIGN KEY (`printerFk`) REFERENCES `printer` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
diff --git a/db/versions/.archive/10451-salmonOak/00-firstScript.sql b/db/versions/.archive/10451-salmonOak/00-firstScript.sql
new file mode 100644
index 000000000..1dd38d8c3
--- /dev/null
+++ b/db/versions/.archive/10451-salmonOak/00-firstScript.sql
@@ -0,0 +1,4 @@
+ALTER TABLE vn.arcRead ADD ip varchar(50) NOT NULL;
+ALTER TABLE vn.arcRead ADD counter smallint(2) unsigned DEFAULT NULL NULL COMMENT 'Número de etiquetas leídas del pallet actual por el arco';
+ALTER TABLE vn.arcRead ADD error varchar(50) NULL;
+ALTER TABLE vn.arcRead ADD CONSTRAINT arcRead_ip_UN UNIQUE KEY (ip);
diff --git a/db/versions/.archive/10452-redEucalyptus/00-firstScript.sql b/db/versions/.archive/10452-redEucalyptus/00-firstScript.sql
new file mode 100644
index 000000000..c7ac09499
--- /dev/null
+++ b/db/versions/.archive/10452-redEucalyptus/00-firstScript.sql
@@ -0,0 +1,13 @@
+CREATE TABLE vn.mdbConfig (
+ id int(10) unsigned auto_increment NOT NULL,
+ issueTrackerUrl varchar(255) NOT NULL,
+ issueNumberRegex varchar(255) NOT NULL,
+ CONSTRAINT mdbConfig_PK PRIMARY KEY (id)
+)
+ENGINE=InnoDB
+DEFAULT CHARSET=utf8mb3
+COLLATE=utf8mb3_unicode_ci
+COMMENT='Global configuration parameters for Access';
+
+INSERT INTO vn.mdbConfig (issueTrackerUrl, issueNumberRegex)
+ VALUES ('https://cau.verdnatura.es/scp/tickets.php?number={index}','#(\\d+)');
diff --git a/db/versions/.archive/10453-aquaMedeola/00-firstScript.sql b/db/versions/.archive/10453-aquaMedeola/00-firstScript.sql
new file mode 100644
index 000000000..035da0448
--- /dev/null
+++ b/db/versions/.archive/10453-aquaMedeola/00-firstScript.sql
@@ -0,0 +1,2 @@
+ALTER TABLE vn.mdbVersionTree ADD description text DEFAULT NULL NULL;
+ALTER TABLE vn.mdbVersionTree CHANGE description description text DEFAULT NULL NULL AFTER userFk;
diff --git a/db/versions/.archive/10454-bronzeMoss/00-firstScript.sql b/db/versions/.archive/10454-bronzeMoss/00-firstScript.sql
new file mode 100644
index 000000000..2b90cb0e0
--- /dev/null
+++ b/db/versions/.archive/10454-bronzeMoss/00-firstScript.sql
@@ -0,0 +1,2 @@
+ALTER TABLE vn.mdbConfig ADD chatDestionation varchar(255) NOT NULL COMMENT 'User (@) or channel (#) to send the message';
+UPDATE vn.mdbConfig SET chatDestionation='#versiones-access' WHERE id=1;
diff --git a/db/versions/.archive/10455-blackGerbera/00-firstScript.sql b/db/versions/.archive/10455-blackGerbera/00-firstScript.sql
new file mode 100644
index 000000000..e7c069bff
--- /dev/null
+++ b/db/versions/.archive/10455-blackGerbera/00-firstScript.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.mdbConfig CHANGE chatDestionation chatDestination varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL COMMENT 'User (@) or channel (#) to send the message';
diff --git a/db/versions/.archive/10456-greenArborvitae/00-firstScript.sql b/db/versions/.archive/10456-greenArborvitae/00-firstScript.sql
new file mode 100644
index 000000000..ffa275f71
--- /dev/null
+++ b/db/versions/.archive/10456-greenArborvitae/00-firstScript.sql
@@ -0,0 +1,2 @@
+USE vn;
+ALTER TABLE saleTracking DROP KEY IF EXISTS saleTracking_UN;
diff --git a/db/versions/.archive/10457-crimsonTulip/00-firstScript.sql b/db/versions/.archive/10457-crimsonTulip/00-firstScript.sql
new file mode 100644
index 000000000..880bee9d8
--- /dev/null
+++ b/db/versions/.archive/10457-crimsonTulip/00-firstScript.sql
@@ -0,0 +1,17 @@
+USE vn;
+
+CREATE TEMPORARY TABLE tmp.tt
+ SELECT MIN(id) id, saleFk, workerFk, stateFk
+ FROM saleTracking
+ GROUP BY saleFk, workerFk, stateFk
+ HAVING COUNT(*) > 1;
+
+DELETE st FROM saleTracking st
+ JOIN tmp.tt USING(saleFk, workerFk, stateFk)
+ WHERE tt.id <> st.id;
+
+ALTER TABLE saleTracking
+ ADD CONSTRAINT saleTracking_UN
+ UNIQUE KEY (saleFk, workerFk, stateFk);
+
+DROP TEMPORARY TABLE tmp.tt;
diff --git a/db/versions/.archive/10458-orangePalmetto/00-firstScript.sql b/db/versions/.archive/10458-orangePalmetto/00-firstScript.sql
new file mode 100644
index 000000000..79f937b10
--- /dev/null
+++ b/db/versions/.archive/10458-orangePalmetto/00-firstScript.sql
@@ -0,0 +1,18 @@
+-- Place your SQL code here
+ALTER TABLE `vn`.`XDiario`
+DROP COLUMN `BASEIMPO`,
+DROP COLUMN `DOCUMENTO`,
+DROP COLUMN `DEPARTA`,
+DROP COLUMN `ESTADO`,
+DROP COLUMN `NCASADO`,
+DROP COLUMN `TCASADO`,
+DROP COLUMN `TRANS`,
+DROP COLUMN `PTAHABER`,
+DROP COLUMN `SUCURSAL`,
+DROP COLUMN `PTADEBE`,
+DROP COLUMN `CODDIVISA`,
+DROP COLUMN `IMPAUXME`,
+DROP COLUMN `NOCONV`,
+DROP COLUMN `NUMEROINV`,
+DROP COLUMN `TIPOFAC`,
+DROP COLUMN `TIPOIVA`;
\ No newline at end of file
diff --git a/db/versions/.archive/10459-chocolateMedeola/00-alterTableUtilConfig.sql b/db/versions/.archive/10459-chocolateMedeola/00-alterTableUtilConfig.sql
new file mode 100644
index 000000000..ede4f3315
--- /dev/null
+++ b/db/versions/.archive/10459-chocolateMedeola/00-alterTableUtilConfig.sql
@@ -0,0 +1,10 @@
+ALTER TABLE util.config
+ ADD mockUtcTime DATETIME NULL,
+ ADD mockEnabled TINYINT UNSIGNED NOT NULL DEFAULT FALSE,
+ ADD mockTz varchar(255) NULL;
+
+UPDATE util.config SET
+ mockUtcTime = '2001-01-01 11:00:00.000',
+ mockEnabled = TRUE,
+ mockTz = '+01:00';
+
\ No newline at end of file
diff --git a/db/versions/.archive/10459-chocolateMedeola/01-createFunctionCurdate.sql b/db/versions/.archive/10459-chocolateMedeola/01-createFunctionCurdate.sql
new file mode 100644
index 000000000..986067ce3
--- /dev/null
+++ b/db/versions/.archive/10459-chocolateMedeola/01-createFunctionCurdate.sql
@@ -0,0 +1,13 @@
+DROP FUNCTION IF EXISTS `util`.`VN_CURDATE`;
+DELIMITER $$
+CREATE DEFINER=`root`@`localhost` FUNCTION `util`.`CURDATE`()
+ RETURNS DATE
+ DETERMINISTIC
+BEGIN
+ /**
+ * @return The mock date
+ **/
+
+ RETURN DATE(mockTime());
+END$$
+DELIMITER ;
diff --git a/db/versions/.archive/10459-chocolateMedeola/02-createFunctionMockTime.sql b/db/versions/.archive/10459-chocolateMedeola/02-createFunctionMockTime.sql
new file mode 100644
index 000000000..01abda758
--- /dev/null
+++ b/db/versions/.archive/10459-chocolateMedeola/02-createFunctionMockTime.sql
@@ -0,0 +1,23 @@
+DROP FUNCTION IF EXISTS `util`.`mockTime`;
+DELIMITER $$
+CREATE DEFINER=`root`@`localhost` FUNCTION `util`.`mockTime`()
+ RETURNS datetime
+ DETERMINISTIC
+BEGIN
+/**
+ * Returns the mockTime with predefined timezone or current dateTime
+ * depending of config.mockEnabled
+ *
+ * @return formatted datetime
+ */
+ DECLARE vMockEnabled BOOL;
+
+ SELECT mockEnabled INTO vMockEnabled FROM config LIMIT 1;
+
+ IF vMockEnabled THEN
+ RETURN mockTimeBase(FALSE);
+ ELSE
+ RETURN util.NOW();
+ END IF;
+END$$
+DELIMITER ;
\ No newline at end of file
diff --git a/db/versions/.archive/10459-chocolateMedeola/03-createFunctionMockTimeBase.sql b/db/versions/.archive/10459-chocolateMedeola/03-createFunctionMockTimeBase.sql
new file mode 100644
index 000000000..f17706639
--- /dev/null
+++ b/db/versions/.archive/10459-chocolateMedeola/03-createFunctionMockTimeBase.sql
@@ -0,0 +1,27 @@
+DROP FUNCTION IF EXISTS `util`.`mockTimeBase`;
+DELIMITER $$
+CREATE DEFINER=`root`@`localhost` FUNCTION `util`.`mockTimeBase`(vIsUtc BOOL)
+ RETURNS datetime
+ DETERMINISTIC
+BEGIN
+/**
+ * Returns the date formatted to utc if vIsUtc or config.mocTz if not
+ *
+ * @param vIsUtc If date must be returned as UTC format
+ * @return The formatted mock time
+ */
+DECLARE vMockUtcTime DATETIME;
+ DECLARE vMockTz VARCHAR(255);
+
+ SELECT mockUtcTime, mockTz
+ INTO vMockUtcTime, vMockTz
+ FROM config
+ LIMIT 1;
+
+ IF vIsUtc OR vMockTz IS NULL THEN
+ RETURN vMockUtcTime;
+ ELSE
+ RETURN CONVERT_TZ(vMockUtcTime, '+00:00', vMockTz);
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/versions/.archive/10459-chocolateMedeola/04-createFunctionNow.sql b/db/versions/.archive/10459-chocolateMedeola/04-createFunctionNow.sql
new file mode 100644
index 000000000..6c84d1d80
--- /dev/null
+++ b/db/versions/.archive/10459-chocolateMedeola/04-createFunctionNow.sql
@@ -0,0 +1,12 @@
+DROP FUNCTION IF EXISTS `util`.`NOW`;
+DELIMITER $$
+CREATE DEFINER=`root`@`localhost` FUNCTION `util`.`NOW`()
+ RETURNS DATETIME
+ DETERMINISTIC
+BEGIN
+ /**
+ * @return The mock datetime
+ */
+ RETURN mockTime();
+END$$
+DELIMITER ;
\ No newline at end of file
diff --git a/db/versions/.archive/10460-crimsonDendro/00-firstScript.sql b/db/versions/.archive/10460-crimsonDendro/00-firstScript.sql
new file mode 100644
index 000000000..52f13e0f8
--- /dev/null
+++ b/db/versions/.archive/10460-crimsonDendro/00-firstScript.sql
@@ -0,0 +1,2 @@
+-- Place your SQL code here
+ALTER TABLE `vn2008`.`ticket_location` RENAME TO `vn2008`.`ticket_location__` ;
\ No newline at end of file
diff --git a/db/versions/.archive/10461-filtroPorTipos/00-firstScript.sql b/db/versions/.archive/10461-filtroPorTipos/00-firstScript.sql
new file mode 100644
index 000000000..9c6c1abcf
--- /dev/null
+++ b/db/versions/.archive/10461-filtroPorTipos/00-firstScript.sql
@@ -0,0 +1,39 @@
+ALTER TABLE vn.clientItemType
+ DROP COLUMN IF EXISTS isAllowed;
+
+ALTER TABLE vn.clientItemType
+ DROP FOREIGN KEY IF EXISTS clientItemType_FK_1;
+
+ALTER TABLE vn.clientItemType
+ MODIFY COLUMN IF EXISTS itemTypeFk SMALLINT UNSIGNED DEFAULT 1 NOT NULL;
+
+TRUNCATE TABLE vn.clientItemType;
+
+ALTER TABLE vn.clientItemType
+ ADD CONSTRAINT clientItemType_FK_1 FOREIGN KEY (itemTypeFk) REFERENCES vn.itemType(id);
+
+DROP TABLE IF EXISTS vn.clientItemCategory;
+
+CREATE TABLE IF NOT EXISTS vn.zoneItemType (
+ id int PRIMARY KEY NOT NULL AUTO_INCREMENT,
+ zoneFk int NOT NULL,
+ itemTypeFk smallint UNSIGNED NOT NULL,
+ CONSTRAINT zoneItemType_FK FOREIGN KEY (zoneFk) REFERENCES vn.`zone`(id) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT zoneItemType_FK_1 FOREIGN KEY (itemTypeFk) REFERENCES vn.itemType(id) ON DELETE CASCADE ON UPDATE CASCADE
+)
+ENGINE=InnoDB
+DEFAULT CHARSET=utf8mb3
+COLLATE=utf8mb3_unicode_ci
+COMMENT='Combinaciones prohibidas entre zone e itemType al calcular el catálogo de items';
+
+CREATE TABLE IF NOT EXISTS vn.agencyModeItemType (
+ id int PRIMARY KEY NOT NULL AUTO_INCREMENT,
+ agencyModeFk int NOT NULL,
+ itemTypeFk smallint UNSIGNED NOT NULL,
+ CONSTRAINT agencyModeItemType_FK FOREIGN KEY (agencyModeFk) REFERENCES vn.agencyMode(id) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT agencyModeItemType_FK_1 FOREIGN KEY (itemTypeFk) REFERENCES vn.itemType(id) ON DELETE CASCADE ON UPDATE CASCADE
+)
+ENGINE=InnoDB
+DEFAULT CHARSET=utf8mb3
+COLLATE=utf8mb3_unicode_ci
+COMMENT='Combinaciones prohibidas entre agencyMode e itemType al calcular el catálogo de items';
diff --git a/db/versions/.archive/10463-wheatMonstera/00-firstScript.sql b/db/versions/.archive/10463-wheatMonstera/00-firstScript.sql
new file mode 100644
index 000000000..28b2da36d
--- /dev/null
+++ b/db/versions/.archive/10463-wheatMonstera/00-firstScript.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.mdbBranch ADD dsName varchar(255) DEFAULT NULL NULL;
diff --git a/db/versions/.archive/10468-goldenGerbera/00-firstScript.sql b/db/versions/.archive/10468-goldenGerbera/00-firstScript.sql
new file mode 100644
index 000000000..0440add97
--- /dev/null
+++ b/db/versions/.archive/10468-goldenGerbera/00-firstScript.sql
@@ -0,0 +1,2 @@
+ALTER TABLE vn.expeditionMistake DROP FOREIGN KEY expeditionMistake_FK;
+ALTER TABLE vn.expeditionMistake ADD CONSTRAINT expeditionMistake_FK FOREIGN KEY (expeditionFk) REFERENCES vn.expedition(id) ON DELETE CASCADE ON UPDATE CASCADE;
\ No newline at end of file
diff --git a/db/versions/.archive/10469-bronzeEucalyptus/00-firstScript.sql b/db/versions/.archive/10469-bronzeEucalyptus/00-firstScript.sql
new file mode 100644
index 000000000..5f844ff31
--- /dev/null
+++ b/db/versions/.archive/10469-bronzeEucalyptus/00-firstScript.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.deviceProduction ADD description varchar(100) DEFAULT NULL NULL;
\ No newline at end of file
diff --git a/db/versions/.archive/10470-notaUltimoUsuario/00-firstScript.sql b/db/versions/.archive/10470-notaUltimoUsuario/00-firstScript.sql
new file mode 100644
index 000000000..86fd847fe
--- /dev/null
+++ b/db/versions/.archive/10470-notaUltimoUsuario/00-firstScript.sql
@@ -0,0 +1,15 @@
+ALTER TABLE `vn`.`entry` ADD observationEditorFk INT(10) unsigned NULL COMMENT 'Último usuario que ha modificado el campo evaNotes';
+ALTER TABLE `vn`.`entry` ADD CONSTRAINT entry_observationEditorFk FOREIGN KEY (observationEditorFk) REFERENCES account.user(id) ON UPDATE CASCADE;
+
+UPDATE
+ `vn`.`entry` e
+SET
+ observationEditorFk = (
+ SELECT w.userFk
+ FROM
+ `vn`.`worker` w
+ JOIN `account`.`user` u ON
+ u.id = w.userFk
+ WHERE
+ w.code = RIGHT(e.evaNotes,3)),
+ evaNotes = LEFT(evaNotes,LENGTH(evaNotes)-5)
\ No newline at end of file
diff --git a/db/versions/.archive/10471-orangeMastic/00-firstScript.sql b/db/versions/.archive/10471-orangeMastic/00-firstScript.sql
new file mode 100644
index 000000000..742db67f4
--- /dev/null
+++ b/db/versions/.archive/10471-orangeMastic/00-firstScript.sql
@@ -0,0 +1,3 @@
+-- Place your SQL code here
+
+ALTER TABLE vn.saleTracking ADD isScanned tinyint(1) DEFAULT NULL NULL COMMENT 'TRUE: se ha escaneado. FALSE: escrito a mano. NULL:demás casos';
diff --git a/db/versions/.archive/10472-bronzeOak/00-firstScript.sql b/db/versions/.archive/10472-bronzeOak/00-firstScript.sql
new file mode 100644
index 000000000..4f8bf198e
--- /dev/null
+++ b/db/versions/.archive/10472-bronzeOak/00-firstScript.sql
@@ -0,0 +1,5 @@
+-- Place your SQL code here
+RENAME TABLE vn2008.payroll_categorias TO vn.payrollCategories;
+ALTER TABLE vn.payrollCategories CHANGE codcategoria id int(11) NOT NULL;
+ALTER TABLE vn.payrollCategories CHANGE Tarifa rate tinyint(4) NOT NULL;
+ALTER TABLE vn.payrollCategories CHANGE descripcion description varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL;
\ No newline at end of file
diff --git a/db/versions/.archive/10477-goldenDendro/00-firstScript.sql b/db/versions/.archive/10477-goldenDendro/00-firstScript.sql
new file mode 100644
index 000000000..a81554bf2
--- /dev/null
+++ b/db/versions/.archive/10477-goldenDendro/00-firstScript.sql
@@ -0,0 +1,12 @@
+-- Place your SQL code here
+ALTER TABLE `vn`.`ticket`
+CHANGE COLUMN `created` `created` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP() ;
+
+ALTER TABLE `vn`.`ticket`
+ADD COLUMN `clonedFrom` INT(11) NULL DEFAULT NULL;
+
+ALTER TABLE `vn`.`entry`
+ADD COLUMN `clonedFrom` INT(11) NULL DEFAULT NULL;
+
+ALTER TABLE `vn`.`travel`
+ADD COLUMN `clonedFrom` INT(11) NULL DEFAULT NULL;
diff --git a/db/versions/.archive/10478-tealGalax/00-dropBasket.sql b/db/versions/.archive/10478-tealGalax/00-dropBasket.sql
new file mode 100644
index 000000000..f455b0f79
--- /dev/null
+++ b/db/versions/.archive/10478-tealGalax/00-dropBasket.sql
@@ -0,0 +1 @@
+DROP TABLE hedera.basketOrder;
diff --git a/db/versions/.archive/10478-tealGalax/00-firstScript.sql b/db/versions/.archive/10478-tealGalax/00-firstScript.sql
new file mode 100644
index 000000000..b100cf4a4
--- /dev/null
+++ b/db/versions/.archive/10478-tealGalax/00-firstScript.sql
@@ -0,0 +1,2 @@
+INSERT INTO hedera.message (code,description)
+ VALUES ('orderOutdated','La configuración del pedido es incorrecta, por favor vuelve a configurarlo para continuar comprando');
diff --git a/db/versions/.archive/10478-tealGalax/01-orderConfigured.sql b/db/versions/.archive/10478-tealGalax/01-orderConfigured.sql
new file mode 100644
index 000000000..6c38123e1
--- /dev/null
+++ b/db/versions/.archive/10478-tealGalax/01-orderConfigured.sql
@@ -0,0 +1 @@
+ALTER TABLE hedera.`order` ADD configured DATETIME NULL;
diff --git a/db/versions/.archive/10478-tealGalax/02-configuredUpdate.sql b/db/versions/.archive/10478-tealGalax/02-configuredUpdate.sql
new file mode 100644
index 000000000..9b99a87cc
--- /dev/null
+++ b/db/versions/.archive/10478-tealGalax/02-configuredUpdate.sql
@@ -0,0 +1 @@
+UPDATE hedera.order SET configured = date_make WHERE configured IS NULL;
diff --git a/db/versions/.archive/10478-tealGalax/99-privileges.sql b/db/versions/.archive/10478-tealGalax/99-privileges.sql
new file mode 100644
index 000000000..d5177738b
--- /dev/null
+++ b/db/versions/.archive/10478-tealGalax/99-privileges.sql
@@ -0,0 +1,12 @@
+/*
+GRANT EXECUTE ON PROCEDURE hedera.myOrder_configureForGuest TO guest;
+GRANT EXECUTE ON PROCEDURE hedera.myOrder_calcCatalogFull TO guest;
+GRANT SELECT ON hedera.myOrder TO guest;
+GRANT EXECUTE ON PROCEDURE hedera.myOrder_create TO account;
+GRANT EXECUTE ON PROCEDURE hedera.myOrder_checkConfig TO account;
+GRANT EXECUTE ON PROCEDURE hedera.myOrder_configure TO account;
+GRANT EXECUTE ON PROCEDURE hedera.myOrder_calcCatalogFromItem TO account;
+GRANT EXECUTE ON PROCEDURE hedera.myOrder_getTax TO account;
+GRANT EXECUTE ON PROCEDURE hedera.myOrder_confirm TO account;
+CALL account.role_syncPrivileges;
+*/
diff --git a/db/versions/.archive/10480-blueTulip/00-firstScript.sql b/db/versions/.archive/10480-blueTulip/00-firstScript.sql
new file mode 100644
index 000000000..013405b75
--- /dev/null
+++ b/db/versions/.archive/10480-blueTulip/00-firstScript.sql
@@ -0,0 +1 @@
+ALTER TABLE edi.ekt MODIFY COLUMN putOrderFk int(11) DEFAULT NULL NULL COMMENT 'RFF+ON';
\ No newline at end of file
diff --git a/db/versions/.archive/10481-brownAspidistra/00-firstScript.sql b/db/versions/.archive/10481-brownAspidistra/00-firstScript.sql
new file mode 100644
index 000000000..8c912eb19
--- /dev/null
+++ b/db/versions/.archive/10481-brownAspidistra/00-firstScript.sql
@@ -0,0 +1 @@
+ALTER TABLE srt.movingLast ADD CONSTRAINT movingLast_PK PRIMARY KEY (id);
diff --git a/db/versions/.archive/10482-blueMastic/00-firstScript.sql b/db/versions/.archive/10482-blueMastic/00-firstScript.sql
new file mode 100644
index 000000000..2c08e2e63
--- /dev/null
+++ b/db/versions/.archive/10482-blueMastic/00-firstScript.sql
@@ -0,0 +1,4 @@
+CREATE INDEX ekt_sub_IDX USING BTREE ON edi.ekt (sub);
+CREATE INDEX buy_itemFk_IDX USING BTREE ON vn.buy (itemFk);
+ALTER TABLE edi.ekt MODIFY COLUMN putOrderFk bigint(20) DEFAULT NULL NULL COMMENT 'RFF+ON';
+ALTER TABLE edi.putOrder MODIFY COLUMN id bigint(20) auto_increment NOT NULL;
diff --git a/db/versions/.archive/10485-aquaCamellia/00-firstScript.sql b/db/versions/.archive/10485-aquaCamellia/00-firstScript.sql
new file mode 100644
index 000000000..c6ee5eff3
--- /dev/null
+++ b/db/versions/.archive/10485-aquaCamellia/00-firstScript.sql
@@ -0,0 +1,9 @@
+-- Place your SQL code here
+DROP TABLE IF EXISTS vn.workers20190711;
+DROP TABLE IF EXISTS vn.workers20190711_FichadasAbril;
+DROP TABLE IF EXISTS vn.workers20190711_FichadasJulio11;
+DROP TABLE IF EXISTS vn.workers20190711_FichadasJunio;
+DROP TABLE IF EXISTS vn.workers20190711_FichadasMayo;
+DROP TABLE IF EXISTS vn.workers20190711_FichadasOctubre;
+DROP TABLE IF EXISTS vn.workers20190711_Garrote;
+DROP TABLE IF EXISTS postgresql.workers20190711_FichadasAbril;
diff --git a/db/versions/.archive/10488-grayCarnation/00-firstScript.sql b/db/versions/.archive/10488-grayCarnation/00-firstScript.sql
new file mode 100644
index 000000000..9375d52dc
--- /dev/null
+++ b/db/versions/.archive/10488-grayCarnation/00-firstScript.sql
@@ -0,0 +1,9 @@
+-- Place your SQL code here
+DROP TABLE IF EXISTS postgresql.address,
+postgresql.address_type,
+postgresql.bank_account_type,
+postgresql.erte_COVID19,
+postgresql.professional_levels,
+postgresql.profile_media,
+postgresql.profile_type,
+postgresql.townKk;
\ No newline at end of file
diff --git a/db/versions/.archive/10491-orangeDracena/00-firstScript.sql b/db/versions/.archive/10491-orangeDracena/00-firstScript.sql
new file mode 100644
index 000000000..9957478c7
--- /dev/null
+++ b/db/versions/.archive/10491-orangeDracena/00-firstScript.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.printQueue MODIFY COLUMN serverId varchar(255) DEFAULT NULL NULL COMMENT 'Indica el identificador de los servidores de impresión';
diff --git a/db/versions/.archive/10492-wheatIvy/00-firstScript.sql b/db/versions/.archive/10492-wheatIvy/00-firstScript.sql
new file mode 100644
index 000000000..1a39b43d9
--- /dev/null
+++ b/db/versions/.archive/10492-wheatIvy/00-firstScript.sql
@@ -0,0 +1,38 @@
+RENAME TABLE vn2008.Reservas TO vn2008.Reservas__;
+ALTER TABLE vn2008.Reservas__ COMMENT='Deprecated 27-02-2023';
+
+RENAME TABLE vn2008.Recibos_recorded TO vn2008.Recibos_recorded__;
+ALTER TABLE vn2008.Recibos_recorded__ COMMENT='Deprecated 27-02-2023';
+
+RENAME TABLE vn2008.Objetivos TO vn2008.Objetivos__;
+ALTER TABLE vn2008.Objetivos__ COMMENT='Deprecated 27-02-2023';
+
+RENAME TABLE vn2008.mail_templates TO vn2008.mail_templates__;
+ALTER TABLE vn2008.mail_templates__ COMMENT='Deprecated 27-02-2023';
+
+RENAME TABLE vn2008.Jefes TO vn2008.Jefes__;
+ALTER TABLE vn2008.Jefes__ COMMENT='Deprecated 27-02-2023';
+
+RENAME TABLE vn2008.intervalos TO vn2008.intervalos__;
+ALTER TABLE vn2008.intervalos__ COMMENT='Deprecated 27-02-2023';
+
+RENAME TABLE vn2008.Estanterias TO vn2008.Estanterias__;
+ALTER TABLE vn2008.Estanterias__ COMMENT='Deprecated 27-02-2023';
+
+RENAME TABLE vn2008.Estanterias_distri TO vn2008.Estanterias_distri__;
+ALTER TABLE vn2008.Estanterias_distri__ COMMENT='Deprecated 27-02-2023';
+
+RENAME TABLE vn2008.Estanterias_distri_name TO vn2008.Estanterias_distri_name__;
+ALTER TABLE vn2008.Estanterias_distri_name__ COMMENT='Deprecated 27-02-2023';
+
+RENAME TABLE vn2008.EnvioMasivo TO vn2008.EnvioMasivo__;
+ALTER TABLE vn2008.EnvioMasivo__ COMMENT='Deprecated 27-02-2023';
+
+RENAME TABLE vn2008.Entradas_turno TO vn2008.Entradas_turno__;
+ALTER TABLE vn2008.Entradas_turno__ COMMENT='Deprecated 27-02-2023';
+
+RENAME TABLE vn2008.Entradas_stack TO vn2008.Entradas_stack__;
+ALTER TABLE vn2008.Entradas_stack__ COMMENT='Deprecated 27-02-2023';
+
+RENAME TABLE vn2008.`Enlaces Facturas` TO vn2008.`Enlaces Facturas__`;
+ALTER TABLE vn2008.`Enlaces Facturas__` COMMENT='Deprecated 27-02-2023';
diff --git a/db/versions/.archive/10493-purpleAnthurium/00-firstScript.sql b/db/versions/.archive/10493-purpleAnthurium/00-firstScript.sql
new file mode 100644
index 000000000..ada713d3d
--- /dev/null
+++ b/db/versions/.archive/10493-purpleAnthurium/00-firstScript.sql
@@ -0,0 +1,2 @@
+ALTER TABLE vn.greugeConfig ADD maxPercentToWrong decimal(10,2) DEFAULT NULL COMMENT 'Porcentaje del precio del ticket que es considerado error';
+ALTER TABLE vn.greugeConfig ADD lastNotifyCheck timestamp DEFAULT NULL NULL COMMENT 'Última ejecución del procedimiento que revisa los greuges anormales';
diff --git a/db/versions/.archive/10495-whiteFern/00-firstScript.sql b/db/versions/.archive/10495-whiteFern/00-firstScript.sql
new file mode 100644
index 000000000..93bff192f
--- /dev/null
+++ b/db/versions/.archive/10495-whiteFern/00-firstScript.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.client DROP COLUMN mailAddress;
diff --git a/db/versions/.archive/10498-redAspidistra/00-firstScript.sql b/db/versions/.archive/10498-redAspidistra/00-firstScript.sql
new file mode 100644
index 000000000..860b57c5e
--- /dev/null
+++ b/db/versions/.archive/10498-redAspidistra/00-firstScript.sql
@@ -0,0 +1,3 @@
+-- Place your SQL code here
+ALTER TABLE `vn`.`supplierAccount`
+CHANGE COLUMN `bankFk` `accountingFk` INT(11) NULL DEFAULT NULL ;
diff --git a/db/versions/.archive/10500-limeChrysanthemum/00-firstScript.sql b/db/versions/.archive/10500-limeChrysanthemum/00-firstScript.sql
new file mode 100644
index 000000000..3792608d4
--- /dev/null
+++ b/db/versions/.archive/10500-limeChrysanthemum/00-firstScript.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.bankEntity DROP KEY bic_UNIQUE;
diff --git a/db/versions/.archive/10500-limeRaphis/00-firstScript.sql b/db/versions/.archive/10500-limeRaphis/00-firstScript.sql
new file mode 100644
index 000000000..7db02c439
--- /dev/null
+++ b/db/versions/.archive/10500-limeRaphis/00-firstScript.sql
@@ -0,0 +1,10 @@
+USE vn;
+CREATE TABLE `vn`.`glsExpedition` (
+ `expeditionFk` int(11) NOT NULL,
+ `barcode` varchar(20) DEFAULT NULL,
+ `uid` varchar(45) DEFAULT NULL COMMENT 'Valor retornado por GLS al hacer pertición al webservice',
+ `codexp` int(11) DEFAULT NULL COMMENT 'Valor retornado por GLS al hacer pertición al webservice',
+ `created` timestamp NOT NULL DEFAULT current_timestamp(),
+ PRIMARY KEY (`expeditionFk`),
+ CONSTRAINT `glsExpedition_FK` FOREIGN KEY (`expeditionFk`) REFERENCES `expedition` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
\ No newline at end of file
diff --git a/db/versions/.archive/10501-orangeAnthurium/00-firstScript.sql b/db/versions/.archive/10501-orangeAnthurium/00-firstScript.sql
new file mode 100644
index 000000000..14a42f832
--- /dev/null
+++ b/db/versions/.archive/10501-orangeAnthurium/00-firstScript.sql
@@ -0,0 +1,5 @@
+ALTER TABLE hedera.tpvTransaction
+ ADD merchantParameters TEXT DEFAULT NULL NULL,
+ ADD signature VARCHAR(255) DEFAULT NULL NULL,
+ ADD signatureVersion varchar(50) DEFAULT NULL NULL,
+ ADD responseError varchar(255) DEFAULT NULL NULL;
diff --git a/db/versions/.archive/10502-azureCarnation/00-firstScript.sql b/db/versions/.archive/10502-azureCarnation/00-firstScript.sql
new file mode 100644
index 000000000..8e3812e6d
--- /dev/null
+++ b/db/versions/.archive/10502-azureCarnation/00-firstScript.sql
@@ -0,0 +1,8 @@
+USE vn;
+
+DROP TABLE IF EXISTS vn.workerTimeControlConfig_;
+ALTER TABLE vn.workerTimeControlConfig
+ ADD breakTimeSplitDay int(11) unsigned DEFAULT 3600 NULL
+ COMMENT 'Tiempo de descanso a partir del cual se determina que la jornada es partida',
+ ADD dateSplitDay date DEFAULT '2023-03-01' NULL
+ COMMENT 'Fecha a partir de la cual se tiene en cuenta el valor de configuración de breakTimeSplitDay';
diff --git a/db/versions/.archive/10502-yellowCordyline/00-firstScript.sql b/db/versions/.archive/10502-yellowCordyline/00-firstScript.sql
new file mode 100644
index 000000000..d1e5a76da
--- /dev/null
+++ b/db/versions/.archive/10502-yellowCordyline/00-firstScript.sql
@@ -0,0 +1,8 @@
+-- Place your SQL code here
+ALTER TABLE vn.sale
+ ADD COLUMN total DECIMAL(10,2)
+ AS (price * quantity * (100 - discount) / 100) VIRTUAL;
+
+ALTER TABLE vn.claim
+ ADD COLUMN responsabilityRate DECIMAL(3,2)
+ AS ((5 - responsibility) / 4) VIRTUAL;
diff --git a/db/versions/.archive/10504-maroonPalmetto/00-firstScript.sql b/db/versions/.archive/10504-maroonPalmetto/00-firstScript.sql
new file mode 100644
index 000000000..f57f96c18
--- /dev/null
+++ b/db/versions/.archive/10504-maroonPalmetto/00-firstScript.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.vehicle MODIFY COLUMN numberPlate varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NULL;
diff --git a/db/versions/.archive/10506-aquaPaniculata/01-firstScript.sql b/db/versions/.archive/10506-aquaPaniculata/01-firstScript.sql
new file mode 100644
index 000000000..9cfd1d7ae
--- /dev/null
+++ b/db/versions/.archive/10506-aquaPaniculata/01-firstScript.sql
@@ -0,0 +1,12 @@
+ALTER TABLE vn.expense
+ ADD COLUMN IF NOT EXISTS code VARCHAR(25) DEFAULT NULL NULL,
+ ADD CONSTRAINT expense_UN UNIQUE KEY IF NOT EXISTS (code);
+
+CREATE TABLE IF NOT EXISTS sage.`taxType` (
+ `id` int(11) NOT NULL,
+ `code` varchar(25) DEFAULT NULL,
+ `isIntracommunity` tinyint(1) NOT NULL DEFAULT 0,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `taxType_UN` (`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
+ COMMENT='Coincidencia del id con Sage.TiposIVA.CodigoIva(propia de Sage), en ningún caso vincular mediate FK';
diff --git a/db/versions/.archive/10506-aquaPaniculata/02-secondScript.sql b/db/versions/.archive/10506-aquaPaniculata/02-secondScript.sql
new file mode 100644
index 000000000..089d47e5e
--- /dev/null
+++ b/db/versions/.archive/10506-aquaPaniculata/02-secondScript.sql
@@ -0,0 +1,3 @@
+INSERT IGNORE INTO sage.taxType (id, isIntracommunity)
+ SELECT CodigoIva, isIntracommunity
+ FROM sage.TiposIva;
\ No newline at end of file
diff --git a/db/versions/.archive/10506-aquaPaniculata/03-thirdScript.sql b/db/versions/.archive/10506-aquaPaniculata/03-thirdScript.sql
new file mode 100644
index 000000000..b891a5858
--- /dev/null
+++ b/db/versions/.archive/10506-aquaPaniculata/03-thirdScript.sql
@@ -0,0 +1,48 @@
+UPDATE sage.taxType tt
+ JOIN sage.TiposIva ti ON ti.CodigoIva = tt.id
+ SET tt.code='import10'
+ WHERE ti.IVA = 'IVA 10% importaciones';
+
+UPDATE sage.taxType tt
+ JOIN sage.TiposIva ti ON ti.CodigoIva = tt.id
+ SET tt.code='import21'
+ WHERE ti.IVA = 'IVA 21% importaciones';
+
+UPDATE sage.taxType tt
+ JOIN sage.TiposIva ti ON ti.CodigoIva = tt.id
+ SET tt.code='ISP21'
+ WHERE ti.IVA = 'HP DEVENGADO 21 ISP';
+
+UPDATE sage.taxType tt
+ JOIN sage.TiposIva ti ON ti.CodigoIva = tt.id
+ SET tt.code='import4'
+ WHERE ti.IVA = 'H.P. IVA Soportado Impor 4%';
+
+UPDATE sage.taxType tt
+ JOIN sage.TiposIva ti ON ti.CodigoIva = tt.id
+ SET tt.code='national10'
+ WHERE ti.IVA = 'I.V.A. 10% Nacional';
+
+UPDATE sage.taxType tt
+ JOIN sage.TiposIva ti ON ti.CodigoIva = tt.id
+ SET tt.code='national21'
+ WHERE ti.IVA = 'I.V.A. 21%';
+
+UPDATE sage.taxType tt
+ JOIN sage.TiposIva ti ON ti.CodigoIva = tt.id
+ SET tt.code='national4'
+ WHERE ti.IVA = 'I.V.A. 4%';
+
+UPDATE sage.taxType tt
+ JOIN sage.TiposIva ti ON ti.CodigoIva = tt.id
+ SET tt.code='national0'
+ WHERE ti.IVA = 'I.V.A 0% Nacional';
+
+UPDATE sage.taxType tt
+ JOIN sage.TiposIva ti ON ti.CodigoIva = tt.id
+ SET tt.code='CEEServices21'
+ WHERE ti.IVA = 'I.V.A. Adqui. servicios CEE';
+
+ALTER TABLE sage.TiposIva
+ DROP COLUMN IF EXISTS isIntracommunity;
+
diff --git a/db/versions/.archive/10506-crimsonRoebelini/00-firstScript.sql b/db/versions/.archive/10506-crimsonRoebelini/00-firstScript.sql
new file mode 100644
index 000000000..ded96ce50
--- /dev/null
+++ b/db/versions/.archive/10506-crimsonRoebelini/00-firstScript.sql
@@ -0,0 +1,12 @@
+-- Place your SQL code here
+ALTER TABLE `postgresql`.`calendar_labour_type` RENAME `vn`.`calendarType`;
+
+ALTER TABLE `vn`.`calendarType`
+DROP COLUMN `pausa_remunerada`,
+CHANGE COLUMN `calendar_labour_type_id` `id` int(11) NOT NULL AUTO_INCREMENT,
+CHANGE COLUMN `descripcion` `description` varchar(50) DEFAULT NULL,
+CHANGE COLUMN `hours_week` `hoursWeek` smallint(6) DEFAULT NULL ,
+CHANGE COLUMN `isPartial` `isPartial` tinyint(1) NOT NULL DEFAULT 0 ;
+
+ALTER TABLE `vn`.`calendarType`
+CHANGE COLUMN `hoursWeek` `hoursWeek` SMALLINT(6) UNSIGNED NULL DEFAULT NULL ;
\ No newline at end of file
diff --git a/db/versions/.archive/10507-greenAspidistra/00-firstScript.sql b/db/versions/.archive/10507-greenAspidistra/00-firstScript.sql
new file mode 100644
index 000000000..52d743f8e
--- /dev/null
+++ b/db/versions/.archive/10507-greenAspidistra/00-firstScript.sql
@@ -0,0 +1,40 @@
+USE vn;
+
+ALTER TABLE vn.sectorCollectionSaleGroup DROP FOREIGN KEY IF EXISTS sectorCollectionSaleGroup_FK_1;
+ALTER TABLE vn.sectorCollectionSaleGroup DROP FOREIGN KEY IF EXISTS sectorCollectionSaleGroup_FK;
+
+ALTER TABLE vn.sectorCollectionSaleGroup DROP KEY IF EXISTS sectorCollectionSaleGroup_UN;
+DELETE
+ FROM sectorCollectionSaleGroup
+ WHERE id NOT IN (
+ SELECT *
+ FROM (
+ SELECT MIN(id)
+ FROM sectorCollectionSaleGroup
+ GROUP BY saleGroupFk
+ ) as temp_table
+ );
+ALTER TABLE vn.sectorCollectionSaleGroup ADD CONSTRAINT UNIQUE KEY (saleGroupFk);
+
+ALTER TABLE vn.sectorCollectionSaleGroup ADD CONSTRAINT FOREIGN KEY (sectorCollectionFk) REFERENCES vn.sectorCollection(id) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE vn.sectorCollectionSaleGroup ADD CONSTRAINT FOREIGN KEY (saleGroupFk) REFERENCES vn.saleGroup(id) ON DELETE CASCADE ON UPDATE CASCADE;
+
+CREATE OR REPLACE TEMPORARY TABLE tSGD
+SELECT saleFk, sgd.id, count(*) n
+ FROM vn.saleGroupDetail sgd
+ GROUP BY saleFk
+ HAVING n > 1;
+
+DELETE sgd.*
+ FROM vn.saleGroupDetail sgd
+ JOIN tSGD ON tSGD.saleFk = sgd.saleFk AND tSGD.id <> sgd.id;
+
+DROP TEMPORARY TABLE tSGD;
+
+ALTER TABLE vn.sectorCollectionSaleGroup ADD CONSTRAINT FOREIGN KEY (saleGroupFk) REFERENCES vn.saleGroup(id) ON DELETE CASCADE ON UPDATE CASCADE;
+
+ALTER TABLE vn.saleGroupDetail DROP FOREIGN KEY IF EXISTS saleGroupDetail_FK;
+ALTER TABLE vn.saleGroupDetail DROP FOREIGN KEY IF EXISTS saleGroupDetail_FK_1;
+ALTER TABLE vn.saleGroupDetail DROP KEY IF EXISTS saleGroupDetail_UN;
+ALTER TABLE vn.saleGroupDetail ADD CONSTRAINT FOREIGN KEY (saleFk) REFERENCES vn.sale(id) ON DELETE CASCADE ON UPDATE CASCADE;
+
\ No newline at end of file
diff --git a/db/versions/.archive/10508-maroonMonstera/00-firstScript.sql b/db/versions/.archive/10508-maroonMonstera/00-firstScript.sql
new file mode 100644
index 000000000..e7e62cebe
--- /dev/null
+++ b/db/versions/.archive/10508-maroonMonstera/00-firstScript.sql
@@ -0,0 +1,2 @@
+-- Place your SQL code here
+ALTER TABLE vn.buy MODIFY COLUMN printedStickers int(11) DEFAULT 0 NOT NULL;
diff --git a/db/versions/.archive/10510-salmonMoss/00-dropBusinessFk.sql b/db/versions/.archive/10510-salmonMoss/00-dropBusinessFk.sql
new file mode 100644
index 000000000..5ef0ecf22
--- /dev/null
+++ b/db/versions/.archive/10510-salmonMoss/00-dropBusinessFk.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.business DROP FOREIGN KEY IF EXISTS business_workerBusinessProfessionalCategoryFk;
\ No newline at end of file
diff --git a/db/versions/.archive/10510-salmonMoss/01-createTableProfessionalCategory.sql b/db/versions/.archive/10510-salmonMoss/01-createTableProfessionalCategory.sql
new file mode 100644
index 000000000..1a8b2d733
--- /dev/null
+++ b/db/versions/.archive/10510-salmonMoss/01-createTableProfessionalCategory.sql
@@ -0,0 +1,11 @@
+CREATE OR REPLACE TABLE vn.professionalCategory (
+ id int(11) auto_increment NOT NULL,
+ name varchar(50) NOT NULL,
+ `level` INT(11) UNSIGNED DEFAULT NULL NULL,
+ dayBreak int(11) UNSIGNED DEFAULT NULL NULL,
+ CONSTRAINT prefessionalCategory_PK PRIMARY KEY (id),
+ CONSTRAINT prefessionalCategory_UN UNIQUE KEY (name)
+)
+ENGINE=InnoDB
+DEFAULT CHARSET=utf8mb3
+COLLATE=utf8mb3_unicode_ci;
\ No newline at end of file
diff --git a/db/versions/.archive/10510-salmonMoss/02-exportToNewTable.sql b/db/versions/.archive/10510-salmonMoss/02-exportToNewTable.sql
new file mode 100644
index 000000000..8f26f5ac5
--- /dev/null
+++ b/db/versions/.archive/10510-salmonMoss/02-exportToNewTable.sql
@@ -0,0 +1,3 @@
+INSERT INTO vn.professionalCategory (id, name, `level`, dayBreak)
+SELECT pc.professional_category_id, pc.category_name, pc.professional_levels_id, pc.dayBreak
+FROM postgresql.professional_category pc;
\ No newline at end of file
diff --git a/db/versions/.archive/10510-salmonMoss/03-RecreateFK.sql b/db/versions/.archive/10510-salmonMoss/03-RecreateFK.sql
new file mode 100644
index 000000000..28f08fc9d
--- /dev/null
+++ b/db/versions/.archive/10510-salmonMoss/03-RecreateFK.sql
@@ -0,0 +1,2 @@
+ALTER TABLE vn.business ADD CONSTRAINT business_FK FOREIGN KEY (workerBusinessProfessionalCategoryFk)
+ REFERENCES vn.professionalCategory(id) ON DELETE RESTRICT ON UPDATE CASCADE;
\ No newline at end of file
diff --git a/db/versions/.archive/10510-salmonMoss/04-kkPostgresqlTable.sql b/db/versions/.archive/10510-salmonMoss/04-kkPostgresqlTable.sql
new file mode 100644
index 000000000..938671c42
--- /dev/null
+++ b/db/versions/.archive/10510-salmonMoss/04-kkPostgresqlTable.sql
@@ -0,0 +1,2 @@
+ALTER TABLE postgresql.professional_category RENAME TO postgresql.professional_category__;
+ALTER TABLE postgresql.professional_category__ COMMENT='@deprecated 2023-03-24';
\ No newline at end of file
diff --git a/db/versions/.archive/10511-chocolateChrysanthemum/00-firstScript.sql b/db/versions/.archive/10511-chocolateChrysanthemum/00-firstScript.sql
new file mode 100644
index 000000000..bc94ecd22
--- /dev/null
+++ b/db/versions/.archive/10511-chocolateChrysanthemum/00-firstScript.sql
@@ -0,0 +1,33 @@
+USE `postgresql`;
+
+DELIMITER $$
+
+USE `postgresql`$$
+DROP TRIGGER IF EXISTS `postgresql`.`income_employee_afterInsert` $$
+DELIMITER ;
+USE `postgresql`;
+
+DELIMITER $$
+
+USE `postgresql`$$
+DROP TRIGGER IF EXISTS `postgresql`.`income_employee_afterUpdate` $$
+DELIMITER ;
+USE `postgresql`;
+
+DELIMITER $$
+
+USE `postgresql`$$
+DROP TRIGGER IF EXISTS `postgresql`.`income_employee_afterDelete` $$
+DELIMITER ;
+
+ALTER TABLE `postgresql`.`income_employee` RENAME `vn`.`workerIncome`;
+
+ALTER TABLE `vn`.`workerIncome`
+CHANGE COLUMN `debe` `debit` decimal(10,2) NOT NULL DEFAULT 0.00,
+CHANGE COLUMN `haber` `credit` decimal(10,2) NOT NULL DEFAULT 0.00,
+CHANGE COLUMN `id_incomeType` `incomeTypeFk` int(11) DEFAULT NULL,
+CHANGE COLUMN `odbc_date` `paymentDate` date DEFAULT NULL,
+CHANGE COLUMN `concepto` `concept` longtext DEFAULT NULL;
+
+GRANT SELECT ON TABLE `vn`.`workerIncome` TO `hr`;
+GRANT INSERT, UPDATE, DELETE ON TABLE `vn`.`workerIncome` TO `hrBoss`;
\ No newline at end of file
diff --git a/db/versions/.archive/10512-purpleRoebelini/00-firstScript.sql b/db/versions/.archive/10512-purpleRoebelini/00-firstScript.sql
new file mode 100644
index 000000000..de8387e2d
--- /dev/null
+++ b/db/versions/.archive/10512-purpleRoebelini/00-firstScript.sql
@@ -0,0 +1,2 @@
+RENAME TABLE postgresql.incometype_employee TO postgresql.incometype_employee__;
+ALTER TABLE postgresql.incometype_employee__ COMMENT='@deprecated 2023-03-15';
\ No newline at end of file
diff --git a/db/versions/.archive/10513-aquaCataractarum/00-firstScript.sql b/db/versions/.archive/10513-aquaCataractarum/00-firstScript.sql
new file mode 100644
index 000000000..a15d4ea27
--- /dev/null
+++ b/db/versions/.archive/10513-aquaCataractarum/00-firstScript.sql
@@ -0,0 +1,4 @@
+-- Place your SQL code here
+ALTER TABLE `salix`.`AccessToken`
+ADD COLUMN `outdated` DATETIME AS (TIMESTAMPADD(SECOND, ttl, created)) PERSISTENT,
+ADD INDEX `outdated_Index` (`outdated` ASC) VISIBLE;
diff --git a/db/versions/.archive/10514-silverAspidistra/00-firstScript.sql b/db/versions/.archive/10514-silverAspidistra/00-firstScript.sql
new file mode 100644
index 000000000..9a5022336
--- /dev/null
+++ b/db/versions/.archive/10514-silverAspidistra/00-firstScript.sql
@@ -0,0 +1,5 @@
+-- Place your SQL code here
+USE vn;
+INSERT INTO vn.silexACL
+(module, `method`, `role`)
+VALUES('almacennew', 'ticket_printLabelPrevious', 'employee');
diff --git a/db/versions/.archive/10516-crimsonSalal/00-firstScript.sql b/db/versions/.archive/10516-crimsonSalal/00-firstScript.sql
new file mode 100644
index 000000000..7db02c439
--- /dev/null
+++ b/db/versions/.archive/10516-crimsonSalal/00-firstScript.sql
@@ -0,0 +1,10 @@
+USE vn;
+CREATE TABLE `vn`.`glsExpedition` (
+ `expeditionFk` int(11) NOT NULL,
+ `barcode` varchar(20) DEFAULT NULL,
+ `uid` varchar(45) DEFAULT NULL COMMENT 'Valor retornado por GLS al hacer pertición al webservice',
+ `codexp` int(11) DEFAULT NULL COMMENT 'Valor retornado por GLS al hacer pertición al webservice',
+ `created` timestamp NOT NULL DEFAULT current_timestamp(),
+ PRIMARY KEY (`expeditionFk`),
+ CONSTRAINT `glsExpedition_FK` FOREIGN KEY (`expeditionFk`) REFERENCES `expedition` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
\ No newline at end of file
diff --git a/db/versions/.archive/10521-salmonLilium/00-firstScript.sql b/db/versions/.archive/10521-salmonLilium/00-firstScript.sql
new file mode 100644
index 000000000..bbd4c8c88
--- /dev/null
+++ b/db/versions/.archive/10521-salmonLilium/00-firstScript.sql
@@ -0,0 +1,4 @@
+CREATE TABLE vn.franceExpressConfig (
+ id INT auto_increment NOT NULL PRIMARY KEY,
+ `path` varchar(100) DEFAULT "\\\\server\\agencies\\franceexpress\\expeditions" NULL
+);
\ No newline at end of file
diff --git a/db/versions/.archive/10522-yellowMedeola/00-firstScript.sql b/db/versions/.archive/10522-yellowMedeola/00-firstScript.sql
new file mode 100644
index 000000000..50e1848a8
--- /dev/null
+++ b/db/versions/.archive/10522-yellowMedeola/00-firstScript.sql
@@ -0,0 +1,4 @@
+RENAME TABLE postgresql.media TO postgresql.media__;
+ALTER TABLE postgresql.media__
+COMMENT='@deprecated 2023-03-31';
+
diff --git a/db/versions/.archive/10523-tealCataractarum/00-firstScript.sql b/db/versions/.archive/10523-tealCataractarum/00-firstScript.sql
new file mode 100644
index 000000000..cd7172bd6
--- /dev/null
+++ b/db/versions/.archive/10523-tealCataractarum/00-firstScript.sql
@@ -0,0 +1,54 @@
+CREATE TABLE vn.farming (
+ id int(10) unsigned auto_increment NOT NULL,
+ name varchar(100) NOT NULL,
+ location varchar(255) NOT NULL,
+ warehouseFk smallint(6) unsigned NOT NULL,
+ description text DEFAULT NULL NULL,
+ photo blob DEFAULT NULL NULL,
+ isActive tinyint(1) DEFAULT 1 NOT NULL,
+ created timestamp DEFAULT current_timestamp() NOT NULL,
+ CONSTRAINT farming_PK PRIMARY KEY (id),
+ CONSTRAINT farming_FK FOREIGN KEY (warehouseFk) REFERENCES vn.warehouse(id) ON DELETE RESTRICT ON UPDATE CASCADE
+)
+ENGINE=InnoDB
+DEFAULT CHARSET=utf8mb3
+COLLATE=utf8mb3_unicode_ci;
+
+CREATE TABLE vn.farmingDms (
+ id int(10) unsigned auto_increment NOT NULL,
+ farmingFk int(10) unsigned NOT NULL,
+ dmsFk int(11) NOT NULL,
+ CONSTRAINT farmingDms_PK PRIMARY KEY (id),
+ CONSTRAINT farmingDms_FK FOREIGN KEY (farmingFk) REFERENCES vn.farming(id) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT farmingDms_FK_1 FOREIGN KEY (dmsFk) REFERENCES vn.dms(id) ON DELETE CASCADE ON UPDATE CASCADE
+)
+ENGINE=InnoDB
+DEFAULT CHARSET=utf8mb3
+COLLATE=utf8mb3_unicode_ci;
+
+CREATE TABLE vn.farmingInvoiceIn (
+ id int(10) unsigned auto_increment NOT NULL,
+ farmingFk int(10) unsigned NOT NULL,
+ invoiceInFk mediumint(8) unsigned NOT NULL,
+ amount decimal(10,2) DEFAULT NULL NULL,
+ CONSTRAINT farmingInvoiceIn_PK PRIMARY KEY (id),
+ CONSTRAINT farmingInvoiceIn_FK FOREIGN KEY (invoiceInFk) REFERENCES vn.invoiceIn(id) ON DELETE RESTRICT ON UPDATE RESTRICT,
+ CONSTRAINT farmingInvoiceIn_FK_1 FOREIGN KEY (farmingFk) REFERENCES vn.farming(id) ON DELETE RESTRICT ON UPDATE RESTRICT
+)
+ENGINE=InnoDB
+DEFAULT CHARSET=utf8mb3
+COLLATE=utf8mb3_unicode_ci;
+
+CREATE TABLE vn.farmingNotes (
+ id int(10) unsigned auto_increment NOT NULL,
+ farmingFk int(10) unsigned NOT NULL,
+ note text NOT NULL,
+ userFk int(10) unsigned NOT NULL,
+ created timestamp DEFAULT current_timestamp() NOT NULL,
+ CONSTRAINT farmingNotes_PK PRIMARY KEY (id),
+ CONSTRAINT farmingNotes_FK FOREIGN KEY (id) REFERENCES account.`user`(id) ON DELETE RESTRICT ON UPDATE RESTRICT,
+ CONSTRAINT farmingNotes_FK_1 FOREIGN KEY (farmingFk) REFERENCES vn.farming(id) ON DELETE RESTRICT ON UPDATE RESTRICT
+)
+ENGINE=InnoDB
+DEFAULT CHARSET=utf8mb3
+COLLATE=utf8mb3_unicode_ci;
\ No newline at end of file
diff --git a/db/versions/.archive/10524-limeCordyline/00-firstScript.sql b/db/versions/.archive/10524-limeCordyline/00-firstScript.sql
new file mode 100644
index 000000000..1c7843073
--- /dev/null
+++ b/db/versions/.archive/10524-limeCordyline/00-firstScript.sql
@@ -0,0 +1,21 @@
+-- Place your SQL code here
+USE vn;
+CREATE OR REPLACE TABLE `rateLog` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `originFk` int(11) DEFAULT NULL,
+ `userFk` int(10) unsigned DEFAULT NULL,
+ `action` set('insert','update','delete','select') NOT NULL,
+ `creationDate` timestamp NULL DEFAULT current_timestamp(),
+ `description` text CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL,
+ `changedModel` enum('Rate') NOT NULL DEFAULT 'Rate',
+ `oldInstance` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`oldInstance`)),
+ `newInstance` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`newInstance`)),
+ `changedModelId` int(11) NOT NULL,
+ `changedModelValue` varchar(45) DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `logRateuserFk` (`userFk`),
+ KEY `rateLog_changedModel` (`changedModel`,`changedModelId`,`creationDate`),
+ KEY `rateLog_originFk` (`originFk`,`creationDate`),
+ CONSTRAINT `rateOriginFk` FOREIGN KEY (`originFk`) REFERENCES `rate` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `rateUserFk` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
diff --git a/db/versions/.archive/10524-limeCordyline/01-rateEditorFk.sql b/db/versions/.archive/10524-limeCordyline/01-rateEditorFk.sql
new file mode 100644
index 000000000..e2b6d27fd
--- /dev/null
+++ b/db/versions/.archive/10524-limeCordyline/01-rateEditorFk.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `vn`.`rate`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT rate_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
\ No newline at end of file
diff --git a/db/versions/.archive/10525-yellowRuscus/00-firstScript.sql b/db/versions/.archive/10525-yellowRuscus/00-firstScript.sql
new file mode 100644
index 000000000..0a9cb6bbe
--- /dev/null
+++ b/db/versions/.archive/10525-yellowRuscus/00-firstScript.sql
@@ -0,0 +1,2 @@
+ALTER TABLE vn.ticketSms DROP FOREIGN KEY ticketSms_FK_1;
+ALTER TABLE vn.ticketSms ADD CONSTRAINT ticketSms_FK_1 FOREIGN KEY (ticketFk) REFERENCES vn.ticket(id) ON DELETE CASCADE ON UPDATE CASCADE;
\ No newline at end of file
diff --git a/db/versions/.archive/10526-goldenOak/00-firstScript.sql b/db/versions/.archive/10526-goldenOak/00-firstScript.sql
new file mode 100644
index 000000000..e50c1ce07
--- /dev/null
+++ b/db/versions/.archive/10526-goldenOak/00-firstScript.sql
@@ -0,0 +1,3 @@
+RENAME TABLE postgresql.province TO postgresql.province__;
+ALTER TABLE postgresql.province__
+COMMENT='@deprecated 2023-03-21';
diff --git a/db/versions/.archive/10528-orangeRoebelini/00-firstScript.sql b/db/versions/.archive/10528-orangeRoebelini/00-firstScript.sql
new file mode 100644
index 000000000..c26a9edbb
--- /dev/null
+++ b/db/versions/.archive/10528-orangeRoebelini/00-firstScript.sql
@@ -0,0 +1,3 @@
+-- Place your SQL code here
+ALTER TABLE `vn`.`supplierAccount`
+CHANGE COLUMN `description` `description__` VARCHAR(45) NULL DEFAULT NULL COMMENT '@deprecated 2023-03-23' ;
diff --git a/db/versions/.archive/10530-orangeCyca/00-firstScript.sql b/db/versions/.archive/10530-orangeCyca/00-firstScript.sql
new file mode 100644
index 000000000..4fbd5f4d4
--- /dev/null
+++ b/db/versions/.archive/10530-orangeCyca/00-firstScript.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.entryLog MODIFY COLUMN userFk int(10) unsigned DEFAULT NULL NULL;
diff --git a/db/versions/.archive/10531-chocolateFern/00-firstScript.sql b/db/versions/.archive/10531-chocolateFern/00-firstScript.sql
new file mode 100644
index 000000000..7ab9c0be8
--- /dev/null
+++ b/db/versions/.archive/10531-chocolateFern/00-firstScript.sql
@@ -0,0 +1,2 @@
+-- Place your SQL code here
+ALTER TABLE vn.config ADD comparativeLastBuyScope int(11) NULL COMMENT 'Rango en el que se busca la última entrada de un artículo';
\ No newline at end of file
diff --git a/db/versions/.archive/10532-tealTulip/00-firstScript.sql b/db/versions/.archive/10532-tealTulip/00-firstScript.sql
new file mode 100644
index 000000000..79e07d591
--- /dev/null
+++ b/db/versions/.archive/10532-tealTulip/00-firstScript.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.glsConfig ADD density INT DEFAULT 42 NOT NULL;
\ No newline at end of file
diff --git a/db/versions/.archive/10533-crimsonLaurel/00-firstScript.sql b/db/versions/.archive/10533-crimsonLaurel/00-firstScript.sql
new file mode 100644
index 000000000..4a24baf95
--- /dev/null
+++ b/db/versions/.archive/10533-crimsonLaurel/00-firstScript.sql
@@ -0,0 +1,2 @@
+-- Place your SQL code here
+ALTER TABLE vn.ppe ADD isDone BOOL NULL;
diff --git a/db/versions/.archive/10537-grayCordyline/00-firstScript.sql b/db/versions/.archive/10537-grayCordyline/00-firstScript.sql
new file mode 100644
index 000000000..ede9a6942
--- /dev/null
+++ b/db/versions/.archive/10537-grayCordyline/00-firstScript.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.printQueue MODIFY COLUMN printerFk tinyint(3) unsigned NULL;
diff --git a/db/versions/.archive/10538-silverAspidistra/00-createChronopostConfig.sql b/db/versions/.archive/10538-silverAspidistra/00-createChronopostConfig.sql
new file mode 100644
index 000000000..0cebe2c0c
--- /dev/null
+++ b/db/versions/.archive/10538-silverAspidistra/00-createChronopostConfig.sql
@@ -0,0 +1,24 @@
+CREATE TABLE vn.chronopostConfig (
+ id INT(11) auto_increment NOT NULL,
+ accountNumber INT(11) NOT NULL,
+ password INT(11) NOT NULL,
+ idEmit varchar(20) DEFAULT "CHRFR" NOT NULL COMMENT "Valor fijo de chronopost",
+ urlShipping varchar(100) DEFAULT "https://ws.chronopost.fr/shipping-cxf/ShippingServiceWS/" NOT NULL,
+ urlTracking varchar(100) DEFAULT "https://ws.chronopost.fr/tracking-cxf/TrackingServiceWS/" NOT NULL,
+ cxfShipping varchar(100) DEFAULT "http://cxf.shipping.soap.chronopost.fr/" NOT NULL,
+ cxfTracking varchar(100) DEFAULT "http://cxf.tracking.soap.chronopost.fr/" NOT NULL,
+ evtCode varchar(2) DEFAULT "DC" NOT NULL COMMENT "Valor fijo de chronopost",
+ objectType VARCHAR(3) DEFAULT "MAR" NOT NULL COMMENT "MAR: mercancia, DOC: documentación",
+ productCode VARCHAR(2) DEFAULT "1S" NOT NULL,
+ weightUnit VARCHAR(3) DEFAULT "KGM" NOT NULL,
+ stickerMode VARCHAR(6) DEFAULT "THE" NOT NULL COMMENT "THE: vertical, THEPSG: horizontal, PDF, ...",
+ defaultWeight INT(11) DEFAULT 10 NOT NULL,
+ defaultSevice INT(11) DEFAULT 0 NOT NULL,
+ numberOfParcel INT(11) DEFAULT 1 NOT NULL,
+ civility varchar(1) DEFAULT 'M' NOT NULL,
+ modeRetour VARCHAR(1) DEFAULT '2' NOT NULL,
+ CONSTRAINT chronopostConfig_PK PRIMARY KEY (id)
+)
+ENGINE=InnoDB
+DEFAULT CHARSET=utf8mb3
+COLLATE=utf8mb3_unicode_ci;
\ No newline at end of file
diff --git a/db/versions/.archive/10538-silverAspidistra/01-createChronopostService.sql b/db/versions/.archive/10538-silverAspidistra/01-createChronopostService.sql
new file mode 100644
index 000000000..1b083201c
--- /dev/null
+++ b/db/versions/.archive/10538-silverAspidistra/01-createChronopostService.sql
@@ -0,0 +1,9 @@
+CREATE TABLE vn.chronopostServiceWeekday (
+ id int(11) auto_increment NOT NULL,
+ weekdays set('mon','tue','wed','thu','fri','sat','sun') NOT NULL,
+ serviceType int(11) unsigned NOT NULL,
+ CONSTRAINT chronopostServiceWeekday_PK PRIMARY KEY (id)
+)
+ENGINE=InnoDB
+DEFAULT CHARSET=utf8mb3
+COLLATE=utf8mb3_unicode_ci;
diff --git a/db/versions/.archive/10538-silverAspidistra/02-createChronopostExpedition.sql b/db/versions/.archive/10538-silverAspidistra/02-createChronopostExpedition.sql
new file mode 100644
index 000000000..b655f8068
--- /dev/null
+++ b/db/versions/.archive/10538-silverAspidistra/02-createChronopostExpedition.sql
@@ -0,0 +1,9 @@
+CREATE TABLE vn.chronopostExpedition (
+ expeditionFk int(11) NOT NULL,
+ skybillNumber varchar(20) NOT NULL COMMENT 'Código devuelto por chronopost',
+ PRIMARY KEY (`expeditionFk`),
+ CONSTRAINT chronopostExpedition_FK FOREIGN KEY (expeditionFk) REFERENCES vn.expedition(id) ON DELETE RESTRICT ON UPDATE RESTRICT
+)
+ENGINE=InnoDB
+DEFAULT CHARSET=utf8mb3
+COLLATE=utf8mb3_unicode_ci;
\ No newline at end of file
diff --git a/db/versions/.archive/10538-silverAspidistra/03-createChronopostSenderAddress.sql b/db/versions/.archive/10538-silverAspidistra/03-createChronopostSenderAddress.sql
new file mode 100644
index 000000000..700d13615
--- /dev/null
+++ b/db/versions/.archive/10538-silverAspidistra/03-createChronopostSenderAddress.sql
@@ -0,0 +1,8 @@
+CREATE TABLE vn.`chronopostSenderAddress` (
+ `warehouseFk` smallint(6) unsigned NOT NULL,
+ `addressFk` int(11) NOT NULL,
+ PRIMARY KEY (`warehouseFk`),
+ KEY `chronopostSenderAddress_FK_1` (`addressFk`),
+ CONSTRAINT `chronopostSenderAddress_FK` FOREIGN KEY (`warehouseFk`) REFERENCES `warehouse` (`id`) ON UPDATE CASCADE,
+ CONSTRAINT `chronopostSenderAddress_FK_1` FOREIGN KEY (`addressFk`) REFERENCES `address` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
\ No newline at end of file
diff --git a/db/versions/.archive/10538-silverAspidistra/04-addgrantPrivilegies.sql b/db/versions/.archive/10538-silverAspidistra/04-addgrantPrivilegies.sql
new file mode 100644
index 000000000..59c32d202
--- /dev/null
+++ b/db/versions/.archive/10538-silverAspidistra/04-addgrantPrivilegies.sql
@@ -0,0 +1,5 @@
+GRANT SELECT ON vn.chronopostConfig TO packager;
+GRANT SELECT ON vn.chronopostSenderAddress TO packager;
+GRANT SELECT ON vn.chronopostServiceWeekday TO packager;
+GRANT INSERT ON vn.chronopostExpedition TO packager;
+GRANT DELETE ON vn.chronopostExpedition TO packager;
\ No newline at end of file
diff --git a/db/versions/.archive/10538-silverAspidistra/05-updateChronopostConfig.sql b/db/versions/.archive/10538-silverAspidistra/05-updateChronopostConfig.sql
new file mode 100644
index 000000000..6475cf5c4
--- /dev/null
+++ b/db/versions/.archive/10538-silverAspidistra/05-updateChronopostConfig.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.chronopostConfig MODIFY COLUMN password VARCHAR(20) NOT NULL;
\ No newline at end of file
diff --git a/db/versions/.archive/10539-pinkPalmetto/00-firstScript.sql b/db/versions/.archive/10539-pinkPalmetto/00-firstScript.sql
new file mode 100644
index 000000000..584d6f6f2
--- /dev/null
+++ b/db/versions/.archive/10539-pinkPalmetto/00-firstScript.sql
@@ -0,0 +1,8 @@
+USE vn;
+DROP TABLE IF EXISTS vn.workerTimeControlConfig_;
+ALTER TABLE vn.workerTimeControlConfig
+ ADD breakTimeSplitDay int(11) unsigned DEFAULT 3600 NULL
+ COMMENT 'Tiempo de descanso a partir del cual se determina que la jornada es partida',
+ ADD dateSplitDay date DEFAULT '2023-03-01' NULL
+ COMMENT 'Fecha a partir de la cual se tiene en cuenta el valor de configuración de breakTimeSplitDay';
+
\ No newline at end of file
diff --git a/db/versions/.archive/10540-bronzeOrchid/00-firstScript.sql b/db/versions/.archive/10540-bronzeOrchid/00-firstScript.sql
new file mode 100644
index 000000000..25f37a457
--- /dev/null
+++ b/db/versions/.archive/10540-bronzeOrchid/00-firstScript.sql
@@ -0,0 +1,39 @@
+-- Place your SQL code here
+USE account;
+CREATE TABLE `userLog` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `originFk` int(10) unsigned NOT NULL,
+ `userFk` int(10) unsigned DEFAULT NULL,
+ `action` set('insert','update','delete','select') NOT NULL,
+ `creationDate` timestamp NULL DEFAULT current_timestamp(),
+ `description` text CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL,
+ `changedModel` varchar(45) DEFAULT NULL,
+ `oldInstance` text DEFAULT NULL,
+ `newInstance` text DEFAULT NULL,
+ `changedModelId` int(11) DEFAULT NULL,
+ `changedModelValue` varchar(45) DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `originFk` (`originFk`),
+ KEY `userFk` (`userFk`),
+ CONSTRAINT `userLog_ibfk_1` FOREIGN KEY (`originFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `userLog_ibfk_2` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+CREATE TABLE `roleLog` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `originFk` int(10) unsigned NOT NULL,
+ `userFk` int(10) unsigned DEFAULT NULL,
+ `action` set('insert','update','delete','select') NOT NULL,
+ `creationDate` timestamp NULL DEFAULT current_timestamp(),
+ `description` text CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL,
+ `changedModel` varchar(45) DEFAULT NULL,
+ `oldInstance` text DEFAULT NULL,
+ `newInstance` text DEFAULT NULL,
+ `changedModelId` int(11) DEFAULT NULL,
+ `changedModelValue` varchar(45) DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `originFk` (`originFk`),
+ KEY `userFk` (`userFk`),
+ CONSTRAINT `roleLog_ibfk_1` FOREIGN KEY (`originFk`) REFERENCES `role` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `roleLog_ibfk_2` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
diff --git a/db/versions/.archive/10545-maroonDracena/00-firstScript.sql b/db/versions/.archive/10545-maroonDracena/00-firstScript.sql
new file mode 100644
index 000000000..7ee9d7f29
--- /dev/null
+++ b/db/versions/.archive/10545-maroonDracena/00-firstScript.sql
@@ -0,0 +1,5 @@
+ UPDATE vn.supplier s
+ JOIN vn.country c ON c.id = s.countryFk
+ SET s.nif = MID(REPLACE(s.nif, ' ', ''), 3, LENGTH(REPLACE(s.nif, ' ', '')) - 1)
+ WHERE s.isVies = TRUE
+ AND c.code = LEFT(REPLACE(s.nif, ' ', ''), 2);
\ No newline at end of file
diff --git a/db/versions/.archive/10546-redOak/00-firstScript.sql b/db/versions/.archive/10546-redOak/00-firstScript.sql
new file mode 100644
index 000000000..3d7f0415f
--- /dev/null
+++ b/db/versions/.archive/10546-redOak/00-firstScript.sql
@@ -0,0 +1,6 @@
+ALTER TABLE vn.item
+ ADD editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT item_fk_editor FOREIGN KEY (editorFk) REFERENCES account.`user`(id);
+
+CREATE INDEX itemLog_changedModel_idx USING BTREE
+ ON vn.itemLog (changedModel,changedModelId);
diff --git a/db/versions/.archive/10547-aquaDendro/00-firstScript.sql b/db/versions/.archive/10547-aquaDendro/00-firstScript.sql
new file mode 100644
index 000000000..3fb94ef41
--- /dev/null
+++ b/db/versions/.archive/10547-aquaDendro/00-firstScript.sql
@@ -0,0 +1,17 @@
+-- Place your SQL code here
+USE vn;
+CREATE INDEX IF NOT EXISTS ticketLog_creationDate_IDX
+ USING BTREE ON vn.ticketLog (creationDate); -- 10m
+
+DELETE tl
+ FROM vn.ticketLog tl
+ JOIN vn.ticket t ON t.id = tl.originFk
+ WHERE tl.creationDate <= util.VN_CURDATE() + INTERVAL -5 YEAR
+ AND t.shipped IS NOT NULL; -- 400000 rows
+
+DELETE tl
+ FROM vn.ticketLog tl
+ JOIN vn.ticket t ON t.id = tl.originFk
+ WHERE t.isDeleted; -- 113574 rows
+
+OPTIMIZE TABLE vn.ticketLog; -- 17m 35s
\ No newline at end of file
diff --git a/db/versions/.archive/10549-goldenHydrangea/00-updateUpdateLog.sql b/db/versions/.archive/10549-goldenHydrangea/00-updateUpdateLog.sql
new file mode 100644
index 000000000..a7619b174
--- /dev/null
+++ b/db/versions/.archive/10549-goldenHydrangea/00-updateUpdateLog.sql
@@ -0,0 +1,37 @@
+-- Place your SQL code here
+UPDATE vn.claimLog
+ SET oldInstance = util.json_removeNulls(oldInstance)
+ WHERE `action` = 'update';
+UPDATE vn.itemLog
+ SET oldInstance = util.json_removeNulls(oldInstance)
+ WHERE `action` = 'update';
+UPDATE vn.entryLog
+ SET oldInstance = util.json_removeNulls(oldInstance)
+ WHERE `action` = 'update';
+UPDATE vn.supplierLog
+ SET oldInstance = util.json_removeNulls(oldInstance)
+ WHERE `action` = 'update';
+UPDATE vn.zoneLog
+ SET oldInstance = util.json_removeNulls(oldInstance)
+ WHERE `action` = 'update';
+UPDATE vn.travelLog
+ SET oldInstance = util.json_removeNulls(oldInstance)
+ WHERE `action` = 'update';
+UPDATE vn.routeLog
+ SET oldInstance = util.json_removeNulls(oldInstance)
+ WHERE `action` = 'update';
+UPDATE vn.clientLog
+ SET oldInstance = util.json_removeNulls(oldInstance)
+ WHERE `action` = 'update';
+UPDATE vn.shelvingLog
+ SET oldInstance = util.json_removeNulls(oldInstance)
+ WHERE `action` = 'update';
+UPDATE vn.ticketLog
+ SET oldInstance = util.json_removeNulls(oldInstance)
+ WHERE `action` = 'update';
+UPDATE vn.deviceProductionLog
+ SET oldInstance = util.json_removeNulls(oldInstance)
+ WHERE `action` = 'update';
+UPDATE vn.workerLog
+ SET oldInstance = util.json_removeNulls(oldInstance)
+ WHERE `action` = 'update';
\ No newline at end of file
diff --git a/db/versions/.archive/10549-goldenHydrangea/01-updateInsertLog.sql b/db/versions/.archive/10549-goldenHydrangea/01-updateInsertLog.sql
new file mode 100644
index 000000000..3c4397c89
--- /dev/null
+++ b/db/versions/.archive/10549-goldenHydrangea/01-updateInsertLog.sql
@@ -0,0 +1,37 @@
+-- Place your SQL code here
+UPDATE vn.claimLog
+ SET oldInstance = NULL
+ WHERE `action` = 'insert';
+UPDATE vn.itemLog
+ SET oldInstance = NULL
+ WHERE `action` = 'insert';
+UPDATE vn.entryLog
+ SET oldInstance = NULL
+ WHERE `action` = 'insert';
+UPDATE vn.supplierLog
+ SET oldInstance = NULL
+ WHERE `action` = 'insert';
+UPDATE vn.zoneLog
+ SET oldInstance = NULL
+ WHERE `action` = 'insert';
+UPDATE vn.travelLog
+ SET oldInstance = NULL
+ WHERE `action` = 'insert';
+UPDATE vn.routeLog
+ SET oldInstance = NULL
+ WHERE `action` = 'insert';
+UPDATE vn.clientLog
+ SET oldInstance = NULL
+ WHERE `action` = 'insert';
+UPDATE vn.shelvingLog
+ SET oldInstance = NULL
+ WHERE `action` = 'insert';
+UPDATE vn.ticketLog
+ SET oldInstance = NULL
+ WHERE `action` = 'insert';
+UPDATE vn.deviceProductionLog
+ SET oldInstance = NULL
+ WHERE `action` = 'insert';
+UPDATE vn.workerLog
+ SET oldInstance = NULL
+ WHERE `action` = 'insert';
\ No newline at end of file
diff --git a/db/versions/.archive/10549-goldenHydrangea/02-updateDeleteLog.sql b/db/versions/.archive/10549-goldenHydrangea/02-updateDeleteLog.sql
new file mode 100644
index 000000000..60890741b
--- /dev/null
+++ b/db/versions/.archive/10549-goldenHydrangea/02-updateDeleteLog.sql
@@ -0,0 +1,37 @@
+-- Place your SQL code here
+UPDATE vn.claimLog
+ SET newInstance = NULL
+ WHERE `action` = 'delete';
+UPDATE vn.itemLog
+ SET newInstance = NULL
+ WHERE `action` = 'delete';
+UPDATE vn.entryLog
+ SET newInstance = NULL
+ WHERE `action` = 'delete';
+UPDATE vn.supplierLog
+ SET newInstance = NULL
+ WHERE `action` = 'delete';
+UPDATE vn.zoneLog
+ SET newInstance = NULL
+ WHERE `action` = 'delete';
+UPDATE vn.travelLog
+ SET newInstance = NULL
+ WHERE `action` = 'delete';
+UPDATE vn.routeLog
+ SET newInstance = NULL
+ WHERE `action` = 'delete';
+UPDATE vn.clientLog
+ SET newInstance = NULL
+ WHERE `action` = 'delete';
+UPDATE vn.shelvingLog
+ SET newInstance = NULL
+ WHERE `action` = 'delete';
+UPDATE vn.ticketLog
+ SET newInstance = NULL
+ WHERE `action` = 'delete';
+UPDATE vn.deviceProductionLog
+ SET newInstance = NULL
+ WHERE `action` = 'delete';
+UPDATE vn.workerLog
+ SET newInstance = NULL
+ WHERE `action` = 'delete';
\ No newline at end of file
diff --git a/db/versions/.archive/10549-goldenHydrangea/03-deleteEmptyLog.sql b/db/versions/.archive/10549-goldenHydrangea/03-deleteEmptyLog.sql
new file mode 100644
index 000000000..616c3a1d2
--- /dev/null
+++ b/db/versions/.archive/10549-goldenHydrangea/03-deleteEmptyLog.sql
@@ -0,0 +1,45 @@
+-- Place your SQL code here
+DELETE FROM vn.claimLog
+ WHERE oldInstance IS NULL
+ AND newInstance IS NULL
+ AND `description` IS NULL;
+DELETE FROM vn.itemLog
+ WHERE oldInstance IS NULL
+ AND newInstance IS NULL
+ AND `description` IS NULL;
+DELETE FROM vn.entryLog
+ WHERE oldInstance IS NULL
+ AND newInstance IS NULL
+ AND `description` IS NULL;
+DELETE FROM vn.supplierLog
+ WHERE oldInstance IS NULL
+ AND newInstance IS NULL
+ AND `description` IS NULL;
+DELETE FROM vn.zoneLog
+ WHERE oldInstance IS NULL
+ AND newInstance IS NULL
+ AND `description` IS NULL;
+DELETE FROM vn.travelLog
+ WHERE oldInstance IS NULL
+ AND newInstance IS NULL
+ AND `description` IS NULL;
+DELETE FROM vn.routeLog
+ WHERE oldInstance IS NULL
+ AND newInstance IS NULL
+ AND `description` IS NULL;
+DELETE FROM vn.clientLog
+ WHERE oldInstance IS NULL
+ AND newInstance IS NULL
+ AND `description` IS NULL;
+DELETE FROM vn.shelvingLog
+ WHERE oldInstance IS NULL
+ AND newInstance IS NULL
+ AND `description` IS NULL;
+DELETE FROM vn.ticketLog
+ WHERE oldInstance IS NULL
+ AND newInstance IS NULL
+ AND `description` IS NULL;
+DELETE FROM vn.workerLog
+ WHERE oldInstance IS NULL
+ AND newInstance IS NULL
+ AND `description` IS NULL;
\ No newline at end of file
diff --git a/db/versions/.archive/10549-goldenHydrangea/04-optimizeLogTables.sql b/db/versions/.archive/10549-goldenHydrangea/04-optimizeLogTables.sql
new file mode 100644
index 000000000..ef9cb5863
--- /dev/null
+++ b/db/versions/.archive/10549-goldenHydrangea/04-optimizeLogTables.sql
@@ -0,0 +1,13 @@
+-- Place your SQL code here
+OPTIMIZE TABLE vn.claimLog;
+OPTIMIZE TABLE vn.itemLog;
+OPTIMIZE TABLE vn.entryLog;
+OPTIMIZE TABLE vn.supplierLog;
+OPTIMIZE TABLE vn.zoneLog;
+OPTIMIZE TABLE vn.travelLog;
+OPTIMIZE TABLE vn.routeLog;
+OPTIMIZE TABLE vn.clientLog;
+OPTIMIZE TABLE vn.shelvingLog;
+OPTIMIZE TABLE vn.ticketLog;
+OPTIMIZE TABLE vn.deviceProductionLog;
+OPTIMIZE TABLE vn.workerLog;
\ No newline at end of file
diff --git a/db/versions/.archive/10550-grayMonstera/00-editorFk.sql b/db/versions/.archive/10550-grayMonstera/00-editorFk.sql
new file mode 100644
index 000000000..7e2ce329c
--- /dev/null
+++ b/db/versions/.archive/10550-grayMonstera/00-editorFk.sql
@@ -0,0 +1,227 @@
+ALTER TABLE `vn`.`ticket`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT ticket_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`sale`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT sale_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`entry`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT entry_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`buy`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT buy_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`route`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT route_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`travel`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT travel_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`business`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT business_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`claimBeginning`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT claimBeginning_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`claimDevelopment`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT claimDevelopment_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`claimDms`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT claimDms_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`claimEnd`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT claimEnd_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`claimObservation`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT claimObservation_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`claimState`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT claimState_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`claim`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT claim_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`address`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT address_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`clientContact`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT clientContact_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`clientDms`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT clientDms_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`clientObservation`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT clientObservation_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`clientSample`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT clientSample_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`client`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT client_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`greuge`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT greuge_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`recovery`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT recovery_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`entryObservation`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT entryObservation_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`invoiceInTax`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT invoiceInTax_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`invoiceIn`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT invoiceIn_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`itemBarcode`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT itemBarcode_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`itemBotanical`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT itemBotanical_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`itemTag`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT itemTag_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`itemTaxCountry`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT itemTaxCountry_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`shelving`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT shelving_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`supplierAccount`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT supplierAccount_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`supplierAddress`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT supplierAddress_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`supplierContact`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT supplierContact_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`supplier`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT supplier_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`expedition`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT expedition_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`ticketDms`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT ticketDms_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`ticketObservation`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT ticketObservation_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`ticketPackaging`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT ticketPackaging_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`ticketRefund`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT ticketRefund_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`ticketRequest`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT ticketRequest_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`ticketService`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT ticketService_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`ticketTracking`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT ticketTracking_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`ticketWeekly`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT ticketWeekly_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`travelThermograph`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT travelThermograph_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`workerDocument`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT workerDocument_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`worker`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT worker_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`zone`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT zone_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`zoneEvent`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT zoneEvent_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`zoneExclusion`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT zoneExclusion_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`zoneIncluded`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT zoneIncluded_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `vn`.`zoneWarehouse`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT zoneWarehouse_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `account`.`user`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT user_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `account`.`account`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT account_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `account`.`mailAlias`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT mailAlias_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `account`.`mailForward`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT mailForward_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `account`.`role`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT role_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+
+ALTER TABLE `account`.`roleInherit`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT roleInherit_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
diff --git a/db/versions/.archive/10550-grayMonstera/01-originFk.sql b/db/versions/.archive/10550-grayMonstera/01-originFk.sql
new file mode 100644
index 000000000..df8c19678
--- /dev/null
+++ b/db/versions/.archive/10550-grayMonstera/01-originFk.sql
@@ -0,0 +1,48 @@
+ALTER TABLE `vn`.`ticketLog`
+ CHANGE COLUMN `originFk` `originFk` INT(11) NULL DEFAULT NULL ;
+
+ALTER TABLE `vn`.`ticketLog`
+ CHANGE COLUMN `originFk` `originFk` INT(11) NULL DEFAULT NULL ;
+
+ALTER TABLE `vn`.`entryLog`
+ CHANGE COLUMN `originFk` `originFk` INT(11) NULL DEFAULT NULL ;
+
+ALTER TABLE `vn`.`shelvingLog`
+ CHANGE COLUMN `originFk` `originFk` INT(11) NULL DEFAULT NULL ;
+
+ALTER TABLE `vn`.`clientLog`
+ CHANGE COLUMN `originFk` `originFk` INT(11) NULL DEFAULT NULL ;
+
+ALTER TABLE `vn`.`zoneLog`
+ CHANGE COLUMN `originFk` `originFk` INT(11) NULL DEFAULT NULL ;
+
+ALTER TABLE `vn`.`routeLog`
+ CHANGE COLUMN `originFk` `originFk` INT(10) UNSIGNED NULL DEFAULT NULL ;
+
+ALTER TABLE `vn`.`travelLog`
+ CHANGE COLUMN `originFk` `originFk` INT(10) UNSIGNED NULL DEFAULT NULL ;
+
+ALTER TABLE `vn`.`claimLog`
+ CHANGE COLUMN `originFk` `originFk` INT(10) UNSIGNED NULL DEFAULT NULL ;
+
+ALTER TABLE `vn`.`invoiceInLog`
+ CHANGE COLUMN `originFk` `originFk` MEDIUMINT(8) UNSIGNED NULL DEFAULT NULL ;
+
+ALTER TABLE `vn`.`workerLog`
+ CHANGE COLUMN `originFk` `originFk` INT(10) UNSIGNED NULL DEFAULT NULL ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/db/versions/.archive/10552-blackAnthurium/00-firstScript.sql b/db/versions/.archive/10552-blackAnthurium/00-firstScript.sql
new file mode 100644
index 000000000..15d6950c4
--- /dev/null
+++ b/db/versions/.archive/10552-blackAnthurium/00-firstScript.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.mrwService ADD kg INT;
diff --git a/db/versions/.archive/10554-maroonFern/00-firstScript.sql b/db/versions/.archive/10554-maroonFern/00-firstScript.sql
new file mode 100644
index 000000000..828de3ae9
--- /dev/null
+++ b/db/versions/.archive/10554-maroonFern/00-firstScript.sql
@@ -0,0 +1,3 @@
+DROP PROCEDURE vn.workerWeekTiming;
+DROP PROCEDURE vn.workerTimeControlSetOrder_by_User_and_dateRange;
+
diff --git a/db/versions/.archive/10557-whiteCordyline/00-firstScript.sql b/db/versions/.archive/10557-whiteCordyline/00-firstScript.sql
new file mode 100644
index 000000000..c382c279d
--- /dev/null
+++ b/db/versions/.archive/10557-whiteCordyline/00-firstScript.sql
@@ -0,0 +1,2 @@
+-- Place your SQL code here
+ALTER TABLE vn.itemCost ADD created TIMESTAMP DEFAULT current_timestamp() NULL;
diff --git a/db/versions/.archive/10559-brownDracena/00-firstScript.sql b/db/versions/.archive/10559-brownDracena/00-firstScript.sql
new file mode 100644
index 000000000..94162d308
--- /dev/null
+++ b/db/versions/.archive/10559-brownDracena/00-firstScript.sql
@@ -0,0 +1,15 @@
+-- Place your SQL code here
+CREATE TABLE edi.offerRefreshConfig (
+ id int unsigned auto_increment NOT NULL,
+ dayRange int unsigned NULL COMMENT 'range of days to update the photos of an article in seconds',
+ CONSTRAINT NewTable_PK PRIMARY KEY (id)
+)
+ENGINE=InnoDB
+DEFAULT CHARSET=utf8mb3
+COLLATE=utf8mb3_unicode_ci;
+
+ALTER TABLE hedera.image MODIFY COLUMN updated bigint unsigned DEFAULT NULL NULL;
+
+UPDATE hedera.image
+ SET updated = UNIX_TIMESTAMP(util.VN_NOW())
+ WHERE updated > UNIX_TIMESTAMP(util.VN_NOW());
\ No newline at end of file
diff --git a/db/versions/.archive/10560-crimsonCataractarum/00-firstScript.sql b/db/versions/.archive/10560-crimsonCataractarum/00-firstScript.sql
new file mode 100644
index 000000000..ae01f6288
--- /dev/null
+++ b/db/versions/.archive/10560-crimsonCataractarum/00-firstScript.sql
@@ -0,0 +1,2 @@
+-- Place your SQL code here
+ALTER TABLE vn.config MODIFY COLUMN dbproduccion tinyint(1) DEFAULT 0 NOT NULL;
\ No newline at end of file
diff --git a/db/versions/.archive/10562-whiteDendro/00-firstScript.sql b/db/versions/.archive/10562-whiteDendro/00-firstScript.sql
new file mode 100644
index 000000000..c099033cd
--- /dev/null
+++ b/db/versions/.archive/10562-whiteDendro/00-firstScript.sql
@@ -0,0 +1,6 @@
+-- Place your SQL code here
+ALTER TABLE `account`.`userLog`
+ CHANGE COLUMN `originFk` `originFk` INT(10) UNSIGNED NULL DEFAULT NULL ;
+
+ALTER TABLE `account`.`roleLog`
+ CHANGE COLUMN `originFk` `originFk` INT(10) UNSIGNED NULL DEFAULT NULL ;
\ No newline at end of file
diff --git a/db/versions/.archive/10563-azureMonstera/00-delivery_ticketFk.sql b/db/versions/.archive/10563-azureMonstera/00-delivery_ticketFk.sql
new file mode 100644
index 000000000..e8ed5d20b
--- /dev/null
+++ b/db/versions/.archive/10563-azureMonstera/00-delivery_ticketFk.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `vn`.`delivery` DROP COLUMN ticketFk;
+ALTER TABLE `vn`.`delivery` ADD ticketFk INT DEFAULT NULL;
+ALTER TABLE `vn`.`delivery` ADD CONSTRAINT delivery_ticketFk_FK FOREIGN KEY (`ticketFk`) REFERENCES `vn`.`ticket`(`id`);
diff --git a/db/changes/231401/00-hotfixDelivery.sql b/db/versions/.archive/10566-azureArborvitae/00-firstScript.sql
similarity index 85%
rename from db/changes/231401/00-hotfixDelivery.sql
rename to db/versions/.archive/10566-azureArborvitae/00-firstScript.sql
index c119bebad..6c69c6172 100644
--- a/db/changes/231401/00-hotfixDelivery.sql
+++ b/db/versions/.archive/10566-azureArborvitae/00-firstScript.sql
@@ -1,4 +1,4 @@
-DROP TABLE IF EXISTS `vn`.`dmsRecover`;
+
DROP PROCEDURE IF EXISTS `vn`.`route_getTickets`;
DELIMITER $$
@@ -71,7 +71,4 @@ SELECT *
END$$
DELIMITER ;
-ALTER TABLE `vn`.`delivery` DROP FOREIGN KEY delivery_ticketFk_FK;
-ALTER TABLE `vn`.`delivery` DROP COLUMN ticketFk;
-ALTER TABLE `vn`.`delivery` ADD ticketFk INT DEFAULT NULL;
-ALTER TABLE `vn`.`delivery` ADD CONSTRAINT delivery_ticketFk_FK FOREIGN KEY (`ticketFk`) REFERENCES `vn`.`ticket`(`id`);
+ALTER TABLE `vn`.`delivery` DROP COLUMN addressFk;
diff --git a/db/versions/.archive/10567-salmonAspidistra/00-firstScript.sql b/db/versions/.archive/10567-salmonAspidistra/00-firstScript.sql
new file mode 100644
index 000000000..a3b9c4e92
--- /dev/null
+++ b/db/versions/.archive/10567-salmonAspidistra/00-firstScript.sql
@@ -0,0 +1,2 @@
+-- Place your SQL code here
+ALTER TABLE vn.auctionConfig CHANGE warehosueFk warehouseFk smallint(6) unsigned DEFAULT 7 NOT NULL COMMENT 'Default warehouse used for the calculation';
diff --git a/db/versions/.archive/10568-grayAnthurium/00-firstScript.sql b/db/versions/.archive/10568-grayAnthurium/00-firstScript.sql
new file mode 100644
index 000000000..5e35ba9f7
--- /dev/null
+++ b/db/versions/.archive/10568-grayAnthurium/00-firstScript.sql
@@ -0,0 +1,3 @@
+ALTER TABLE util.config DROP COLUMN mockTz;
+ALTER TABLE util.config ADD mockTime datetime DEFAULT NULL NULL;
+ALTER TABLE util.config CHANGE mockTime mockTime datetime DEFAULT NULL NULL AFTER mockUtcTime;
diff --git a/db/versions/.archive/10569-salmonLaurel/00-firstScript.sql b/db/versions/.archive/10569-salmonLaurel/00-firstScript.sql
new file mode 100644
index 000000000..acba96844
--- /dev/null
+++ b/db/versions/.archive/10569-salmonLaurel/00-firstScript.sql
@@ -0,0 +1,3 @@
+-- Place your SQL code here
+ALTER TABLE `vn`.`itemLog`
+CHANGE COLUMN `originFk` `originFk` INT(11) NULL DEFAULT NULL ;
\ No newline at end of file
diff --git a/db/versions/.archive/10570-goldenTulip/00-createSendingConfig.sql b/db/versions/.archive/10570-goldenTulip/00-createSendingConfig.sql
new file mode 100644
index 000000000..471abc39c
--- /dev/null
+++ b/db/versions/.archive/10570-goldenTulip/00-createSendingConfig.sql
@@ -0,0 +1,9 @@
+CREATE TABLE vn.sendingConfig (
+ id INT auto_increment NOT NULL,
+ defaultWeight INT DEFAULT 13 NOT NULL,
+ defaultPackages INT DEFAULT 1 NOT NULL,
+ CONSTRAINT sendingConfig_PK PRIMARY KEY (id)
+)
+ENGINE=InnoDB
+DEFAULT CHARSET=utf8mb3
+COLLATE=utf8mb3_unicode_ci;
\ No newline at end of file
diff --git a/db/versions/.archive/10570-goldenTulip/01-createSendingServiceWeekday.sql b/db/versions/.archive/10570-goldenTulip/01-createSendingServiceWeekday.sql
new file mode 100644
index 000000000..2926ffd23
--- /dev/null
+++ b/db/versions/.archive/10570-goldenTulip/01-createSendingServiceWeekday.sql
@@ -0,0 +1,6 @@
+CREATE TABLE vn.sendingServiceWeekday (
+ id INT(11) auto_increment NOT NULL,
+ weekdays set('mon','tue','wed','thu','fri','sat','sun') NOT NULL,
+ params VARCHAR(20) NOT NULL,
+ CONSTRAINT chronopostServiceWeekday_PK PRIMARY KEY (id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='Configuración de parámetros por dia de SENDING';
\ No newline at end of file
diff --git a/db/versions/.archive/10570-goldenTulip/02-createSendingService.sql b/db/versions/.archive/10570-goldenTulip/02-createSendingService.sql
new file mode 100644
index 000000000..6c9824333
--- /dev/null
+++ b/db/versions/.archive/10570-goldenTulip/02-createSendingService.sql
@@ -0,0 +1,7 @@
+CREATE TABLE vn.`sendingService` (
+ `agencyModeCodeFk` varchar(45) NOT NULL,
+ `serviceType` varchar(45) NOT NULL DEFAULT '01',
+ `accountNumber` varchar(100) NOT NULL,
+ PRIMARY KEY (`agencyModeCodeFk`),
+ CONSTRAINT `sendingService_agencyModeCodeFk` FOREIGN KEY (`agencyModeCodeFk`) REFERENCES `agencyMode` (`code`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='Configuración de los servicios de Sending';
\ No newline at end of file
diff --git a/db/versions/.archive/10570-goldenTulip/03-permisos.sql b/db/versions/.archive/10570-goldenTulip/03-permisos.sql
new file mode 100644
index 000000000..34ff35d3d
--- /dev/null
+++ b/db/versions/.archive/10570-goldenTulip/03-permisos.sql
@@ -0,0 +1,3 @@
+GRANT SELECT ON vn.sendingConfig TO packager;
+GRANT SELECT ON vn.sendingServiceWeekday TO packager;
+GRANT SELECT ON vn.sendingService TO packager;
\ No newline at end of file
diff --git a/db/versions/.archive/10571-navyCyca/00-firstScript.sql b/db/versions/.archive/10571-navyCyca/00-firstScript.sql
new file mode 100644
index 000000000..efa7750d2
--- /dev/null
+++ b/db/versions/.archive/10571-navyCyca/00-firstScript.sql
@@ -0,0 +1,9 @@
+-- Place your SQL code here
+ALTER TABLE `postgresql`.`journey` RENAME `vn`.`businessSchedule`;
+
+ALTER TABLE `vn`.`businessSchedule`
+CHANGE COLUMN `journey_id` `id` int(11) NOT NULL AUTO_INCREMENT,
+CHANGE COLUMN `day_id` `weekday` smallint(6) NOT NULL DEFAULT 1 COMMENT 'Lunes = 1 \nDomingo = 7',
+CHANGE COLUMN `start` `started` time DEFAULT NULL,
+CHANGE COLUMN `end` `ended` time DEFAULT NULL,
+CHANGE COLUMN `business_id` `businessFk` int(11) NOT NULL;
\ No newline at end of file
diff --git a/db/versions/.archive/10573-tealChico/00-firstScript.sql b/db/versions/.archive/10573-tealChico/00-firstScript.sql
new file mode 100644
index 000000000..1710cd263
--- /dev/null
+++ b/db/versions/.archive/10573-tealChico/00-firstScript.sql
@@ -0,0 +1,11 @@
+-- Place your SQL code here
+ALTER TABLE vn.entry ADD IF NOT EXISTS lockerUserFk int(10) unsigned NULL;
+ALTER TABLE vn.entry ADD IF NOT EXISTS locked DATETIME DEFAULT NOW() NULL;
+ALTER TABLE vn.entry ADD CONSTRAINT entryAccountFk FOREIGN KEY IF NOT EXISTS (lockerUserFk) REFERENCES account.`user`(id);
+
+ALTER TABLE vn.entry CHANGE isBlocked isBlocked__ tinyint(4) DEFAULT 0 NOT NULL COMMENT 'Deprecado 04/07/2023';
+
+ALTER TABLE vn.entryConfig ADD IF NOT EXISTS maxLockTime int(10) unsigned NULL COMMENT 'Tiempo máximo que puede estar una entrada bloqueada en segundos';
+
+UPDATE vn.entryConfig
+ SET maxLockTime = 300;
\ No newline at end of file
diff --git a/db/versions/.archive/10575-crimsonAnthurium/00-firstScript.sql b/db/versions/.archive/10575-crimsonAnthurium/00-firstScript.sql
new file mode 100644
index 000000000..8c4aa1b94
--- /dev/null
+++ b/db/versions/.archive/10575-crimsonAnthurium/00-firstScript.sql
@@ -0,0 +1,3 @@
+-- Place your SQL code here
+ALTER TABLE `vn`.`alertLevel`
+ADD COLUMN `hasToRecalcPrice` TINYINT(1) NOT NULL DEFAULT 0 AFTER `id`;
diff --git a/db/versions/.archive/10577-salmonMonstera/00-firstScript.sql b/db/versions/.archive/10577-salmonMonstera/00-firstScript.sql
new file mode 100644
index 000000000..5e9ac76fb
--- /dev/null
+++ b/db/versions/.archive/10577-salmonMonstera/00-firstScript.sql
@@ -0,0 +1,2 @@
+-- Place your SQL code here
+ALTER TABLE vn.itemImageQueue MODIFY COLUMN url varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL;
diff --git a/db/versions/.archive/10578-brownCarnation/00-firstScript.sql b/db/versions/.archive/10578-brownCarnation/00-firstScript.sql
new file mode 100644
index 000000000..807fcf24e
--- /dev/null
+++ b/db/versions/.archive/10578-brownCarnation/00-firstScript.sql
@@ -0,0 +1,6 @@
+-- Place your SQL code here
+ALTER TABLE vn.routeLoadWorker DROP FOREIGN KEY IF EXISTS frmRutas;
+ALTER TABLE vn.routeLoadWorker DROP FOREIGN KEY IF EXISTS frmWorker;
+
+RENAME TABLE vn.routeLoadWorker TO vn.routeLoadWorker__;
+ALTER TABLE vn.routeLoadWorker__ COMMENT= 'Table deprecated on 26/04/23';
\ No newline at end of file
diff --git a/db/versions/.archive/10579-aquaRoebelini/00-firstScript.sql b/db/versions/.archive/10579-aquaRoebelini/00-firstScript.sql
new file mode 100644
index 000000000..41c59d61b
--- /dev/null
+++ b/db/versions/.archive/10579-aquaRoebelini/00-firstScript.sql
@@ -0,0 +1,3 @@
+-- Place your SQL code here
+ALTER TABLE vn.farming ADD companyFk smallint(5) unsigned NULL;
+ALTER TABLE vn.farming ADD CONSTRAINT farming_FK_1 FOREIGN KEY (companyFk) REFERENCES vn.company(id);
diff --git a/db/versions/.archive/10580-purpleCataractarum/00-itemTypeDropConstraint.sql b/db/versions/.archive/10580-purpleCataractarum/00-itemTypeDropConstraint.sql
new file mode 100644
index 000000000..2a47637f3
--- /dev/null
+++ b/db/versions/.archive/10580-purpleCataractarum/00-itemTypeDropConstraint.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.item DROP FOREIGN KEY item_FK_1;
diff --git a/db/versions/.archive/10580-purpleCataractarum/01-itemTypeAddConstraint.sql b/db/versions/.archive/10580-purpleCataractarum/01-itemTypeAddConstraint.sql
new file mode 100644
index 000000000..f872b43fa
--- /dev/null
+++ b/db/versions/.archive/10580-purpleCataractarum/01-itemTypeAddConstraint.sql
@@ -0,0 +1,2 @@
+ALTER TABLE vn.item
+ ADD CONSTRAINT item_FK_1 FOREIGN KEY (typeFk) REFERENCES vn.itemType(id) ON DELETE RESTRICT ON UPDATE CASCADE;
diff --git a/db/versions/.archive/10581-grayPaniculata/00-itemTypeAutoIncrement.sql b/db/versions/.archive/10581-grayPaniculata/00-itemTypeAutoIncrement.sql
new file mode 100644
index 000000000..854d1accf
--- /dev/null
+++ b/db/versions/.archive/10581-grayPaniculata/00-itemTypeAutoIncrement.sql
@@ -0,0 +1,29 @@
+ALTER TABLE edi .item_groupToOffer DROP CONSTRAINT IF EXISTS item_groupToOffer_fk2 ;
+ALTER TABLE bs .waste DROP CONSTRAINT IF EXISTS waste_itemType_id ;
+ALTER TABLE vn .itemTypeTag DROP CONSTRAINT IF EXISTS itemTypeTag_FK ;
+ALTER TABLE vn .itemTypeRestriction DROP CONSTRAINT IF EXISTS itemTypeRestriction_FK ;
+ALTER TABLE vn .clientItemType DROP CONSTRAINT IF EXISTS clientItemType_FK_1 ;
+ALTER TABLE vn .agencyModeItemType DROP CONSTRAINT IF EXISTS agencyModeItemType_FK_1 ;
+ALTER TABLE vn .item DROP CONSTRAINT IF EXISTS item_FK_1 ;
+ALTER TABLE vn .zoneItemType DROP CONSTRAINT IF EXISTS zoneItemType_FK_1 ;
+ALTER TABLE vn .zoneFilter DROP CONSTRAINT IF EXISTS zoneFilter_FK_1 ;
+ALTER TABLE hedera.shelfConfig DROP CONSTRAINT IF EXISTS shelfConfig_ibfk_1 ;
+ALTER TABLE bi .analisis_ventas_familia_evolution DROP CONSTRAINT IF EXISTS analisis_ventas_familia_evolution_FK;
+ALTER TABLE bs .salesByItemTypeDay DROP CONSTRAINT IF EXISTS itemTypeSalesByweek_itemTypeFk ;
+ALTER TABLE bs .sale DROP CONSTRAINT IF EXISTS sale_FK_3 ;
+
+ALTER TABLE vn.itemType MODIFY COLUMN id smallint(5) unsigned auto_increment NOT NULL;
+
+ALTER TABLE edi .item_groupToOffer ADD CONSTRAINT item_groupToOffer_fk2 FOREIGN KEY IF NOT EXISTS (itemTypeFk) REFERENCES vn.itemType(id);
+ALTER TABLE bs .waste ADD CONSTRAINT waste_itemType_id FOREIGN KEY IF NOT EXISTS (itemTypeFk) REFERENCES vn.itemType(id);
+ALTER TABLE vn .itemTypeTag ADD CONSTRAINT itemTypeTag_FK FOREIGN KEY IF NOT EXISTS (itemTypeFk) REFERENCES vn.itemType(id);
+ALTER TABLE vn .itemTypeRestriction ADD CONSTRAINT itemTypeRestriction_FK FOREIGN KEY IF NOT EXISTS (itemTypeFk) REFERENCES vn.itemType(id);
+ALTER TABLE vn .clientItemType ADD CONSTRAINT clientItemType_FK_1 FOREIGN KEY IF NOT EXISTS (itemTypeFk) REFERENCES vn.itemType(id);
+ALTER TABLE vn .agencyModeItemType ADD CONSTRAINT agencyModeItemType_FK_1 FOREIGN KEY IF NOT EXISTS (itemTypeFk) REFERENCES vn.itemType(id);
+ALTER TABLE vn .item ADD CONSTRAINT item_FK_1 FOREIGN KEY IF NOT EXISTS (typeFk ) REFERENCES vn.itemType(id);
+ALTER TABLE vn .zoneItemType ADD CONSTRAINT zoneItemType_FK_1 FOREIGN KEY IF NOT EXISTS (itemTypeFk) REFERENCES vn.itemType(id);
+ALTER TABLE vn .zoneFilter ADD CONSTRAINT zoneFilter_FK_1 FOREIGN KEY IF NOT EXISTS (itemTypeFk) REFERENCES vn.itemType(id);
+ALTER TABLE hedera.shelfConfig ADD CONSTRAINT shelfConfig_ibfk_1 FOREIGN KEY IF NOT EXISTS (family ) REFERENCES vn.itemType(id);
+ALTER TABLE bi .analisis_ventas_familia_evolution ADD CONSTRAINT analisis_ventas_familia_evolution_FK FOREIGN KEY IF NOT EXISTS (typeFk ) REFERENCES vn.itemType(id);
+ALTER TABLE bs .salesByItemTypeDay ADD CONSTRAINT itemTypeSalesByweek_itemTypeFk FOREIGN KEY IF NOT EXISTS (itemTypeFk) REFERENCES vn.itemType(id);
+ALTER TABLE bs .sale ADD CONSTRAINT sale_FK_3 FOREIGN KEY IF NOT EXISTS (typeFk ) REFERENCES vn.itemType(id);
diff --git a/db/versions/.archive/10582-purpleOrchid/00-firstScript.sql b/db/versions/.archive/10582-purpleOrchid/00-firstScript.sql
new file mode 100644
index 000000000..3ff779c9d
--- /dev/null
+++ b/db/versions/.archive/10582-purpleOrchid/00-firstScript.sql
@@ -0,0 +1,2 @@
+ALTER TABLE vn.packingSite MODIFY COLUMN hostFk int(11) NULL;
+
diff --git a/db/versions/.archive/10583-turquoiseGerbera/00-firstScript.sql b/db/versions/.archive/10583-turquoiseGerbera/00-firstScript.sql
new file mode 100644
index 000000000..cdbcfa04e
--- /dev/null
+++ b/db/versions/.archive/10583-turquoiseGerbera/00-firstScript.sql
@@ -0,0 +1 @@
+DROP SCHEMA `ext`;
diff --git a/db/versions/.archive/10584-azureGerbera/00-firstScript.sql b/db/versions/.archive/10584-azureGerbera/00-firstScript.sql
new file mode 100644
index 000000000..09ee9381b
--- /dev/null
+++ b/db/versions/.archive/10584-azureGerbera/00-firstScript.sql
@@ -0,0 +1,10 @@
+ALTER TABLE `vn`.`agencyModeItemType`
+ADD UNIQUE INDEX `agencyModeFk_ItemType_UNIQUE` (`agencyModeFk` ASC, `itemTypeFk` ASC) VISIBLE;
+
+ALTER TABLE `vn`.`clientItemType`
+ADD UNIQUE INDEX `clientFk_itemTypeFk_UNIQUE` (`clientFk` ASC, `itemTypeFk` ASC) VISIBLE;
+
+ALTER TABLE `vn`.`zoneItemType`
+ADD UNIQUE INDEX `zoneType_itemTypeFk_UNIQUE` (`zoneFk` ASC, `itemTypeFk` ASC) VISIBLE;
+
+
diff --git a/db/versions/.archive/10585-pinkMedeola/00-ticketLog.sql b/db/versions/.archive/10585-pinkMedeola/00-ticketLog.sql
new file mode 100644
index 000000000..2a2d2cf68
--- /dev/null
+++ b/db/versions/.archive/10585-pinkMedeola/00-ticketLog.sql
@@ -0,0 +1,10 @@
+-- Place your SQL code here
+ALTER TABLE `vn`.`ticketLog`
+CHANGE COLUMN `changedModel` `changedModel` ENUM('Ticket', 'Sale', 'TicketWeekly', 'TicketTracking', 'TicketService', 'TicketRequest', 'TicketRefund', 'TicketPackaging', 'TicketObservation', 'TicketDms', 'Expedition', 'Sms') NOT NULL DEFAULT 'Ticket',
+MODIFY COLUMN changedModelId INT(11) NOT NULL,
+MODIFY COLUMN oldInstance JSON NULL,
+MODIFY COLUMN newInstance JSON NULL,
+ADD INDEX IF NOT EXISTS `ticketLog_changedModel` (`changedModel` ASC, `changedModelId` ASC, `creationDate` ASC),
+ADD INDEX IF NOT EXISTS `ticketLog_originFk` (`originFk` ASC, `creationDate` ASC),
+DROP INDEX IF EXISTS `ticketLog_creationDate_IDX` ,
+DROP INDEX IF EXISTS `logTicketoriginFk` ;
\ No newline at end of file
diff --git a/db/versions/.archive/10585-pinkMedeola/01-entryLog.sql b/db/versions/.archive/10585-pinkMedeola/01-entryLog.sql
new file mode 100644
index 000000000..ce4940533
--- /dev/null
+++ b/db/versions/.archive/10585-pinkMedeola/01-entryLog.sql
@@ -0,0 +1,8 @@
+ALTER TABLE `vn`.`entryLog`
+CHANGE COLUMN `changedModel` `changedModel` ENUM('Entry', 'Buy', 'EntryObservation') NOT NULL DEFAULT 'Entry' ,
+MODIFY COLUMN changedModelId INT(11) NOT NULL,
+MODIFY COLUMN oldInstance JSON NULL,
+MODIFY COLUMN newInstance JSON NULL,
+ADD INDEX IF NOT EXISTS `entryLog_changedModel` (`changedModel` ASC, `changedModelId` ASC, `creationDate` ASC),
+ADD INDEX IF NOT EXISTS `entryLog_originFk` (`originFk` ASC, `creationDate` ASC),
+DROP INDEX IF EXISTS `logEntry_ibfk_1` ;
\ No newline at end of file
diff --git a/db/versions/.archive/10585-pinkMedeola/02-claimLog.sql b/db/versions/.archive/10585-pinkMedeola/02-claimLog.sql
new file mode 100644
index 000000000..41684c190
--- /dev/null
+++ b/db/versions/.archive/10585-pinkMedeola/02-claimLog.sql
@@ -0,0 +1,8 @@
+ALTER TABLE `vn`.`claimLog`
+CHANGE COLUMN `changedModel` `changedModel` ENUM('Claim', 'ClaimBeginning','ClaimState', 'ClaimDevelopment', 'ClaimDms', 'ClaimEnd', 'ClaimObservation') NOT NULL DEFAULT 'Claim',
+MODIFY COLUMN changedModelId INT(11) NOT NULL,
+MODIFY COLUMN oldInstance JSON NULL,
+MODIFY COLUMN newInstance JSON NULL,
+ADD INDEX IF NOT EXISTS `claimLog_changedModel` (`changedModel` ASC, `changedModelId` ASC, `creationDate` ASC),
+ADD INDEX IF NOT EXISTS `claimLog_claimLog` (`originFk` ASC, `creationDate` ASC),
+DROP INDEX IF EXISTS `originFk` ;
\ No newline at end of file
diff --git a/db/versions/.archive/10585-pinkMedeola/03-clientLog.sql b/db/versions/.archive/10585-pinkMedeola/03-clientLog.sql
new file mode 100644
index 000000000..b7c21aa8f
--- /dev/null
+++ b/db/versions/.archive/10585-pinkMedeola/03-clientLog.sql
@@ -0,0 +1,8 @@
+ALTER TABLE `vn`.`clientLog`
+CHANGE COLUMN `changedModel` `changedModel` ENUM('Client', 'Address', 'ClientContact', 'ClientDms', 'ClientObservation', 'ClientSample', 'Greuge', 'Recovery', 'TpvTransaction', 'WorkerDms', 'Sms') NOT NULL DEFAULT 'Client',
+MODIFY COLUMN changedModelId INT(11) NOT NULL,
+MODIFY COLUMN oldInstance JSON NULL,
+MODIFY COLUMN newInstance JSON NULL,
+ADD INDEX IF NOT EXISTS `clientLog_changedModel` (`changedModel` ASC, `changedModelId` ASC, `creationDate` ASC),
+ADD INDEX IF NOT EXISTS `clientLog_clientLog` (`originFk` ASC, `creationDate` ASC),
+DROP INDEX IF EXISTS `originFk` ;
\ No newline at end of file
diff --git a/db/versions/.archive/10585-pinkMedeola/04-invoiceInLog.sql b/db/versions/.archive/10585-pinkMedeola/04-invoiceInLog.sql
new file mode 100644
index 000000000..b9b8ff95b
--- /dev/null
+++ b/db/versions/.archive/10585-pinkMedeola/04-invoiceInLog.sql
@@ -0,0 +1,8 @@
+ALTER TABLE `vn`.`invoiceInLog`
+CHANGE COLUMN `changedModel` `changedModel` ENUM('InvoiceIn', 'invoiceInTax') NOT NULL DEFAULT 'InvoiceIn',
+MODIFY COLUMN changedModelId INT(11) NOT NULL,
+MODIFY COLUMN oldInstance JSON NULL,
+MODIFY COLUMN newInstance JSON NULL,
+ADD INDEX IF NOT EXISTS `invoiceInLog_changedModel` (`changedModel` ASC, `changedModelId` ASC, `creationDate` ASC),
+ADD INDEX IF NOT EXISTS `invoiceInLog_originFk` (`originFk` ASC, `creationDate` ASC),
+DROP INDEX IF EXISTS `originFk` ;
\ No newline at end of file
diff --git a/db/versions/.archive/10585-pinkMedeola/05-itemLog.sql b/db/versions/.archive/10585-pinkMedeola/05-itemLog.sql
new file mode 100644
index 000000000..cd82e943b
--- /dev/null
+++ b/db/versions/.archive/10585-pinkMedeola/05-itemLog.sql
@@ -0,0 +1,9 @@
+ALTER TABLE `vn`.`itemLog`
+CHANGE COLUMN `changedModel` `changedModel` ENUM('Item', 'ItemBarcode', 'ItemBotanical', 'ItemNiche', 'ItemTag', 'ItemTaxCountry') NOT NULL DEFAULT 'Item',
+MODIFY COLUMN changedModelId INT(11) NOT NULL,
+MODIFY COLUMN oldInstance JSON NULL,
+MODIFY COLUMN newInstance JSON NULL,
+DROP INDEX IF EXISTS `itemLog_changedModel_idx` ,
+ADD INDEX IF NOT EXISTS `itemLog_changedModel_idx` (`changedModel` ASC, `changedModelId` ASC, `creationDate` ASC),
+ADD INDEX IF NOT EXISTS `itemLog_originFk` (`originFk` ASC, `creationDate` ASC),
+DROP INDEX IF EXISTS `itemLogItemFk_idx` ;
\ No newline at end of file
diff --git a/db/versions/.archive/10585-pinkMedeola/06-routeLog.sql b/db/versions/.archive/10585-pinkMedeola/06-routeLog.sql
new file mode 100644
index 000000000..d35a6a503
--- /dev/null
+++ b/db/versions/.archive/10585-pinkMedeola/06-routeLog.sql
@@ -0,0 +1,8 @@
+ALTER TABLE `vn`.`routeLog`
+CHANGE COLUMN `changedModel` `changedModel` ENUM('Route') NOT NULL DEFAULT 'Route',
+MODIFY COLUMN changedModelId INT(11) NOT NULL,
+MODIFY COLUMN oldInstance JSON NULL,
+MODIFY COLUMN newInstance JSON NULL,
+ADD INDEX IF NOT EXISTS `routeLog_changedModel` (`changedModel` ASC, `changedModelId` ASC, `creationDate` ASC),
+ADD INDEX IF NOT EXISTS `routeLog_originFk` (`originFk` ASC, `creationDate` ASC),
+DROP INDEX IF EXISTS `originFk` ;
\ No newline at end of file
diff --git a/db/versions/.archive/10585-pinkMedeola/07-shelvingLog.sql b/db/versions/.archive/10585-pinkMedeola/07-shelvingLog.sql
new file mode 100644
index 000000000..34c190a99
--- /dev/null
+++ b/db/versions/.archive/10585-pinkMedeola/07-shelvingLog.sql
@@ -0,0 +1,15 @@
+ALTER TABLE `vn`.`shelvingLog`
+CHANGE COLUMN `changedModel` `changedModel` ENUM('Shelving') NOT NULL DEFAULT 'Shelving',
+MODIFY COLUMN changedModelId INT(11) NOT NULL,
+MODIFY COLUMN oldInstance JSON NULL,
+MODIFY COLUMN newInstance JSON NULL,
+ADD INDEX IF NOT EXISTS `shelvingLog_changedModel` (`changedModel` ASC, `changedModelId` ASC, `creationDate` ASC),
+ADD INDEX IF NOT EXISTS `shelvingLog_originFk` (`originFk` ASC, `creationDate` ASC),
+DROP INDEX IF EXISTS `originFk` ;
+;
+ALTER TABLE `vn`.`shelvingLog`
+ADD CONSTRAINT `shelvingLog_ibfk_1`
+ FOREIGN KEY IF NOT EXISTS (`originFk`)
+ REFERENCES `vn`.`shelving` (`id`)
+ ON DELETE CASCADE
+ ON UPDATE CASCADE;
\ No newline at end of file
diff --git a/db/versions/.archive/10585-pinkMedeola/08-supplierLog.sql b/db/versions/.archive/10585-pinkMedeola/08-supplierLog.sql
new file mode 100644
index 000000000..b82d3f060
--- /dev/null
+++ b/db/versions/.archive/10585-pinkMedeola/08-supplierLog.sql
@@ -0,0 +1,8 @@
+ALTER TABLE `vn`.`supplierLog`
+CHANGE COLUMN `changedModel` `changedModel` ENUM('Supplier', 'SupplierAddress', 'SupplierAccount', 'SupplierContact') NOT NULL DEFAULT 'Supplier',
+MODIFY COLUMN changedModelId INT(11) NOT NULL,
+MODIFY COLUMN oldInstance JSON NULL,
+MODIFY COLUMN newInstance JSON NULL,
+ADD INDEX IF NOT EXISTS `supplierLog_changedModel` (`changedModel` ASC, `changedModelId` ASC, `creationDate` ASC),
+ADD INDEX IF NOT EXISTS `supplierLog_originFk` (`originFk` ASC, `creationDate` ASC),
+DROP INDEX IF EXISTS `logSupplier_ibfk_1` ;
diff --git a/db/versions/.archive/10585-pinkMedeola/09-travelLog.sql b/db/versions/.archive/10585-pinkMedeola/09-travelLog.sql
new file mode 100644
index 000000000..058f2ca32
--- /dev/null
+++ b/db/versions/.archive/10585-pinkMedeola/09-travelLog.sql
@@ -0,0 +1,8 @@
+ALTER TABLE `vn`.`travelLog`
+CHANGE COLUMN `changedModel` `changedModel` ENUM('Travel', 'TravelThermograph') NOT NULL DEFAULT 'Travel',
+MODIFY COLUMN changedModelId INT(11) NOT NULL,
+MODIFY COLUMN oldInstance JSON NULL,
+MODIFY COLUMN newInstance JSON NULL,
+ADD INDEX IF NOT EXISTS `travelLog_changedModel` (`changedModel` ASC, `changedModelId` ASC, `originFk` ASC),
+ADD INDEX IF NOT EXISTS `travelLog_originFk` (`originFk` ASC, `creationDate` ASC),
+DROP INDEX IF EXISTS `originFk` ;
\ No newline at end of file
diff --git a/db/versions/.archive/10585-pinkMedeola/10-workerLog.sql b/db/versions/.archive/10585-pinkMedeola/10-workerLog.sql
new file mode 100644
index 000000000..01528c6f9
--- /dev/null
+++ b/db/versions/.archive/10585-pinkMedeola/10-workerLog.sql
@@ -0,0 +1,8 @@
+ALTER TABLE `vn`.`workerLog`
+CHANGE COLUMN `changedModel` `changedModel` ENUM('Worker', 'workerDocument', 'Calendar', 'WorkerTimeControlMail') NOT NULL DEFAULT 'Worker',
+MODIFY COLUMN changedModelId INT(11) NOT NULL,
+MODIFY COLUMN oldInstance JSON NULL,
+MODIFY COLUMN newInstance JSON NULL,
+ADD INDEX IF NOT EXISTS `workerLog_changedModel` (`changedModel` ASC, `changedModelId` ASC, `creationDate` ASC),
+ADD INDEX IF NOT EXISTS `workerLog_originFk` (`originFk` ASC, `creationDate` ASC),
+DROP INDEX IF EXISTS `workerFk_idx` ;
diff --git a/db/versions/.archive/10585-pinkMedeola/11-zoneLog.sql b/db/versions/.archive/10585-pinkMedeola/11-zoneLog.sql
new file mode 100644
index 000000000..cb27a535c
--- /dev/null
+++ b/db/versions/.archive/10585-pinkMedeola/11-zoneLog.sql
@@ -0,0 +1,9 @@
+ALTER TABLE `vn`.`zoneLog`
+CHANGE COLUMN `changedModel` `changedModel` ENUM('Zone', 'ZoneEvent', 'ZoneExclusion', 'ZoneIncluded', 'ZoneWarehouse') NOT NULL DEFAULT 'Zone',
+MODIFY COLUMN changedModelId INT(11) NOT NULL,
+MODIFY COLUMN oldInstance JSON NULL,
+MODIFY COLUMN newInstance JSON NULL,
+ADD INDEX IF NOT EXISTS `zoneLog_changedModel` (`changedModel` ASC, `changedModelId` ASC, `creationDate` ASC),
+ADD INDEX IF NOT EXISTS `zoneLog_originFk` (`originFk` ASC, `creationDate` ASC),
+DROP INDEX IF EXISTS `originFk` ;
+;
\ No newline at end of file
diff --git a/db/versions/.archive/10585-pinkMedeola/12-userLog.sql b/db/versions/.archive/10585-pinkMedeola/12-userLog.sql
new file mode 100644
index 000000000..6cface450
--- /dev/null
+++ b/db/versions/.archive/10585-pinkMedeola/12-userLog.sql
@@ -0,0 +1,9 @@
+ALTER TABLE `account`.`userLog`
+CHANGE COLUMN `changedModel` `changedModel` ENUM('User') NOT NULL DEFAULT 'User',
+MODIFY COLUMN changedModelId INT(11) NOT NULL,
+MODIFY COLUMN oldInstance JSON NULL,
+MODIFY COLUMN newInstance JSON NULL,
+ADD INDEX IF NOT EXISTS `userLog_changedModel` (`changedModel` ASC, `changedModelId` ASC, `creationDate` ASC),
+ADD INDEX IF NOT EXISTS `userLog_originFk` (`originFk` ASC, `creationDate` ASC),
+DROP INDEX IF EXISTS `originFk` ;
+;
diff --git a/db/versions/.archive/10585-pinkMedeola/13-roleLog.sql b/db/versions/.archive/10585-pinkMedeola/13-roleLog.sql
new file mode 100644
index 000000000..75c037eb4
--- /dev/null
+++ b/db/versions/.archive/10585-pinkMedeola/13-roleLog.sql
@@ -0,0 +1,9 @@
+ALTER TABLE `account`.`roleLog`
+CHANGE COLUMN `changedModel` `changedModel` ENUM('Role') NOT NULL DEFAULT 'Role',
+MODIFY COLUMN changedModelId INT(11) NOT NULL,
+MODIFY COLUMN oldInstance JSON NULL,
+MODIFY COLUMN newInstance JSON NULL,
+ADD INDEX IF NOT EXISTS `roleLog_changedModel` (`changedModel` ASC, `changedModelId` ASC, `creationDate` ASC),
+ADD INDEX IF NOT EXISTS `roleLog_originFk` (`originFk` ASC, `creationDate` ASC),
+DROP INDEX IF EXISTS `originFk` ;
+;
diff --git a/db/versions/.archive/10587-navyOak/00-arcRead_addMinimum.sql b/db/versions/.archive/10587-navyOak/00-arcRead_addMinimum.sql
new file mode 100644
index 000000000..97af35911
--- /dev/null
+++ b/db/versions/.archive/10587-navyOak/00-arcRead_addMinimum.sql
@@ -0,0 +1 @@
+ALTER TABLE `vn`.`arcRead` ADD minimum TINYINT NULL;
diff --git a/db/versions/.archive/10593-greenLilium/00-firstScript.sql b/db/versions/.archive/10593-greenLilium/00-firstScript.sql
new file mode 100644
index 000000000..f6e04b0a1
--- /dev/null
+++ b/db/versions/.archive/10593-greenLilium/00-firstScript.sql
@@ -0,0 +1,7 @@
+CREATE TABLE `vn`.`vehiclePlateRegex` (
+ `countryCodeFk` VARCHAR(2) NOT NULL,
+ `regex` VARCHAR(45) NOT NULL,
+ PRIMARY KEY (`countryCodeFk`));
+
+ALTER TABLE `vn`.`vehicle`
+ADD COLUMN `countryCodeFk` VARCHAR(2) NULL DEFAULT 'ES' AFTER `ppeFk`;
\ No newline at end of file
diff --git a/db/versions/.archive/10596-purpleCamellia/00-firstScript.sql b/db/versions/.archive/10596-purpleCamellia/00-firstScript.sql
new file mode 100644
index 000000000..2fba524d0
--- /dev/null
+++ b/db/versions/.archive/10596-purpleCamellia/00-firstScript.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.company CHANGE footnotes footnotes__ longtext CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL COMMENT 'pie de paginas en las facturas';
diff --git a/db/versions/.archive/10597-navyAralia/00-firstScript.sql b/db/versions/.archive/10597-navyAralia/00-firstScript.sql
new file mode 100644
index 000000000..bad3c3939
--- /dev/null
+++ b/db/versions/.archive/10597-navyAralia/00-firstScript.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.vehicle ADD leasing varchar(50) NULL COMMENT 'Id de arrendamiento';
diff --git a/db/versions/.archive/10598-purpleGalax/00-workerLog.sql b/db/versions/.archive/10598-purpleGalax/00-workerLog.sql
new file mode 100644
index 000000000..7a5081c5e
--- /dev/null
+++ b/db/versions/.archive/10598-purpleGalax/00-workerLog.sql
@@ -0,0 +1,3 @@
+-- Place your SQL code here
+ALTER TABLE vn.workerLog
+MODIFY COLUMN userFk int(10) unsigned DEFAULT NULL NULL;
\ No newline at end of file
diff --git a/db/versions/.archive/10598-purpleGalax/01-supplierLog.sql b/db/versions/.archive/10598-purpleGalax/01-supplierLog.sql
new file mode 100644
index 000000000..ca0eea44b
--- /dev/null
+++ b/db/versions/.archive/10598-purpleGalax/01-supplierLog.sql
@@ -0,0 +1,3 @@
+-- Place your SQL code here
+ALTER TABLE vn.supplierLog
+MODIFY COLUMN userFk int(10) unsigned DEFAULT NULL NULL;
\ No newline at end of file
diff --git a/db/versions/.archive/10598-purpleGalax/02-workerTimeControlLog.sql b/db/versions/.archive/10598-purpleGalax/02-workerTimeControlLog.sql
new file mode 100644
index 000000000..83dc5bb1e
--- /dev/null
+++ b/db/versions/.archive/10598-purpleGalax/02-workerTimeControlLog.sql
@@ -0,0 +1,3 @@
+-- Place your SQL code here
+ALTER TABLE vn.workerTimeControlLog
+MODIFY COLUMN userFk int(10) DEFAULT NULL NULL;
\ No newline at end of file
diff --git a/db/versions/.archive/10598-purpleGalax/03-workerClockLog.sql b/db/versions/.archive/10598-purpleGalax/03-workerClockLog.sql
new file mode 100644
index 000000000..2cbcb2b9b
--- /dev/null
+++ b/db/versions/.archive/10598-purpleGalax/03-workerClockLog.sql
@@ -0,0 +1,3 @@
+-- Place your SQL code here
+ALTER TABLE vn.workerClockLog
+MODIFY COLUMN userFk int(10) unsigned DEFAULT NULL NULL;
diff --git a/db/versions/.archive/10599-orangeHydrangea/00-firstScript.sql b/db/versions/.archive/10599-orangeHydrangea/00-firstScript.sql
new file mode 100644
index 000000000..92aa037af
--- /dev/null
+++ b/db/versions/.archive/10599-orangeHydrangea/00-firstScript.sql
@@ -0,0 +1,2 @@
+ALTER TABLE vn.expeditionTruck CHANGE ETD eta datetime DEFAULT NULL NULL COMMENT 'Estimated time of arrival';
+ALTER TABLE vn.expeditionTruck ADD COLUMN ETD DATETIME AS (eta) VIRTUAL;
\ No newline at end of file
diff --git a/db/versions/.archive/10601-orangeErica/00-firstScript.sql b/db/versions/.archive/10601-orangeErica/00-firstScript.sql
new file mode 100644
index 000000000..017309dfb
--- /dev/null
+++ b/db/versions/.archive/10601-orangeErica/00-firstScript.sql
@@ -0,0 +1,2 @@
+ALTER TABLE vn.expedition
+ MODIFY COLUMN hasNewRoute BOOL DEFAULT FALSE NOT NULL;
diff --git a/db/versions/.archive/10602-whiteArborvitae/00-firstScript.sql b/db/versions/.archive/10602-whiteArborvitae/00-firstScript.sql
new file mode 100644
index 000000000..62e01601b
--- /dev/null
+++ b/db/versions/.archive/10602-whiteArborvitae/00-firstScript.sql
@@ -0,0 +1,3 @@
+
+ALTER TABLE vn.workerTimeControlConfig DROP COLUMN dateSplitDay;
+ALTER TABLE vn.workerTimeControlConfig DROP COLUMN breakTimeSplitDay;
diff --git a/db/versions/.archive/10606-pinkChico/00-firstScript.sql b/db/versions/.archive/10606-pinkChico/00-firstScript.sql
new file mode 100644
index 000000000..4c1bde562
--- /dev/null
+++ b/db/versions/.archive/10606-pinkChico/00-firstScript.sql
@@ -0,0 +1,2 @@
+-- Place your SQL code here
+ALTER TABLE vn.farming MODIFY COLUMN location varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL;
diff --git a/db/versions/.archive/10608-pinkAsparagus/00-firstScript.sql b/db/versions/.archive/10608-pinkAsparagus/00-firstScript.sql
new file mode 100644
index 000000000..a8795aa9b
--- /dev/null
+++ b/db/versions/.archive/10608-pinkAsparagus/00-firstScript.sql
@@ -0,0 +1,2 @@
+-- Place your SQL code here
+ALTER TABLE vn.farming MODIFY COLUMN warehouseFk smallint(6) unsigned DEFAULT NULL NULL;
\ No newline at end of file
diff --git a/db/versions/.archive/10609-grayRaphis/00-firstScript.sql b/db/versions/.archive/10609-grayRaphis/00-firstScript.sql
new file mode 100644
index 000000000..df72131ba
--- /dev/null
+++ b/db/versions/.archive/10609-grayRaphis/00-firstScript.sql
@@ -0,0 +1,19 @@
+USE account;
+ALTER TABLE userLog PAGE_COMPRESSED=1;
+ALTER TABLE roleLog PAGE_COMPRESSED=1;
+
+USE vn;
+ALTER TABLE supplierLog PAGE_COMPRESSED=1;
+ALTER TABLE deviceProductionLog PAGE_COMPRESSED=1;
+ALTER TABLE routeLog PAGE_COMPRESSED=1;
+ALTER TABLE itemLog PAGE_COMPRESSED=1;
+ALTER TABLE userLog PAGE_COMPRESSED=1;
+ALTER TABLE invoiceInLog PAGE_COMPRESSED=1;
+ALTER TABLE zoneLog PAGE_COMPRESSED=1;
+ALTER TABLE clientLog PAGE_COMPRESSED=1;
+ALTER TABLE workerLog PAGE_COMPRESSED=1;
+ALTER TABLE ticketLog PAGE_COMPRESSED=1;
+ALTER TABLE claimLog PAGE_COMPRESSED=1;
+ALTER TABLE travelLog PAGE_COMPRESSED=1;
+ALTER TABLE shelvingLog PAGE_COMPRESSED=1;
+ALTER TABLE entryLog PAGE_COMPRESSED=1;
diff --git a/db/versions/.archive/10610-goldenArborvitae/00-updateCompanyId.sql b/db/versions/.archive/10610-goldenArborvitae/00-updateCompanyId.sql
new file mode 100644
index 000000000..5e323b6c8
--- /dev/null
+++ b/db/versions/.archive/10610-goldenArborvitae/00-updateCompanyId.sql
@@ -0,0 +1,104 @@
+-- Place your SQL code here
+ALTER TABLE hedera.`orderConfig` DROP FOREIGN KEY IF EXISTS `orderConfig_ibfk_2`;
+ALTER TABLE vn.`project` DROP FOREIGN KEY IF EXISTS `project_FK_2`;
+ALTER TABLE vn.`vehicle` DROP FOREIGN KEY IF EXISTS `vehicle_ibfk_1`;
+ALTER TABLE vn.`routeConfig` DROP FOREIGN KEY IF EXISTS `routeConfig_FK`;
+ALTER TABLE vn.`entry` DROP FOREIGN KEY IF EXISTS `entry_ibfk_7`;
+ALTER TABLE vn.`payment` DROP FOREIGN KEY IF EXISTS `payment_ibfk_1`;
+ALTER TABLE vn.`receipt` DROP FOREIGN KEY IF EXISTS `receipt_ibfk_1`;
+ALTER TABLE vn.`invoiceIn` DROP FOREIGN KEY IF EXISTS `invoiceIn_ibfk_2`;
+ALTER TABLE vn.`sinister` DROP FOREIGN KEY IF EXISTS `sinister_fk4`;
+ALTER TABLE vn.`supplierExpense` DROP FOREIGN KEY IF EXISTS `pago_ibfk_1`;
+ALTER TABLE vn.`ticket` DROP FOREIGN KEY IF EXISTS `ticket_ibfk_5`;
+ALTER TABLE vn.`mandate` DROP FOREIGN KEY IF EXISTS `mandato_fgkey2`;
+ALTER TABLE vn.`XDiario` DROP FOREIGN KEY IF EXISTS `XDiario_ibfk_1`;
+ALTER TABLE vn.`dms` DROP FOREIGN KEY IF EXISTS `dms_companyFk`;
+ALTER TABLE vn.`property` DROP FOREIGN KEY IF EXISTS `property_company`;
+ALTER TABLE vn.`cmr` DROP FOREIGN KEY IF EXISTS `cmr_fk2`;
+ALTER TABLE vn.`host` DROP FOREIGN KEY IF EXISTS `configHost_FK_3`;
+ALTER TABLE vn.`clientRisk` DROP FOREIGN KEY IF EXISTS `clientRisk_ibfk_2`;
+ALTER TABLE vn.`ppe` DROP FOREIGN KEY IF EXISTS `ppe_fk4`;
+ALTER TABLE vn.`invoiceOut` DROP FOREIGN KEY IF EXISTS `invoiceOut_ibfk_1`;
+ALTER TABLE vn.`dua` DROP FOREIGN KEY IF EXISTS `dua_fk4`;
+ALTER TABLE vn.`clientSample` DROP FOREIGN KEY IF EXISTS `clientSample_ibfk_1`;
+ALTER TABLE vn2008.`Saldos_Prevision` DROP FOREIGN KEY IF EXISTS `empresa_prevision`;
+ALTER TABLE vn2008.`pago_sdc` DROP FOREIGN KEY IF EXISTS `empresa_sdc`;
+ALTER TABLE vn2008.`Clientes_empresa` DROP FOREIGN KEY IF EXISTS `empresa_id`;
+ALTER TABLE vn2008.`Bancos_poliza` DROP FOREIGN KEY IF EXISTS `Id_Poliza_Empresa`;
+ALTER TABLE vn2008.`Permisos` DROP FOREIGN KEY IF EXISTS `Permisos_ibfk_1`;
+ALTER TABLE vn2008.`albaran` DROP FOREIGN KEY IF EXISTS `fk_albaran_empresa1`;
+ALTER TABLE vn2008.`Remesas` DROP FOREIGN KEY IF EXISTS `Remesas_ibfk_1`;
+ALTER TABLE vn2008.`Enlaces Facturas__` DROP FOREIGN KEY IF EXISTS `Enlaces@0020Facturas_ibfk_1`;
+ALTER TABLE bs.`sale` DROP FOREIGN KEY IF EXISTS `sale_FK_2`;
+ALTER TABLE vn.`farming` DROP FOREIGN KEY IF EXISTS `farming_Fk_1`;
+ALTER TABLE vn.companyI18n DROP FOREIGN KEY IF EXISTS companyI18n_FK;
+
+
+ALTER TABLE vn.company MODIFY COLUMN id INT UNSIGNED NOT NULL;
+ALTER TABLE hedera.`orderConfig` MODIFY COLUMN defaultCompanyFk INT UNSIGNED DEFAULT NULL;
+ALTER TABLE vn.`project` MODIFY COLUMN companyFk INT UNSIGNED DEFAULT 442 NOT NULL ;
+ALTER TABLE vn.`vehicle` MODIFY COLUMN companyFk INT UNSIGNED DEFAULT 442 NOT NULL ;
+ALTER TABLE vn.`routeConfig` MODIFY COLUMN defaultCompanyFk INT UNSIGNED DEFAULT 442;
+ALTER TABLE vn.`entry` MODIFY COLUMN companyFk INT UNSIGNED DEFAULT 442 NOT NULL ;
+ALTER TABLE vn.`payment` MODIFY COLUMN companyFk INT UNSIGNED DEFAULT 442 NOT NULL ;
+ALTER TABLE vn.`receipt` MODIFY COLUMN companyFk INT UNSIGNED DEFAULT 442 NOT NULL ;
+ALTER TABLE vn.`invoiceIn` MODIFY COLUMN companyFk INT UNSIGNED DEFAULT 442 NOT NULL ;
+ALTER TABLE vn.`sinister` MODIFY COLUMN companyFk INT UNSIGNED NOT NULL ;
+ALTER TABLE vn.`supplierExpense` MODIFY COLUMN companyFk INT UNSIGNED DEFAULT 442 NOT NULL ;
+ALTER TABLE vn.`ticket` MODIFY COLUMN companyFk INT UNSIGNED DEFAULT 442 NOT NULL ;
+ALTER TABLE vn.`mandate` MODIFY COLUMN companyFk INT UNSIGNED NOT NULL ;
+ALTER TABLE vn.`XDiario` MODIFY COLUMN empresa_id INT UNSIGNED DEFAULT 442 NOT NULL ;
+ALTER TABLE vn.`dms` MODIFY COLUMN companyFk INT UNSIGNED DEFAULT 442 NOT NULL ;
+ALTER TABLE vn.`property` MODIFY COLUMN companyFk INT UNSIGNED NOT NULL ;
+ALTER TABLE vn.`cmr` MODIFY COLUMN companyFk INT UNSIGNED DEFAULT NULL;
+ALTER TABLE vn.`host` MODIFY COLUMN companyFk INT UNSIGNED DEFAULT 442;
+ALTER TABLE vn.`clientRisk` MODIFY COLUMN companyFk INT UNSIGNED DEFAULT 0 NOT NULL ;
+ALTER TABLE vn.`ppe` MODIFY COLUMN companyFk INT UNSIGNED DEFAULT 442 NOT NULL ;
+-- ALTER TABLE vn.`invoiceOut` MODIFY COLUMN companyFk INT UNSIGNED DEFAULT 442 NOT NULL ;
+ALTER TABLE vn.`dua` MODIFY COLUMN companyFk INT UNSIGNED DEFAULT 442 NOT NULL ;
+ALTER TABLE vn.`clientSample` MODIFY COLUMN companyFk INT UNSIGNED DEFAULT NULL;
+ALTER TABLE vn2008.`Saldos_Prevision` MODIFY COLUMN empresa_id INT UNSIGNED DEFAULT 442 NOT NULL ;
+ALTER TABLE vn2008.`pago_sdc` MODIFY COLUMN empresa_id INT UNSIGNED DEFAULT 442 NOT NULL ;
+ALTER TABLE vn2008.`Clientes_empresa` MODIFY COLUMN empresa_id INT UNSIGNED NOT NULL ;
+ALTER TABLE vn2008.`Bancos_poliza` MODIFY COLUMN empresa_id INT UNSIGNED DEFAULT 442 NOT NULL ;
+ALTER TABLE vn2008.`Permisos` MODIFY COLUMN empresa_id INT UNSIGNED DEFAULT 442 NOT NULL ;
+ALTER TABLE vn2008.`albaran` MODIFY COLUMN empresa_id INT UNSIGNED NOT NULL ;
+ALTER TABLE vn2008.`Remesas` MODIFY COLUMN empresa_id INT UNSIGNED DEFAULT 442 NOT NULL ;
+ALTER TABLE vn2008.`Enlaces Facturas__` MODIFY COLUMN empresa_id INT UNSIGNED DEFAULT 442 NOT NULL ;
+ALTER TABLE bs.`sale` MODIFY COLUMN companyFk INT UNSIGNED DEFAULT 442 NOT NULL ;
+ALTER TABLE vn.`farming` MODIFY COLUMN companyFk INT UNSIGNED DEFAULT 442 NOT NULL ;
+ALTER TABLE vn.companyI18n MODIFY COLUMN companyFk INT UNSIGNED NOT NULL;
+
+ALTER TABLE hedera.`orderConfig` ADD CONSTRAINT `orderConfigCompany_Fk` FOREIGN KEY IF NOT EXISTS (defaultCompanyFk) REFERENCES vn.company(id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`project` ADD CONSTRAINT `projectCompany_Fk` FOREIGN KEY IF NOT EXISTS (companyFk) REFERENCES vn.company (id) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE vn.`vehicle` ADD CONSTRAINT `vehicleCompany_Fk` FOREIGN KEY IF NOT EXISTS (companyFk) REFERENCES vn.company (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`routeConfig` ADD CONSTRAINT `routeConfigCompany_Fk` FOREIGN KEY IF NOT EXISTS (defaultCompanyFk) REFERENCES vn.company (id) ON DELETE RESTRICT ON UPDATE RESTRICT;
+ALTER TABLE vn.`entry` ADD CONSTRAINT `entryCompany_Fk` FOREIGN KEY IF NOT EXISTS (companyFk) REFERENCES vn.company (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`payment` ADD CONSTRAINT `paymentCompany_Fk` FOREIGN KEY IF NOT EXISTS (companyFk) REFERENCES vn.company (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`receipt` ADD CONSTRAINT `receiptCompany_Fk` FOREIGN KEY IF NOT EXISTS (companyFk) REFERENCES vn.company (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`invoiceIn` ADD CONSTRAINT `invoiceInCompany_Fk` FOREIGN KEY IF NOT EXISTS (companyFk) REFERENCES vn.company (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`sinister` ADD CONSTRAINT `sinisterCompany_Fk` FOREIGN KEY IF NOT EXISTS (companyFk) REFERENCES vn.company (id) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE vn.`supplierExpense` ADD CONSTRAINT `supplierExpenseCompany_Fk` FOREIGN KEY IF NOT EXISTS (companyFk) REFERENCES vn.company (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`ticket` ADD CONSTRAINT `ticketCompany_Fk` FOREIGN KEY IF NOT EXISTS (companyFk) REFERENCES vn.company (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`mandate` ADD CONSTRAINT `mandateCompany_Fk` FOREIGN KEY IF NOT EXISTS (companyFk) REFERENCES vn.company (id) ON DELETE NO ACTION ON UPDATE CASCADE;
+ALTER TABLE vn.`XDiario` ADD CONSTRAINT `XDiarioCompany_Fk` FOREIGN KEY IF NOT EXISTS (empresa_id) REFERENCES vn.company (id) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE vn.`dms` ADD CONSTRAINT `dmsCompany_Fk` FOREIGN KEY IF NOT EXISTS (companyFk) REFERENCES vn.company (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`property` ADD CONSTRAINT `propertyCompany_Fk` FOREIGN KEY IF NOT EXISTS (companyFk) REFERENCES vn.company (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`cmr` ADD CONSTRAINT `cmrCompany_Fk` FOREIGN KEY IF NOT EXISTS (companyFk) REFERENCES vn.company (id) ON DELETE SET NULL ON UPDATE CASCADE;
+ALTER TABLE vn.`host` ADD CONSTRAINT `hostCompany_Fk` FOREIGN KEY IF NOT EXISTS (companyFk) REFERENCES vn.company (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`clientRisk` ADD CONSTRAINT `clientRiskCompany_Fk` FOREIGN KEY IF NOT EXISTS (companyFk) REFERENCES vn.company (id) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE vn.`ppe` ADD CONSTRAINT `ppeCompany_Fk` FOREIGN KEY IF NOT EXISTS (companyFk) REFERENCES vn.company (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+-- ALTER TABLE vn.`invoiceOut` ADD CONSTRAINT `invoiceOutCompany_Fk` FOREIGN KEY IF NOT EXISTS (companyFk) REFERENCES vn.company (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`dua` ADD CONSTRAINT `duaCompany_Fk` FOREIGN KEY IF NOT EXISTS (companyFk) REFERENCES vn.company (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`clientSample` ADD CONSTRAINT `clientSampleCompany_Fk` FOREIGN KEY IF NOT EXISTS (companyFk) REFERENCES vn.company (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn2008.`Saldos_Prevision` ADD CONSTRAINT `Saldos_PrevisionCompany_Fk` FOREIGN KEY IF NOT EXISTS (empresa_id) REFERENCES vn.company (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn2008.`pago_sdc` ADD CONSTRAINT `pago_sdcCompany_Fk` FOREIGN KEY IF NOT EXISTS (empresa_id) REFERENCES vn.company (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn2008.`Clientes_empresa` ADD CONSTRAINT `Clientes_empresaCompany_Fk` FOREIGN KEY IF NOT EXISTS (empresa_id) REFERENCES vn.company (id) ON DELETE NO ACTION ON UPDATE RESTRICT;
+ALTER TABLE vn2008.`Bancos_poliza` ADD CONSTRAINT `Bancos_polizaCompany_Fk` FOREIGN KEY IF NOT EXISTS (empresa_id) REFERENCES vn.company (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn2008.`Permisos` ADD CONSTRAINT `PermisosCompany_Fk` FOREIGN KEY IF NOT EXISTS (empresa_id) REFERENCES vn.company (id) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE vn2008.`albaran` ADD CONSTRAINT `albaranCompany_Fk` FOREIGN KEY IF NOT EXISTS (empresa_id) REFERENCES vn.company (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn2008.`Remesas` ADD CONSTRAINT `RemesasCompany_Fk` FOREIGN KEY IF NOT EXISTS (empresa_id) REFERENCES vn.company (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn2008.`Enlaces Facturas__` ADD CONSTRAINT `EnlacesFacturas__Company_Fk` FOREIGN KEY IF NOT EXISTS (empresa_id) REFERENCES vn.company (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE bs.`sale` ADD CONSTRAINT `saleCompany_Fk` FOREIGN KEY IF NOT EXISTS (companyFk) REFERENCES vn.company (id) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE vn.`farming` ADD CONSTRAINT `farmingCompany_Fk` FOREIGN KEY IF NOT EXISTS(companyFk) REFERENCES vn.company(id) ON DELETE RESTRICT ON UPDATE RESTRICT;
+ALTER TABLE vn.`companyI18n` ADD CONSTRAINT `companyI18nCompany_Fk` FOREIGN KEY IF NOT EXISTS(companyFk) REFERENCES vn.company(id) ON DELETE RESTRICT ON UPDATE CASCADE;
diff --git a/db/versions/.archive/10610-goldenArborvitae/01-updateSupplierId.sql b/db/versions/.archive/10610-goldenArborvitae/01-updateSupplierId.sql
new file mode 100644
index 000000000..89eee7ac2
--- /dev/null
+++ b/db/versions/.archive/10610-goldenArborvitae/01-updateSupplierId.sql
@@ -0,0 +1,80 @@
+ALTER TABLE vn.`budget` DROP FOREIGN KEY IF EXISTS `budget_FK_3`;
+ALTER TABLE vn.`supplierContact` DROP FOREIGN KEY IF EXISTS `supplier_id`;
+ALTER TABLE vn.`entry` DROP FOREIGN KEY IF EXISTS `entry_ibfk_1`;
+ALTER TABLE vn.`payment` DROP FOREIGN KEY IF EXISTS `pago_ibfk_3`;
+ALTER TABLE vn.`travelClonedWeekly` DROP FOREIGN KEY IF EXISTS `travelClonedWeekly_FK_3`;
+ALTER TABLE vn.`invoiceIn` DROP FOREIGN KEY IF EXISTS `invoiceIn_ibfk_1`;
+ALTER TABLE vn.`sinister` DROP FOREIGN KEY IF EXISTS `sinister_fk1`;
+ALTER TABLE vn.`comparativeFilter` DROP FOREIGN KEY IF EXISTS `comparativeFilter_FK_2`;
+ALTER TABLE vn.`supplierExpense` DROP FOREIGN KEY IF EXISTS `proveedor_pago`;
+ALTER TABLE vn.`supplierAccount` DROP FOREIGN KEY IF EXISTS `supplierAccount_FK`;
+ALTER TABLE vn.`roadmap` DROP FOREIGN KEY IF EXISTS `roadmap_ibfk_1`;
+ALTER TABLE vn.`awb` DROP FOREIGN KEY IF EXISTS `awbTransitoryFk`;
+ALTER TABLE vn.`awb` DROP FOREIGN KEY IF EXISTS `awb_FK_2`;
+ALTER TABLE vn.`supplierLog` DROP FOREIGN KEY IF EXISTS `supplierLog_ibfk_1`;
+ALTER TABLE vn.`cmr` DROP FOREIGN KEY IF EXISTS `cm_fk4`;
+ALTER TABLE vn.`duaTax` DROP FOREIGN KEY IF EXISTS `duaTax_fk2`;
+ALTER TABLE vn.`supplierAgencyTerm` DROP FOREIGN KEY IF EXISTS `agencyTerm_FK_1`;
+ALTER TABLE vn.`machine` DROP FOREIGN KEY IF EXISTS `machine_FK_2`;
+ALTER TABLE vn2008.`travel_pattern` DROP FOREIGN KEY IF EXISTS `travel_pattern_ibfk_6`;
+ALTER TABLE vn2008.`Bancos_poliza` DROP FOREIGN KEY IF EXISTS `bankNotaryIdx3`;
+ALTER TABLE vn2008.`Bancos_poliza` DROP FOREIGN KEY IF EXISTS `bankSupplierIdx1`;
+ALTER TABLE vn2008.`Vehiculos_consumo` DROP FOREIGN KEY IF EXISTS `proveedoresFk`;
+ALTER TABLE vn2008.`albaran` DROP FOREIGN KEY IF EXISTS `fk_albaran_Proveedores`;
+ALTER TABLE vn2008.`Proveedores_cargueras` DROP FOREIGN KEY IF EXISTS `proveedores_cargueras_fk1`;
+ALTER TABLE vn2008.`Proveedores_comunicados` DROP FOREIGN KEY IF EXISTS `Proveedores_comunicados_ibfk_3`;
+
+ALTER TABLE vn.supplier MODIFY COLUMN id INT UNSIGNED NOT NULL ;
+ALTER TABLE vn.`budget` MODIFY COLUMN supplierFk INT UNSIGNED DEFAULT NULL;
+ALTER TABLE vn.`supplierContact` MODIFY COLUMN supplierFk INT UNSIGNED DEFAULT NULL;
+ALTER TABLE vn.`entry` MODIFY COLUMN supplierFk INT UNSIGNED DEFAULT 644 NOT NULL ;
+ALTER TABLE vn.`payment` MODIFY COLUMN supplierFk INT UNSIGNED NOT NULL ;
+ALTER TABLE vn.`travelClonedWeekly` MODIFY COLUMN supplierFk INT UNSIGNED DEFAULT NULL;
+ALTER TABLE vn.`invoiceIn` MODIFY COLUMN supplierFk INT UNSIGNED NOT NULL ;
+ALTER TABLE vn.`sinister` MODIFY COLUMN supplierFk INT UNSIGNED NOT NULL ;
+ALTER TABLE vn.`comparativeFilter` MODIFY COLUMN supplierFk INT UNSIGNED DEFAULT NULL;
+ALTER TABLE vn.`supplierExpense` MODIFY COLUMN supplierFk INT UNSIGNED NOT NULL ;
+ALTER TABLE vn.`supplierAccount` MODIFY COLUMN supplierFk INT UNSIGNED DEFAULT NULL;
+ALTER TABLE vn.`roadmap` MODIFY COLUMN supplierFk INT UNSIGNED DEFAULT NULL;
+ALTER TABLE vn.`awb` MODIFY COLUMN transitoryFk INT UNSIGNED DEFAULT NULL;
+ALTER TABLE vn.`awb` MODIFY COLUMN freightFk INT UNSIGNED DEFAULT NULL;
+ALTER TABLE vn.`supplierLog` MODIFY COLUMN originFk INT UNSIGNED NOT NULL ;
+ALTER TABLE vn.`cmr` MODIFY COLUMN supplierFk INT UNSIGNED DEFAULT NULL;
+ALTER TABLE vn.`duaTax` MODIFY COLUMN supplierFk INT UNSIGNED NOT NULL ;
+ALTER TABLE vn.`supplierAgencyTerm` MODIFY COLUMN supplierFk INT UNSIGNED DEFAULT NULL;
+ALTER TABLE vn.`machine` MODIFY COLUMN supplierFk INT UNSIGNED DEFAULT NULL;
+ALTER TABLE vn2008.`travel_pattern` MODIFY COLUMN cargoSupplierFk INT UNSIGNED DEFAULT NULL;
+ALTER TABLE vn2008.`Bancos_poliza` MODIFY COLUMN notaryFk INT UNSIGNED DEFAULT NULL;
+ALTER TABLE vn2008.`Bancos_poliza` MODIFY COLUMN supplierFk INT UNSIGNED DEFAULT NULL;
+ALTER TABLE vn2008.`Vehiculos_consumo` MODIFY COLUMN proveedoresFk INT UNSIGNED DEFAULT NULL;
+ALTER TABLE vn2008.`albaran` MODIFY COLUMN Id_Proveedor INT UNSIGNED NOT NULL ;
+ALTER TABLE vn2008.`Proveedores_cargueras` MODIFY COLUMN Id_Proveedor INT UNSIGNED NOT NULL ;
+ALTER TABLE vn2008.`Proveedores_comunicados` MODIFY COLUMN Id_Proveedor INT UNSIGNED NOT NULL ;
+
+ALTER TABLE vn.`budget` ADD CONSTRAINT `budgetSupplier_Fk` FOREIGN KEY IF NOT EXISTS (supplierFk) REFERENCES vn.supplier (id) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE vn.`supplierContact` ADD CONSTRAINT `supplierContactSupplier_Fk` FOREIGN KEY IF NOT EXISTS (supplierFk) REFERENCES vn.supplier (id) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE vn.`entry` ADD CONSTRAINT `entrySupplier_Fk` FOREIGN KEY IF NOT EXISTS (supplierFk) REFERENCES vn.supplier (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`payment` ADD CONSTRAINT `paymentSupplier_Fk` FOREIGN KEY IF NOT EXISTS (supplierFk) REFERENCES vn.supplier (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`travelClonedWeekly` ADD CONSTRAINT `travelClonedWeeklySupplier_Fk` FOREIGN KEY IF NOT EXISTS (supplierFk) REFERENCES vn.supplier (id) ON DELETE SET NULL ON UPDATE CASCADE;
+ALTER TABLE vn.`invoiceIn` ADD CONSTRAINT `invoiceInSupplier_Fk` FOREIGN KEY IF NOT EXISTS (supplierFk) REFERENCES vn.supplier (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`sinister` ADD CONSTRAINT `sinisterSupplier_Fk` FOREIGN KEY IF NOT EXISTS (supplierFk) REFERENCES vn.supplier (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`comparativeFilter` ADD CONSTRAINT `comparativeFilterSupplier_Fk` FOREIGN KEY IF NOT EXISTS (supplierFk) REFERENCES vn.supplier (id) ON DELETE RESTRICT ON UPDATE RESTRICT;
+ALTER TABLE vn.`supplierExpense` ADD CONSTRAINT `supplierExpenseSupplier_Fk` FOREIGN KEY IF NOT EXISTS (supplierFk) REFERENCES vn.supplier (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`supplierAccount` ADD CONSTRAINT `supplierAccountSupplier_Fk` FOREIGN KEY IF NOT EXISTS (supplierFk) REFERENCES vn.supplier (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`roadmap` ADD CONSTRAINT `roadmapSupplier_Fk` FOREIGN KEY IF NOT EXISTS (supplierFk) REFERENCES vn.supplier (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`awb` ADD CONSTRAINT `awbSupplier_Fk` FOREIGN KEY IF NOT EXISTS (transitoryFk) REFERENCES vn.supplier (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`awb` ADD CONSTRAINT `awbSupplier_Fk` FOREIGN KEY IF NOT EXISTS (freightFk) REFERENCES vn.supplier (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`supplierLog` ADD CONSTRAINT `supplierLogSupplier_Fk` FOREIGN KEY IF NOT EXISTS (originFk) REFERENCES vn.supplier (id) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE vn.`cmr` ADD CONSTRAINT `cmrSupplier_Fk` FOREIGN KEY IF NOT EXISTS (supplierFk) REFERENCES vn.supplier (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`duaTax` ADD CONSTRAINT `duaTaxSupplier_Fk` FOREIGN KEY IF NOT EXISTS (supplierFk) REFERENCES vn.supplier (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`supplierAgencyTerm` ADD CONSTRAINT `supplierAgencyTermSupplier_Fk` FOREIGN KEY IF NOT EXISTS (supplierFk) REFERENCES vn.supplier (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`machine` ADD CONSTRAINT `machineSupplier_Fk` FOREIGN KEY IF NOT EXISTS (supplierFk) REFERENCES vn.supplier (id) ON DELETE SET NULL ON UPDATE CASCADE;
+ALTER TABLE vn2008.`travel_pattern` ADD CONSTRAINT `travel_patternSupplier_Fk` FOREIGN KEY IF NOT EXISTS (cargoSupplierFk) REFERENCES vn.supplier (id) ON DELETE SET NULL ON UPDATE CASCADE;
+ALTER TABLE vn2008.`Bancos_poliza` ADD CONSTRAINT `Bancos_polizaSupplier_Fk` FOREIGN KEY IF NOT EXISTS (notaryFk) REFERENCES vn.supplier (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn2008.`Bancos_poliza` ADD CONSTRAINT `Bancos_polizaSupplier_Fk` FOREIGN KEY IF NOT EXISTS (supplierFk) REFERENCES vn.supplier (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn2008.`Vehiculos_consumo` ADD CONSTRAINT `Vehiculos_consumoSupplier_Fk` FOREIGN KEY IF NOT EXISTS (proveedoresFk) REFERENCES vn.supplier (id) ON DELETE NO ACTION ON UPDATE NO ACTION;
+ALTER TABLE vn2008.`albaran` ADD CONSTRAINT `albaranSupplier_Fk` FOREIGN KEY IF NOT EXISTS (Id_Proveedor) REFERENCES vn.supplier (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn2008.`Proveedores_cargueras` ADD CONSTRAINT `Proveedores_carguerasSupplier_Fk` FOREIGN KEY IF NOT EXISTS (Id_Proveedor) REFERENCES vn.supplier (id) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE vn2008.`Proveedores_comunicados` ADD CONSTRAINT `Proveedores_comunicadosSupplier_Fk` FOREIGN KEY IF NOT EXISTS (Id_Proveedor) REFERENCES vn.supplier (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+
+ALTER TABLE vn.company ADD CONSTRAINT company_FK FOREIGN KEY IF NOT EXISTS (id) REFERENCES vn.supplier(id) ON DELETE RESTRICT ON UPDATE CASCADE;
diff --git a/db/versions/.archive/10610-goldenArborvitae/02-invoiceOutCompany.sql b/db/versions/.archive/10610-goldenArborvitae/02-invoiceOutCompany.sql
new file mode 100644
index 000000000..7a347369c
--- /dev/null
+++ b/db/versions/.archive/10610-goldenArborvitae/02-invoiceOutCompany.sql
@@ -0,0 +1,8 @@
+-- SET SESSION idle_transaction_timeout = 0;
+
+ALTER TABLE vn.`invoiceOut`
+ MODIFY COLUMN companyFk INT UNSIGNED DEFAULT 442 NOT NULL;
+
+ALTER TABLE vn.`invoiceOut`
+ ADD CONSTRAINT `invoiceOutCompany_Fk` FOREIGN KEY IF NOT EXISTS (companyFk)
+ REFERENCES vn.company (id) ON DELETE RESTRICT ON UPDATE CASCADE;
diff --git a/db/versions/.archive/10611-blueGerbera/00-firstScript.sql b/db/versions/.archive/10611-blueGerbera/00-firstScript.sql
new file mode 100644
index 000000000..457d1d3d4
--- /dev/null
+++ b/db/versions/.archive/10611-blueGerbera/00-firstScript.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.ticketRefund ADD CONSTRAINT ticketRefund_UN UNIQUE KEY (refundTicketFk);
diff --git a/db/versions/.archive/10613-purpleAspidistra/00-firstScript.sql b/db/versions/.archive/10613-purpleAspidistra/00-firstScript.sql
new file mode 100644
index 000000000..e50a8cc9c
--- /dev/null
+++ b/db/versions/.archive/10613-purpleAspidistra/00-firstScript.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.bankEntityConfig ADD defaultBankId int DEFAULT 3117 NOT NULL COMMENT 'Id del banco por defecto';
\ No newline at end of file
diff --git a/db/versions/.archive/10614-chocolateGalax/00-firstScript.sql b/db/versions/.archive/10614-chocolateGalax/00-firstScript.sql
new file mode 100644
index 000000000..ab9d4539c
--- /dev/null
+++ b/db/versions/.archive/10614-chocolateGalax/00-firstScript.sql
@@ -0,0 +1 @@
+DROP TABLE vn.contratos_subvencion_270619;
diff --git a/db/versions/.archive/10615-azureCataractarum/00-firstScript.sql b/db/versions/.archive/10615-azureCataractarum/00-firstScript.sql
new file mode 100644
index 000000000..c8c7119c8
--- /dev/null
+++ b/db/versions/.archive/10615-azureCataractarum/00-firstScript.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `vn`.`warehouse`
+ADD COLUMN IF NOT EXISTS `isOrigin` TINYINT(1) NULL AFTER `isHalt`,
+ADD COLUMN IF NOT EXISTS `isDestiny` TINYINT(1) NULL AFTER `isOrigin`;
\ No newline at end of file
diff --git a/db/versions/.archive/10616-yellowIvy/00-firstScript.sql b/db/versions/.archive/10616-yellowIvy/00-firstScript.sql
new file mode 100644
index 000000000..281d43133
--- /dev/null
+++ b/db/versions/.archive/10616-yellowIvy/00-firstScript.sql
@@ -0,0 +1,13 @@
+
+CREATE TABLE IF NOT EXISTS vn.`budgetState` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `code` varchar(45) NOT NULL,
+ `description` varchar(45) DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `budgetState_UN` (`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+ALTER TABLE vn.budget ADD IF NOT EXISTS budgetStateFk varchar(45) NULL;
+
+ALTER TABLE vn.budget ADD CONSTRAINT budgetStateFk FOREIGN KEY IF NOT EXISTS
+(budgetStateFk) REFERENCES vn.budgetState(code) ON DELETE RESTRICT ON UPDATE CASCADE;
diff --git a/db/versions/.archive/10616-yellowIvy/01-firstScript.sql b/db/versions/.archive/10616-yellowIvy/01-firstScript.sql
new file mode 100644
index 000000000..50ea15f8b
--- /dev/null
+++ b/db/versions/.archive/10616-yellowIvy/01-firstScript.sql
@@ -0,0 +1,8 @@
+
+ALTER TABLE vn.property ADD IF NOT EXISTS supplierFk int(10) unsigned NULL;
+ALTER TABLE vn.property
+ ADD CONSTRAINT propertySupplierFk
+ FOREIGN KEY IF NOT EXISTS (supplierFk)
+ REFERENCES vn.supplier(id)
+ ON DELETE RESTRICT
+ ON UPDATE CASCADE;
diff --git a/db/versions/.archive/10617-aquaAralia/00-firstScript.sql b/db/versions/.archive/10617-aquaAralia/00-firstScript.sql
new file mode 100644
index 000000000..a2ddd50a5
--- /dev/null
+++ b/db/versions/.archive/10617-aquaAralia/00-firstScript.sql
@@ -0,0 +1 @@
+CREATE INDEX ticketTracking_created_IDX USING BTREE ON vn.ticketTracking (created);
diff --git a/db/versions/.archive/10618-whiteArborvitae/00-firstScript.sql b/db/versions/.archive/10618-whiteArborvitae/00-firstScript.sql
new file mode 100644
index 000000000..161525ab7
--- /dev/null
+++ b/db/versions/.archive/10618-whiteArborvitae/00-firstScript.sql
@@ -0,0 +1,2 @@
+ALTER TABLE vn.company CHANGE footnotes__ footnotes longtext CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL COMMENT 'pie de paginas en las facturas';
+
diff --git a/db/versions/.archive/10619-chocolateErica/00-firstScript.sql b/db/versions/.archive/10619-chocolateErica/00-firstScript.sql
new file mode 100644
index 000000000..66c626c83
--- /dev/null
+++ b/db/versions/.archive/10619-chocolateErica/00-firstScript.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.expeditionTruck DROP COLUMN ETD;
\ No newline at end of file
diff --git a/db/versions/.archive/10620-azurePalmetto/00-firstScript.sql b/db/versions/.archive/10620-azurePalmetto/00-firstScript.sql
new file mode 100644
index 000000000..34b02f24e
--- /dev/null
+++ b/db/versions/.archive/10620-azurePalmetto/00-firstScript.sql
@@ -0,0 +1,11 @@
+-- Place your SQL code here
+SET @isTriggerDisabled = TRUE;
+
+UPDATE vn.buy
+ SET printedStickers = 0
+ WHERE printedStickers < 0;
+
+ALTER TABLE vn.buy MODIFY COLUMN IF EXISTS
+ printedStickers int(10) unsigned DEFAULT 0 NOT NULL;
+
+SET @isTriggerDisabled = FALSE;
\ No newline at end of file
diff --git a/db/versions/.archive/10624-blueAnthurium/00-firstScript.sql b/db/versions/.archive/10624-blueAnthurium/00-firstScript.sql
new file mode 100644
index 000000000..def992317
--- /dev/null
+++ b/db/versions/.archive/10624-blueAnthurium/00-firstScript.sql
@@ -0,0 +1,142 @@
+ALTER TABLE vn.workerLog
+ MODIFY COLUMN changedModel enum('Worker','workerDocument','Calendar','WorkerTimeControlMail','Business')
+ CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT 'Worker' NOT NULL,
+ MODIFY COLUMN description text CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NULL;
+
+-- Fix description, model and id
+
+UPDATE vn.workerLog SET description = NULL WHERE description = '';
+
+UPDATE vn.workerLog
+ SET changedModel = 'Business'
+ WHERE description LIKE '%del contrato con id%'
+ AND changedModel = '';
+
+UPDATE vn.workerLog
+ SET changedModelId = REGEXP_REPLACE(description, '.*del contrato con id ([0-9]*)$', '\\1')
+ WHERE description LIKE '%del contrato con id%'
+ AND changedModel = 'Business'
+ AND changedModelId = 0;
+
+-- Various fixes
+
+DELETE FROM vn.workerLog
+ WHERE `action` = 'update' AND oldInstance = newInstance;
+
+-- Set instance from description
+
+UPDATE vn.workerLog
+ SET newInstance = JSON_OBJECT('departmentFk',
+ IF((@val := REGEXP_REPLACE(description, 'Cambiado el departamento a (.*) del contrato con id ?[0-9]*', '\\1')) = '',
+ NULL, CAST(@val AS SIGNED)
+ )
+ ),
+ description = NULL
+ WHERE description LIKE 'Cambiado el departamento a %del contrato con id%'
+ AND newInstance IS NULL
+ AND changedModel = 'Business';
+
+UPDATE vn.workerLog
+ SET newInstance = JSON_OBJECT('ended',
+ IF((@val := REGEXP_REPLACE(description, 'Cambiado el Fecha finalización a (.*) del contrato con id ?[0-9]*', '\\1')) = '',
+ NULL, CAST(@val AS SIGNED)
+ )
+ ),
+ description = NULL
+ WHERE description LIKE 'Cambiado el Fecha finalización a %del contrato con id%'
+ AND newInstance IS NULL
+ AND changedModel = 'Business';
+
+UPDATE vn.workerLog
+ SET newInstance = JSON_OBJECT('workcenterFk',
+ IF((@val := REGEXP_REPLACE(description, 'Cambiado el Centro de trabajo a (.*) del contrato con id ?[0-9]*', '\\1')) = '',
+ NULL, CAST(@val AS SIGNED)
+ )
+ ),
+ description = NULL
+ WHERE description LIKE 'Cambiado el Centro de trabajo a %del contrato con id%'
+ AND newInstance IS NULL
+ AND changedModel = 'Business';
+
+UPDATE vn.workerLog
+ SET newInstance = JSON_OBJECT('calendarTypeFk',
+ IF((@val := REGEXP_REPLACE(description, 'Cambiado el Calendario a (.*) del contrato con id ?[0-9]*', '\\1')) = '',
+ NULL, CAST(@val AS SIGNED)
+ )
+ ),
+ description = NULL
+ WHERE description LIKE 'Cambiado el Calendario a %del contrato con id%'
+ AND newInstance IS NULL
+ AND changedModel = 'Business';
+
+UPDATE vn.workerLog
+ SET newInstance = JSON_OBJECT('amount',
+ IF((@val := REGEXP_REPLACE(description, 'Cambiado el importe Pactado a (.*) del contrato con id ?[0-9]*', '\\1')) <> '',
+ CAST(REPLACE(@val, ',', '.') AS DECIMAL(12,2)),
+ NULL
+ )
+ ),
+ description = NULL
+ WHERE description LIKE 'Cambiado el importe Pactado a %del contrato con id%'
+ AND newInstance IS NULL
+ AND changedModel = 'Business';
+
+UPDATE vn.workerLog
+ SET newInstance = JSON_OBJECT('rate',
+ IF((@val := REGEXP_REPLACE(description, 'Cambiado el tarifa a (.*) del contrato con id ?[0-9]*', '\\1')) <> '',
+ CAST(@val AS SIGNED),
+ NULL
+ )
+ ),
+ description = NULL
+ WHERE description LIKE 'Cambiado el tarifa a %del contrato con id%'
+ AND newInstance IS NULL
+ AND changedModel = 'Business';
+
+UPDATE vn.workerLog
+ SET newInstance = JSON_OBJECT('departmentFk',
+ IF((@val := REGEXP_REPLACE(description, 'Ha cambiado el departamento a (.*) del contrato con id ?[0-9]*', '\\1')) <> '',
+ @val,
+ NULL
+ )
+ ),
+ description = NULL
+ WHERE description LIKE 'Ha cambiado el departamento a %del contrato con id%'
+ AND newInstance IS NULL
+ AND changedModel = 'Business';
+
+UPDATE vn.workerLog
+ SET newInstance = JSON_OBJECT('departmentFk',
+ IF((@val := REGEXP_REPLACE(description, 'Ha cambiado el departamento .* a (.*) del contrato con id ?[0-9]*', '\\1')) <> '',
+ @val,
+ NULL
+ )
+ ),
+ oldInstance = JSON_OBJECT('departmentFk',
+ IF((@val := REGEXP_REPLACE(description, 'Ha cambiado el departamento (.*) a .* del contrato con id ?[0-9]*', '\\1')) <> '',
+ @val,
+ NULL
+ )
+ ),
+ description = NULL
+ WHERE description LIKE 'Ha cambiado el departamento % a % del contrato con id%'
+ AND newInstance IS NULL
+ AND changedModel = 'Business';
+
+UPDATE vn.workerLog
+ SET newInstance = JSON_OBJECT('amount',
+ IF((@val := REGEXP_REPLACE(description, 'Ha cambiado el salario de [0-9,]* a ([0-9,]*) del contrato con id ?[0-9]*', '\\1')) <> '',
+ CAST(REPLACE(@val, ',', '.') AS DECIMAL(12,2)),
+ NULL
+ )
+ ),
+ oldInstance = JSON_OBJECT('amount',
+ IF((@val := REGEXP_REPLACE(description, 'Ha cambiado el salario de ([0-9,]*) a [0-9,]* del contrato con id ?[0-9]*', '\\1')) <> '',
+ CAST(REPLACE(@val, ',', '.') AS DECIMAL(12,2)),
+ NULL
+ )
+ ),
+ description = NULL
+ WHERE description LIKE 'Ha cambiado el salario de % a % del contrato con id%'
+ AND newInstance IS NULL
+ AND changedModel = 'Business';
diff --git a/db/versions/.archive/10625-whiteOak/00-firstScript.sql b/db/versions/.archive/10625-whiteOak/00-firstScript.sql
new file mode 100644
index 000000000..5ac2e5978
--- /dev/null
+++ b/db/versions/.archive/10625-whiteOak/00-firstScript.sql
@@ -0,0 +1,3 @@
+RENAME TABLE bs.compradores TO bs.compradores__;
+DROP TABLE bi.analisis_ventas_comprador_evolution;
+
diff --git a/db/versions/.archive/10626-silverRaphis/00-firstScript.sql b/db/versions/.archive/10626-silverRaphis/00-firstScript.sql
new file mode 100644
index 000000000..8fa4af266
--- /dev/null
+++ b/db/versions/.archive/10626-silverRaphis/00-firstScript.sql
@@ -0,0 +1,5 @@
+-- Place your SQL code here
+UPDATE vn.buy b
+ JOIN vn.entryConfig e ON e.defaultEntry = b.entryFk
+ SET b.printedStickers = 0
+ WHERE printedStickers <> 0;
\ No newline at end of file
diff --git a/db/versions/.archive/10628-grayOrchid/00-firstScript.sql b/db/versions/.archive/10628-grayOrchid/00-firstScript.sql
new file mode 100644
index 000000000..020c47177
--- /dev/null
+++ b/db/versions/.archive/10628-grayOrchid/00-firstScript.sql
@@ -0,0 +1 @@
+RENAME TABLE vn2008.Permisos TO vn2008.Permisos__;
\ No newline at end of file
diff --git a/db/versions/.archive/10630-brownMastic/00-firstScript.sql b/db/versions/.archive/10630-brownMastic/00-firstScript.sql
new file mode 100644
index 000000000..caa0b45bc
--- /dev/null
+++ b/db/versions/.archive/10630-brownMastic/00-firstScript.sql
@@ -0,0 +1,38 @@
+
+-- Fix vn.workerLog.changedModel
+
+ALTER TABLE vn.workerLog
+ MODIFY COLUMN changedModel ENUM('Worker','workerDocument','Calendar','WorkerTimeControlMail','Business', 'WorkerDms')
+ CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT 'Worker' NOT NULL;
+
+UPDATE vn.workerLog SET changedModel = 'WorkerDms' WHERE changedModel = 'workerDocument';
+
+ALTER TABLE vn.workerLog
+ MODIFY COLUMN changedModel ENUM('Worker','Calendar','WorkerTimeControlMail','Business', 'WorkerDms')
+ CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT 'Worker' NOT NULL;
+
+-- Fix account.userLog.changedModel
+
+ALTER TABLE account.userLog
+ MODIFY COLUMN changedModel enum('User', 'VnUser', 'Account', 'MailAliasAccount', 'MailForward')
+ CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT 'User' NOT NULL;
+
+UPDATE account.userLog SET changedModel = 'VnUser' WHERE changedModel = 'User';
+
+UPDATE account.userLog u
+ SET changedModel = 'MailForward'
+ WHERE
+ changedModel = ''
+ AND (JSON_VALUE(newInstance, '$.forwardTo') IS NOT NULL
+ OR JSON_VALUE(oldInstance, '$.forwardTo') IS NOT NULL);
+
+UPDATE account.userLog u
+ SET changedModel = 'MailAliasAccount'
+ WHERE
+ changedModel = ''
+ AND (JSON_VALUE(newInstance, '$.mailAlias') IS NOT NULL
+ OR JSON_VALUE(oldInstance, '$.mailAlias') IS NOT NULL);
+
+ALTER TABLE account.userLog
+ MODIFY COLUMN changedModel enum('VnUser', 'Account', 'MailAliasAccount', 'MailForward')
+ CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT 'VnUser' NOT NULL;
diff --git a/db/versions/.archive/10631-yellowBamboo/00-firstScript.sql b/db/versions/.archive/10631-yellowBamboo/00-firstScript.sql
new file mode 100644
index 000000000..391d54860
--- /dev/null
+++ b/db/versions/.archive/10631-yellowBamboo/00-firstScript.sql
@@ -0,0 +1,18 @@
+ALTER TABLE account.roleLog
+ MODIFY COLUMN changedModel enum('Role', 'RoleInherit')
+ CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT 'Role' NOT NULL;
+
+UPDATE account.roleLog SET changedModel = 'RoleInherit'
+ WHERE changedModel = '';
+
+UPDATE account.roleLog
+ SET oldInstance = JSON_REMOVE(oldInstance, '$.modified'),
+ newInstance = JSON_REMOVE(newInstance, '$.modified')
+ WHERE changedModel = 'Role'
+ AND (JSON_VALUE(oldInstance, '$.modified') IS NOT NULL
+ OR JSON_VALUE(newInstance, '$.modified') IS NOT NULL);
+
+DELETE FROM account.roleLog
+ WHERE oldInstance = '{}'
+ AND newInstance = '{}'
+ AND description IS NULL;
diff --git a/db/versions/.archive/10632-wheatPaniculata/00-firstScript.sql b/db/versions/.archive/10632-wheatPaniculata/00-firstScript.sql
new file mode 100644
index 000000000..ec3e42c30
--- /dev/null
+++ b/db/versions/.archive/10632-wheatPaniculata/00-firstScript.sql
@@ -0,0 +1,4 @@
+RENAME TABLE bi.analisis_ventas_familia_evolution TO bi.analisis_ventas_familia_evolution__;
+ALTER TABLE bi.analisis_ventas_familia_evolution__
+COMMENT='refs #5196 Deprecated 2023-06-05';
+
diff --git a/db/versions/.archive/10633-orangeArborvitae/00-firstScript.sql b/db/versions/.archive/10633-orangeArborvitae/00-firstScript.sql
new file mode 100644
index 000000000..f1406f2bc
--- /dev/null
+++ b/db/versions/.archive/10633-orangeArborvitae/00-firstScript.sql
@@ -0,0 +1,2 @@
+-- Place your SQL code here
+ALTER TABLE vn.vehicle MODIFY COLUMN companyFk int(10) unsigned DEFAULT 442 NULL;
diff --git a/db/versions/.archive/10634-pinkCymbidium/00-firstScript.sql b/db/versions/.archive/10634-pinkCymbidium/00-firstScript.sql
new file mode 100644
index 000000000..7ee397ba3
--- /dev/null
+++ b/db/versions/.archive/10634-pinkCymbidium/00-firstScript.sql
@@ -0,0 +1,70 @@
+USE hedera;
+CREATE OR REPLACE TABLE `messageI18n` (
+ `code` CHAR(35) NOT NULL,
+ `lang` char(2) NOT NULL,
+ `description` varchar(255) NOT NULL,
+ PRIMARY KEY (`code`,`lang`),
+ CONSTRAINT `messageI18nFk` FOREIGN KEY (`code`) REFERENCES `hedera`.`message` (`code`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+INSERT IGNORE INTO hedera.message (code, description)
+ VALUES ('clientNotVerified', 'Datos fiscales incompletos, por favor contacte con su comercial');
+
+INSERT IGNORE INTO hedera.messageI18n (code, lang, description)
+ VALUES ('ORDER_DATE_HOLIDAY', 'es', 'No es posible realizar pedidos para días festivos'),
+('ORDER_DATE_HOLIDAY', 'fr', 'Il n''est pas possible de passer des commandes pour les jours fériés'),
+('ORDER_DATE_HOLIDAY', 'pt', 'Não é possível efectuar encomendas para feriados'),
+('ORDER_EMPTY', 'es', 'El pedido esta vacío'),
+('ORDER_EMPTY', 'fr', 'La commande est vide'),
+('ORDER_EMPTY', 'pt', 'A encomenda está vazia'),
+('ORDER_UNAVAILABLE', 'es', 'Algunos artículos ya no están disponibles, verifica las cantidades resaltadas en rojo'),
+('ORDER_UNAVAILABLE', 'fr', 'Certains articles ne sont plus disponibles, veuillez vérifier les quantités surlignées en rouge'),
+('ORDER_UNAVAILABLE', 'pt', 'Alguns artigos já não estão disponíveis, verifique as quantidades assinaladas a vermelho'),
+('SURVEY_MAX_ONE_VOTE', 'es', 'Solo es posible realizar un voto por encuesta'),
+('SURVEY_MAX_ONE_VOTE', 'fr', 'Un seul vote est possible par sondage'),
+('SURVEY_MAX_ONE_VOTE', 'pt', 'Só é possível um voto por sondagem'),
+('ORDER_MAX_EXCEEDED', 'es', 'Has excedido el número máximo de pedidos por confirmar, por favor elimina o confirma los pedidos iniciados'),
+('ORDER_MAX_EXCEEDED', 'fr', 'Vous avez dépassé le nombre maximum de commandes à confirmer, veuillez supprimer ou confirmer les commandes entamées'),
+('ORDER_MAX_EXCEEDED', 'pt', 'Excedeu o número máximo de encomendas a serem confirmadas, por favor apague ou confirme as encomendas iniciadas'),
+('LOGIN_INCORRECT', 'es', 'Usuario o contraseña incorrectos. Recuerda que se hace distinción entre mayúsculas y minúsculas.'),
+('LOGIN_INCORRECT', 'fr', 'Nom d''utilisateur ou mot de passe incorrect. N''oubliez pas que nous respectons les majuscules et les minuscules'),
+('LOGIN_INCORRECT', 'pt', 'Nome de utilizador ou palavra-passe incorrectos. Lembre-se que somos sensíveis às maiúsculas e minúsculas'),
+('ORDER_DATE_PAST', 'es', 'La fecha de su pedido debe ser mayor o igual al día de hoy'),
+('ORDER_DATE_PAST', 'fr', 'La date de votre commande doit être supérieure ou égale à la date d''aujourd''hui'),
+('ORDER_DATE_PAST', 'pt', 'A data da sua encomenda deve ser maior ou igual à data de hoje'),
+('ORDER_DATE_LAST', 'es', 'No es posible realizar más para hoy, por favor atrasa la fecha de tu pedido a mañana o días posteriores'),
+('ORDER_DATE_LAST', 'fr', 'Il n''est plus possible de passer des commandes pour aujourd''hui, veuillez reporter la date de votre commande à demain ou plus tard'),
+('ORDER_DATE_LAST', 'pt', 'Não é possível efectuar mais encomendas para hoje, por favor adie a data da sua encomenda para amanhã ou mais tarde'),
+('ORDER_DATE_SUNDAY', 'es', 'No es posible confirmar pedidos para Domingo'),
+('ORDER_DATE_SUNDAY', 'fr', 'Il n''est pas possible de confirmer les commandes pour le dimanche'),
+('ORDER_DATE_SUNDAY', 'pt', 'Não é possível confirmar encomendas para domingo'),
+('ORDER_DATE_SATURATED', 'es', 'Estamos saturados de pedidos, por favor selecciona otra fecha de envío o recogida '),
+('ORDER_DATE_SATURATED', 'fr', 'Nous sommes surchargés de commandes, veuillez choisir une autre date de livraison ou d''enlèvement'),
+('ORDER_DATE_SATURATED', 'pt', 'Estamos sobrecarregados com encomendas, por favor seleccione outra data de entrega ou recolha'),
+('USER_DISCONNECTED', 'es', 'Has sido desconectado del servidor, por favor vuelve a iniciar sesión'),
+('USER_DISCONNECTED', 'fr', 'Vous avez été déconnecté du serveur, veuillez vous connecter à nouveau'),
+('USER_DISCONNECTED', 'pt', 'Foi desligado do servidor, por favor inicie novamente a sessão'),
+('UNAUTH_ACTION', 'es', 'Acción no permitida'),
+('UNAUTH_ACTION', 'fr', 'Action non autorisée'),
+('UNAUTH_ACTION', 'pt', 'Acção não permitida'),
+('ORDER_INVALID_AGENCY', 'es', 'La agencia de envío no es válida'),
+('ORDER_INVALID_AGENCY', 'fr', 'L''agence de livraison n''est pas valide'),
+('ORDER_INVALID_AGENCY', 'pt', 'A agência de expedição é inválida'),
+('ORDER_EMPTY_ADDRESS', 'es', 'Selecciona una dirección de envío'),
+('ORDER_EMPTY_ADDRESS', 'fr', 'Veuillez sélectionner une adresse de livraison'),
+('ORDER_EMPTY_ADDRESS', 'pt', 'Por favor, seleccione um endereço de entrega'),
+('ORDER_AMOUNT_ROUNDED', 'es', 'Este artículo se vende agrupado y la cantidad ha sido redondeada'),
+('ORDER_AMOUNT_ROUNDED', 'fr', 'Cet article est vendu groupé et la quantité a été arrondie'),
+('ORDER_AMOUNT_ROUNDED', 'pt', 'Este artigo é vendido em pacote e a quantidade foi arredondada'),
+('orderOutdated', 'es', 'La configuración del pedido es incorrecta, por favor vuelve a configurarlo para continuar comprando'),
+('orderOutdated', 'fr', 'La configuration de la commande est incorrecte, veuillez la reconfigurer pour poursuivre vos achats'),
+('orderOutdated', 'pt', 'A configuração da encomenda está incorrecta, por favor reconfigure-a para continuar a comprar'),
+('orderNotOwnedByUser', 'es', 'El pedido pertenece a otro usuario'),
+('orderNotOwnedByUser', 'fr', 'La commande appartient à un autre utilisateur'),
+('orderNotOwnedByUser', 'pt', 'A encomenda pertence a outro utilizador'),
+('orderConfirmed', 'es', 'El pedido ya ha sido confirmado y no puede modificarse'),
+('orderConfirmed', 'fr', 'La commande a déjà été confirmée et ne peut être modifiée'),
+('orderConfirmed', 'pt', 'A encomenda já foi confirmada e não pode ser modificada'),
+('clientNotVerified', 'es', 'Datos fiscales incompletos, por favor contacte con su comercial'),
+('clientNotVerified', 'fr', 'Données fiscales incomplètes, veuillez contacter votre représentant commercial'),
+('clientNotVerified', 'pt', 'Dados fiscais incompletos, por favor contacte o seu representante de vendas');
diff --git a/db/versions/.archive/10637-yellowAspidistra/00-firstScript.sql b/db/versions/.archive/10637-yellowAspidistra/00-firstScript.sql
new file mode 100644
index 000000000..ec633f4a2
--- /dev/null
+++ b/db/versions/.archive/10637-yellowAspidistra/00-firstScript.sql
@@ -0,0 +1,17 @@
+RENAME TABLE bi.live_counter TO bi.live_counter__;
+ALTER TABLE bi.live_counter__
+COMMENT='refs #5744 Deprecated 2023-06-06';
+RENAME TABLE bi.partitioning_information TO bi.partitioning_information__;
+ALTER TABLE bi.partitioning_information__
+COMMENT='refs #5744 Deprecated 2023-06-06';
+RENAME TABLE bi.primer_pedido TO bi.primer_pedido__;
+ALTER TABLE bi.primer_pedido__
+COMMENT='refs #5744 Deprecated 2023-06-06';
+RENAME TABLE bi.tarifa_premisas TO bi.tarifa_premisas__;
+ALTER TABLE bi.tarifa_premisas__
+COMMENT='refs #5744 Deprecated 2023-06-06';
+RENAME TABLE bi.tarifa_warehouse TO bi.tarifa_warehouse__;
+ALTER TABLE bi.tarifa_warehouse__
+COMMENT='refs #5744 Deprecated 2023-06-06
+Almacena los valores de gasto por almacen';
+
diff --git a/db/versions/.archive/10640-redPalmetto/00-companyFkDrop.sql b/db/versions/.archive/10640-redPalmetto/00-companyFkDrop.sql
new file mode 100644
index 000000000..b6345086e
--- /dev/null
+++ b/db/versions/.archive/10640-redPalmetto/00-companyFkDrop.sql
@@ -0,0 +1,36 @@
+ALTER TABLE bs.sale DROP FOREIGN KEY IF EXISTS saleCompany_Fk;
+ALTER TABLE edi.clientFHAdminNumber DROP FOREIGN KEY IF EXISTS clientFHAdminNumber_fk;
+ALTER TABLE hedera.orderConfig DROP FOREIGN KEY IF EXISTS orderConfigCompany_Fk;
+ALTER TABLE vn.business DROP FOREIGN KEY IF EXISTS business_companyCodeFk;
+ALTER TABLE vn.clientRisk DROP FOREIGN KEY IF EXISTS clientRiskCompany_Fk;
+ALTER TABLE vn.clientSample DROP FOREIGN KEY IF EXISTS clientSampleCompany_Fk;
+ALTER TABLE vn.cmr DROP FOREIGN KEY IF EXISTS cmrCompany_Fk;
+ALTER TABLE vn.companyI18n DROP FOREIGN KEY IF EXISTS companyI18nCompany_Fk;
+ALTER TABLE vn.dms DROP FOREIGN KEY IF EXISTS dmsCompany_Fk;
+ALTER TABLE vn.dua DROP FOREIGN KEY IF EXISTS duaCompany_Fk;
+ALTER TABLE vn.entry DROP FOREIGN KEY IF EXISTS entryCompany_Fk;
+ALTER TABLE vn.farming DROP FOREIGN KEY IF EXISTS farmingCompany_Fk;
+ALTER TABLE vn.host DROP FOREIGN KEY IF EXISTS hostCompany_Fk;
+ALTER TABLE vn.invoiceIn DROP FOREIGN KEY IF EXISTS invoiceInCompany_Fk;
+ALTER TABLE vn.invoiceOut DROP FOREIGN KEY IF EXISTS invoiceOutCompany_Fk;
+ALTER TABLE vn.mandate DROP FOREIGN KEY IF EXISTS mandateCompany_Fk;
+ALTER TABLE vn.payment DROP FOREIGN KEY IF EXISTS paymentCompany_Fk;
+ALTER TABLE vn.ppe DROP FOREIGN KEY IF EXISTS ppeCompany_Fk;
+ALTER TABLE vn.project DROP FOREIGN KEY IF EXISTS projectCompany_Fk;
+ALTER TABLE vn.property DROP FOREIGN KEY IF EXISTS propertyCompany_Fk;
+ALTER TABLE vn.receipt DROP FOREIGN KEY IF EXISTS receiptCompany_Fk;
+ALTER TABLE vn.routeConfig DROP FOREIGN KEY IF EXISTS routeConfigCompany_Fk;
+ALTER TABLE vn.sinister DROP FOREIGN KEY IF EXISTS sinisterCompany_Fk;
+ALTER TABLE vn.supplierExpense DROP FOREIGN KEY IF EXISTS supplierExpenseCompany_Fk;
+ALTER TABLE vn.ticket DROP FOREIGN KEY IF EXISTS ticketCompany_Fk;
+ALTER TABLE vn.vehicle DROP FOREIGN KEY IF EXISTS vehicleCompany_Fk;
+ALTER TABLE vn.XDiario DROP FOREIGN KEY IF EXISTS XDiarioCompany_Fk;
+ALTER TABLE vn2008.albaran DROP FOREIGN KEY IF EXISTS albaranCompany_Fk;
+ALTER TABLE vn2008.Bancos_poliza DROP FOREIGN KEY IF EXISTS Bancos_polizaCompany_Fk;
+ALTER TABLE vn2008.Clientes_empresa DROP FOREIGN KEY IF EXISTS Clientes_empresaCompany_Fk;
+ALTER TABLE vn2008.`Enlaces Facturas__` DROP FOREIGN KEY IF EXISTS EnlacesFacturas__Company_Fk;
+ALTER TABLE vn2008.pago_sdc DROP FOREIGN KEY IF EXISTS pago_sdcCompany_Fk;
+ALTER TABLE vn2008.Permisos__ DROP FOREIGN KEY IF EXISTS PermisosCompany_Fk;
+ALTER TABLE vn2008.Remesas DROP FOREIGN KEY IF EXISTS RemesasCompany_Fk;
+ALTER TABLE vn2008.Saldos_Prevision DROP FOREIGN KEY IF EXISTS Saldos_PrevisionCompany_Fk;
+ALTER TABLE vn.company DROP FOREIGN KEY IF EXISTS company_Fk;
diff --git a/db/versions/.archive/10640-redPalmetto/01-companyFkAi.sql b/db/versions/.archive/10640-redPalmetto/01-companyFkAi.sql
new file mode 100644
index 000000000..e04206667
--- /dev/null
+++ b/db/versions/.archive/10640-redPalmetto/01-companyFkAi.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.company MODIFY COLUMN id INT UNSIGNED auto_increment NOT NULL;
diff --git a/db/versions/.archive/10640-redPalmetto/02-companyFkCreate.sql b/db/versions/.archive/10640-redPalmetto/02-companyFkCreate.sql
new file mode 100644
index 000000000..086dcb18c
--- /dev/null
+++ b/db/versions/.archive/10640-redPalmetto/02-companyFkCreate.sql
@@ -0,0 +1,32 @@
+ALTER TABLE hedera.`orderConfig` ADD CONSTRAINT `orderConfigCompany_Fk` FOREIGN KEY IF NOT EXISTS (defaultCompanyFk) REFERENCES vn.company(id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`project` ADD CONSTRAINT `projectCompany_Fk` FOREIGN KEY IF NOT EXISTS (companyFk) REFERENCES vn.company (id) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE vn.`vehicle` ADD CONSTRAINT `vehicleCompany_Fk` FOREIGN KEY IF NOT EXISTS (companyFk) REFERENCES vn.company (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`routeConfig` ADD CONSTRAINT `routeConfigCompany_Fk` FOREIGN KEY IF NOT EXISTS (defaultCompanyFk) REFERENCES vn.company (id) ON DELETE RESTRICT ON UPDATE RESTRICT;
+ALTER TABLE vn.`entry` ADD CONSTRAINT `entryCompany_Fk` FOREIGN KEY IF NOT EXISTS (companyFk) REFERENCES vn.company (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`payment` ADD CONSTRAINT `paymentCompany_Fk` FOREIGN KEY IF NOT EXISTS (companyFk) REFERENCES vn.company (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`receipt` ADD CONSTRAINT `receiptCompany_Fk` FOREIGN KEY IF NOT EXISTS (companyFk) REFERENCES vn.company (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`invoiceIn` ADD CONSTRAINT `invoiceInCompany_Fk` FOREIGN KEY IF NOT EXISTS (companyFk) REFERENCES vn.company (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`sinister` ADD CONSTRAINT `sinisterCompany_Fk` FOREIGN KEY IF NOT EXISTS (companyFk) REFERENCES vn.company (id) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE vn.`supplierExpense` ADD CONSTRAINT `supplierExpenseCompany_Fk` FOREIGN KEY IF NOT EXISTS (companyFk) REFERENCES vn.company (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`ticket` ADD CONSTRAINT `ticketCompany_Fk` FOREIGN KEY IF NOT EXISTS (companyFk) REFERENCES vn.company (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`mandate` ADD CONSTRAINT `mandateCompany_Fk` FOREIGN KEY IF NOT EXISTS (companyFk) REFERENCES vn.company (id) ON DELETE NO ACTION ON UPDATE CASCADE;
+ALTER TABLE vn.`XDiario` ADD CONSTRAINT `XDiarioCompany_Fk` FOREIGN KEY IF NOT EXISTS (empresa_id) REFERENCES vn.company (id) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE vn.`dms` ADD CONSTRAINT `dmsCompany_Fk` FOREIGN KEY IF NOT EXISTS (companyFk) REFERENCES vn.company (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`property` ADD CONSTRAINT `propertyCompany_Fk` FOREIGN KEY IF NOT EXISTS (companyFk) REFERENCES vn.company (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`cmr` ADD CONSTRAINT `cmrCompany_Fk` FOREIGN KEY IF NOT EXISTS (companyFk) REFERENCES vn.company (id) ON DELETE SET NULL ON UPDATE CASCADE;
+ALTER TABLE vn.`host` ADD CONSTRAINT `hostCompany_Fk` FOREIGN KEY IF NOT EXISTS (companyFk) REFERENCES vn.company (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`clientRisk` ADD CONSTRAINT `clientRiskCompany_Fk` FOREIGN KEY IF NOT EXISTS (companyFk) REFERENCES vn.company (id) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE vn.`ppe` ADD CONSTRAINT `ppeCompany_Fk` FOREIGN KEY IF NOT EXISTS (companyFk) REFERENCES vn.company (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+-- ALTER TABLE vn.`invoiceOut` ADD CONSTRAINT `invoiceOutCompany_Fk` FOREIGN KEY IF NOT EXISTS (companyFk) REFERENCES vn.company (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`dua` ADD CONSTRAINT `duaCompany_Fk` FOREIGN KEY IF NOT EXISTS (companyFk) REFERENCES vn.company (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`clientSample` ADD CONSTRAINT `clientSampleCompany_Fk` FOREIGN KEY IF NOT EXISTS (companyFk) REFERENCES vn.company (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn2008.`Saldos_Prevision` ADD CONSTRAINT `Saldos_PrevisionCompany_Fk` FOREIGN KEY IF NOT EXISTS (empresa_id) REFERENCES vn.company (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn2008.`pago_sdc` ADD CONSTRAINT `pago_sdcCompany_Fk` FOREIGN KEY IF NOT EXISTS (empresa_id) REFERENCES vn.company (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn2008.`Clientes_empresa` ADD CONSTRAINT `Clientes_empresaCompany_Fk` FOREIGN KEY IF NOT EXISTS (empresa_id) REFERENCES vn.company (id) ON DELETE NO ACTION ON UPDATE RESTRICT;
+ALTER TABLE vn2008.`Bancos_poliza` ADD CONSTRAINT `Bancos_polizaCompany_Fk` FOREIGN KEY IF NOT EXISTS (empresa_id) REFERENCES vn.company (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn2008.`albaran` ADD CONSTRAINT `albaranCompany_Fk` FOREIGN KEY IF NOT EXISTS (empresa_id) REFERENCES vn.company (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn2008.`Remesas` ADD CONSTRAINT `RemesasCompany_Fk` FOREIGN KEY IF NOT EXISTS (empresa_id) REFERENCES vn.company (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn2008.`Enlaces Facturas__` ADD CONSTRAINT `EnlacesFacturas__Company_Fk` FOREIGN KEY IF NOT EXISTS (empresa_id) REFERENCES vn.company (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE bs.`sale` ADD CONSTRAINT `saleCompany_Fk` FOREIGN KEY IF NOT EXISTS (companyFk) REFERENCES vn.company (id) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE vn.`farming` ADD CONSTRAINT `farmingCompany_Fk` FOREIGN KEY IF NOT EXISTS(companyFk) REFERENCES vn.company(id) ON DELETE RESTRICT ON UPDATE RESTRICT;
+ALTER TABLE vn.`companyI18n` ADD CONSTRAINT `companyI18nCompany_Fk` FOREIGN KEY IF NOT EXISTS(companyFk) REFERENCES vn.company(id) ON DELETE RESTRICT ON UPDATE CASCADE;
diff --git a/db/versions/.archive/10640-redPalmetto/04-supplierFkDrop.sql b/db/versions/.archive/10640-redPalmetto/04-supplierFkDrop.sql
new file mode 100644
index 000000000..377198fd5
--- /dev/null
+++ b/db/versions/.archive/10640-redPalmetto/04-supplierFkDrop.sql
@@ -0,0 +1,26 @@
+ALTER TABLE vn.`budget` DROP FOREIGN KEY IF EXISTS `budgetSupplier_Fk`;
+ALTER TABLE vn.`supplierContact` DROP FOREIGN KEY IF EXISTS `supplierContactSupplier_Fk`;
+ALTER TABLE vn.`entry` DROP FOREIGN KEY IF EXISTS `entrySupplier_Fk`;
+ALTER TABLE vn.`payment` DROP FOREIGN KEY IF EXISTS `paymentSupplier_Fk`;
+ALTER TABLE vn.`travelClonedWeekly` DROP FOREIGN KEY IF EXISTS `travelClonedWeeklySupplier_Fk`;
+ALTER TABLE vn.`invoiceIn` DROP FOREIGN KEY IF EXISTS `invoiceInSupplier_Fk`;
+ALTER TABLE vn.`sinister` DROP FOREIGN KEY IF EXISTS `sinisterSupplier_Fk`;
+ALTER TABLE vn.`company` DROP FOREIGN KEY IF EXISTS `company_FK`;
+ALTER TABLE vn.`comparativeFilter` DROP FOREIGN KEY IF EXISTS `comparativeFilterSupplier_Fk`;
+ALTER TABLE vn.`supplierExpense` DROP FOREIGN KEY IF EXISTS `supplierExpenseSupplier_Fk`;
+ALTER TABLE vn.`supplierAccount` DROP FOREIGN KEY IF EXISTS `supplierAccountSupplier_Fk`;
+ALTER TABLE vn.`roadmap` DROP FOREIGN KEY IF EXISTS `roadmapSupplier_Fk`;
+ALTER TABLE vn.`awb` DROP FOREIGN KEY IF EXISTS `awbSupplier_Fk`;
+ALTER TABLE vn.`awb` DROP FOREIGN KEY IF EXISTS `awbSupplier_Fk`;
+ALTER TABLE vn.`supplierLog` DROP FOREIGN KEY IF EXISTS `supplierLogSupplier_Fk`;
+ALTER TABLE vn.`cmr` DROP FOREIGN KEY IF EXISTS `cmrSupplier_Fk`;
+ALTER TABLE vn.`duaTax` DROP FOREIGN KEY IF EXISTS `duaTaxSupplier_Fk`;
+ALTER TABLE vn.`supplierAgencyTerm` DROP FOREIGN KEY IF EXISTS `supplierAgencyTermSupplier_Fk`;
+ALTER TABLE vn.`machine` DROP FOREIGN KEY IF EXISTS `machineSupplier_Fk`;
+ALTER TABLE vn2008.`travel_pattern` DROP FOREIGN KEY IF EXISTS `travel_patternSupplier_Fk`;
+ALTER TABLE vn2008.`Bancos_poliza` DROP FOREIGN KEY IF EXISTS `Bancos_polizaSupplier_Fk`;
+ALTER TABLE vn2008.`Bancos_poliza` DROP FOREIGN KEY IF EXISTS `Bancos_polizaSupplier_Fk1`;
+ALTER TABLE vn2008.`Vehiculos_consumo` DROP FOREIGN KEY IF EXISTS `Vehiculos_consumoSupplier_Fk`;
+ALTER TABLE vn2008.`albaran` DROP FOREIGN KEY IF EXISTS `albaranSupplier_Fk`;
+ALTER TABLE vn2008.`Proveedores_cargueras` DROP FOREIGN KEY IF EXISTS `Proveedores_carguerasSupplier_Fk`;
+ALTER TABLE vn2008.`Proveedores_comunicados` DROP FOREIGN KEY IF EXISTS `Proveedores_comunicadosSupplier_Fk`;
diff --git a/db/versions/.archive/10640-redPalmetto/05-supplierFkAi.sql b/db/versions/.archive/10640-redPalmetto/05-supplierFkAi.sql
new file mode 100644
index 000000000..94cf0d815
--- /dev/null
+++ b/db/versions/.archive/10640-redPalmetto/05-supplierFkAi.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.supplier MODIFY COLUMN id INT UNSIGNED auto_increment NOT NULL ;
diff --git a/db/versions/.archive/10640-redPalmetto/06-supplierFkCreate.sql b/db/versions/.archive/10640-redPalmetto/06-supplierFkCreate.sql
new file mode 100644
index 000000000..a5ad7a629
--- /dev/null
+++ b/db/versions/.archive/10640-redPalmetto/06-supplierFkCreate.sql
@@ -0,0 +1,26 @@
+ALTER TABLE vn.`budget` ADD CONSTRAINT `budget_supplierFk` FOREIGN KEY IF NOT EXISTS (supplierFk) REFERENCES vn.supplier (id) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE vn.`supplierContact` ADD CONSTRAINT `supplierContact_supplierFk` FOREIGN KEY IF NOT EXISTS (supplierFk) REFERENCES vn.supplier (id) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE vn.`entry` ADD CONSTRAINT `entry_supplierFk` FOREIGN KEY IF NOT EXISTS (supplierFk) REFERENCES vn.supplier (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`payment` ADD CONSTRAINT `payment_supplierFk` FOREIGN KEY IF NOT EXISTS (supplierFk) REFERENCES vn.supplier (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`travelClonedWeekly` ADD CONSTRAINT `travelClonedWeekly_supplierFk` FOREIGN KEY IF NOT EXISTS (supplierFk) REFERENCES vn.supplier (id) ON DELETE SET NULL ON UPDATE CASCADE;
+ALTER TABLE vn.`invoiceIn` ADD CONSTRAINT `invoiceIn_supplierFk` FOREIGN KEY IF NOT EXISTS (supplierFk) REFERENCES vn.supplier (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`sinister` ADD CONSTRAINT `sinister_supplierFk` FOREIGN KEY IF NOT EXISTS (supplierFk) REFERENCES vn.supplier (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`company` ADD CONSTRAINT company_supplierFk FOREIGN KEY IF NOT EXISTS (id) REFERENCES vn.supplier(id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`comparativeFilter` ADD CONSTRAINT `comparativeFilter_supplierFk` FOREIGN KEY IF NOT EXISTS (supplierFk) REFERENCES vn.supplier (id) ON DELETE RESTRICT ON UPDATE RESTRICT;
+ALTER TABLE vn.`supplierExpense` ADD CONSTRAINT `supplierExpense_supplierFk` FOREIGN KEY IF NOT EXISTS (supplierFk) REFERENCES vn.supplier (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`supplierAccount` ADD CONSTRAINT `supplierAccount_supplierFk` FOREIGN KEY IF NOT EXISTS (supplierFk) REFERENCES vn.supplier (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`roadmap` ADD CONSTRAINT `roadmap_supplierFk` FOREIGN KEY IF NOT EXISTS (supplierFk) REFERENCES vn.supplier (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`awb` ADD CONSTRAINT `awb_supplierFk` FOREIGN KEY IF NOT EXISTS (transitoryFk) REFERENCES vn.supplier (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`awb` ADD CONSTRAINT `awb_supplierFk` FOREIGN KEY IF NOT EXISTS (freightFk) REFERENCES vn.supplier (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`supplierLog` ADD CONSTRAINT `supplierLog_supplierFk` FOREIGN KEY IF NOT EXISTS (originFk) REFERENCES vn.supplier (id) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE vn.`cmr` ADD CONSTRAINT `cmr_supplierFk` FOREIGN KEY IF NOT EXISTS (supplierFk) REFERENCES vn.supplier (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`duaTax` ADD CONSTRAINT `duaTax_supplierFk` FOREIGN KEY IF NOT EXISTS (supplierFk) REFERENCES vn.supplier (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`supplierAgencyTerm` ADD CONSTRAINT `supplierAgencyTerm_supplierFk` FOREIGN KEY IF NOT EXISTS (supplierFk) REFERENCES vn.supplier (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.`machine` ADD CONSTRAINT `machine_supplierFk` FOREIGN KEY IF NOT EXISTS (supplierFk) REFERENCES vn.supplier (id) ON DELETE SET NULL ON UPDATE CASCADE;
+ALTER TABLE vn2008.`travel_pattern` ADD CONSTRAINT `travel_pattern_supplierFk` FOREIGN KEY IF NOT EXISTS (cargoSupplierFk) REFERENCES vn.supplier (id) ON DELETE SET NULL ON UPDATE CASCADE;
+ALTER TABLE vn2008.`Bancos_poliza` ADD CONSTRAINT `Bancos_poliza_notaryFk` FOREIGN KEY IF NOT EXISTS (notaryFk) REFERENCES vn.supplier (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn2008.`Bancos_poliza` ADD CONSTRAINT `Bancos_poliza_supplierFk` FOREIGN KEY IF NOT EXISTS (supplierFk) REFERENCES vn.supplier (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn2008.`Vehiculos_consumo` ADD CONSTRAINT `Vehiculos_consumo_supplierFk` FOREIGN KEY IF NOT EXISTS (proveedoresFk) REFERENCES vn.supplier (id) ON DELETE NO ACTION ON UPDATE NO ACTION;
+ALTER TABLE vn2008.`albaran` ADD CONSTRAINT `albaran_supplierFk` FOREIGN KEY IF NOT EXISTS (Id_Proveedor) REFERENCES vn.supplier (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn2008.`Proveedores_cargueras` ADD CONSTRAINT `Proveedores_cargueras_supplierFk` FOREIGN KEY IF NOT EXISTS (Id_Proveedor) REFERENCES vn.supplier (id) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE vn2008.`Proveedores_comunicados` ADD CONSTRAINT `Proveedores_comunicados_supplierFk` FOREIGN KEY IF NOT EXISTS (Id_Proveedor) REFERENCES vn.supplier (id) ON DELETE RESTRICT ON UPDATE CASCADE;
diff --git a/db/versions/.archive/10642-crimsonAspidistra/00-firstScript.sql b/db/versions/.archive/10642-crimsonAspidistra/00-firstScript.sql
new file mode 100644
index 000000000..a1a0e1721
--- /dev/null
+++ b/db/versions/.archive/10642-crimsonAspidistra/00-firstScript.sql
@@ -0,0 +1,303 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`json_cleanEquals`(vA JSON, vB JSON)
+ RETURNS JSON
+ DETERMINISTIC
+BEGIN
+/**
+* Cleans @vA instance removing nulls and keys whose values are the same.
+*
+* @param vA JSON containing the old values
+* @param vB JSON containing the new values
+*/
+ DECLARE vKeys JSON;
+ DECLARE vPath VARCHAR(255);
+ DECLARE vValueA JSON;
+ DECLARE vValueB JSON;
+ DECLARE i INT DEFAULT 0;
+ DECLARE vCount INT;
+
+ IF vA IS NULL OR vB IS NULL THEN
+ RETURN vA;
+ END IF;
+
+ SET vKeys = JSON_KEYS(vB);
+ SET vCount = JSON_LENGTH(vKeys);
+
+ WHILE i < vCount DO
+ SET vPath = CONCAT('$.', JSON_VALUE(vKeys, CONCAT('$[',i,']')));
+ SET vValueA = JSON_EXTRACT(vA, vPath);
+ SET vValueB = JSON_EXTRACT(vB, vPath);
+ IF vValueA <=> vValueB THEN
+ SET vA = JSON_REMOVE(vA, vPath);
+ END IF;
+ SET i := i + 1;
+ END WHILE;
+
+ RETURN vA;
+END$$
+DELIMITER ;
+
+
+-- Aplicar a todas las tablas log
+
+-- ticketLog
+UPDATE vn.ticketLog
+ SET oldInstance = util.json_cleanEquals(@oldI := oldInstance, newInstance),
+ newInstance = util.json_cleanEquals(newInstance, @oldI)
+ WHERE `action` = 'update';
+
+UPDATE vn.ticketLog
+ SET oldInstance = util.json_removeNulls(oldInstance)
+ WHERE `action` = 'delete'
+ AND oldInstance IS NOT NULL
+ AND NOT (oldInstance <=> util.json_removeNulls(oldInstance));
+
+UPDATE vn.ticketLog
+ SET newInstance = util.json_removeNulls(newInstance)
+ WHERE `action` = 'insert'
+ AND newInstance IS NOT NULL
+ AND NOT (newInstance <=> util.json_removeNulls(newInstance));
+
+OPTIMIZE TABLE vn.ticketLog;
+
+-- entryLog
+UPDATE vn.entryLog
+ SET oldInstance = util.json_cleanEquals(@oldI := oldInstance, newInstance),
+ newInstance = util.json_cleanEquals(newInstance, @oldI)
+ WHERE `action` = 'update';
+
+UPDATE vn.entryLog
+ SET oldInstance = util.json_removeNulls(oldInstance)
+ WHERE `action` = 'delete'
+ AND oldInstance IS NOT NULL
+ AND NOT (oldInstance <=> util.json_removeNulls(oldInstance));
+
+UPDATE vn.entryLog
+ SET newInstance = util.json_removeNulls(newInstance)
+ WHERE `action` = 'insert'
+ AND newInstance IS NOT NULL
+ AND NOT (newInstance <=> util.json_removeNulls(newInstance));
+
+OPTIMIZE TABLE vn.entryLog;
+
+-- itemLog
+UPDATE vn.itemLog
+ SET oldInstance = util.json_cleanEquals(@oldI := oldInstance, newInstance),
+ newInstance = util.json_cleanEquals(newInstance, @oldI)
+ WHERE `action` = 'update';
+
+UPDATE vn.itemLog
+ SET oldInstance = util.json_removeNulls(oldInstance)
+ WHERE `action` = 'delete'
+ AND oldInstance IS NOT NULL
+ AND NOT (oldInstance <=> util.json_removeNulls(oldInstance));
+
+UPDATE vn.itemLog
+ SET newInstance = util.json_removeNulls(newInstance)
+ WHERE `action` = 'insert'
+ AND newInstance IS NOT NULL
+ AND NOT (newInstance <=> util.json_removeNulls(newInstance));
+
+OPTIMIZE TABLE vn.itemLog;
+
+-- routeLog
+UPDATE vn.routeLog
+ SET oldInstance = util.json_cleanEquals(@oldI := oldInstance, newInstance),
+ newInstance = util.json_cleanEquals(newInstance, @oldI)
+ WHERE `action` = 'update';
+
+UPDATE vn.routeLog
+ SET oldInstance = util.json_removeNulls(oldInstance)
+ WHERE `action` = 'delete'
+ AND oldInstance IS NOT NULL
+ AND NOT (oldInstance <=> util.json_removeNulls(oldInstance));
+
+UPDATE vn.routeLog
+ SET newInstance = util.json_removeNulls(newInstance)
+ WHERE `action` = 'insert'
+ AND newInstance IS NOT NULL
+ AND NOT (newInstance <=> util.json_removeNulls(newInstance));
+
+OPTIMIZE TABLE vn.routeLog;
+
+-- travelLog
+UPDATE vn.travelLog
+ SET oldInstance = util.json_cleanEquals(@oldI := oldInstance, newInstance),
+ newInstance = util.json_cleanEquals(newInstance, @oldI)
+ WHERE `action` = 'update';
+
+UPDATE vn.travelLog
+ SET oldInstance = util.json_removeNulls(oldInstance)
+ WHERE `action` = 'delete'
+ AND oldInstance IS NOT NULL
+ AND NOT (oldInstance <=> util.json_removeNulls(oldInstance));
+
+UPDATE vn.travelLog
+ SET newInstance = util.json_removeNulls(newInstance)
+ WHERE `action` = 'insert'
+ AND newInstance IS NOT NULL
+ AND NOT (newInstance <=> util.json_removeNulls(newInstance));
+
+OPTIMIZE TABLE vn.travelLog;
+
+-- zoneLog
+UPDATE vn.zoneLog
+ SET oldInstance = util.json_cleanEquals(@oldI := oldInstance, newInstance),
+ newInstance = util.json_cleanEquals(newInstance, @oldI)
+ WHERE `action` = 'update';
+
+UPDATE vn.zoneLog
+ SET oldInstance = util.json_removeNulls(oldInstance)
+ WHERE `action` = 'delete'
+ AND oldInstance IS NOT NULL
+ AND NOT (oldInstance <=> util.json_removeNulls(oldInstance));
+
+UPDATE vn.zoneLog
+ SET newInstance = util.json_removeNulls(newInstance)
+ WHERE `action` = 'insert'
+ AND newInstance IS NOT NULL
+ AND NOT (newInstance <=> util.json_removeNulls(newInstance));
+
+OPTIMIZE TABLE vn.zoneLog;
+
+-- clientLog
+UPDATE vn.clientLog
+ SET oldInstance = util.json_cleanEquals(@oldI := oldInstance, newInstance),
+ newInstance = util.json_cleanEquals(newInstance, @oldI)
+ WHERE `action` = 'update';
+
+UPDATE vn.clientLog
+ SET oldInstance = util.json_removeNulls(oldInstance)
+ WHERE `action` = 'delete'
+ AND oldInstance IS NOT NULL
+ AND NOT (oldInstance <=> util.json_removeNulls(oldInstance));
+
+UPDATE vn.clientLog
+ SET newInstance = util.json_removeNulls(newInstance)
+ WHERE `action` = 'insert'
+ AND newInstance IS NOT NULL
+ AND NOT (newInstance <=> util.json_removeNulls(newInstance));
+
+OPTIMIZE TABLE vn.clientLog;
+
+-- workerLog
+UPDATE vn.workerLog
+ SET oldInstance = util.json_cleanEquals(@oldI := oldInstance, newInstance),
+ newInstance = util.json_cleanEquals(newInstance, @oldI)
+ WHERE `action` = 'update';
+
+UPDATE vn.workerLog
+ SET oldInstance = util.json_removeNulls(oldInstance)
+ WHERE `action` = 'delete'
+ AND oldInstance IS NOT NULL
+ AND NOT (oldInstance <=> util.json_removeNulls(oldInstance));
+
+UPDATE vn.workerLog
+ SET newInstance = util.json_removeNulls(newInstance)
+ WHERE `action` = 'insert'
+ AND newInstance IS NOT NULL
+ AND NOT (newInstance <=> util.json_removeNulls(newInstance));
+
+OPTIMIZE TABLE vn.workerLog;
+
+-- claimLog
+UPDATE vn.claimLog
+ SET oldInstance = util.json_cleanEquals(@oldI := oldInstance, newInstance),
+ newInstance = util.json_cleanEquals(newInstance, @oldI)
+ WHERE `action` = 'update';
+
+UPDATE vn.claimLog
+ SET oldInstance = util.json_removeNulls(oldInstance)
+ WHERE `action` = 'delete'
+ AND oldInstance IS NOT NULL
+ AND NOT (oldInstance <=> util.json_removeNulls(oldInstance));
+
+UPDATE vn.claimLog
+ SET newInstance = util.json_removeNulls(newInstance)
+ WHERE `action` = 'insert'
+ AND newInstance IS NOT NULL
+ AND NOT (newInstance <=> util.json_removeNulls(newInstance));
+
+OPTIMIZE TABLE vn.claimLog;
+
+-- shelvingLog
+UPDATE vn.shelvingLog
+ SET oldInstance = util.json_cleanEquals(@oldI := oldInstance, newInstance),
+ newInstance = util.json_cleanEquals(newInstance, @oldI)
+ WHERE `action` = 'update';
+
+UPDATE vn.shelvingLog
+ SET oldInstance = util.json_removeNulls(oldInstance)
+ WHERE `action` = 'delete'
+ AND oldInstance IS NOT NULL
+ AND NOT (oldInstance <=> util.json_removeNulls(oldInstance));
+
+UPDATE vn.shelvingLog
+ SET newInstance = util.json_removeNulls(newInstance)
+ WHERE `action` = 'insert'
+ AND newInstance IS NOT NULL
+ AND NOT (newInstance <=> util.json_removeNulls(newInstance));
+
+OPTIMIZE TABLE vn.shelvingLog;
+
+-- invoiceInLog
+UPDATE vn.invoiceInLog
+ SET oldInstance = util.json_cleanEquals(@oldI := oldInstance, newInstance),
+ newInstance = util.json_cleanEquals(newInstance, @oldI)
+ WHERE `action` = 'update';
+
+UPDATE vn.invoiceInLog
+ SET oldInstance = util.json_removeNulls(oldInstance)
+ WHERE `action` = 'delete'
+ AND oldInstance IS NOT NULL
+ AND NOT (oldInstance <=> util.json_removeNulls(oldInstance));
+
+UPDATE vn.invoiceInLog
+ SET newInstance = util.json_removeNulls(newInstance)
+ WHERE `action` = 'insert'
+ AND newInstance IS NOT NULL
+ AND NOT (newInstance <=> util.json_removeNulls(newInstance));
+
+OPTIMIZE TABLE vn.invoiceInLog;
+
+-- userLog
+UPDATE vn.userLog
+ SET oldInstance = util.json_cleanEquals(@oldI := oldInstance, newInstance),
+ newInstance = util.json_cleanEquals(newInstance, @oldI)
+ WHERE `action` = 'update';
+
+UPDATE vn.userLog
+ SET oldInstance = util.json_removeNulls(oldInstance)
+ WHERE `action` = 'delete'
+ AND oldInstance IS NOT NULL
+ AND NOT (oldInstance <=> util.json_removeNulls(oldInstance));
+
+UPDATE vn.userLog
+ SET newInstance = util.json_removeNulls(newInstance)
+ WHERE `action` = 'insert'
+ AND newInstance IS NOT NULL
+ AND NOT (newInstance <=> util.json_removeNulls(newInstance));
+
+OPTIMIZE TABLE vn.userLog;
+
+-- supplierLog
+UPDATE vn.supplierLog
+ SET oldInstance = util.json_cleanEquals(@oldI := oldInstance, newInstance),
+ newInstance = util.json_cleanEquals(newInstance, @oldI)
+ WHERE `action` = 'update';
+
+UPDATE vn.supplierLog
+ SET oldInstance = util.json_removeNulls(oldInstance)
+ WHERE `action` = 'delete'
+ AND oldInstance IS NOT NULL
+ AND NOT (oldInstance <=> util.json_removeNulls(oldInstance));
+
+UPDATE vn.supplierLog
+ SET newInstance = util.json_removeNulls(newInstance)
+ WHERE `action` = 'insert'
+ AND newInstance IS NOT NULL
+ AND NOT (newInstance <=> util.json_removeNulls(newInstance));
+
+OPTIMIZE TABLE vn.supplierLog;
+
+DROP FUNCTION util.json_cleanEquals;
diff --git a/db/versions/.archive/10643-blueCataractarum/00-firstScript.sql b/db/versions/.archive/10643-blueCataractarum/00-firstScript.sql
new file mode 100644
index 000000000..184a5ea3b
--- /dev/null
+++ b/db/versions/.archive/10643-blueCataractarum/00-firstScript.sql
@@ -0,0 +1,43 @@
+DELIMITER $$
+$$
+CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`clientRemoveWorker1`()
+BEGIN
+ DECLARE vDone BOOL DEFAULT FALSE;
+ DECLARE vClientFk INT;
+ DECLARE rs CURSOR FOR
+ SELECT c.clientFk
+ FROM tmp.clientGetDebt c
+ LEFT JOIN clientRisk r ON r.clientFk = c.clientFk
+ GROUP BY c.clientFk
+ HAVING SUM(IFNULL(r.amount,0)) = 0;
+
+ DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
+
+ CREATE OR REPLACE TEMPORARY TABLE tmp.clientGetDebt
+ SELECT cd.id as clientFk
+ FROM bs.clientDied cd
+ LEFT JOIN clientProtected cp ON cp.clientFk = cd.id
+ JOIN client c ON c.id = cd.id
+ JOIN province p ON p.id = c.provinceFk
+ LEFT JOIN autonomy a ON a.id = p.autonomyFk
+ JOIN country co ON co.id = p.countryFk
+ WHERE cd.Aviso = 'TERCER AVISO'
+ AND cp.clientFk IS NULL
+ AND co.code NOT IN ('PT')
+ AND a.name <> 'Canarias'
+ AND c.salesPersonFk IS NOT NULL;
+
+ OPEN rs;
+ FETCH rs INTO vClientFk;
+ WHILE NOT vDone DO
+ CALL vn.clientGreugeSpray(vClientFk, TRUE, '',TRUE);
+ UPDATE vn.client SET salesPersonFk = NULL WHERE id = vClientFk;
+ FETCH rs INTO vClientFk;
+ END WHILE;
+ CLOSE rs;
+ DROP TEMPORARY TABLE tmp.clientGetDebt;
+END$$
+DELIMITER ;
+
+CALL vn.clientRemoveWorker1();
+DROP PROCEDURE vn.clientRemoveWorker1;
diff --git a/db/versions/.archive/10644-aquaLaurel/00-firstScript.sql b/db/versions/.archive/10644-aquaLaurel/00-firstScript.sql
new file mode 100644
index 000000000..cf09bc029
--- /dev/null
+++ b/db/versions/.archive/10644-aquaLaurel/00-firstScript.sql
@@ -0,0 +1,5 @@
+ALTER TABLE vn.expeditionBoxVol ADD code varchar(45) DEFAULT NULL NULL;
+ALTER TABLE vn.routeMaster CHANGE mounth `month` int(11) DEFAULT 0 NOT NULL;
+ALTER TABLE vn.routeMaster CHANGE warehoseFk warehouseFk smallint(6) unsigned DEFAULT NULL NULL;
+
+
diff --git a/db/versions/.archive/10645-purplePalmetto/00-addNewFields.sql b/db/versions/.archive/10645-purplePalmetto/00-addNewFields.sql
new file mode 100644
index 000000000..524cbe6d8
--- /dev/null
+++ b/db/versions/.archive/10645-purplePalmetto/00-addNewFields.sql
@@ -0,0 +1,2 @@
+ALTER TABLE vn.collectionWagonTicket ADD rgb varchar(30) NULL COMMENT 'Color de la balda';
+ALTER TABLE vn.collectionWagonTicket ADD height int(11) NULL COMMENT 'altura de la balda';
\ No newline at end of file
diff --git a/db/versions/.archive/10645-purplePalmetto/01-updateCollectionWagonPrimaryKey.sql b/db/versions/.archive/10645-purplePalmetto/01-updateCollectionWagonPrimaryKey.sql
new file mode 100644
index 000000000..8bd540252
--- /dev/null
+++ b/db/versions/.archive/10645-purplePalmetto/01-updateCollectionWagonPrimaryKey.sql
@@ -0,0 +1,4 @@
+ALTER TABLE vn.collectionWagonTicket DROP FOREIGN KEY collectionWagonTicket_ticket;
+ALTER TABLE vn.collectionWagonTicket DROP PRIMARY KEY;
+ALTER TABLE vn.collectionWagonTicket ADD CONSTRAINT collectionWagonTicket_PK PRIMARY KEY (ticketFk,trayFk);
+ALTER TABLE vn.collectionWagonTicket ADD CONSTRAINT collectionWagonTicket_FK FOREIGN KEY (ticketFk) REFERENCES vn.ticket(id) ON DELETE RESTRICT ON UPDATE CASCADE;
\ No newline at end of file
diff --git a/db/versions/.archive/10645-purplePalmetto/02-updateWagonPrimaryKey.sql b/db/versions/.archive/10645-purplePalmetto/02-updateWagonPrimaryKey.sql
new file mode 100644
index 000000000..80078c510
--- /dev/null
+++ b/db/versions/.archive/10645-purplePalmetto/02-updateWagonPrimaryKey.sql
@@ -0,0 +1,20 @@
+ALTER TABLE vn.wagonVolumetry DROP FOREIGN KEY wagonVolumetry_FK;
+ALTER TABLE vn.wagonVolumetry MODIFY COLUMN wagonFk VARCHAR(6) NOT NULL;
+
+ALTER TABLE vn.collectionWagon DROP FOREIGN KEY collectionWagon_wagon;
+ALTER TABLE vn.collectionWagon MODIFY COLUMN wagonFk VARCHAR(6) NOT NULL;
+
+ALTER TABLE vn.collectionWagonTicket DROP FOREIGN KEY collectionWagonTicket_wagon;
+ALTER TABLE vn.collectionWagonTicket MODIFY COLUMN wagonFk VARCHAR(6) NOT NULL;
+
+ALTER TABLE vn.wagon MODIFY COLUMN id varchar(6) NOT NULL COMMENT '26 letras de alfabeto inglés';
+
+ALTER TABLE vn.wagonVolumetry ADD CONSTRAINT wagonVolumetry_FK_1 FOREIGN KEY (wagonFk) REFERENCES vn.wagon(id) ON UPDATE CASCADE;
+
+ALTER TABLE vn.collectionWagon COLLATE=utf8mb3_unicode_ci;
+ALTER TABLE vn.collectionWagon MODIFY COLUMN wagonFk varchar(6) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL;
+ALTER TABLE vn.collectionWagon ADD CONSTRAINT collectionWagon_FK_1 FOREIGN KEY (wagonFk) REFERENCES vn.wagon(id) ON UPDATE CASCADE;
+
+ALTER TABLE vn.collectionWagonTicket COLLATE=utf8mb3_unicode_ci;
+ALTER TABLE vn.collectionWagonTicket MODIFY COLUMN wagonFk varchar(6) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL;
+ALTER TABLE vn.collectionWagonTicket ADD CONSTRAINT collectionWagonTicket_FK_1 FOREIGN KEY (wagonFk) REFERENCES vn.wagon(id) ON UPDATE CASCADE;
\ No newline at end of file
diff --git a/db/versions/.archive/10645-purplePalmetto/03-addFieldToPackingSite.sql b/db/versions/.archive/10645-purplePalmetto/03-addFieldToPackingSite.sql
new file mode 100644
index 000000000..1047a4681
--- /dev/null
+++ b/db/versions/.archive/10645-purplePalmetto/03-addFieldToPackingSite.sql
@@ -0,0 +1,2 @@
+ALTER TABLE vn.packingSite ADD parkingFk int(11) NULL;
+ALTER TABLE vn.packingSite ADD CONSTRAINT packingSite_FK_3 FOREIGN KEY (parkingFk) REFERENCES vn.parking(id) ON DELETE CASCADE ON UPDATE SET NULL;
\ No newline at end of file
diff --git a/db/versions/.archive/10647-goldenBamboo/00-renombrarTabla.sql b/db/versions/.archive/10647-goldenBamboo/00-renombrarTabla.sql
new file mode 100644
index 000000000..562472d28
--- /dev/null
+++ b/db/versions/.archive/10647-goldenBamboo/00-renombrarTabla.sql
@@ -0,0 +1,2 @@
+RENAME TABLE postgresql.media_type TO postgresql.media_type__;
+ALTER TABLE postgresql.media_type__ COMMENT='#5374 @deprecated 2023-06-19';
diff --git a/db/versions/.archive/10648-blackBirch/00-firstScript.sql b/db/versions/.archive/10648-blackBirch/00-firstScript.sql
new file mode 100644
index 000000000..8f5c37a87
--- /dev/null
+++ b/db/versions/.archive/10648-blackBirch/00-firstScript.sql
@@ -0,0 +1,3 @@
+ALTER TABLE vn.workerDocument DROP FOREIGN KEY workerDocument_ibfk_1;
+ALTER TABLE vn.workerDocument ADD CONSTRAINT workerDocument_FK FOREIGN KEY (worker) REFERENCES vn.worker(id) ON DELETE RESTRICT ON UPDATE CASCADE;
+
diff --git a/db/versions/.archive/10649-yellowAsparagus/00-firstScript.sql b/db/versions/.archive/10649-yellowAsparagus/00-firstScript.sql
new file mode 100644
index 000000000..6ab678808
--- /dev/null
+++ b/db/versions/.archive/10649-yellowAsparagus/00-firstScript.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.supplierLog MODIFY COLUMN originFk int(10) unsigned NULL;
diff --git a/db/versions/.archive/10651-chocolatePalmetto/00-comparativeCountryFk.sql b/db/versions/.archive/10651-chocolatePalmetto/00-comparativeCountryFk.sql
new file mode 100644
index 000000000..d8c41cfe2
--- /dev/null
+++ b/db/versions/.archive/10651-chocolatePalmetto/00-comparativeCountryFk.sql
@@ -0,0 +1,40 @@
+
+DROP VIEW IF EXISTS vn.comparative;
+
+CREATE TABLE IF NOT EXISTS vn.comparative (
+ id int unsigned auto_increment NULL,
+ timePeriod int NULL,
+ itemFk int(11) NULL,
+ warehouseFk smallint(6) unsigned NULL,
+ quantity int NULL,
+ price int NULL,
+ countryFk mediumint(8) unsigned NULL,
+ CONSTRAINT comparative_PK PRIMARY KEY (id),
+ CONSTRAINT comparative_UN UNIQUE KEY (timePeriod,itemFk,warehouseFk),
+ CONSTRAINT comparativeItem_FK FOREIGN KEY (itemFk) REFERENCES vn.item(id),
+ CONSTRAINT comparativeWarehouse_FK FOREIGN KEY (warehouseFk) REFERENCES vn.warehouse(id),
+ CONSTRAINT comparativeCountry_FK FOREIGN KEY (countryFk) REFERENCES vn.country(id)
+)
+ENGINE=InnoDB
+DEFAULT CHARSET=utf8mb3
+COLLATE=utf8mb3_unicode_ci;
+
+INSERT INTO vn.comparative(
+ timePeriod,
+ itemFk,
+ warehouseFk,
+ quantity,
+ price
+)
+ SELECT c.Periodo,
+ c.Id_Article,
+ c.warehouse_id,
+ c.Cantidad,
+ c.price
+ FROM vn2008.Comparativa c
+ JOIN vn.item i ON i.id = c.Id_Article
+ JOIN vn.warehouse w ON w.id = c.warehouse_id;
+
+RENAME TABLE vn2008.Comparativa TO vn2008.Comparativa__;
+
+ALTER TABLE vn2008.Comparativa__ COMMENT= '20/11/2023';
\ No newline at end of file
diff --git a/db/versions/.archive/10651-chocolatePalmetto/01-comparativeAddConfig.sql b/db/versions/.archive/10651-chocolatePalmetto/01-comparativeAddConfig.sql
new file mode 100644
index 000000000..a718fd1ae
--- /dev/null
+++ b/db/versions/.archive/10651-chocolatePalmetto/01-comparativeAddConfig.sql
@@ -0,0 +1,11 @@
+-- Place your SQL code here
+CREATE TABLE IF NOT EXISTS vn.`comparativeAddConfig` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `period` INT(10) UNSIGNED DEFAULT NULL COMMENT 'The number of periods to be regressed for insertion in vn.comparative',
+ `week` INT(10) UNSIGNED DEFAULT NULL COMMENT 'The number of weeks to exceed for recalculating the last period',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+INSERT IGNORE INTO vn.comparativeAddConfig (period, week)
+ VALUES (3, 3);
+
diff --git a/db/versions/.archive/10651-chocolatePalmetto/02-nightTaskAddNewTask.sql b/db/versions/.archive/10651-chocolatePalmetto/02-nightTaskAddNewTask.sql
new file mode 100644
index 000000000..fec4f9a46
--- /dev/null
+++ b/db/versions/.archive/10651-chocolatePalmetto/02-nightTaskAddNewTask.sql
@@ -0,0 +1,6 @@
+-- Place your SQL code here
+DELETE FROM bs.nightTask
+ WHERE `procedure` = 'comparativa_add';
+
+INSERT IGNORE INTO bs.nightTask (`order`,`schema`,`procedure`)
+ VALUES (260,'vn','comparative_add');
diff --git a/db/versions/.archive/10651-chocolatePalmetto/03-grantProc.vn.sql b/db/versions/.archive/10651-chocolatePalmetto/03-grantProc.vn.sql
new file mode 100644
index 000000000..f6118b993
--- /dev/null
+++ b/db/versions/.archive/10651-chocolatePalmetto/03-grantProc.vn.sql
@@ -0,0 +1,2 @@
+GRANT EXECUTE ON PROCEDURE vn.item_comparative TO claimManager, buyer;
+FLUSH PRIVILEGES;
\ No newline at end of file
diff --git a/db/versions/.archive/10652-maroonPhormium/00-firstScript.sql b/db/versions/.archive/10652-maroonPhormium/00-firstScript.sql
new file mode 100644
index 000000000..3cad31e56
--- /dev/null
+++ b/db/versions/.archive/10652-maroonPhormium/00-firstScript.sql
@@ -0,0 +1,4 @@
+RENAME TABLE postgresql.labour_agreement TO postgresql.labour_agreement__;
+ALTER TABLE postgresql.labour_agreement__
+COMMENT='deprecated 2023-06-21';
+
diff --git a/db/versions/.archive/10653-redHydrangea/00-firstScript.sql b/db/versions/.archive/10653-redHydrangea/00-firstScript.sql
new file mode 100644
index 000000000..3e20614d0
--- /dev/null
+++ b/db/versions/.archive/10653-redHydrangea/00-firstScript.sql
@@ -0,0 +1,3 @@
+RENAME TABLE postgresql.profile_address TO postgresql.profile_address__;
+ALTER TABLE postgresql.profile_address__ COMMENT='deprecated 2023-07-03';
+
diff --git a/db/versions/.archive/10655-navyRuscus/00-firstScript.sql b/db/versions/.archive/10655-navyRuscus/00-firstScript.sql
new file mode 100644
index 000000000..4c99697ef
--- /dev/null
+++ b/db/versions/.archive/10655-navyRuscus/00-firstScript.sql
@@ -0,0 +1,6 @@
+-- Place your SQL code here
+USE vn;
+
+ALTER TABLE vn.worker CHANGE labelerFk labelerFk__ tinyint(3) unsigned DEFAULT NULL NULL COMMENT '@deprecated 2023-06-26';
+ALTER TABLE vn.worker CHANGE sectorFk sectorFk__ int(11) DEFAULT NULL NULL COMMENT '@deprecated 2023-06-26';
+
diff --git a/db/versions/.archive/10656-navyMastic/00-firstScript.sql b/db/versions/.archive/10656-navyMastic/00-firstScript.sql
new file mode 100644
index 000000000..077829579
--- /dev/null
+++ b/db/versions/.archive/10656-navyMastic/00-firstScript.sql
@@ -0,0 +1,34 @@
+UPDATE sage.taxType tt
+ JOIN sage.TiposIva ti ON ti.CodigoIva = tt.id
+ SET tt.code = 'nonTaxable'
+ WHERE ti.Iva = 'Operaciones no sujetas';
+
+ALTER TABLE sage.config ADD nontaxableTransactionTypeFk TINYINT(4) NULL
+ COMMENT 'Transacción Operaciones exentas';
+ALTER TABLE sage.config ADD pendingServiceTransactionTypeFk TINYINT(4) NULL
+ COMMENT 'Transacción Import. bienes y serv. corrientes pdte. liquidar';
+ALTER TABLE sage.config ADD definitiveExportTransactionTypeFk TINYINT(4) NULL
+ COMMENT 'Transacción Exportaciones definitivas';
+ALTER TABLE sage.config ADD shipmentTransactionTypeFk TINYINT(4) NULL
+ COMMENT 'Transacción Envíos definitivos a Canarias, Ceuta y Melilla';
+
+UPDATE sage.config c
+ JOIN sage.TiposTransacciones tt
+ ON tt.Transaccion = 'Operaciones exentas'
+ SET c.nontaxableTransactionTypeFk = tt.CodigoTransaccion;
+
+UPDATE sage.config c
+ JOIN sage.TiposTransacciones tt
+ ON tt.Transaccion = 'Import. bienes y serv. corrientes pdte. liquidar'
+ SET c.pendingServiceTransactionTypeFk = tt.CodigoTransaccion;
+
+UPDATE sage.config c
+ JOIN sage.TiposTransacciones tt
+ ON tt.Transaccion = 'Exportaciones definitivas'
+ SET c.definitiveExportTransactionTypeFk = tt.CodigoTransaccion;
+
+
+UPDATE sage.config c
+ JOIN sage.TiposTransacciones tt
+ ON tt.Transaccion = 'Envíos definitivos a Canarias, Ceuta y Melilla'
+ SET c.shipmentTransactionTypeFk = tt.CodigoTransaccion;
diff --git a/db/versions/.archive/10657-redDracena/00-renameErrorProduction.sql b/db/versions/.archive/10657-redDracena/00-renameErrorProduction.sql
new file mode 100644
index 000000000..1b39039a7
--- /dev/null
+++ b/db/versions/.archive/10657-redDracena/00-renameErrorProduction.sql
@@ -0,0 +1 @@
+RENAME TABLE vn.errorProduction TO vn.productionError;
\ No newline at end of file
diff --git a/db/versions/.archive/10657-redDracena/01-changeNightTask.sql b/db/versions/.archive/10657-redDracena/01-changeNightTask.sql
new file mode 100644
index 000000000..9b55d1583
--- /dev/null
+++ b/db/versions/.archive/10657-redDracena/01-changeNightTask.sql
@@ -0,0 +1 @@
+UPDATE bs.nightTask SET `procedure` = "productionError_add" WHERE `procedure` = "errorProduction_addLauncher"
\ No newline at end of file
diff --git a/db/versions/.archive/10657-redDracena/02-addCodeToClaimResponsible.sql b/db/versions/.archive/10657-redDracena/02-addCodeToClaimResponsible.sql
new file mode 100644
index 000000000..07b602f88
--- /dev/null
+++ b/db/versions/.archive/10657-redDracena/02-addCodeToClaimResponsible.sql
@@ -0,0 +1,27 @@
+ALTER TABLE vn.claimResponsible ADD code varchar(3) NOT NULL;
+
+UPDATE vn.claimResponsible SET code='buy' WHERE `description` = "Compradores";
+UPDATE vn.claimResponsible SET code='sup' WHERE `description` = "Proveedor";
+UPDATE vn.claimResponsible SET code='ent' WHERE `description` = "Entradores";
+UPDATE vn.claimResponsible SET code='bar' WHERE `description` = "Camareros";
+UPDATE vn.claimResponsible SET code='pic' WHERE `description` = "Sacadores";
+UPDATE vn.claimResponsible SET code='chk' WHERE `description` = "Revisadores";
+UPDATE vn.claimResponsible SET code='qas' WHERE `description` = "Calidad general";
+UPDATE vn.claimResponsible SET code='pck' WHERE `description` = "Encajadores";
+UPDATE vn.claimResponsible SET code='wea' WHERE `description` = "Clima";
+UPDATE vn.claimResponsible SET code='com' WHERE `description` = "Comerciales";
+UPDATE vn.claimResponsible SET code='cli' WHERE `description` = "Clientes";
+UPDATE vn.claimResponsible SET code='adm' WHERE `description` = "Administración";
+UPDATE vn.claimResponsible SET code='age' WHERE `description` = "Agencia";
+UPDATE vn.claimResponsible SET code='del' WHERE `description` = "Repartidores";
+UPDATE vn.claimResponsible SET code='ite' WHERE `description` = "Informatica";
+UPDATE vn.claimResponsible SET code='tra' WHERE `description` = "Transp.origen";
+UPDATE vn.claimResponsible SET code='con' WHERE `description` = "Confeccion";
+UPDATE vn.claimResponsible SET code='oth' WHERE `description` = "OTROS";
+UPDATE vn.claimResponsible SET code='man' WHERE `description` = "Gerencia";
+UPDATE vn.claimResponsible SET code='pal' WHERE `description` = "Paletizadores";
+UPDATE vn.claimResponsible SET code='pre' WHERE `description` = "Preparación Previa";
+UPDATE vn.claimResponsible SET code='war' WHERE `description` = "Almacén PCA";
+UPDATE vn.claimResponsible SET code='str' WHERE `description` = "Huelga";
+
+ALTER TABLE vn.claimResponsible ADD CONSTRAINT claimResponsible_UN UNIQUE KEY (code);
\ No newline at end of file
diff --git a/db/versions/.archive/10657-redDracena/03-grantSelectGrafana.sql b/db/versions/.archive/10657-redDracena/03-grantSelectGrafana.sql
new file mode 100644
index 000000000..f910f4df4
--- /dev/null
+++ b/db/versions/.archive/10657-redDracena/03-grantSelectGrafana.sql
@@ -0,0 +1 @@
+GRANT SELECT ON TABLE vn.productionError TO `grafana`@`10.0.%.%`;
\ No newline at end of file
diff --git a/db/versions/.archive/10658-whiteDracena/00-firstScript.sql b/db/versions/.archive/10658-whiteDracena/00-firstScript.sql
new file mode 100644
index 000000000..4af955f8a
--- /dev/null
+++ b/db/versions/.archive/10658-whiteDracena/00-firstScript.sql
@@ -0,0 +1,3 @@
+ALTER TABLE vn2008.account_detail DROP FOREIGN KEY fk_account_detail_account_id_proveedores_account;
+ALTER TABLE vn2008.account_detail ADD CONSTRAINT fk_account_detail_account_id_proveedores_account
+FOREIGN KEY (Id_Proveedores_account) REFERENCES vn.supplierAccount(id) ON DELETE RESTRICT ON UPDATE CASCADE;
diff --git a/db/versions/.archive/10659-azureDracena/00-firstScript.sql b/db/versions/.archive/10659-azureDracena/00-firstScript.sql
new file mode 100644
index 000000000..3299481c6
--- /dev/null
+++ b/db/versions/.archive/10659-azureDracena/00-firstScript.sql
@@ -0,0 +1,11 @@
+USE vn;
+DELETE tc FROM vn.ticketCollection tc
+ JOIN (
+ SELECT id, COUNT(ticketFk) counter
+ FROM vn.ticketCollection
+ GROUP BY ticketFk
+ HAVING counter > 1
+ ) sub ON sub.id = tc.id;
+
+ALTER TABLE vn.ticketCollection DROP KEY ticketCollection_UN;
+ALTER TABLE vn.ticketCollection ADD CONSTRAINT ticketCollection_UN UNIQUE KEY (ticketFk);
diff --git a/db/versions/.archive/10661-crimsonIvy/00-firstScript.sql b/db/versions/.archive/10661-crimsonIvy/00-firstScript.sql
new file mode 100644
index 000000000..d0ac38b87
--- /dev/null
+++ b/db/versions/.archive/10661-crimsonIvy/00-firstScript.sql
@@ -0,0 +1,4 @@
+-- Place your SQL code here
+ALTER TABLE vn.itemShelving ADD buyFk int(11) NULL;
+ALTER TABLE vn.itemShelving ADD CONSTRAINT itemShelvingBuy_FK FOREIGN KEY (buyFk) REFERENCES vn.buy(id);
+ALTER TABLE vn.itemShelving ADD CONSTRAINT itemShelving_UN UNIQUE KEY (buyFk,shelvingFk);
\ No newline at end of file
diff --git a/db/versions/.archive/10662-wheatErica/00-firstScript.sql b/db/versions/.archive/10662-wheatErica/00-firstScript.sql
new file mode 100644
index 000000000..7cb5b1d45
--- /dev/null
+++ b/db/versions/.archive/10662-wheatErica/00-firstScript.sql
@@ -0,0 +1,2 @@
+UPDATE IGNORE vn.invoiceIn SET currencyFk = 1 WHERE NOT currencyFk;
+ALTER TABLE vn.invoiceIn ADD CONSTRAINT invoiceIn_FK FOREIGN KEY (currencyFk) REFERENCES vn.currency(id) ON DELETE RESTRICT ON UPDATE CASCADE;
diff --git a/db/versions/.archive/10663-tealCymbidium/00-firstScript.sql b/db/versions/.archive/10663-tealCymbidium/00-firstScript.sql
new file mode 100644
index 000000000..ffc60d47d
--- /dev/null
+++ b/db/versions/.archive/10663-tealCymbidium/00-firstScript.sql
@@ -0,0 +1,2 @@
+-- Place your SQL code here
+ALTER TABLE vn.vehicle ADD CONSTRAINT vehicle_UN UNIQUE KEY (numberPlate);
\ No newline at end of file
diff --git a/db/versions/.archive/10665-maroonSalal/00-firstScript.sql b/db/versions/.archive/10665-maroonSalal/00-firstScript.sql
new file mode 100644
index 000000000..7283a2b36
--- /dev/null
+++ b/db/versions/.archive/10665-maroonSalal/00-firstScript.sql
@@ -0,0 +1,19 @@
+ALTER TABLE vn.business DROP FOREIGN KEY business_workerBusinessAgreementFk;
+
+CREATE TABLE `vn`.`workerBusinessAgreement` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `name` varchar(50) DEFAULT NULL,
+ `monthHolidays` double DEFAULT NULL,
+ `yearHours` int(11) DEFAULT NULL,
+ `started` date DEFAULT NULL,
+ `ended` date DEFAULT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci;
+
+INSERT INTO vn.workerBusinessAgreement
+ SELECT labour_agreement_id, name, month_hollidays, year_hours, date_START, date_END
+ FROM postgresql.labour_agreement__;
+
+ALTER TABLE vn.business ADD CONSTRAINT business_workerBusinessAgreementFk FOREIGN KEY (workerBusinessAgreementFk) REFERENCES vn.workerBusinessAgreement(id) ON DELETE RESTRICT ON UPDATE CASCADE;
+
+DROP TABLE postgresql.labour_agreement__;
diff --git a/db/versions/.archive/10666-limeGerbera/00-firstScript.sql b/db/versions/.archive/10666-limeGerbera/00-firstScript.sql
new file mode 100644
index 000000000..866a8de18
--- /dev/null
+++ b/db/versions/.archive/10666-limeGerbera/00-firstScript.sql
@@ -0,0 +1,3 @@
+RENAME TABLE vn2008.Colores TO vn2008.Colores__;
+ALTER TABLE vn2008.Colores__ COMMENT='refs #5903 deprecated 2023-06-30';
+
diff --git a/db/versions/.archive/10667-blackChrysanthemum/00-firstScript.sql b/db/versions/.archive/10667-blackChrysanthemum/00-firstScript.sql
new file mode 100644
index 000000000..b05518b35
--- /dev/null
+++ b/db/versions/.archive/10667-blackChrysanthemum/00-firstScript.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.entryConfig ADD defaultSupplierFk int(11) DEFAULT 13 NULL;
\ No newline at end of file
diff --git a/db/versions/.archive/10668-tealBirch/00-firstScript.sql b/db/versions/.archive/10668-tealBirch/00-firstScript.sql
new file mode 100644
index 000000000..2cbad363f
--- /dev/null
+++ b/db/versions/.archive/10668-tealBirch/00-firstScript.sql
@@ -0,0 +1,29 @@
+ALTER TABLE vn.deviceProduction ADD editorFk int(10) unsigned NULL;
+ALTER TABLE vn.deviceProductionModels ADD editorFk int(10) unsigned NULL;
+ALTER TABLE vn.deviceProductionState ADD editorFk int(10) unsigned NULL;
+ALTER TABLE vn.deviceProductionUser ADD editorFk int(10) unsigned NULL;
+ALTER TABLE vn.deviceProduction ADD CONSTRAINT deviceProduction_fk_editor FOREIGN KEY (editorFk) REFERENCES account.`user`(id) ON DELETE RESTRICT ON UPDATE RESTRICT;
+ALTER TABLE vn.deviceProductionModels ADD CONSTRAINT deviceProductionModels_fk_editor FOREIGN KEY (editorFk) REFERENCES account.`user`(id) ON DELETE RESTRICT ON UPDATE RESTRICT;
+ALTER TABLE vn.deviceProductionState ADD CONSTRAINT deviceProductionState_fk_editor FOREIGN KEY (editorFk) REFERENCES account.`user`(id) ON DELETE RESTRICT ON UPDATE RESTRICT;
+ALTER TABLE vn.deviceProductionUser ADD CONSTRAINT deviceProductionUser_fk_editor FOREIGN KEY (editorFk) REFERENCES account.`user`(id) ON DELETE RESTRICT ON UPDATE RESTRICT;
+
+DROP TABLE vn.deviceProductionLog;
+CREATE TABLE `vn`.`deviceProductionLog` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `originFk` int(11) DEFAULT NULL,
+ `userFk` int(10) unsigned DEFAULT NULL,
+ `action` set('insert','update','delete') NOT NULL,
+ `creationDate` timestamp NULL DEFAULT current_timestamp(),
+ `description` text CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL,
+ `changedModel` enum('DeviceProduction','DeviceProductionModels','DeviceProductionState','DeviceProductionUser') NOT NULL DEFAULT 'DeviceProduction',
+ `oldInstance` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`oldInstance`)),
+ `newInstance` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`newInstance`)),
+ `changedModelId` int(11) NOT NULL,
+ `changedModelValue` varchar(45) DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `userFk` (`userFk`),
+ KEY `deviceProductionLog_changedModel` (`changedModel`,`changedModelId`,`creationDate`),
+ KEY `deviceProductionLog_deviceProductionLog` (`originFk`,`creationDate`),
+ CONSTRAINT `deviceProductionOriginFk` FOREIGN KEY (`originFk`) REFERENCES `deviceProduction` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `deviceProductionUserFk` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci `PAGE_COMPRESSED`=1;
\ No newline at end of file
diff --git a/db/versions/.archive/10671-maroonIvy/00-firstScript.sql b/db/versions/.archive/10671-maroonIvy/00-firstScript.sql
new file mode 100644
index 000000000..f67ee98bc
--- /dev/null
+++ b/db/versions/.archive/10671-maroonIvy/00-firstScript.sql
@@ -0,0 +1,2 @@
+ALTER TABLE vn.floramondoConfig ADD daysToKeepItem int(4) NULL COMMENT 'Número de dias para mantener artículos';
+UPDATE IGNORE vn.floramondoConfig SET daysToKeepItem=7 WHERE id=1;
diff --git a/db/versions/.archive/10675-grayRuscus/00-firstScript.sql b/db/versions/.archive/10675-grayRuscus/00-firstScript.sql
new file mode 100644
index 000000000..39bed640e
--- /dev/null
+++ b/db/versions/.archive/10675-grayRuscus/00-firstScript.sql
@@ -0,0 +1 @@
+DROP EVENT vn.ticketClosure;
diff --git a/db/versions/.archive/10676-aquaTulip/00-firstScript.sql b/db/versions/.archive/10676-aquaTulip/00-firstScript.sql
new file mode 100644
index 000000000..c956c60f4
--- /dev/null
+++ b/db/versions/.archive/10676-aquaTulip/00-firstScript.sql
@@ -0,0 +1,4 @@
+DROP TABLE IF EXISTS vn.chronopostConfig;
+DROP TABLE IF EXISTS vn.chronopostExpedition;
+DROP TABLE IF EXISTS vn.chronopostSenderAddress;
+DROP TABLE IF EXISTS vn.chronopostServiceWeekday;
\ No newline at end of file
diff --git a/db/versions/.archive/10677-yellowMoss/00-firstScript.sql b/db/versions/.archive/10677-yellowMoss/00-firstScript.sql
new file mode 100644
index 000000000..400f1d9d5
--- /dev/null
+++ b/db/versions/.archive/10677-yellowMoss/00-firstScript.sql
@@ -0,0 +1,4 @@
+ALTER TABLE vn.packagingConfig ADD defaultSmallPackageFk VARCHAR(10) DEFAULT '94p' NOT NULL COMMENT 'bulto pequeño';
+ALTER TABLE vn.packagingConfig ADD defaultBigPackageFk VARCHAR(10) DEFAULT '94m' NOT NULL COMMENT 'bulto grande';
+ALTER TABLE vn.packagingConfig ADD CONSTRAINT packagingConfig_FK FOREIGN KEY (defaultSmallPackageFk) REFERENCES vn.packaging(id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.packagingConfig ADD CONSTRAINT packagingConfig_FK_1 FOREIGN KEY (defaultBigPackageFk) REFERENCES vn.packaging(id) ON DELETE RESTRICT ON UPDATE CASCADE;
\ No newline at end of file
diff --git a/db/versions/.archive/10678-orangeMedeola/00-firstScript.sql b/db/versions/.archive/10678-orangeMedeola/00-firstScript.sql
new file mode 100644
index 000000000..e0c09a14c
--- /dev/null
+++ b/db/versions/.archive/10678-orangeMedeola/00-firstScript.sql
@@ -0,0 +1,2 @@
+ALTER TABLE vn.itemConfig ADD downloadMaxAttempts tinyint(3) DEFAULT NULL NULL COMMENT 'Intentos máximos para que se borre';
+INSERT IGNORE INTO vn.itemConfig (downloadMaxAttempts) VALUES (3);
diff --git a/db/versions/.archive/10679-inventoryDiscrepancy/00-tables.sql b/db/versions/.archive/10679-inventoryDiscrepancy/00-tables.sql
new file mode 100644
index 000000000..ab4f1b475
--- /dev/null
+++ b/db/versions/.archive/10679-inventoryDiscrepancy/00-tables.sql
@@ -0,0 +1,28 @@
+
+-- bs.inventoryDiscrepancy definition
+USE bs;
+
+CREATE TABLE `inventoryDiscrepancy` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `warehouseFk` int(11) NOT NULL,
+ `timed` timestamp NOT NULL DEFAULT current_timestamp(),
+ `alert` int(11) NOT NULL DEFAULT 0,
+ `quantity` int(11) NOT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB
+COMMENT='This table collects the discrepancies between theorical inventory and located items';
+
+-- bs.inventoryDiscrepancyDetail definition
+
+CREATE TABLE `inventoryDiscrepancyDetail` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `warehouseFk` int(11) NOT NULL,
+ `itemFk` int(11) NOT NULL,
+ `theorical` int(11) DEFAULT NULL COMMENT 'theorical stock: purchases vs. sales',
+ `visible` int(11) DEFAULT NULL COMMENT 'located stock',
+ `notPicked` int(11) DEFAULT NULL COMMENT 'sales not picked yet',
+ `alert` int(11) DEFAULT NULL COMMENT 'alert level for this discrepancy',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `inventoryDiscrepancyDetail_UN` (`warehouseFk`,`itemFk`)
+ ) ENGINE=InnoDB
+ COMMENT='Last discrepancies';
\ No newline at end of file
diff --git a/db/versions/.archive/10680-turquoiseLilium/00-firstScript.sql b/db/versions/.archive/10680-turquoiseLilium/00-firstScript.sql
new file mode 100644
index 000000000..1b15d79c1
--- /dev/null
+++ b/db/versions/.archive/10680-turquoiseLilium/00-firstScript.sql
@@ -0,0 +1,2 @@
+ALTER TABLE vn.stockBuyed CHANGE `date` dated date DEFAULT NULL NULL;
+ALTER TABLE vn.stockBuyed CHANGE `user` userFk int(10) unsigned DEFAULT NULL NULL;
\ No newline at end of file
diff --git a/db/versions/.archive/10682-crimsonEucalyptus/00-firstScript.sql b/db/versions/.archive/10682-crimsonEucalyptus/00-firstScript.sql
new file mode 100644
index 000000000..c63d644a9
--- /dev/null
+++ b/db/versions/.archive/10682-crimsonEucalyptus/00-firstScript.sql
@@ -0,0 +1,15 @@
+CREATE TABLE bs.clientDiedPeriod (
+ id int(10) unsigned auto_increment NOT NULL,
+ countryFk mediumint(8) unsigned NOT NULL,
+ days int(11) NOT NULL,
+ CONSTRAINT clientDiedPeriod_PK PRIMARY KEY (id),
+ CONSTRAINT clientDiedPeriod_UN UNIQUE KEY (countryFk),
+ CONSTRAINT clientDiedPeriod_FK FOREIGN KEY (countryFk) REFERENCES vn.country(id) ON DELETE RESTRICT ON UPDATE CASCADE
+)
+ENGINE=InnoDB
+DEFAULT CHARSET=utf8mb3
+COLLATE=utf8mb3_unicode_ci
+COMMENT='Define lo que es un periodo para los clientes de los diferentes países';
+
+DELETE IGNORE FROM bs.nightTask
+ WHERE `procedure` = 'clientDied_recalc';
diff --git a/db/versions/.archive/10683-bronzeMastic/00-firstScript.sql b/db/versions/.archive/10683-bronzeMastic/00-firstScript.sql
new file mode 100644
index 000000000..8ca6ff831
--- /dev/null
+++ b/db/versions/.archive/10683-bronzeMastic/00-firstScript.sql
@@ -0,0 +1,20 @@
+-- Place your SQL code here
+DROP TABLE IF EXISTS vn.comparativeConfig;
+
+CREATE TABLE IF NOT EXISTS vn.comparativeConfig (
+ id int unsigned NOT NULL AUTO_INCREMENT,
+ defaultDayRange int unsigned NULL COMMENT 'Rango de días predeterminado si no se especifica',
+ weekRange int unsigned NULL COMMENT 'La cantidad de semanas que se restarán y sumarán',
+ maxDayRange int unsigned NULL COMMENT 'El rango máximo de días antes de utilizar el rango de días predeterminado',
+ minDayRange int unsigned NULL COMMENT 'El rango mínimo de días antes de utilizar el rango de días predeterminado',
+ PRIMARY KEY (id)
+)
+ENGINE=InnoDB
+DEFAULT CHARSET=utf8mb3
+COLLATE=utf8mb3_unicode_ci;
+
+INSERT IGNORE INTO vn.comparativeConfig
+ SET defaultDayRange = 21,
+ weekRange = 3,
+ maxDayRange = 60,
+ minDayRange = 0;
\ No newline at end of file
diff --git a/db/versions/.archive/10684-tealEucalyptus/00-firstScript.sql b/db/versions/.archive/10684-tealEucalyptus/00-firstScript.sql
new file mode 100644
index 000000000..152f13f53
--- /dev/null
+++ b/db/versions/.archive/10684-tealEucalyptus/00-firstScript.sql
@@ -0,0 +1,2 @@
+RENAME TABLE vn.botanicExport TO vn.botanicExport__;
+ALTER TABLE vn.botanicExport__ COMMENT='refs #4419 Deprecated 2023-07-20';
\ No newline at end of file
diff --git a/db/versions/.archive/10685-blueMedeola/00-firstScript.sql b/db/versions/.archive/10685-blueMedeola/00-firstScript.sql
new file mode 100644
index 000000000..d60801291
--- /dev/null
+++ b/db/versions/.archive/10685-blueMedeola/00-firstScript.sql
@@ -0,0 +1,23 @@
+-- Place your SQL code here
+ALTER TABLE vn.clientContact
+ ADD CONSTRAINT clientContact_FK FOREIGN KEY (clientFk) REFERENCES vn.client(id)
+ ON DELETE CASCADE ON UPDATE CASCADE;
+
+ALTER TABLE vn.clientSample MODIFY COLUMN clientFk int(11) NOT NULL;
+
+ALTER TABLE vn.clientSample
+ ADD CONSTRAINT clientSample_FK FOREIGN KEY (clientFk) REFERENCES vn.client(id)
+ ON DELETE CASCADE ON UPDATE CASCADE;
+
+ALTER TABLE vn.greuge MODIFY COLUMN clientFk int(11) NOT NULL;
+
+ALTER TABLE vn.greuge
+ ADD CONSTRAINT greuge_FK_1 FOREIGN KEY (clientFk) REFERENCES vn.client(id)
+ ON DELETE CASCADE ON UPDATE CASCADE;
+
+ALTER TABLE vn.supplierAddress MODIFY COLUMN supplierFk int(10) UNSIGNED DEFAULT NULL NULL;
+-- poner unsigned
+
+ALTER TABLE vn.supplierAddress
+ ADD CONSTRAINT supplierAddress_FK FOREIGN KEY (supplierFk) REFERENCES vn.supplier(id)
+ ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/db/versions/.archive/10690-azureGalax/00-firstScript.sql b/db/versions/.archive/10690-azureGalax/00-firstScript.sql
new file mode 100644
index 000000000..7c05d905b
--- /dev/null
+++ b/db/versions/.archive/10690-azureGalax/00-firstScript.sql
@@ -0,0 +1,2 @@
+-- Place your SQL code here
+ALTER TABLE vn.entry CHANGE isBlocked__ isBlocked tinyint(4) DEFAULT 0 NOT NULL;
diff --git a/db/versions/.archive/10691-bronzeCamellia/00-firstScript.sql b/db/versions/.archive/10691-bronzeCamellia/00-firstScript.sql
new file mode 100644
index 000000000..0d409a389
--- /dev/null
+++ b/db/versions/.archive/10691-bronzeCamellia/00-firstScript.sql
@@ -0,0 +1,7 @@
+
+ALTER TABLE vn.invoiceInLog MODIFY COLUMN changedModel enum('InvoiceIn','InvoiceInTax','InvoiceInDueDay')
+ CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT 'InvoiceIn' NOT NULL;
+
+ALTER TABLE `vn`.`invoiceInDueDay`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT invoiceInDueDay_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
\ No newline at end of file
diff --git a/db/versions/.archive/10692-silverLilium/00-firstScript.sql b/db/versions/.archive/10692-silverLilium/00-firstScript.sql
new file mode 100644
index 000000000..faf91c393
--- /dev/null
+++ b/db/versions/.archive/10692-silverLilium/00-firstScript.sql
@@ -0,0 +1,3 @@
+ALTER TABLE bs.salesByItemTypeDay DROP FOREIGN KEY itemTypeSalesByweek_itemCategoryFk;
+ALTER TABLE bs.salesByItemTypeDay DROP COLUMN itemCategoryFk;
+ALTER TABLE bs.salesByItemTypeDay DROP COLUMN saleComponent;
diff --git a/db/versions/.archive/10693-chocolateCordyline/00-firstScript.sql b/db/versions/.archive/10693-chocolateCordyline/00-firstScript.sql
new file mode 100644
index 000000000..bc19d0af5
--- /dev/null
+++ b/db/versions/.archive/10693-chocolateCordyline/00-firstScript.sql
@@ -0,0 +1,2 @@
+RENAME TABLE bi.rutasBoard TO bi.rutasBoard__;
+ALTER TABLE bi.rutasBoard__ COMMENT='refs #5801 @deprecated 2023-07-27';
diff --git a/db/versions/.archive/10694-bluePaniculata/00-firstScript.sql b/db/versions/.archive/10694-bluePaniculata/00-firstScript.sql
new file mode 100644
index 000000000..db0ef6e17
--- /dev/null
+++ b/db/versions/.archive/10694-bluePaniculata/00-firstScript.sql
@@ -0,0 +1,3 @@
+ALTER TABLE vn.company MODIFY COLUMN stamp longblob DEFAULT NULL NULL;
+ALTER TABLE vn.supplier ADD stamp longblob DEFAULT NULL NULL;
+ALTER TABLE vn.supplier CHANGE stamp stamp longblob DEFAULT NULL NULL AFTER isVies;
diff --git a/db/versions/.archive/10695-pinkMastic/00-firstScript.sql b/db/versions/.archive/10695-pinkMastic/00-firstScript.sql
new file mode 100644
index 000000000..212cedb6e
--- /dev/null
+++ b/db/versions/.archive/10695-pinkMastic/00-firstScript.sql
@@ -0,0 +1,4 @@
+ALTER TABLE vn.ticket ADD cmrFk int(11) DEFAULT NULL NULL;
+ALTER TABLE vn.ticket ADD CONSTRAINT ticket_cmrFk FOREIGN KEY (cmrFk) REFERENCES vn.cmr(id) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE vn.ticket CHANGE cmrFk cmrFk int(11) DEFAULT NULL NULL AFTER clonedFrom;
+ALTER TABLE vn.cmr MODIFY COLUMN ticketFk int(11) DEFAULT NULL NULL COMMENT 'refs #6092 @toDeprecate 2023-08-02';
\ No newline at end of file
diff --git a/db/versions/.archive/10696-blackCataractarum/00-firstScript.sql b/db/versions/.archive/10696-blackCataractarum/00-firstScript.sql
new file mode 100644
index 000000000..7a91697ff
--- /dev/null
+++ b/db/versions/.archive/10696-blackCataractarum/00-firstScript.sql
@@ -0,0 +1,2 @@
+-- Place your SQL code here
+ALTER TABLE vn.itemTag MODIFY COLUMN value varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL;
diff --git a/db/versions/.archive/10698-yellowGalax/00-firstScript.sql b/db/versions/.archive/10698-yellowGalax/00-firstScript.sql
new file mode 100644
index 000000000..b3b4141fc
--- /dev/null
+++ b/db/versions/.archive/10698-yellowGalax/00-firstScript.sql
@@ -0,0 +1,2 @@
+ALTER TABLE vn.cmr DROP FOREIGN KEY cmr_fk1;
+ALTER TABLE vn.cmr ADD CONSTRAINT cmr_fk1 FOREIGN KEY (ticketFk) REFERENCES vn.ticket(id);
diff --git a/db/versions/.archive/10699-aquaOak/00-firstScript.sql b/db/versions/.archive/10699-aquaOak/00-firstScript.sql
new file mode 100644
index 000000000..b64ceaadf
--- /dev/null
+++ b/db/versions/.archive/10699-aquaOak/00-firstScript.sql
@@ -0,0 +1,3 @@
+-- Place your SQL code here
+ALTER TABLE vn.cmr MODIFY COLUMN senderInstruccions varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NULL;
+ALTER TABLE vn.cmr MODIFY COLUMN paymentInstruccions varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NULL;
diff --git a/db/versions/.archive/10700-salmonTulip/00-firstScript.sql b/db/versions/.archive/10700-salmonTulip/00-firstScript.sql
new file mode 100644
index 000000000..fef078e1f
--- /dev/null
+++ b/db/versions/.archive/10700-salmonTulip/00-firstScript.sql
@@ -0,0 +1,3 @@
+RENAME TABLE vn2008.Entradas_dits TO vn2008.Entradas_dits__;
+ALTER TABLE vn2008.Entradas_dits__ COMMENT='refs #6039 @deprecated 2023-08-04';
+
diff --git a/db/versions/.archive/10701-turquoisePaniculata/00-firstScript.sql b/db/versions/.archive/10701-turquoisePaniculata/00-firstScript.sql
new file mode 100644
index 000000000..16504797f
--- /dev/null
+++ b/db/versions/.archive/10701-turquoisePaniculata/00-firstScript.sql
@@ -0,0 +1,21 @@
+USE vn;
+ALTER TABLE vn.duaTax DROP FOREIGN KEY duaTax_supplierFk;
+ALTER TABLE vn.duaTax DROP INDEX duaTax_fk2_idx;
+ALTER TABLE vn.duaTax DROP COLUMN supplierFk;
+
+UPDATE vn.duaTax d
+ JOIN (
+ SELECT duaFk, taxClassFk , SUM(base) totalBase, rate, SUM(tax)totalTax
+ FROM vn.duaTax
+ GROUP BY duaFk, taxClassFk
+ )sub ON sub.duaFk = d.id
+ SET d.base = totalBase,
+ d.tax = totalTax;
+
+DELETE d FROM vn.duaTax d
+ LEFT JOIN (
+ SELECT id
+ FROM vn.duaTax
+ GROUP BY duaFk, taxClassFk
+ )sub ON sub.id = d.id
+ WHERE sub.id IS NULL;
\ No newline at end of file
diff --git a/db/versions/.archive/10702-crimsonCymbidium/00-firstScript.sql b/db/versions/.archive/10702-crimsonCymbidium/00-firstScript.sql
new file mode 100644
index 000000000..1429017da
--- /dev/null
+++ b/db/versions/.archive/10702-crimsonCymbidium/00-firstScript.sql
@@ -0,0 +1,11 @@
+-- Place your SQL code here
+USE vn;
+CREATE TABLE vn.`routeDefaultAgencyMode` (
+ `id` int(11) NOT NULL DEFAULT 0,
+ `workcenterFk` int(11) UNIQUE DEFAULT NULL,
+ `agencyModeFk` int(11) DEFAULT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci;
+
+ALTER TABLE vn.routeDefaultAgencyMode ADD CONSTRAINT routeDefaultAgencyMode_FK FOREIGN KEY (agencyModeFk) REFERENCES vn.`agencyMode`(id);
+ALTER TABLE vn.routeDefaultAgencyMode ADD CONSTRAINT routeDefaultAgencyMode_FK_1 FOREIGN KEY (workcenterFk) REFERENCES vn.workCenter(id);
diff --git a/db/versions/.archive/10704-wheatMastic/00-firstScript.sql b/db/versions/.archive/10704-wheatMastic/00-firstScript.sql
new file mode 100644
index 000000000..047a50477
--- /dev/null
+++ b/db/versions/.archive/10704-wheatMastic/00-firstScript.sql
@@ -0,0 +1,2 @@
+ALTER TABLE vn.delivery DROP FOREIGN KEY delivery_ticketFk_FK;
+ALTER TABLE vn.delivery ADD CONSTRAINT delivery_ticketFk_FK FOREIGN KEY (ticketFk) REFERENCES vn.ticket(id) ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/db/versions/.archive/10705-yellowBirch/00-firstScript.sql b/db/versions/.archive/10705-yellowBirch/00-firstScript.sql
new file mode 100644
index 000000000..ff4b4ff85
--- /dev/null
+++ b/db/versions/.archive/10705-yellowBirch/00-firstScript.sql
@@ -0,0 +1,2 @@
+RENAME TABLE bi.rutasBoard__ TO bi.rutasBoard;
+ALTER TABLE bi.rutasBoard ;
diff --git a/db/versions/.archive/10707-azureFern/00-firstScript.sql b/db/versions/.archive/10707-azureFern/00-firstScript.sql
new file mode 100644
index 000000000..7b28ed764
--- /dev/null
+++ b/db/versions/.archive/10707-azureFern/00-firstScript.sql
@@ -0,0 +1,5 @@
+CREATE TABLE `vn`.`salesPersonProtected` (
+ `salesPersonFk` int(10) unsigned NOT NULL,
+ PRIMARY KEY (`salesPersonFk`),
+ CONSTRAINT `salesPersonProtected_FK` FOREIGN KEY (`salesPersonFk`) REFERENCES `worker` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='Lista de comerciales que no se desasignarán automáticamente los clientes';
\ No newline at end of file
diff --git a/db/versions/.archive/10708-greenChrysanthemum/00-firstScript.sql b/db/versions/.archive/10708-greenChrysanthemum/00-firstScript.sql
new file mode 100644
index 000000000..e4067f23d
--- /dev/null
+++ b/db/versions/.archive/10708-greenChrysanthemum/00-firstScript.sql
@@ -0,0 +1,12 @@
+ALTER TABLE bs.salesByItemTypeDay CHANGE netSale netSale__ int(11) DEFAULT 0 NOT NULL COMMENT '@deprecated 2023-08-31, Mismo valor que campo sale';
+
+ALTER TABLE bs.salesByItemTypeDay MODIFY COLUMN stems int(11) DEFAULT 0 NOT NULL COMMENT 'Número de tallos vendidos';
+ALTER TABLE bs.salesByItemTypeDay MODIFY COLUMN `references` int(11) DEFAULT 0 NOT NULL COMMENT 'Número de artículos distintos por tipo vendidos';
+ALTER TABLE bs.salesByItemTypeDay MODIFY COLUMN trash int(11) DEFAULT 0 NOT NULL COMMENT 'Tallos basura';
+ALTER TABLE bs.salesByItemTypeDay MODIFY COLUMN faults int(11) DEFAULT 0 NOT NULL COMMENT 'Tallos faltas';
+ALTER TABLE bs.salesByItemTypeDay MODIFY COLUMN claimed decimal(10, 2) DEFAULT 0 NOT NULL COMMENT 'Valor total de reclamaciones';
+ALTER TABLE bs.salesByItemTypeDay MODIFY COLUMN accepted decimal(10, 2) DEFAULT 0 NOT NULL COMMENT 'Valor total de reclamaciones aceptadas';
+ALTER TABLE bs.salesByItemTypeDay MODIFY COLUMN sale decimal(10, 2) DEFAULT 0 NOT NULL COMMENT 'Ventas totales';
+ALTER TABLE bs.salesByItemTypeDay MODIFY COLUMN buy decimal(10, 2) DEFAULT 0 NOT NULL COMMENT 'Valor de compras totales';
+ALTER TABLE bs.salesByItemTypeDay MODIFY COLUMN costComponent decimal(10, 2) DEFAULT 0 NOT NULL COMMENT 'Suma de componentes que son valor de compra';
+ALTER TABLE bs.salesByItemTypeDay MODIFY COLUMN marginComponent decimal(10, 2) DEFAULT 0 NOT NULL COMMENT 'Suma de componentes que son márgen';
\ No newline at end of file
diff --git a/db/versions/.archive/10712-crimsonCordyline/00-firstScript.sql b/db/versions/.archive/10712-crimsonCordyline/00-firstScript.sql
new file mode 100644
index 000000000..47cb741fc
--- /dev/null
+++ b/db/versions/.archive/10712-crimsonCordyline/00-firstScript.sql
@@ -0,0 +1 @@
+DROP SCHEMA IF EXISTS postgresql;
diff --git a/db/versions/.archive/10714-azureOak/00-firstScript.sql b/db/versions/.archive/10714-azureOak/00-firstScript.sql
new file mode 100644
index 000000000..a42ab17d3
--- /dev/null
+++ b/db/versions/.archive/10714-azureOak/00-firstScript.sql
@@ -0,0 +1,25 @@
+USE vn;
+UPDATE vn.deviceProduction dp
+ JOIN (
+ SELECT id
+ FROM deviceProduction dp
+ WHERE LENGTH(android_id) < 16
+ ) sub ON sub.id = dp.id
+ SET dp.android_id = NULL;
+UPDATE vn.deviceProduction dp
+ JOIN (
+ SELECT id
+ FROM (
+ SELECT id, COUNT(*) total, android_id
+ FROM deviceProduction dp
+ WHERE android_id IS NOT NULL
+ GROUP BY android_id
+ ) sub
+ WHERE total > 1
+ ) sub ON sub.id = dp.id
+ SET dp.android_id = NULL;
+ALTER TABLE vn.deviceLog DROP COLUMN deviceProductionFk;
+ALTER TABLE vn.deviceLog MODIFY COLUMN android_id varchar(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL;
+ALTER TABLE vn.deviceProduction MODIFY COLUMN android_id varchar(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL;
+ALTER TABLE vn.deviceProduction ADD CONSTRAINT deviceProduction_UN UNIQUE KEY (android_id);
+ALTER TABLE vn.deviceProduction ADD CONSTRAINT deviceProduction_CHECK CHECK (android_id REGEXP '[A-Za-z0-9]{16,}' OR android_id IS NULL);
diff --git a/db/versions/.archive/10716-chocolateCamellia/00-firstScript.sql b/db/versions/.archive/10716-chocolateCamellia/00-firstScript.sql
new file mode 100644
index 000000000..2b75d7be1
--- /dev/null
+++ b/db/versions/.archive/10716-chocolateCamellia/00-firstScript.sql
@@ -0,0 +1,17 @@
+
+CREATE TABLE vn.transitoryDuaUnified (
+ id INT auto_increment NOT NULL,
+ supplierFk INT(10) UNSIGNED NULL,
+ CONSTRAINT transitoryDuaUnified_PK PRIMARY KEY (id),
+ CONSTRAINT transitoryDuaUnified_FK FOREIGN KEY (supplierFk) REFERENCES vn.supplier(id) ON DELETE CASCADE ON UPDATE CASCADE
+)
+ENGINE=InnoDB
+DEFAULT CHARSET=utf8mb3
+COLLATE=utf8mb3_unicode_ci
+COMMENT='Transitarios que al contabilizar sus entradas sólo generan un único DUA para todos los proveedores';
+
+
+INSERT INTO vn.transitoryDuaUnified (supplierFk)
+ SELECT id
+ FROM vn.supplier
+ WHERE name = 'VALLINOTO CARGO SA';
diff --git a/db/versions/.archive/10717-silverRose/00-firstScript.sql b/db/versions/.archive/10717-silverRose/00-firstScript.sql
new file mode 100644
index 000000000..73ae80c25
--- /dev/null
+++ b/db/versions/.archive/10717-silverRose/00-firstScript.sql
@@ -0,0 +1,6 @@
+ALTER TABLE vn.expedition ADD packingSiteFk INT NULL;
+ALTER TABLE vn.expedition ADD monitorId varchar(255) NULL;
+ALTER TABLE vn.expedition ADD started TIMESTAMP NOT NULL;
+ALTER TABLE vn.expedition ADD ended TIMESTAMP NOT NULL;
+
+ALTER TABLE vn.expedition ADD CONSTRAINT expedition_FK_1 FOREIGN KEY (packingSiteFk) REFERENCES vn.packingSite(id) ON DELETE SET NULL ON UPDATE CASCADE;
\ No newline at end of file
diff --git a/db/versions/.archive/10718-orangeRaphis/00-firstScript.sql b/db/versions/.archive/10718-orangeRaphis/00-firstScript.sql
new file mode 100644
index 000000000..d083fca48
--- /dev/null
+++ b/db/versions/.archive/10718-orangeRaphis/00-firstScript.sql
@@ -0,0 +1,2 @@
+ALTER TABLE vn.invoiceInConfig ADD taxRowLimit INT DEFAULT 4 NULL
+ COMMENT 'Número máximo de líneas de IVA que puede tener una factura';
\ No newline at end of file
diff --git a/db/versions/.archive/10719-orangeMonstera/00-firstScript.sql b/db/versions/.archive/10719-orangeMonstera/00-firstScript.sql
new file mode 100644
index 000000000..18a859114
--- /dev/null
+++ b/db/versions/.archive/10719-orangeMonstera/00-firstScript.sql
@@ -0,0 +1,6 @@
+ALTER TABLE pbx.sipConfig
+ DROP COLUMN avpf,
+ DROP COLUMN icesupport,
+ CHANGE careInvite directMedia enum('yes','no') DEFAULT NULL,
+ ADD `disallow` varchar(100) DEFAULT 'all',
+ ADD `allow` varchar(100) DEFAULT 'g729;ilbc;gsm;ulaw;alaw';
diff --git a/db/versions/.archive/10720-wheatCymbidium/00-firstScript.sql b/db/versions/.archive/10720-wheatCymbidium/00-firstScript.sql
new file mode 100644
index 000000000..045a2b697
--- /dev/null
+++ b/db/versions/.archive/10720-wheatCymbidium/00-firstScript.sql
@@ -0,0 +1,5 @@
+RENAME TABLE account.mailClientAccess TO account.mailClientAccess__;
+RENAME TABLE account.mailSenderAccess TO account.mailSenderAccess__;
+
+ALTER TABLE account.mailClientAccess__ COMMENT='@deprecated 2023-09-03';
+ALTER TABLE account.mailSenderAccess__ COMMENT='@deprecated 2023-09-03';
diff --git a/db/versions/.archive/10721-blueEucalyptus/00-firstScript.sql b/db/versions/.archive/10721-blueEucalyptus/00-firstScript.sql
new file mode 100644
index 000000000..c14220085
--- /dev/null
+++ b/db/versions/.archive/10721-blueEucalyptus/00-firstScript.sql
@@ -0,0 +1,2 @@
+ALTER TABLE vn.till MODIFY COLUMN concept varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NULL;
+ALTER TABLE vn2008.account_conciliacion MODIFY COLUMN Concepto varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NULL;
diff --git a/db/versions/.archive/10722-azureAralia/00-firstScript.vn.sql b/db/versions/.archive/10722-azureAralia/00-firstScript.vn.sql
new file mode 100644
index 000000000..2d04dfe03
--- /dev/null
+++ b/db/versions/.archive/10722-azureAralia/00-firstScript.vn.sql
@@ -0,0 +1,289 @@
+CREATE ROLE 'salix', 'android', 'hedera-web', 'grafana';
+
+REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'salix'@'10.0.%.%', 'android'@'10.0.%.%', 'hedera-web'@'10.0.%.%', 'grafana'@'10.0.%.%';
+
+GRANT 'salix' TO 'salix'@'10.0.%.%';
+GRANT 'android' TO 'android'@'10.0.%.%';
+GRANT 'hedera-web' TO 'hedera-web'@'10.0.%.%';
+GRANT 'grafana' TO 'grafana'@'10.0.%.%';
+
+SET DEFAULT ROLE 'salix' FOR 'salix'@'10.0.%.%';
+SET DEFAULT ROLE 'android' FOR 'android'@'10.0.%.%';
+SET DEFAULT ROLE 'hedera-web' FOR 'hedera-web'@'10.0.%.%';
+SET DEFAULT ROLE 'grafana' FOR 'grafana'@'10.0.%.%';
+
+-- salix
+ -- GRANT `$root` TO `salix` WITH ADMIN OPTION; Access denied for user 'root'@'%'
+GRANT CREATE USER ON *.* TO `salix` WITH GRANT OPTION;
+GRANT SELECT, UPDATE ON `mysql`.* TO `salix`;
+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE TEMPORARY TABLES, EXECUTE, EVENT ON `account`.* TO `salix`;
+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE TEMPORARY TABLES, EXECUTE ON `bs`.* TO `salix`;
+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE TEMPORARY TABLES, EXECUTE ON `util`.* TO `salix`;
+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE TEMPORARY TABLES, EXECUTE ON `pbx`.* TO `salix`;
+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE TEMPORARY TABLES, EXECUTE, EVENT ON `vn`.* TO `salix`;
+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `salix`.* TO `salix`;
+GRANT SELECT ON `managedesktop`.* TO `salix`;
+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE TEMPORARY TABLES, EXECUTE ON `edi`.* TO `salix`;
+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE TEMPORARY TABLES, EXECUTE ON `vn2008`.* TO `salix`;
+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE TEMPORARY TABLES, EXECUTE ON `tmp`.* TO `salix`;
+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE TEMPORARY TABLES, EXECUTE ON `sage`.* TO `salix`;
+GRANT SELECT, CREATE TEMPORARY TABLES, EXECUTE ON `cache`.* TO `salix`;
+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE TEMPORARY TABLES, EXECUTE ON `nst`.* TO `salix`;
+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE TEMPORARY TABLES, EXECUTE ON `hedera`.* TO `salix`;
+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE TEMPORARY TABLES, EXECUTE ON `postgresql`.* TO `salix`;
+
+-- android
+GRANT USAGE ON *.* TO `android`;
+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE TEMPORARY TABLES, EXECUTE ON `android`.* TO `android`;
+GRANT SELECT, INSERT, UPDATE, DELETE, EXECUTE ON `vn`.* TO `android`;
+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE TEMPORARY TABLES, EXECUTE ON `cache`.* TO `android`;
+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE TEMPORARY TABLES, EXECUTE ON `hedera`.* TO `android`;
+GRANT SELECT, EXECUTE ON `pbx`.* TO `android`;
+GRANT SELECT, INSERT, UPDATE, DELETE, DROP, CREATE TEMPORARY TABLES ON `tmp`.* TO `android`;
+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE TEMPORARY TABLES, EXECUTE ON `vn2008`.* TO `android`;
+GRANT SELECT ON `edi`.* TO `android`;
+GRANT SELECT, INSERT, UPDATE, DELETE, EXECUTE ON `account`.* TO `android`;
+GRANT SELECT, INSERT, UPDATE, DELETE, DROP, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, SHOW VIEW ON `bi`.* TO `android`;
+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE TEMPORARY TABLES, EXECUTE ON `Consumos`.* TO `android`;
+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE TEMPORARY TABLES, EXECUTE ON `vncontrol`.* TO `android`;
+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE TEMPORARY TABLES, EXECUTE ON `srt`.* TO `android`;
+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE TEMPORARY TABLES, EXECUTE ON `psico`.* TO `android`;
+GRANT SELECT ON `salix`.`AccessToken` TO `android`;
+GRANT EXECUTE ON PROCEDURE `util`.`debugadd` TO `android`;
+GRANT EXECUTE ON PROCEDURE `util`.`log_add` TO `android`;
+GRANT EXECUTE ON FUNCTION `util`.`vn_now` TO `android`;
+
+-- hedera-web
+GRANT USAGE ON *.* TO `hedera-web`;
+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE TEMPORARY TABLES, EXECUTE ON `stock`.* TO `hedera-web`;
+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE TEMPORARY TABLES, EXECUTE ON `vn`.* TO `hedera-web`;
+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE TEMPORARY TABLES, EXECUTE ON `hedera`.* TO `hedera-web`;
+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE TEMPORARY TABLES, EXECUTE ON `account`.* TO `hedera-web`;
+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE TEMPORARY TABLES, EXECUTE ON `vn2008`.* TO `hedera-web`;
+GRANT SELECT ON `util`.* TO `hedera-web`;
+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE TEMPORARY TABLES, EXECUTE ON `edi`.* TO `hedera-web`;
+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE TEMPORARY TABLES, EXECUTE ON `salix`.* TO `hedera-web`;
+
+-- grafana
+GRANT USAGE ON *.* TO `grafana` WITH MAX_USER_CONNECTIONS 50;
+GRANT EXECUTE ON `util`.* TO `grafana`;
+GRANT SELECT ON `vn`.`mistakeType` TO `grafana`;
+GRANT SELECT ON `vn`.`collectionHotbed` TO `grafana`;
+GRANT SELECT ON `bs`.`clientDied` TO `grafana`;
+GRANT SELECT ON `vn`.`expeditionScan` TO `grafana`;
+GRANT SELECT ON `vn`.`sale` TO `grafana`;
+GRANT SELECT ON `vn`.`printQueue` TO `grafana`;
+GRANT SELECT ON `vn`.`operator` TO `grafana`;
+GRANT SELECT ON `vn`.`itemType` TO `grafana`;
+GRANT SELECT ON `vn`.`expedition` TO `grafana`;
+GRANT SELECT ON `srt`.`bufferState` TO `grafana`;
+GRANT SELECT ON `edi`.`offerList` TO `grafana`;
+GRANT SELECT ON `vn`.`creditInsurance` TO `grafana`;
+GRANT SELECT ON `vn`.`workerTimeControl` TO `grafana`;
+GRANT SELECT ON `vn`.`volumeConfig` TO `grafana`;
+GRANT SELECT ON `vn`.`agency` TO `grafana`;
+GRANT SELECT ON `vn`.`alertLevel` TO `grafana`;
+GRANT SELECT (user_id, extension) ON `pbx`.`sip` TO `grafana`;
+GRANT SELECT ON `vn`.`expeditionStateType` TO `grafana`;
+GRANT SELECT ON `vn`.`businessType` TO `grafana`;
+GRANT SELECT ON `vn`.`time` TO `grafana`;
+GRANT SELECT ON `hedera`.`visitUser` TO `grafana`;
+GRANT SELECT ON `vn`.`workCenter` TO `grafana`;
+GRANT SELECT ON `vn`.`ticket` TO `grafana`;
+GRANT SELECT ON `vn`.`ticketWeekly` TO `grafana`;
+GRANT SELECT ON `vn`.`claimEnd` TO `grafana`;
+GRANT SELECT ON `vn`.`arcRead` TO `grafana`;
+GRANT SELECT ON `vn`.`saleGoal` TO `grafana`;
+GRANT SELECT ON `edi`.`supplyResponse` TO `grafana`;
+GRANT SELECT ON `vn`.`invoiceInTax` TO `grafana`;
+GRANT SELECT ON `bs`.`salesPersonEvolution` TO `grafana`;
+GRANT SELECT ON `vn`.`saleComponent` TO `grafana`;
+GRANT SELECT ON `vn`.`itemShelvingStock` TO `grafana`;
+GRANT SELECT ON `vn`.`clientChain` TO `grafana`;
+GRANT SELECT ON `edi`.`VMPSettings` TO `grafana`;
+GRANT SELECT ON `util`.`debug` TO `grafana`;
+GRANT SELECT ON `vn`.`claimResponsible` TO `grafana`;
+GRANT SELECT ON `vn`.`ticketState` TO `grafana`;
+GRANT SELECT ON `vn`.`packingSiteLog` TO `grafana`;
+GRANT SELECT ON `bs`.`sale` TO `grafana`;
+GRANT SELECT ON `vn`.`ink` TO `grafana`;
+GRANT SELECT ON `bs`.`inventoryDiscrepancyDetail` TO `grafana`;
+GRANT SELECT ON `vn`.`clientCredit` TO `grafana`;
+GRANT SELECT ON `vn`.`workerMana` TO `grafana`;
+GRANT SELECT ON `vn`.`greugeType` TO `grafana`;
+GRANT SELECT ON `vn`.`supplierPackaging` TO `grafana`;
+GRANT SELECT ON `vn`.`mdbVersion` TO `grafana`;
+GRANT SELECT ON `vn`.`clientLog` TO `grafana`;
+GRANT SELECT ON `vn`.`calendar` TO `grafana`;
+GRANT SELECT ON `vn`.`campaign` TO `grafana`;
+GRANT SELECT ON `vn`.`ticketService` TO `grafana`;
+GRANT SELECT ON `vn`.`report` TO `grafana`;
+GRANT SELECT ON `vn`.`buyer` TO `grafana`;
+GRANT SELECT ON `bs`.`defaulter` TO `grafana`;
+GRANT SELECT ON `vn`.`componentType` TO `grafana`;
+GRANT SELECT ON `vn`.`clientManaCache` TO `grafana`;
+GRANT SELECT ON `vn`.`invoiceIn` TO `grafana`;
+GRANT SELECT ON `edi`.`deliveryInformation` TO `grafana`;
+GRANT SELECT ON `srt`.`bufferType` TO `grafana`;
+GRANT SELECT ON `account`.`role` TO `grafana`;
+GRANT SELECT ON `edi`.`supplyOffer` TO `grafana`;
+GRANT SELECT ON `vn`.`travel` TO `grafana`;
+GRANT SELECT ON `srt`.`bufferFreeLength` TO `grafana`;
+GRANT SELECT ON `vn`.`worker` TO `grafana`;
+GRANT SELECT ON `vn`.`client` TO `grafana`;
+GRANT SELECT ON `vn`.`supplier` TO `grafana`;
+GRANT SELECT ON `vn`.`zoneEstimatedDelivery` TO `grafana`;
+GRANT SELECT ON `vn`.`workerDistributionCategory` TO `grafana`;
+GRANT SELECT ON `vn`.`entry` TO `grafana`;
+GRANT SELECT ON `vn`.`claimBeginning` TO `grafana`;
+GRANT SELECT ON `vn`.`payMethod` TO `grafana`;
+GRANT SELECT ON `vn`.`collection` TO `grafana`;
+GRANT SELECT ON `srt`.`routePalletized` TO `grafana`;
+GRANT SELECT ON `bs`.`inventoryDiscrepancy` TO `grafana`;
+GRANT SELECT ON `vn`.`itemImageQueue` TO `grafana`;
+GRANT SELECT ON `bi`.`rutasBoard` TO `grafana`;
+GRANT SELECT ON `vn`.`department` TO `grafana`;
+GRANT SELECT ON `bs`.`workerLabourDataByMonth` TO `grafana`;
+GRANT SELECT ON `vn`.`route` TO `grafana`;
+GRANT SELECT ON `vn`.`routeCommission` TO `grafana`;
+GRANT SELECT ON `bs`.`m3` TO `grafana`;
+GRANT SELECT ON `vn`.`itemCost` TO `grafana`;
+GRANT SELECT ON `vn`.`zone` TO `grafana`;
+GRANT SELECT ON `vn`.`mdbApp` TO `grafana`;
+GRANT SELECT ON `vn`.`ticketPackaging` TO `grafana`;
+GRANT SELECT ON `vn`.`itemTaxCountry` TO `grafana`;
+GRANT SELECT ON `vn`.`sectorCollection` TO `grafana`;
+GRANT SELECT ON `vn`.`address` TO `grafana`;
+GRANT SELECT ON `vn`.`deviceProductionLog` TO `grafana`;
+GRANT SELECT ON `vn`.`itemPackingType` TO `grafana`;
+GRANT SELECT ON `vn`.`workerJourney` TO `grafana`;
+GRANT SELECT ON `srt`.`expedition` TO `grafana`;
+GRANT SELECT ON `vn`.`expeditionMistake` TO `grafana`;
+GRANT SELECT ON `vn`.`productionError` TO `grafana`;
+GRANT SELECT ON `vn`.`expeditionState` TO `grafana`;
+GRANT SELECT ON `bs`.`salesByItemTypeDay` TO `grafana`;
+GRANT SELECT ON `vn`.`packingSite` TO `grafana`;
+GRANT SELECT ON `vn`.`businessCalendar` TO `grafana`;
+GRANT SELECT ON `vn`.`chain` TO `grafana`;
+GRANT SELECT ON `vn`.`clientRisk` TO `grafana`;
+GRANT SELECT ON `vn`.`claimRedelivery` TO `grafana`;
+GRANT SELECT ON `vn`.`business` TO `grafana`;
+GRANT SELECT ON `bs`.`clientAnnualConsumption` TO `grafana`;
+GRANT SELECT ON `vn`.`dock` TO `grafana`;
+GRANT SELECT ON `vn`.`item` TO `grafana`;
+GRANT SELECT ON `vn`.`province` TO `grafana`;
+GRANT SELECT ON `vn`.`shelving` TO `grafana`;
+GRANT SELECT ON `vn`.`claim` TO `grafana`;
+GRANT SELECT ON `vn`.`clientType` TO `grafana`;
+GRANT SELECT ON `vn`.`supplierAccount` TO `grafana`;
+GRANT SELECT ON `vn`.`workerDepartment` TO `grafana`;
+GRANT SELECT ON `pbx`.`cdr` TO `grafana`;
+GRANT SELECT ON `vn`.`workerTimeControlConfig` TO `grafana`;
+GRANT SELECT ON `vn`.`workerMistake` TO `grafana`;
+GRANT SELECT ON `edi`.`putOrder` TO `grafana`;
+GRANT SELECT ON `vn`.`saleMistake` TO `grafana`;
+GRANT SELECT ON `vn`.`deviceProductionUser` TO `grafana`;
+GRANT SELECT ON `vn`.`contactChannel` TO `grafana`;
+GRANT SELECT ON `vn`.`deviceLog` TO `grafana`;
+GRANT SELECT ON `vn`.`vehicle` TO `grafana`;
+GRANT SELECT ON `vn`.`packaging` TO `grafana`;
+GRANT SELECT ON `bs`.`workerProductivityConfig` TO `grafana`;
+GRANT SELECT ON `srt`.`antenna` TO `grafana`;
+GRANT SELECT ON `vn`.`cmr` TO `grafana`;
+GRANT SELECT ON `vn`.`accounting` TO `grafana`;
+GRANT SELECT ON `vn`.`creditClassification` TO `grafana`;
+GRANT SELECT ON `vn`.`ticketLog` TO `grafana`;
+GRANT SELECT ON `srt`.`moving` TO `grafana`;
+GRANT SELECT ON `vn`.`claimDevelopment` TO `grafana`;
+GRANT SELECT ON `srt`.`expeditionLog` TO `grafana`;
+GRANT SELECT ON `bs`.`compradores_evolution` TO `grafana`;
+GRANT SELECT ON `vn`.`currency` TO `grafana`;
+GRANT SELECT ON `vn`.`claimObservation` TO `grafana`;
+GRANT SELECT ON `vn`.`salesPreviousPreparated` TO `grafana`;
+GRANT SELECT ON `vn`.`claimState` TO `grafana`;
+GRANT SELECT ON `vn`.`company` TO `grafana`;
+GRANT SELECT ON `srt`.`buffer` TO `grafana`;
+GRANT SELECT ON `vn`.`greuge` TO `grafana`;
+GRANT SELECT ON `vn`.`routeComplement` TO `grafana`;
+GRANT SELECT ON `vn`.`saleVolume` TO `grafana`;
+GRANT SELECT ON `vn`.`component` TO `grafana`;
+GRANT SELECT ON `vn`.`train` TO `grafana`;
+GRANT SELECT ON `srt`.`ticketPalletized` TO `grafana`;
+GRANT SELECT ON `vn`.`autonomy` TO `grafana`;
+GRANT SELECT ON `vn`.`expeditionMistakeType` TO `grafana`;
+GRANT SELECT ON `vn`.`ticketParking` TO `grafana`;
+GRANT SELECT ON `vn`.`itemShelving` TO `grafana`;
+GRANT SELECT ON `vn`.`state` TO `grafana`;
+GRANT SELECT ON `vn`.`taxClass` TO `grafana`;
+GRANT SELECT ON `bs`.`salesByWeek` TO `grafana`;
+GRANT SELECT ON `vn`.`invoiceInDueDay` TO `grafana`;
+GRANT SELECT ON `vn`.`sectorProductivity` TO `grafana`;
+GRANT SELECT ON `bs`.`salesByclientSalesPerson` TO `grafana`;
+GRANT SELECT ON `edi`.`marketPlace` TO `grafana`;
+GRANT SELECT ON `vn`.`routeAction` TO `grafana`;
+GRANT SELECT ON `vn`.`deviceProduction` TO `grafana`;
+GRANT SELECT ON `vn`.`invoiceOut` TO `grafana`;
+GRANT SELECT ON `vn`.`printer` TO `grafana`;
+GRANT SELECT ON `vn`.`mdbBranch` TO `grafana`;
+GRANT SELECT ON `bs`.`workerProductivity` TO `grafana`;
+GRANT SELECT ON `vn`.`config` TO `grafana`;
+GRANT SELECT ON `hedera`.`userSession` TO `grafana`;
+GRANT SELECT ON `vn`.`receipt` TO `grafana`;
+GRANT SELECT ON `vn`.`buy` TO `grafana`;
+GRANT SELECT ON `vn`.`calendarHolidays` TO `grafana`;
+GRANT SELECT ON `vn`.`parking` TO `grafana`;
+GRANT SELECT ON `vn`.`role` TO `grafana`;
+GRANT SELECT ON `vn`.`errorLogApp` TO `grafana`;
+GRANT SELECT ON `vn`.`continent` TO `grafana`;
+GRANT SELECT ON `srt`.`lastRFID` TO `grafana`;
+GRANT SELECT ON `vn`.`farmingInvoiceIn` TO `grafana`;
+GRANT SELECT ON `vn`.`agencyMode` TO `grafana`;
+GRANT SELECT ON `vn`.`absenceType` TO `grafana`;
+GRANT SELECT ON `vn`.`saleGroupDetail` TO `grafana`;
+GRANT SELECT ON `vn`.`workerMistakeType` TO `grafana`;
+GRANT SELECT ON `vn`.`mdbVersionTree` TO `grafana`;
+GRANT SELECT ON `vn`.`expeditionTruck` TO `grafana`;
+GRANT SELECT ON `vn`.`routeConfig` TO `grafana`;
+GRANT SELECT ON `vn`.`claimReason` TO `grafana`;
+GRANT SELECT ON `edi`.`log` TO `grafana`;
+GRANT SELECT ON `srt`.`failureLog` TO `grafana`;
+GRANT SELECT ON `bs`.`clientNewBorn` TO `grafana`;
+GRANT SELECT ON `vn`.`farming` TO `grafana`;
+GRANT SELECT ON `hedera`.`order` TO `grafana`;
+GRANT SELECT ON `bs`.`packingSpeed` TO `grafana`;
+GRANT SELECT ON `vn`.`expense` TO `grafana`;
+GRANT SELECT ON `vn`.`workerLabour` TO `grafana`;
+GRANT SELECT ON `hedera`.`orderRow` TO `grafana`;
+GRANT SELECT ON `srt`.`movingLog` TO `grafana`;
+GRANT SELECT ON `vn`.`warehouse` TO `grafana`;
+GRANT SELECT ON `vn`.`sector` TO `grafana`;
+GRANT SELECT ON `vn`.`salesPersonGoal` TO `grafana`;
+GRANT SELECT ON `srt`.`movingState` TO `grafana`;
+GRANT SELECT ON `vn`.`claimResult` TO `grafana`;
+GRANT SELECT ON `vn`.`routesMonitor` TO `grafana`;
+GRANT SELECT ON `vn`.`expeditionPallet` TO `grafana`;
+GRANT SELECT ON `bs`.`ventas` TO `grafana`;
+GRANT SELECT ON `vn`.`intrastat` TO `grafana`;
+GRANT SELECT ON `vn`.`printQueueArgs` TO `grafana`;
+GRANT SELECT ON `bi`.`Greuge_Evolution` TO `grafana`;
+GRANT SELECT ON `vn`.`host` TO `grafana`;
+GRANT SELECT ON `vn`.`country` TO `grafana`;
+GRANT SELECT ON `bs`.`waste` TO `grafana`;
+GRANT SELECT ON `vn`.`ticketTracking` TO `grafana`;
+GRANT SELECT ON `vn`.`itemCategory` TO `grafana`;
+GRANT SELECT ON `vn`.`saleTracking` TO `grafana`;
+GRANT SELECT ON `vn`.`producer` TO `grafana`;
+GRANT SELECT ON `cache`.`stock` TO `grafana`;
+GRANT SELECT (name, active, role, email, id, nickname) ON `account`.`user` TO `grafana`;
+GRANT SELECT ON `vn`.`deliveryMethod` TO `grafana`;
+GRANT SELECT ON `vn`.`ticketCollection` TO `grafana`;
+GRANT EXECUTE ON PROCEDURE `vn`.`zone_upcomingdeliveries` TO `grafana`;
+GRANT EXECUTE ON PROCEDURE `vn`.`zone_getaddresses` TO `grafana`;
+GRANT EXECUTE ON FUNCTION `util`.`firstdayofmonth` TO `grafana`;
+GRANT EXECUTE ON FUNCTION `util`.`dayend` TO `grafana`;
+GRANT EXECUTE ON FUNCTION `vn`.`lastdayofweek` TO `grafana`;
+GRANT EXECUTE ON FUNCTION `vn`.`firstdayofweek` TO `grafana`;
+GRANT EXECUTE ON FUNCTION `util`.`quarterfirstday` TO `grafana`;
+GRANT EXECUTE ON FUNCTION `util`.`firstdayofyear` TO `grafana`;
+
+FLUSH PRIVILEGES;
diff --git a/db/versions/.archive/10725-wheatAnthurium/00-firstScript.sql b/db/versions/.archive/10725-wheatAnthurium/00-firstScript.sql
new file mode 100644
index 000000000..e26ad5197
--- /dev/null
+++ b/db/versions/.archive/10725-wheatAnthurium/00-firstScript.sql
@@ -0,0 +1,2 @@
+ALTER TABLE vn.worker MODIFY COLUMN bossFk int(10) unsigned DEFAULT 103 NOT NULL;
+ALTER TABLE vn.worker ADD CONSTRAINT workerWorker_FK FOREIGN KEY (bossFk) REFERENCES vn.worker(id) ON DELETE RESTRICT ON UPDATE CASCADE;
\ No newline at end of file
diff --git a/db/versions/.archive/10726-blackMastic/00-firstScript.sql b/db/versions/.archive/10726-blackMastic/00-firstScript.sql
new file mode 100644
index 000000000..bb357cf4b
--- /dev/null
+++ b/db/versions/.archive/10726-blackMastic/00-firstScript.sql
@@ -0,0 +1,3 @@
+
+ALTER TABLE vn.workerTimeControlConfig
+ ADD maxTimeToBreak INT DEFAULT 3600 NULL;
diff --git a/db/versions/.archive/10727-limeErica/00-addPrinterField.sql b/db/versions/.archive/10727-limeErica/00-addPrinterField.sql
new file mode 100644
index 000000000..1502fa418
--- /dev/null
+++ b/db/versions/.archive/10727-limeErica/00-addPrinterField.sql
@@ -0,0 +1 @@
+ALTER TABLE `vn`.`printer` ADD isRfid TINYINT DEFAULT 0 NOT NULL;
diff --git a/db/versions/.archive/10727-limeErica/01-createTableScreenModel.sql b/db/versions/.archive/10727-limeErica/01-createTableScreenModel.sql
new file mode 100644
index 000000000..dd11b6dfa
--- /dev/null
+++ b/db/versions/.archive/10727-limeErica/01-createTableScreenModel.sql
@@ -0,0 +1,13 @@
+/**
+ * Hemos utilizado CREATE OR REPLACE y IF || OR EXISTS
+ * porque se han subido los cambios a medias a dev y a
+ * test (en el proceso ha fallado), simplemente para que
+ * no falle.
+ */
+CREATE OR REPLACE TABLE `vn`.`screenModel` (
+ code VARCHAR(50) NOT NULL,
+ CONSTRAINT screenModel_UN PRIMARY KEY (code)
+)
+ENGINE=InnoDB
+DEFAULT CHARSET=utf8mb3
+COLLATE=utf8mb3_unicode_ci;
diff --git a/db/versions/.archive/10727-limeErica/02-createTableScreen.sql b/db/versions/.archive/10727-limeErica/02-createTableScreen.sql
new file mode 100644
index 000000000..3358229b4
--- /dev/null
+++ b/db/versions/.archive/10727-limeErica/02-createTableScreen.sql
@@ -0,0 +1,10 @@
+CREATE OR REPLACE TABLE `vn`.`screen` (
+ id INT(11) AUTO_INCREMENT NOT NULL,
+ `name` VARCHAR(100) NOT NULL,
+ modelFk VARCHAR(50) NOT NULL,
+ CONSTRAINT screen_PK PRIMARY KEY (id),
+ CONSTRAINT screen_FK FOREIGN KEY (modelFk) REFERENCES vn.screenModel(code) ON UPDATE CASCADE
+)
+ENGINE=InnoDB
+DEFAULT CHARSET=utf8mb3
+COLLATE=utf8mb3_unicode_ci;
diff --git a/db/versions/.archive/10727-limeErica/03-createTableScreenModel.sql b/db/versions/.archive/10727-limeErica/03-createTableScreenModel.sql
new file mode 100644
index 000000000..3f208a24e
--- /dev/null
+++ b/db/versions/.archive/10727-limeErica/03-createTableScreenModel.sql
@@ -0,0 +1,7 @@
+CREATE OR REPLACE TABLE `vn`.`scannerModel` (
+ code VARCHAR(50) NOT NULL,
+ CONSTRAINT scannerModel_UN PRIMARY KEY (code)
+)
+ENGINE=InnoDB
+DEFAULT CHARSET=utf8mb3
+COLLATE=utf8mb3_unicode_ci;
diff --git a/db/versions/.archive/10727-limeErica/04-createTableScanner.sql b/db/versions/.archive/10727-limeErica/04-createTableScanner.sql
new file mode 100644
index 000000000..dee978190
--- /dev/null
+++ b/db/versions/.archive/10727-limeErica/04-createTableScanner.sql
@@ -0,0 +1,10 @@
+CREATE OR REPLACE TABLE `vn`.`scanner` (
+ id INT(11) auto_increment NOT NULL,
+ name varchar(100) NOT NULL,
+ modelFk VARCHAR(50) NOT NULL,
+ CONSTRAINT scanner_PK PRIMARY KEY (id),
+ CONSTRAINT scanner_FK FOREIGN KEY (modelFk) REFERENCES vn.scannerModel(code) ON UPDATE CASCADE
+)
+ENGINE=InnoDB
+DEFAULT CHARSET=utf8mb3
+COLLATE=utf8mb3_unicode_ci;
diff --git a/db/versions/.archive/10727-limeErica/05-createTablePackingSiteDeviceLog.sql b/db/versions/.archive/10727-limeErica/05-createTablePackingSiteDeviceLog.sql
new file mode 100644
index 000000000..8d7d9456e
--- /dev/null
+++ b/db/versions/.archive/10727-limeErica/05-createTablePackingSiteDeviceLog.sql
@@ -0,0 +1,19 @@
+CREATE OR REPLACE TABLE `vn`.`packingSiteDeviceLog` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `originFk` int(11) DEFAULT NULL,
+ `userFk` int(10) unsigned DEFAULT NULL,
+ `action` set('insert','update','delete') NOT NULL,
+ `creationDate` timestamp NULL DEFAULT current_timestamp(),
+ `description` text CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL,
+ `changedModel` enum('PackingSite') NOT NULL DEFAULT 'PackingSite',
+ `oldInstance` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`oldInstance`)),
+ `newInstance` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`newInstance`)),
+ `changedModelId` int(11) NOT NULL,
+ `changedModelValue` varchar(45) DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `userFk` (`userFk`),
+ KEY `packingSiteDeviceLog_changedModel` (`changedModel`,`changedModelId`,`creationDate`),
+ KEY `packingSiteDeviceLog_packingSiteDeviceLog` (`originFk`,`creationDate`),
+ CONSTRAINT `packingSiteDeviceLog_ibfk_1` FOREIGN KEY (`originFk`) REFERENCES `client` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `packingSiteDeviceLog_ibfk_2` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci `PAGE_COMPRESSED`=1;
diff --git a/db/versions/.archive/10727-limeErica/06-alterTablePrinterModel.sql b/db/versions/.archive/10727-limeErica/06-alterTablePrinterModel.sql
new file mode 100644
index 000000000..9b28456ef
--- /dev/null
+++ b/db/versions/.archive/10727-limeErica/06-alterTablePrinterModel.sql
@@ -0,0 +1,8 @@
+ALTER TABLE vn.printer DROP FOREIGN KEY IF EXISTS printer_FK;
+ALTER TABLE vn.packingSiteLog DROP FOREIGN KEY IF EXISTS packingSiteLog_FK_1;
+
+ALTER TABLE vn.printerModel ADD CONSTRAINT printerModel_PK PRIMARY KEY IF NOT EXISTS (code);
+ALTER TABLE vn.printerModel DROP KEY IF EXISTS printerModel_UN;
+
+ALTER TABLE vn.printer ADD CONSTRAINT printer_FK FOREIGN KEY IF NOT EXISTS (modelFk) REFERENCES vn.printerModel(code) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.packingSiteLog ADD CONSTRAINT packingSiteLog_FK_1 FOREIGN KEY IF NOT EXISTS (printerModelFk) REFERENCES vn.printerModel(code) ON DELETE RESTRICT ON UPDATE CASCADE;
diff --git a/db/versions/.archive/10727-limeErica/07-AddFieldsToPackingSite.sql b/db/versions/.archive/10727-limeErica/07-AddFieldsToPackingSite.sql
new file mode 100644
index 000000000..958abfd8c
--- /dev/null
+++ b/db/versions/.archive/10727-limeErica/07-AddFieldsToPackingSite.sql
@@ -0,0 +1,14 @@
+ALTER TABLE vn.packingSite ADD printerRfidFk TINYINT(3) UNSIGNED DEFAULT NULL NULL UNIQUE AFTER hostFk;
+ALTER TABLE vn.packingSite ADD scannerFk INT(11) NULL UNIQUE;
+ALTER TABLE vn.packingSite ADD screenFk INT(11) NULL UNIQUE;
+ALTER TABLE vn.packingSite ADD editorFk INT(10) UNSIGNED NULL;
+
+ALTER TABLE vn.packingSite ADD CONSTRAINT packingSite_FK_4 FOREIGN KEY (printerRfidFk) REFERENCES vn.printer(id) ON UPDATE CASCADE;
+ALTER TABLE vn.packingSite ADD CONSTRAINT packingSite_FK_5 FOREIGN KEY (scannerFk) REFERENCES vn.scanner(id) ON UPDATE CASCADE;
+ALTER TABLE vn.packingSite ADD CONSTRAINT packingSite_FK_6 FOREIGN KEY (screenFk) REFERENCES vn.screen(id) ON UPDATE CASCADE;
+
+ALTER TABLE vn.packingSite CHANGE collectionFk collectionFk int(11) DEFAULT NULL NULL COMMENT 'Last collection packed on this site';
+ALTER TABLE vn.packingSite ADD CONSTRAINT packingSite_UNI UNIQUE KEY (hostFk);
+
+UPDATE vn.packingSite SET printerRfidFk = printerFk;
+UPDATE vn.packingSite SET printerFk = NULL;
diff --git a/db/versions/.archive/10730-whiteChrysanthemum/00-firstScript.sql b/db/versions/.archive/10730-whiteChrysanthemum/00-firstScript.sql
new file mode 100644
index 000000000..f537d1871
--- /dev/null
+++ b/db/versions/.archive/10730-whiteChrysanthemum/00-firstScript.sql
@@ -0,0 +1 @@
+ALTER TABLE pbx.sipConfig ADD qualify ENUM('yes','no') NULL DEFAULT NULL;
diff --git a/db/versions/.archive/10733-azureErica/00-firstScript.sql b/db/versions/.archive/10733-azureErica/00-firstScript.sql
new file mode 100644
index 000000000..8fdd37d38
--- /dev/null
+++ b/db/versions/.archive/10733-azureErica/00-firstScript.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.productionConfig ADD stockScopeDays INT DEFAULT 1 NULL COMMENT 'Días a futuro al revisar el stock';
diff --git a/db/versions/.archive/10736-maroonChico/00-workerBossNull.sql b/db/versions/.archive/10736-maroonChico/00-workerBossNull.sql
new file mode 100644
index 000000000..3747acf98
--- /dev/null
+++ b/db/versions/.archive/10736-maroonChico/00-workerBossNull.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.worker MODIFY COLUMN bossFk int(10) unsigned NULL DEFAULT 103;
diff --git a/db/versions/.archive/10739-turquoiseCordyline/00-firstScript.sql b/db/versions/.archive/10739-turquoiseCordyline/00-firstScript.sql
new file mode 100644
index 000000000..c6ef13e2d
--- /dev/null
+++ b/db/versions/.archive/10739-turquoiseCordyline/00-firstScript.sql
@@ -0,0 +1,88 @@
+ALTER TABLE vn.item DROP COLUMN IF EXISTS minQuantity;
+
+ALTER TABLE vn.item ADD minQuantity INT UNSIGNED DEFAULT NULL NULL
+ COMMENT 'Cantidad mínima para una línea de venta';
+
+INSERT IGNORE INTO hedera.message (code, description)
+ VALUES ('quantityLessThanMin','The quantity cannot be less than the minimum');
+
+INSERT IGNORE INTO hedera.messageI18n (code, lang, description) VALUES
+ ('quantityLessThanMin','fr','Le montant ne peut être inférieur au montant minimum'),
+ ('quantityLessThanMin','pt','O montante não pode ser inferior ao montante mínimo'),
+ ('quantityLessThanMin','es','La cantidad no puedes ser menor a la mínima');
+
+UPDATE hedera.message
+ SET description='Orders for holidays are not possible'
+ WHERE code='ORDER_DATE_HOLIDAY';
+
+UPDATE hedera.message
+ SET description='The order is empty'
+ WHERE code='ORDER_EMPTY';
+
+UPDATE hedera.message
+ SET description='Some items are no longer available, please check the quantities highlighted in red'
+ WHERE code='ORDER_UNAVAILABLE';
+
+UPDATE hedera.message
+ SET description='Only one vote per survey is possible'
+ WHERE code='SURVEY_MAX_ONE_VOTE';
+
+UPDATE hedera.message
+ SET description='You have exceeded the maximum number of unconfirmed orders, please delete or confirm started orders'
+ WHERE code='ORDER_MAX_EXCEEDED';
+
+UPDATE hedera.message
+ SET description='Incorrect username or password. Case-sensitive.'
+ WHERE code='LOGIN_INCORRECT';
+
+UPDATE hedera.message
+ SET description='The order date must be today or later'
+ WHERE code='ORDER_DATE_PAST';
+
+UPDATE hedera.message
+ SET description='No more orders can be made for today, please postpone your order for tomorrow or later'
+ WHERE code='ORDER_DATE_LAST';
+
+UPDATE hedera.message
+ SET description='Orders for Sunday cannot be confirmed'
+ WHERE code='ORDER_DATE_SUNDAY';
+
+UPDATE hedera.message
+ SET description='We are overwhelmed with orders, please select another delivery or pick-up date'
+ WHERE code='ORDER_DATE_SATURATED';
+
+UPDATE hedera.message
+ SET description='You have been disconnected from the server, please log in again'
+ WHERE code='USER_DISCONNECTED';
+
+UPDATE hedera.message
+ SET description='Action not allowed'
+ WHERE code='UNAUTH_ACTION';
+
+UPDATE hedera.message
+ SET description='The shipping agency is not valid'
+ WHERE code='ORDER_INVALID_AGENCY';
+
+UPDATE hedera.message
+ SET description='Please select a shipping address'
+ WHERE code='ORDER_EMPTY_ADDRESS';
+
+UPDATE hedera.message
+ SET description='This item is sold in bundles, the quantity has been rounded'
+ WHERE code='ORDER_AMOUNT_ROUNDED';
+
+UPDATE hedera.message
+ SET description='The order configuration is incorrect, please reconfigure it to continue shopping'
+ WHERE code='orderOutdated';
+
+UPDATE hedera.message
+ SET description='The order belongs to another user'
+ WHERE code='orderNotOwnedByUser';
+
+UPDATE hedera.message
+ SET description='The order has already been confirmed and cannot be modified'
+ WHERE code='orderConfirmed';
+
+UPDATE hedera.message
+ SET description='Incomplete tax data, please contact your sales representative'
+ WHERE code='clientNotVerified';
\ No newline at end of file
diff --git a/db/versions/.archive/10740-pinkCataractarum/00-firstScript.sql b/db/versions/.archive/10740-pinkCataractarum/00-firstScript.sql
new file mode 100644
index 000000000..d46373355
--- /dev/null
+++ b/db/versions/.archive/10740-pinkCataractarum/00-firstScript.sql
@@ -0,0 +1,9 @@
+UPDATE bs.clientDied SET Aviso='first' WHERE Aviso like 'Primer Aviso';
+UPDATE bs.clientDied SET Aviso='second' WHERE Aviso like 'Segundo Aviso';
+UPDATE bs.clientDied SET Aviso='third' WHERE Aviso like 'Tercer Aviso';
+
+ALTER TABLE bs.clientDied CHANGE id clientFk int(11) DEFAULT 0 NOT NULL;
+ALTER TABLE bs.clientDied CHANGE Aviso warning ENUM('first', 'second','third') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL NULL;
+ALTER TABLE bs.clientDied CHANGE workerCode workerCode__ varchar(3) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL COMMENT '@deprecated 2023-10-15';
+ALTER TABLE bs.clientDied CHANGE clientName clientName__ varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL COMMENT '@deprecated 2023-10-15';
+ALTER TABLE bs.clientDied CHANGE Boss Boss__ varchar(3) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL COMMENT '@deprecated 2023-10-15';
\ No newline at end of file
diff --git a/db/versions/.archive/10741-maroonMastic/01-refactorCplusTrascendency472.sql b/db/versions/.archive/10741-maroonMastic/01-refactorCplusTrascendency472.sql
new file mode 100644
index 000000000..37d0b2c0d
--- /dev/null
+++ b/db/versions/.archive/10741-maroonMastic/01-refactorCplusTrascendency472.sql
@@ -0,0 +1,54 @@
+UPDATE vn.cplusTrascendency472
+ SET id=13
+ WHERE id=11;
+
+UPDATE vn.cplusTrascendency472
+ SET id=14
+ WHERE id=12;
+
+UPDATE vn.cplusTrascendency472
+ SET id=12
+ WHERE id=10;
+
+UPDATE vn.cplusTrascendency472
+ SET description='Operación de régimen general'
+ WHERE id=1;
+UPDATE vn.cplusTrascendency472
+ SET description='Operaciones por las que los empresarios satisfacen compensaciones REAGYP'
+ WHERE id=2;
+UPDATE vn.cplusTrascendency472
+ SET description='Operaciones a las que se aplique el régimen especial de bienes usados, objetos de arte, antigüedades y objetos de colección (135 - 139 de LIVA)'
+ WHERE id=3;
+UPDATE vn.cplusTrascendency472
+ SET description='Régimen especial oro de inversión'
+ WHERE id=4;
+UPDATE vn.cplusTrascendency472
+ SET description='Régimen especial agencias de viajes'
+ WHERE id=5;
+UPDATE vn.cplusTrascendency472
+ SET description='Régimen especial grupo de entidades en IVA (Nivel Avanzado)'
+ WHERE id=6;
+UPDATE vn.cplusTrascendency472
+ SET description='Régimen especial criterio de caja'
+ WHERE id=7;
+UPDATE vn.cplusTrascendency472
+ SET description='Operaciones sujetas al IPSI / IGIC'
+ WHERE id=8;
+UPDATE vn.cplusTrascendency472
+ SET description='Adquisiciones intracomunitarias de bienes y prestaciones de servicios'
+ WHERE id=9;
+UPDATE vn.cplusTrascendency472
+ SET description='Operaciones de arrendamiento de local de negocio'
+ WHERE id=12;
+UPDATE vn.cplusTrascendency472
+ SET description='Factura correspondiente a una importación (informada sin asociar a un DUA)'
+ WHERE id=13;
+UPDATE vn.cplusTrascendency472
+ SET description='Primer semestre 2017'
+ WHERE id=14;
+
+RENAME TABLE vn.cplusTrascendency472 TO vn.siiTrascendencyInvoiceIn;
+ ALTER TABLE vn.siiTrascendencyInvoiceIn
+ COMMENT='Clave de régimen especial o trascendencia en facturas recibidas en el suministro de inmediato';
+
+ALTER TABLE vn.invoiceIn CHANGE cplusTrascendency472Fk siiTrascendencyInvoiceInFk int(10) unsigned DEFAULT 1 NULL;
diff --git a/db/versions/.archive/10741-maroonMastic/02-refactorCplusTrascendency477.sql b/db/versions/.archive/10741-maroonMastic/02-refactorCplusTrascendency477.sql
new file mode 100644
index 000000000..7a6066677
--- /dev/null
+++ b/db/versions/.archive/10741-maroonMastic/02-refactorCplusTrascendency477.sql
@@ -0,0 +1,55 @@
+RENAME TABLE vn.cplusTrascendency477 TO vn.siiTrascendencyInvoiceOut;
+ ALTER TABLE vn.siiTrascendencyInvoiceOut
+ COMMENT='Clave de régimen especial o trascendencia en facturas expedidas del suministro de inmediato';
+
+ALTER TABLE vn.pgc CHANGE cplusTrascendency477Fk siiTrascendencyInvoiceOutFk int(10) unsigned DEFAULT 1 NULL;
+ALTER TABLE vn.invoiceOut CHANGE cplusTrascendency477Fk siiTrascendencyInvoiceOutFk int(10) unsigned DEFAULT 1 NOT NULL;
+
+UPDATE vn.siiTrascendencyInvoiceOut
+ SET description='Operación de régimen general'
+ WHERE id=1;
+UPDATE vn.siiTrascendencyInvoiceOut
+ SET description='Exportación'
+ WHERE id=2;
+UPDATE vn.siiTrascendencyInvoiceOut
+ SET description='Operaciones a las que se aplique el régimen especial de bienes usados, objetos de arte, antigüedades y objetos de colección (135 - 139 de LIVA)'
+ WHERE id=3;
+UPDATE vn.siiTrascendencyInvoiceOut
+ SET description='Régimen especial oro de inversión'
+ WHERE id=4;
+UPDATE vn.siiTrascendencyInvoiceOut
+ SET description='Régimen especial agencias de viajes'
+ WHERE id=5;
+UPDATE vn.siiTrascendencyInvoiceOut
+ SET description='Régimen especial grupo de entidades en IVA (Nivel Avanzado)'
+ WHERE id=6;
+UPDATE vn.siiTrascendencyInvoiceOut
+ SET description='Régimen especial criterio de caja'
+ WHERE id=7;
+UPDATE vn.siiTrascendencyInvoiceOut
+ SET description='Operaciones sujetas al IPSI / IGIC'
+ WHERE id=8;
+UPDATE vn.siiTrascendencyInvoiceOut
+ SET description='Facturación de las prestaciones de servicios de agencias de viaje que actúan como mediadoras en nombre y por cuenta ajena (D.A.4ª RD 1619/2012)'
+ WHERE id=9;
+UPDATE vn.siiTrascendencyInvoiceOut
+ SET description='Cobros por cuenta de terceros de honorarios profesionales o de Dº derivados de la propiedad industrial, de autor u otros por cuenta de sus socios, asociados,colegiados efectuados por sociedades, asociaciones, colegios profesionales u otras entidades '
+ WHERE id=10;
+UPDATE vn.siiTrascendencyInvoiceOut
+ SET description='Operaciones de arrendamiento de local de negocio sujetas a retención'
+ WHERE id=11;
+UPDATE vn.siiTrascendencyInvoiceOut
+ SET description='Operaciones de arrendamiento de local de negocio no sujetos a retención'
+ WHERE id=12;
+UPDATE vn.siiTrascendencyInvoiceOut
+ SET description='Operaciones de arrendamiento de local de negocio sujetas y no sujetas a retención'
+ WHERE id=13;
+UPDATE vn.siiTrascendencyInvoiceOut
+ SET description='Factura con IVA pendiente de devengo (certificaciones de obra cuyo destinatario sea una Administración Pública)'
+ WHERE id=14;
+UPDATE vn.siiTrascendencyInvoiceOut
+ SET description='Factura con IVA pendiente de devengo - operaciones de tracto sucesivo'
+ WHERE id=15;
+UPDATE vn.siiTrascendencyInvoiceOut
+ SET description='Primer semestre 2017'
+ WHERE id=16;
\ No newline at end of file
diff --git a/db/versions/.archive/10741-maroonMastic/03-refactorCplusInvoiceType477.sql b/db/versions/.archive/10741-maroonMastic/03-refactorCplusInvoiceType477.sql
new file mode 100644
index 000000000..cc1b958ab
--- /dev/null
+++ b/db/versions/.archive/10741-maroonMastic/03-refactorCplusInvoiceType477.sql
@@ -0,0 +1,49 @@
+RENAME TABLE vn.cplusInvoiceType477 TO vn.siiTypeInvoiceOut;
+ ALTER TABLE vn.siiTypeInvoiceOut
+ COMMENT='Tipo de Factura Emitidas en el suministro de inmediato';
+
+ALTER TABLE vn.invoiceOut CHANGE cplusInvoiceType477Fk siiTypeInvoiceOut int(10) unsigned DEFAULT 1 NOT NULL;
+
+ALTER TABLE vn.invoiceCorrection CHANGE cplusInvoiceType477Fk siiTypeInvoiceOutFk int(10) unsigned NOT NULL;
+
+ALTER TABLE vn.siiTypeInvoiceOut ADD code varchar(2) NOT NULL AFTER `id`;
+
+UPDATE vn.siiTypeInvoiceOut
+ SET code='F1',
+ description = 'Factura'
+ WHERE id=1;
+UPDATE vn.siiTypeInvoiceOut
+ SET code='F2',
+ description = 'Factura simplificada (ticket)'
+ WHERE id=2;
+UPDATE vn.siiTypeInvoiceOut
+ SET code='F3',
+ description = 'Factura emitida en sustitución de facturas simplificadas facturadas y declaradas'
+ WHERE id=3;
+UPDATE vn.siiTypeInvoiceOut
+ SET code='F4',
+ description = 'Asiento resumen de facturas'
+ WHERE id=4;
+UPDATE vn.siiTypeInvoiceOut
+ SET code='R1',
+ description = 'Factura rectificativa (Art. 80.1, 80.2 y error fundado en derecho)'
+ WHERE id=5;
+UPDATE vn.siiTypeInvoiceOut
+ SET code='R2',
+ description = 'Factura rectificativa (Art. 80.3)'
+ WHERE id=6;
+UPDATE vn.siiTypeInvoiceOut
+ SET code='R3',
+ description = 'Factura rectificativa (Art. 80.4)'
+ WHERE id=7;
+UPDATE vn.siiTypeInvoiceOut
+ SET code='R4',
+ description = 'Factura rectificativa (Resto)'
+ WHERE id=8;
+UPDATE vn.siiTypeInvoiceOut
+ SET code='R5',
+ description = 'Factura rectificativa en facturas simplificadas'
+ WHERE id=9;
+
+ALTER TABLE `vn`.`siiTypeInvoiceOut`
+ ADD UNIQUE INDEX `code_UNIQUE` (`code` ASC) ;
\ No newline at end of file
diff --git a/db/versions/.archive/10741-maroonMastic/04-refactorCplusInvoiceType472.sql b/db/versions/.archive/10741-maroonMastic/04-refactorCplusInvoiceType472.sql
new file mode 100644
index 000000000..419e58568
--- /dev/null
+++ b/db/versions/.archive/10741-maroonMastic/04-refactorCplusInvoiceType472.sql
@@ -0,0 +1,44 @@
+RENAME TABLE vn.cplusInvoiceType472 TO vn.siiTypeInvoiceIn;
+ALTER TABLE vn.siiTypeInvoiceIn
+COMMENT='Tipo de Factura Recibidas en el suministro de inmediato';
+
+ALTER TABLE vn.invoiceIn CHANGE cplusInvoiceType472Fk siiTypeInvoiceInFk int(10) unsigned DEFAULT 1 NULL;
+
+ALTER TABLE vn.siiTypeInvoiceIn ADD code varchar(2) NOT NULL AFTER `id`;
+
+UPDATE vn.siiTypeInvoiceIn
+ SET code='F1',description='Factura'
+ WHERE id=1;
+UPDATE vn.siiTypeInvoiceIn
+ SET code='F2',description='Factura simplificada (ticket)'
+ WHERE id=2;
+UPDATE vn.siiTypeInvoiceIn
+ SET code='F3',description='Factura emitida en sustitución de facturas simplificadas facturadas y declaradas'
+ WHERE id=3;
+UPDATE vn.siiTypeInvoiceIn
+ SET code='F4',description='Asiento resumen de facturas'
+ WHERE id=4;
+UPDATE vn.siiTypeInvoiceIn
+ SET code='F5',description='Importaciones (DUA)'
+ WHERE id=5;
+UPDATE vn.siiTypeInvoiceIn
+ SET code='F6',description='Otros justificantes contables'
+ WHERE id=6;
+UPDATE vn.siiTypeInvoiceIn
+ SET code='R1',description='Factura rectificativa (Art. 80.1, 80.2 y error fundado en derecho)'
+ WHERE id=7;
+UPDATE vn.siiTypeInvoiceIn
+ SET code='R2',description='Factura rectificativa (Art. 80.3)'
+ WHERE id=8;
+UPDATE vn.siiTypeInvoiceIn
+ SET code='R3',description='Factura rectificativa (Art. 80.4)'
+ WHERE id=9;
+UPDATE vn.siiTypeInvoiceIn
+ SET code='R4',description='Factura rectificativa (Resto)'
+ WHERE id=10;
+UPDATE vn.siiTypeInvoiceIn
+ SET code='R5',description='Factura rectificativa en facturas simplificadas'
+ WHERE id=11;
+
+ALTER TABLE `vn`.`siiTypeInvoiceIn`
+ ADD UNIQUE INDEX `code_UNIQUE` (`code` ASC) ;
\ No newline at end of file
diff --git a/db/versions/.archive/10741-maroonMastic/05-fixes.sql b/db/versions/.archive/10741-maroonMastic/05-fixes.sql
new file mode 100644
index 000000000..8a42e3365
--- /dev/null
+++ b/db/versions/.archive/10741-maroonMastic/05-fixes.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.invoiceOut CHANGE siiTypeInvoiceOut siiTypeInvoiceOutFk int(10) unsigned DEFAULT 1 NOT NULL;
\ No newline at end of file
diff --git a/db/versions/.archive/10744-aquaBirch/00-firstScript.sql b/db/versions/.archive/10744-aquaBirch/00-firstScript.sql
new file mode 100644
index 000000000..a4f6c32ad
--- /dev/null
+++ b/db/versions/.archive/10744-aquaBirch/00-firstScript.sql
@@ -0,0 +1,9 @@
+UPDATE vn.shelving
+SET isPrinted = TRUE
+ WHERE LEFT (code, 2) IN (
+ SELECT DISTINCT LEFT(code,2)
+ FROM vn.shelving
+ WHERE isPrinted
+ AND code REGEXP '^[A-Za-z]{2}[0-9]'
+ ORDER BY code)
+ AND code REGEXP '^[A-Za-z]{2}[0-9]'
\ No newline at end of file
diff --git a/db/versions/.archive/10746-aquaMastic/00-firstScript.sql b/db/versions/.archive/10746-aquaMastic/00-firstScript.sql
new file mode 100644
index 000000000..87fdd140d
--- /dev/null
+++ b/db/versions/.archive/10746-aquaMastic/00-firstScript.sql
@@ -0,0 +1,4 @@
+-- Place your SQL code here
+ALTER TABLE vn.salespersonConfig ADD manaDateFrom DATE DEFAULT '2023-01-01' NOT NULL COMMENT 'first date to count mana';
+ALTER TABLE vn.salespersonConfig ADD manaFromDays INT DEFAULT 90 NOT NULL COMMENT 'Range of days from mana calculation';
+ALTER TABLE vn.salespersonConfig ADD manaToDays INT DEFAULT 30 NOT NULL COMMENT 'Range of days to mana calculation';
diff --git a/db/versions/.archive/10747-brownRaphis/00-firstScript.sql b/db/versions/.archive/10747-brownRaphis/00-firstScript.sql
new file mode 100644
index 000000000..517cbddd8
--- /dev/null
+++ b/db/versions/.archive/10747-brownRaphis/00-firstScript.sql
@@ -0,0 +1,13 @@
+ALTER TABLE bi.rutasBoard CHANGE km km__ varchar(9) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL NULL COMMENT '@deprecated 2023-11-01, refs #6087';
+ALTER TABLE bi.rutasBoard CHANGE Dia Dia__ varchar(9) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL NULL COMMENT '@deprecated 2023-11-01, refs #6087';
+ALTER TABLE bi.rutasBoard CHANGE Terceros Terceros__ int(11) DEFAULT NULL NULL COMMENT '@deprecated 2023-11-01, refs #6087';
+ALTER TABLE bi.rutasBoard CHANGE Matricula Matricula__ varchar(10) DEFAULT NULL NULL COMMENT '@deprecated 2023-11-01, refs #6087';
+ALTER TABLE bi.rutasBoard CHANGE Tipo Tipo__ varchar(1) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL NULL COMMENT '@deprecated 2023-11-01, refs #6087';
+ALTER TABLE bi.rutasBoard CHANGE `year` year__ int(4) DEFAULT NULL NULL COMMENT '@deprecated 2023-11-01, refs #6087';
+ALTER TABLE bi.rutasBoard CHANGE `month` month__ int(2) DEFAULT NULL NULL COMMENT '@deprecated 2023-11-01, refs #6087';
+ALTER TABLE bi.rutasBoard CHANGE warehouse_id warehouse_id__ smallint(5) unsigned DEFAULT NULL NULL COMMENT '@deprecated 2023-11-01, refs #6087';
+ALTER TABLE bi.rutasBoard CHANGE coste_bulto coste_bulto__ decimal(10,2) unsigned DEFAULT NULL NULL COMMENT '@deprecated 2023-11-01, refs #6087';
+ALTER TABLE bi.rutasBoard CHANGE m3 m3__ decimal(10,1) unsigned DEFAULT NULL NULL COMMENT '@deprecated 2023-11-01, refs #6087';
+
+ALTER TABLE bi.rutasBoard
+COMMENT='Se usa en https://grafana.verdnatura.es/d/c089276b-5ab5-430f-aa76-e5d8e0e7fe2e/analisis-de-volumen-y-rendimiento-por-agencia?orgId=1';
diff --git a/db/versions/.archive/10748-navyRose/00-firstScript.sql b/db/versions/.archive/10748-navyRose/00-firstScript.sql
new file mode 100644
index 000000000..6f6e081d4
--- /dev/null
+++ b/db/versions/.archive/10748-navyRose/00-firstScript.sql
@@ -0,0 +1,2 @@
+ALTER TABLE vn.cmr CHANGE ticketFk `ticketFk__` int(11) DEFAULT NULL NULL COMMENT '@deprecated 2023-10-20 refs #6092';
+ALTER TABLE vn.cmr MODIFY COLUMN `ticketFk__` int(11) DEFAULT NULL NULL COMMENT '@deprecated 2023-10-20 refs #6092';
diff --git a/db/versions/.archive/10748-navyRose/01-SecondScript.sql b/db/versions/.archive/10748-navyRose/01-SecondScript.sql
new file mode 100644
index 000000000..d3ae6fee3
--- /dev/null
+++ b/db/versions/.archive/10748-navyRose/01-SecondScript.sql
@@ -0,0 +1,7 @@
+UPDATE vn.ticket t
+ JOIN (
+ SELECT id, ticketFk__
+ FROM vn.cmr
+ WHERE ticketFk__
+ ) sub ON sub.ticketFk__ = t.id
+ SET cmrFk = sub.id;
diff --git a/db/versions/.archive/10749-chocolateEucalyptus/00-firstScript.sql b/db/versions/.archive/10749-chocolateEucalyptus/00-firstScript.sql
new file mode 100644
index 000000000..17f518a52
--- /dev/null
+++ b/db/versions/.archive/10749-chocolateEucalyptus/00-firstScript.sql
@@ -0,0 +1,2 @@
+-- Place your SQL code here
+ALTER TABLE vn.shelving ADD isMoving BOOL NULL;
diff --git a/db/versions/.archive/10750-limeAsparagus/00-firstScript.sql b/db/versions/.archive/10750-limeAsparagus/00-firstScript.sql
new file mode 100644
index 000000000..21410f5f8
--- /dev/null
+++ b/db/versions/.archive/10750-limeAsparagus/00-firstScript.sql
@@ -0,0 +1 @@
+CREATE INDEX ticket_created_IDX USING BTREE ON vn.ticket (created);
diff --git a/db/versions/.archive/10750-wheatGalax/00-ticket_addGrants.sql b/db/versions/.archive/10750-wheatGalax/00-ticket_addGrants.sql
new file mode 100644
index 000000000..c318b7df6
--- /dev/null
+++ b/db/versions/.archive/10750-wheatGalax/00-ticket_addGrants.sql
@@ -0,0 +1,3 @@
+REVOKE EXECUTE ON PROCEDURE `vn`.`ticket_add` FROM `employee`;
+REVOKE EXECUTE ON PROCEDURE `vn`.`ticket_add` FROM `administrative`;
+GRANT EXECUTE ON PROCEDURE `vn`.`ticket_add` TO `developer`;
diff --git a/db/versions/.archive/10751-silverArborvitae/00-firstScript.sql b/db/versions/.archive/10751-silverArborvitae/00-firstScript.sql
new file mode 100644
index 000000000..49a680964
--- /dev/null
+++ b/db/versions/.archive/10751-silverArborvitae/00-firstScript.sql
@@ -0,0 +1,3 @@
+ALTER TABLE vn.routeConfig DROP COLUMN kmRate;
+ALTER TABLE vn.routeConfig DROP COLUMN kmTruckRate;
+
diff --git a/db/versions/.archive/10752-crimsonChrysanthemum/00-firstScript.sql b/db/versions/.archive/10752-crimsonChrysanthemum/00-firstScript.sql
new file mode 100644
index 000000000..751daa20e
--- /dev/null
+++ b/db/versions/.archive/10752-crimsonChrysanthemum/00-firstScript.sql
@@ -0,0 +1 @@
+CREATE INDEX client_isTaxDataChecked_IDX USING BTREE ON vn.client (isTaxDataChecked);
diff --git a/db/versions/.archive/10753-blueDracena/00-firstScript.sql b/db/versions/.archive/10753-blueDracena/00-firstScript.sql
new file mode 100644
index 000000000..375dfbee9
--- /dev/null
+++ b/db/versions/.archive/10753-blueDracena/00-firstScript.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.ticket DROP INDEX ticket_created_IDX;
diff --git a/db/versions/.archive/10754-purpleMonstera/00-firstScript.sql b/db/versions/.archive/10754-purpleMonstera/00-firstScript.sql
new file mode 100644
index 000000000..01d466ad3
--- /dev/null
+++ b/db/versions/.archive/10754-purpleMonstera/00-firstScript.sql
@@ -0,0 +1,2 @@
+ALTER TABLE vn.sector DROP FOREIGN KEY sector_FK;
+ALTER TABLE vn.sector DROP PRIMARY KEY, ADD PRIMARY KEY (id);
diff --git a/db/versions/.archive/10755-redGalax/00-firstScript.sql b/db/versions/.archive/10755-redGalax/00-firstScript.sql
new file mode 100644
index 000000000..11633e845
--- /dev/null
+++ b/db/versions/.archive/10755-redGalax/00-firstScript.sql
@@ -0,0 +1 @@
+CREATE INDEX tpvTransaction_status_IDX USING BTREE ON hedera.tpvTransaction (status,receiptFk);
diff --git a/db/versions/10724-maroonOrchid/00-firstScript.sql b/db/versions/10724-maroonOrchid/00-firstScript.sql
new file mode 100644
index 000000000..0e9e73e4b
--- /dev/null
+++ b/db/versions/10724-maroonOrchid/00-firstScript.sql
@@ -0,0 +1,33 @@
+-- Place your SQL code here
+USE vn;
+ALTER TABLE `vn`.`saleGroup`
+ADD COLUMN IF NOT EXISTS `ticketFk` int(11) NULL,
+ADD COLUMN IF NOT EXISTS `editorFk` int(10) unsigned DEFAULT NULL;
+
+ALTER TABLE vn.saleGroup ADD CONSTRAINT saleGroup_FK
+ FOREIGN KEY (ticketFk) REFERENCES vn.ticket(id) ON DELETE CASCADE ON UPDATE CASCADE;
+
+ALTER TABLE vn.saleGroup
+ MODIFY COLUMN userFk int(10) unsigned DEFAULT NULL NULL;
+
+ALTER TABLE vn.saleGroup ADD CONSTRAINT saleGroup_userFK
+ FOREIGN KEY (userFk) REFERENCES account.`user`(id) ON DELETE CASCADE ON UPDATE CASCADE;
+
+ALTER TABLE vn.saleGroup ADD CONSTRAINT saleGroup_parkingFK
+ FOREIGN KEY (parkingFk) REFERENCES vn.`parking`(id) ON DELETE CASCADE ON UPDATE CASCADE;
+
+ALTER TABLE vn.saleGroup ADD CONSTRAINT saleGroup_sectorFK
+ FOREIGN KEY (sectorFk) REFERENCES vn.`sector`(id) ON DELETE CASCADE ON UPDATE CASCADE;
+
+UPDATE `vn`.`saleGroup` sg
+ JOIN (
+ SELECT sgd.saleGroupFk, s.ticketFk
+ FROM saleGroupDetail sgd
+ JOIN sale s ON s.id = sgd.saleFk
+ GROUP BY sgd.saleGroupFk
+ ) sub ON sg.id = sub.saleGroupFk
+ SET sg.ticketFk = sub.ticketFk;
+
+ALTER TABLE vn.ticketLog MODIFY COLUMN changedModel enum('Ticket','Sale','TicketWeekly','TicketTracking','TicketService','TicketRequest',
+ 'TicketRefund','TicketPackaging','TicketObservation','TicketDms','Expedition','Sms','SaleGroup')
+ CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT 'Ticket' NOT NULL;
diff --git a/db/versions/10738-greenCordyline/00-addFieldToTravel.sql b/db/versions/10738-greenCordyline/00-addFieldToTravel.sql
new file mode 100644
index 000000000..af4903c95
--- /dev/null
+++ b/db/versions/10738-greenCordyline/00-addFieldToTravel.sql
@@ -0,0 +1,9 @@
+ALTER TABLE vn.travel DROP FOREIGN KEY IF EXISTS travel_FK_1 ;
+ALTER TABLE vn.travel DROP COLUMN IF EXISTS awbFk;
+
+ALTER TABLE vn.travel
+ ADD awbFk SMALLINT(11) UNSIGNED;
+
+ALTER TABLE vn.travel
+ ADD CONSTRAINT travel_FK_1 FOREIGN KEY (awbFk) REFERENCES vn.awb(id)
+ ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/db/versions/10738-greenCordyline/01-copyDataToTravel.sql b/db/versions/10738-greenCordyline/01-copyDataToTravel.sql
new file mode 100644
index 000000000..0469d4ce8
--- /dev/null
+++ b/db/versions/10738-greenCordyline/01-copyDataToTravel.sql
@@ -0,0 +1,9 @@
+UPDATE vn.travel t
+ JOIN(SELECT t.id travelFk, d.awbFk
+ FROM vn.dua d
+ JOIN vn.duaEntry de ON de.duaFk = d.id
+ JOIN vn.`entry` e ON e.id = de.entryFk
+ JOIN vn.travel t ON t.id = e.travelFk
+ GROUP BY t.id
+ )sub ON sub.travelFk = t.id
+ SET t.awbFk = sub.awbFk;
diff --git a/db/versions/10738-greenCordyline/03-deprecateDuaAwbFk.sql b/db/versions/10738-greenCordyline/03-deprecateDuaAwbFk.sql
new file mode 100644
index 000000000..3daf86f9b
--- /dev/null
+++ b/db/versions/10738-greenCordyline/03-deprecateDuaAwbFk.sql
@@ -0,0 +1,2 @@
+ALTER TABLE vn.dua CHANGE awbFk awbFk__ smallint(11) unsigned DEFAULT NULL NULL COMMENT '@Deprecated refs #5871 01/10/2023';
+ALTER TABLE vn.dua DROP FOREIGN KEY dua_fk2;
diff --git a/db/versions/10756-wheatRoebelini/00-firstScript.sql b/db/versions/10756-wheatRoebelini/00-firstScript.sql
new file mode 100644
index 000000000..5886863e2
--- /dev/null
+++ b/db/versions/10756-wheatRoebelini/00-firstScript.sql
@@ -0,0 +1 @@
+CREATE INDEX sale_created_IDX USING BTREE ON vn.sale (created);
diff --git a/db/versions/10757-silverChrysanthemum/00-firstScript.sql b/db/versions/10757-silverChrysanthemum/00-firstScript.sql
new file mode 100644
index 000000000..ee64b83e1
--- /dev/null
+++ b/db/versions/10757-silverChrysanthemum/00-firstScript.sql
@@ -0,0 +1,3 @@
+ALTER TABLE vn.ticketTracking MODIFY COLUMN workerFk int(10) unsigned DEFAULT NULL NULL;
+ALTER TABLE vn.ticketTracking ADD CONSTRAINT ticketTracking_FK3 FOREIGN KEY (workerFk)
+REFERENCES account.`user`(id) ON DELETE RESTRICT ON UPDATE CASCADE;
diff --git a/db/versions/10758-boxPicking/00-sectorType.sql b/db/versions/10758-boxPicking/00-sectorType.sql
new file mode 100644
index 000000000..464752a62
--- /dev/null
+++ b/db/versions/10758-boxPicking/00-sectorType.sql
@@ -0,0 +1,33 @@
+USE vn;
+
+ALTER TABLE vn.sector DROP FOREIGN KEY IF EXISTS sectorType_FK;
+
+CREATE OR REPLACE TABLE vn.sectorType (
+ id INT(10) UNSIGNED PRIMARY KEY NOT NULL AUTO_INCREMENT,
+ description VARCHAR(100) NOT NULL
+)
+ENGINE=InnoDB
+DEFAULT CHARSET=utf8mb3
+COLLATE=utf8mb3_unicode_ci;
+
+INSERT IGNORE INTO sectorType (id, `description`)
+ VALUES (1, 'normalPicking');
+INSERT IGNORE INTO sectorType (id, `description`)
+ VALUES (2, 'previousByPacking');
+INSERT IGNORE INTO sectorType (id, `description`)
+ VALUES (3, 'boxPicking');
+INSERT IGNORE INTO sectorType (id, `description`)
+ VALUES (4, 'previousPrepared');
+
+ALTER TABLE sector ADD IF NOT EXISTS typeFk INT(10) UNSIGNED DEFAULT 1 NOT NULL;
+
+UPDATE sector s
+ SET typeFk = (SELECT id FROM sectorType WHERE `description` = 'previousByPacking')
+ WHERE s.isPreviousPreparedByPacking;
+
+UPDATE sector s
+ SET typeFk = (SELECT id FROM sectorType WHERE `description` = 'previousPrepared')
+ WHERE s.isPreviousPrepared;
+
+ALTER TABLE vn.sector ADD CONSTRAINT sectorType_FK FOREIGN KEY IF NOT EXISTS (typeFk)
+ REFERENCES vn.sectorType(id) ON DELETE RESTRICT ON UPDATE CASCADE;
\ No newline at end of file
diff --git a/db/versions/10758-boxPicking/01-dipole.sql b/db/versions/10758-boxPicking/01-dipole.sql
new file mode 100644
index 000000000..05c4542bb
--- /dev/null
+++ b/db/versions/10758-boxPicking/01-dipole.sql
@@ -0,0 +1,5 @@
+ALTER TABLE dipole.expedition_PrintOut ADD itemFk INT NULL;
+ALTER TABLE dipole.expedition_PrintOut ADD quantity int NULL;
+ALTER TABLE dipole.expedition_PrintOut ADD longName varchar(30) NULL;
+ALTER TABLE dipole.expedition_PrintOut ADD shelvingFk varchar(5) NULL;
+ALTER TABLE dipole.expedition_PrintOut ADD comments varchar(100) NULL;
diff --git a/db/versions/10758-boxPicking/02-agencyMode.sql b/db/versions/10758-boxPicking/02-agencyMode.sql
new file mode 100644
index 000000000..0cb71d5af
--- /dev/null
+++ b/db/versions/10758-boxPicking/02-agencyMode.sql
@@ -0,0 +1,3 @@
+UPDATE vn.agencyMode am
+ SET am.code = 'REC_ALG'
+ WHERE am.name = 'REC_ALGEMESI';
\ No newline at end of file
diff --git a/db/versions/10758-boxPicking/03-item.sql b/db/versions/10758-boxPicking/03-item.sql
new file mode 100644
index 000000000..1ba254dc0
--- /dev/null
+++ b/db/versions/10758-boxPicking/03-item.sql
@@ -0,0 +1,3 @@
+ALTER TABLE vn.item ADD isBoxPickingMode BOOLEAN DEFAULT FALSE NOT NULL
+COMMENT 'FALSE: using item.packingOut TRUE: boxPicking using itemShelving.packing';
+
diff --git a/db/versions/10761-greenGalax/00-firstScript.sql b/db/versions/10761-greenGalax/00-firstScript.sql
new file mode 100644
index 000000000..5540a9b71
--- /dev/null
+++ b/db/versions/10761-greenGalax/00-firstScript.sql
@@ -0,0 +1,4 @@
+-- Place your SQL code here
+ALTER TABLE vn2008.albaran ADD IF NOT EXISTS farmingFk int(10) unsigned NULL;
+ALTER TABLE vn2008.albaran DROP FOREIGN KEY IF EXISTS albaran_FK;
+ALTER TABLE vn2008.albaran ADD CONSTRAINT albaran_FK FOREIGN KEY (farmingFk) REFERENCES vn.farming(id);
diff --git a/db/versions/10764-navyTulip/00-firstScript.sql b/db/versions/10764-navyTulip/00-firstScript.sql
new file mode 100644
index 000000000..9cfbe0ccb
--- /dev/null
+++ b/db/versions/10764-navyTulip/00-firstScript.sql
@@ -0,0 +1,7 @@
+USE sage;
+
+CREATE TABLE `accountingEntryError` (
+ `accountingEntryFk` int(10) unsigned NOT NULL,
+ PRIMARY KEY (`accountingEntryFk`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
+ COMMENT='Listado de asientos presentes en Sage para notificar su error';
\ No newline at end of file
diff --git a/db/versions/10768-blueRose/00-firstScript.sql b/db/versions/10768-blueRose/00-firstScript.sql
new file mode 100644
index 000000000..6746b4448
--- /dev/null
+++ b/db/versions/10768-blueRose/00-firstScript.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`time_generate`()
+BEGIN
+
+END$$
+DELIMITER ;
+
+GRANT EXECUTE ON PROCEDURE util.time_generate TO guest;
diff --git a/db/versions/10771-bronzeLaurel/00-firstScript.sql b/db/versions/10771-bronzeLaurel/00-firstScript.sql
new file mode 100644
index 000000000..877407de5
--- /dev/null
+++ b/db/versions/10771-bronzeLaurel/00-firstScript.sql
@@ -0,0 +1,14 @@
+
+UPDATE vn.client c
+ JOIN (
+ SELECT c.id, COUNT(DISTINCT co.id) > 1 hasDifferentCountries
+ FROM vn.client c
+ JOIN vn.`address` a ON a.clientFk = c.id
+ JOIN vn.province p ON p.id = a.provinceFk
+ JOIN vn.country co ON co.id = p.countryFk
+ WHERE NOT c.hasToInvoiceByAddress
+ AND a.isActive
+ GROUP BY a.clientFk
+ HAVING hasDifferentCountries
+ )sub ON sub.id = c.id
+ SET c.hasToInvoiceByAddress = TRUE;
\ No newline at end of file
diff --git a/db/versions/10773-maroonBamboo/00-firstScript.sql b/db/versions/10773-maroonBamboo/00-firstScript.sql
new file mode 100644
index 000000000..026f89ad1
--- /dev/null
+++ b/db/versions/10773-maroonBamboo/00-firstScript.sql
@@ -0,0 +1 @@
+ALTER TABLE dipole.expedition_PrintOut MODIFY COLUMN province varchar(20) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL;
\ No newline at end of file
diff --git a/db/versions/10775-chocolateOrchid/00-firstScript.sql b/db/versions/10775-chocolateOrchid/00-firstScript.sql
new file mode 100644
index 000000000..61d92d400
--- /dev/null
+++ b/db/versions/10775-chocolateOrchid/00-firstScript.sql
@@ -0,0 +1,2 @@
+ALTER TABLE vn.clientProtected DROP FOREIGN KEY clientProtected_fk2;
+ALTER TABLE vn.clientProtected DROP COLUMN workerFk;
\ No newline at end of file
diff --git a/db/versions/10778-goldenSalal/00-firstScript.sql b/db/versions/10778-goldenSalal/00-firstScript.sql
new file mode 100644
index 000000000..7ce9e2ea5
--- /dev/null
+++ b/db/versions/10778-goldenSalal/00-firstScript.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.routesMonitor ADD CONSTRAINT routesMonitor_FK_3 FOREIGN KEY (expeditionTruckFk) REFERENCES vn.expeditionTruck(id) ON DELETE RESTRICT ON UPDATE CASCADE;
diff --git a/db/versions/10781-crimsonMonstera/00-firstScript.sql b/db/versions/10781-crimsonMonstera/00-firstScript.sql
new file mode 100644
index 000000000..5babdb003
--- /dev/null
+++ b/db/versions/10781-crimsonMonstera/00-firstScript.sql
@@ -0,0 +1,9 @@
+ALTER TABLE `vn`.`workerTimeControl`
+ ADD COLUMN IF NOT EXISTS `logExclude` tinyint(1) AS (IF(`manual`, FALSE, TRUE)) VIRTUAL,
+ ADD COLUMN IF NOT EXISTS `editorFk` int(10) unsigned DEFAULT NULL;
+
+ALTER TABLE `vn`.`calendar`
+ ADD COLUMN IF NOT EXISTS `editorFk` int(10) unsigned DEFAULT NULL;
+
+ALTER TABLE vn.workerLog MODIFY COLUMN changedModel enum('Worker','Calendar','WorkerTimeControlMail','Business','WorkerDms','WorkerTimeControl') CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT 'Worker' NOT NULL;
+
diff --git a/db/versions/10782-salmonErica/00-firstScript.sql b/db/versions/10782-salmonErica/00-firstScript.sql
new file mode 100644
index 000000000..b2ee19780
--- /dev/null
+++ b/db/versions/10782-salmonErica/00-firstScript.sql
@@ -0,0 +1,10 @@
+CREATE TABLE vn.`agencyModePricePercentage` (
+ `agencyModeFk` int(11) NOT NULL,
+ `percentage` double NOT NULL,
+ PRIMARY KEY (`agencyModeFk`),
+ CONSTRAINT `agencyModePricePercentage_FK`
+ FOREIGN KEY (`agencyModeFk`) REFERENCES `agencyMode` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+)
+ENGINE=InnoDB
+DEFAULT CHARSET=utf8mb3
+COLLATE=utf8mb3_unicode_ci;
diff --git a/db/versions/10783-silverGalax/00-firstScript.sql b/db/versions/10783-silverGalax/00-firstScript.sql
new file mode 100644
index 000000000..fb7e26224
--- /dev/null
+++ b/db/versions/10783-silverGalax/00-firstScript.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.`zone` MODIFY COLUMN price double DEFAULT 0 NOT NULL CHECK(price>0);
diff --git a/db/versions/10784-tealCamellia/00-firstScript.sql b/db/versions/10784-tealCamellia/00-firstScript.sql
new file mode 100644
index 000000000..a5c5b519f
--- /dev/null
+++ b/db/versions/10784-tealCamellia/00-firstScript.sql
@@ -0,0 +1,3 @@
+-- Place your SQL code here
+ALTER TABLE `vn`.`itemShelving`
+ADD COLUMN IF NOT EXISTS `editorFk` int(10) unsigned DEFAULT NULL;
\ No newline at end of file
diff --git a/db/versions/10785-grayCyca/00-firstScript.sql b/db/versions/10785-grayCyca/00-firstScript.sql
new file mode 100644
index 000000000..3f0ec701f
--- /dev/null
+++ b/db/versions/10785-grayCyca/00-firstScript.sql
@@ -0,0 +1,9 @@
+/*
+RENAME TABLE vn.expence TO vn.expense;
+RENAME TABLE vn.invoiceOutExpence TO vn.invoiceOutExpense;
+ALTER TABLE vn.invoiceOutExpense CHANGE expenceFk expenseFk varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL;
+ALTER TABLE vn.ticketServiceType CHANGE expenceFk expenseFk varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT '7050000000' NOT NULL;
+ALTER TABLE vn.invoiceOutTaxConfig CHANGE expenceFk expenseFk varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL;
+ALTER TABLE vn.invoiceInSage CHANGE expenceFk expenseFk varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL;
+ALTER TABLE vn.agencyTermConfig CHANGE expenceFk expenseFk varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL NULL;
+*/
diff --git a/db/versions/10785-grayCyca/02-invoiceIn.sql b/db/versions/10785-grayCyca/02-invoiceIn.sql
new file mode 100644
index 000000000..f9b4fe9eb
--- /dev/null
+++ b/db/versions/10785-grayCyca/02-invoiceIn.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.invoiceIn CHANGE expenceFkDeductible expenseFkDeductible varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL NULL;
diff --git a/db/versions/10785-grayCyca/02-invoiceInTax.sql b/db/versions/10785-grayCyca/02-invoiceInTax.sql
new file mode 100644
index 000000000..a284ba282
--- /dev/null
+++ b/db/versions/10785-grayCyca/02-invoiceInTax.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.invoiceInTax CHANGE expenceFk expenseFk varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL;
diff --git a/db/versions/10785-grayCyca/02-item.sql b/db/versions/10785-grayCyca/02-item.sql
new file mode 100644
index 000000000..407b75fc5
--- /dev/null
+++ b/db/versions/10785-grayCyca/02-item.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.item CHANGE expenceFk expenseFk varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT '7001000000' NOT NULL;
diff --git a/db/versions/10789-whiteSalal/00-firstScript.sql b/db/versions/10789-whiteSalal/00-firstScript.sql
new file mode 100644
index 000000000..0a2bafaa1
--- /dev/null
+++ b/db/versions/10789-whiteSalal/00-firstScript.sql
@@ -0,0 +1,5 @@
+-- Place your SQL code here
+
+ALTER TABLE vn.productionConfig ADD clientSelfConsumptionFk int(11) NULL COMMENT 'Cliente para crear el ticket de autoconsumo';
+ALTER TABLE vn.productionConfig ADD CONSTRAINT productionConfig_FK_1 FOREIGN KEY (clientSelfConsumptionFk) REFERENCES vn.client(id) ON DELETE CASCADE ON UPDATE CASCADE;
+
diff --git a/db/versions/10789-whiteSalal/00-firstScript.vn.sql b/db/versions/10789-whiteSalal/00-firstScript.vn.sql
new file mode 100644
index 000000000..61324de57
--- /dev/null
+++ b/db/versions/10789-whiteSalal/00-firstScript.vn.sql
@@ -0,0 +1,5 @@
+-- Place your SQL code here
+
+UPDATE vn.productionConfig
+ SET clientSelfConsumptionFk=450
+ WHERE id=1;
diff --git a/db/versions/10792-crimsonMoss/00-buy.sql b/db/versions/10792-crimsonMoss/00-buy.sql
new file mode 100644
index 000000000..9c8bfb44a
--- /dev/null
+++ b/db/versions/10792-crimsonMoss/00-buy.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.buy MODIFY COLUMN buyingValue decimal(10,4) DEFAULT 0.0000 NOT NULL;
diff --git a/db/versions/10798-grayLaurel/00-firstScript.sql b/db/versions/10798-grayLaurel/00-firstScript.sql
new file mode 100644
index 000000000..afdcc74d4
--- /dev/null
+++ b/db/versions/10798-grayLaurel/00-firstScript.sql
@@ -0,0 +1,5 @@
+ALTER TABLE `vn`.`routesMonitor`
+ ADD IF NOT EXISTS editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT routesMonitor_fk_editor FOREIGN KEY IF NOT EXISTS (editorFk) REFERENCES account.`user`(id);
+ALTER TABLE vn.routeLog
+ MODIFY COLUMN changedModel enum('Route', 'RoutesMonitor') CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT 'Route' NOT NULL;
diff --git a/db/versions/10799-limePalmetto/00-firstScript.sql b/db/versions/10799-limePalmetto/00-firstScript.sql
new file mode 100644
index 000000000..690c0fc4f
--- /dev/null
+++ b/db/versions/10799-limePalmetto/00-firstScript.sql
@@ -0,0 +1,27 @@
+ALTER TABLE vn.routeCommission DROP FOREIGN KEY IF EXISTS routeCommission_firstEditorFk;
+ALTER TABLE vn.routeCommission DROP COLUMN IF EXISTS firstEditorFk;
+
+ALTER TABLE vn.route DROP FOREIGN KEY IF EXISTS route_firstEditorFk;
+ALTER TABLE vn.route DROP COLUMN IF EXISTS firstEditorFk;
+
+ALTER TABLE vn.route
+ ADD firstEditorFk INTEGER UNSIGNED NOT NULL
+ COMMENT 'Usuario creador de la ruta' AFTER workerFk;
+
+ALTER TABLE vn.routeCommission
+ ADD firstEditorFk INTEGER UNSIGNED NOT NULL
+ COMMENT 'Usuario creador de la ruta' AFTER workCenterFk;
+
+
+UPDATE vn.routeCommission rc
+ JOIN vn.routeLog rl ON rl.originFk = rc.routeFk
+ SET rc.firstEditorFk = rl.userFk
+ WHERE rl.`action` = 'insert';
+
+UPDATE vn.routeCommission rc
+ SET firstEditorFk = 4365
+ WHERE routeFk = 125360;
+
+ALTER TABLE vn.routeCommission
+ ADD CONSTRAINT routeCommission_firstEditorFk FOREIGN KEY (firstEditorFk)
+ REFERENCES account.user(id) ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/db/versions/10800-yellowSalal/00-firstScript.sql b/db/versions/10800-yellowSalal/00-firstScript.sql
new file mode 100644
index 000000000..07b6084b2
--- /dev/null
+++ b/db/versions/10800-yellowSalal/00-firstScript.sql
@@ -0,0 +1,2 @@
+ALTER TABLE vn.operator ADD CONSTRAINT operator_FK_4
+ FOREIGN KEY (sectorFk) REFERENCES vn.sector(id) ON DELETE RESTRICT ON UPDATE CASCADE;
diff --git a/db/versions/10801-redRoebelini/00-firstScript.sql b/db/versions/10801-redRoebelini/00-firstScript.sql
new file mode 100644
index 000000000..ad828b3d3
--- /dev/null
+++ b/db/versions/10801-redRoebelini/00-firstScript.sql
@@ -0,0 +1,3 @@
+ALTER TABLE vn.sector
+ DROP COLUMN isPreviousPrepared,
+ DROP COLUMN isPreviousPreparedByPacking;
diff --git a/db/versions/10806-limeRose/00-firstScript.sql b/db/versions/10806-limeRose/00-firstScript.sql
new file mode 100644
index 000000000..0e2085fe8
--- /dev/null
+++ b/db/versions/10806-limeRose/00-firstScript.sql
@@ -0,0 +1,3 @@
+
+ALTER TABLE vn.routeCommission
+ DROP FOREIGN KEY routeCommission_firstEditorFk;
diff --git a/db/versions/10808-maroonRoebelini/00-firstScript.sql b/db/versions/10808-maroonRoebelini/00-firstScript.sql
new file mode 100644
index 000000000..7f45f2522
--- /dev/null
+++ b/db/versions/10808-maroonRoebelini/00-firstScript.sql
@@ -0,0 +1,2 @@
+INSERT INTO bs.nightTask (`order`,`schema`,`procedure`)
+ VALUES (652,'sage','clean');
\ No newline at end of file
diff --git a/db/versions/10809-purpleDendro/00-firstScript.sql b/db/versions/10809-purpleDendro/00-firstScript.sql
new file mode 100644
index 000000000..53511fcb3
--- /dev/null
+++ b/db/versions/10809-purpleDendro/00-firstScript.sql
@@ -0,0 +1,2 @@
+ALTER TABLE vn.operator ADD linesLimit int DEFAULT NULL NULL COMMENT 'Límite de lineas en una colección para la asignación de pedidos';
+ALTER TABLE vn.operator ADD volumeLimit decimal DEFAULT NULL NULL COMMENT 'Límite de volumen en una colección para la asignación de pedidos';
diff --git a/db/versions/10810-turquoiseCataractarum/00-firstScript.sql b/db/versions/10810-turquoiseCataractarum/00-firstScript.sql
new file mode 100644
index 000000000..3e939e069
--- /dev/null
+++ b/db/versions/10810-turquoiseCataractarum/00-firstScript.sql
@@ -0,0 +1,7 @@
+USE sage;
+
+CREATE OR REPLACE TABLE `accountingEntryError` (
+ `accountingEntryFk` int(10) unsigned NOT NULL,
+ PRIMARY KEY (`accountingEntryFk`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
+ COMMENT='Listado de asientos presentes en Sage para notificar su error';
\ No newline at end of file
diff --git a/db/versions/10811-pinkBirch/00-firstScript.sql b/db/versions/10811-pinkBirch/00-firstScript.sql
new file mode 100644
index 000000000..1d02ec0d6
--- /dev/null
+++ b/db/versions/10811-pinkBirch/00-firstScript.sql
@@ -0,0 +1,7 @@
+ALTER TABLE vn.travel DROP KEY shipment_1;
+
+ALTER TABLE `vn`.`travel` ADD CONSTRAINT shipment_1 UNIQUE KEY (shipped,landed,warehouseInFk,warehouseOutFk,agencyModeFk,`ref`);
+
+ALTER TABLE vn.travel DROP FOREIGN KEY travel_ibfk_3;
+
+ALTER TABLE vn.travel CHANGE agencyFk agencyFk__ smallint(5) unsigned NOT NULL COMMENT '@deprecated 2024-10-01 refs #6604';
diff --git a/db/versions/10812-goldenPaniculata/00-update.sql b/db/versions/10812-goldenPaniculata/00-update.sql
new file mode 100644
index 000000000..3d882e546
--- /dev/null
+++ b/db/versions/10812-goldenPaniculata/00-update.sql
@@ -0,0 +1,8 @@
+UPDATE IGNORE vn.dms
+ SET dmsTypeFk = (SELECT id FROM vn.dmsType WHERE code = 'vehicle')
+ WHERE id IN (
+ SELECT d.id
+ FROM vn.dms d
+ JOIN vn.dmsType dt ON dt.id = d.dmsTypeFk
+ WHERE dt.code = 'vehicles'
+ );
diff --git a/db/versions/10812-goldenPaniculata/01-delete.sql b/db/versions/10812-goldenPaniculata/01-delete.sql
new file mode 100644
index 000000000..6d98064cc
--- /dev/null
+++ b/db/versions/10812-goldenPaniculata/01-delete.sql
@@ -0,0 +1 @@
+DELETE IGNORE FROM vn.dmsType WHERE code = 'vehicles';
diff --git a/db/versions/10812-goldenPaniculata/02-rename.sql b/db/versions/10812-goldenPaniculata/02-rename.sql
new file mode 100644
index 000000000..d98292e2f
--- /dev/null
+++ b/db/versions/10812-goldenPaniculata/02-rename.sql
@@ -0,0 +1,2 @@
+ALTER TABLE vn.dmsType CHANGE `path` path__ varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL COMMENT '@deprecated 2024-01-08 refs #6410';
+ALTER TABLE vn.dmsType MODIFY COLUMN path__ varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL COMMENT '@deprecated 2024-01-08 refs #6410';
diff --git a/db/versions/10812-goldenPaniculata/03-changePosition.sql b/db/versions/10812-goldenPaniculata/03-changePosition.sql
new file mode 100644
index 000000000..9aea1fdf8
--- /dev/null
+++ b/db/versions/10812-goldenPaniculata/03-changePosition.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.dmsType CHANGE code code varchar(45) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL AFTER id;
diff --git a/db/versions/10812-goldenPaniculata/04-unique.sql b/db/versions/10812-goldenPaniculata/04-unique.sql
new file mode 100644
index 000000000..5cbe32b0d
--- /dev/null
+++ b/db/versions/10812-goldenPaniculata/04-unique.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.dmsType ADD CONSTRAINT dmsType_unique UNIQUE KEY (code);
diff --git a/db/versions/10813-salmonChico/00-firstScript.sql b/db/versions/10813-salmonChico/00-firstScript.sql
new file mode 100644
index 000000000..d5bd26ca3
--- /dev/null
+++ b/db/versions/10813-salmonChico/00-firstScript.sql
@@ -0,0 +1,2 @@
+ALTER TABLE vn.entryObservation DROP FOREIGN KEY entry_id_entryFk;
+ALTER TABLE vn.entryObservation ADD CONSTRAINT entry_id_entryFk FOREIGN KEY (entryFk) REFERENCES vn.entry(id) ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/db/versions/10815-brownGalax/00-firstScript.sql b/db/versions/10815-brownGalax/00-firstScript.sql
new file mode 100644
index 000000000..7812988aa
--- /dev/null
+++ b/db/versions/10815-brownGalax/00-firstScript.sql
@@ -0,0 +1,3 @@
+-- Place your SQL code here
+ALTER TABLE vn.comparative DROP KEY comparative_UN;
+ALTER TABLE vn.comparative ADD CONSTRAINT comparative_unique UNIQUE KEY (timePeriod,itemFk,warehouseFk,countryFk);
\ No newline at end of file
diff --git a/db/versions/10816-yellowMonstera/00-firstScript.sql b/db/versions/10816-yellowMonstera/00-firstScript.sql
new file mode 100644
index 000000000..3dd5378f0
--- /dev/null
+++ b/db/versions/10816-yellowMonstera/00-firstScript.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.operator MODIFY COLUMN volumeLimit decimal(10,6) DEFAULT NULL NULL COMMENT 'Límite de volumen en una colección para la asignación de pedidos';
diff --git a/db/versions/10817-navyChico/00-invoiceOutConfig_refLen.sql b/db/versions/10817-navyChico/00-invoiceOutConfig_refLen.sql
new file mode 100644
index 000000000..8b91889f2
--- /dev/null
+++ b/db/versions/10817-navyChico/00-invoiceOutConfig_refLen.sql
@@ -0,0 +1,2 @@
+ALTER TABLE vn.invoiceOutConfig
+ ADD IF NOT EXISTS refLen TINYINT UNSIGNED DEFAULT 5 NOT NULL COMMENT 'Invoice reference identifier length';
diff --git a/db/versions/10818-crimsonCamellia/00-firstScript.sql b/db/versions/10818-crimsonCamellia/00-firstScript.sql
new file mode 100644
index 000000000..81550be61
--- /dev/null
+++ b/db/versions/10818-crimsonCamellia/00-firstScript.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.supplier MODIFY COLUMN isSerious tinyint(1) unsigned DEFAULT 0 NOT NULL;
diff --git a/db/versions/10819-blueIvy/00-firstScript.sql b/db/versions/10819-blueIvy/00-firstScript.sql
new file mode 100644
index 000000000..b9145ec69
--- /dev/null
+++ b/db/versions/10819-blueIvy/00-firstScript.sql
@@ -0,0 +1,18 @@
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+ SQL SECURITY DEFINER
+ VIEW `vn`.`ticketStateToday`
+AS SELECT
+ `ts`.`ticketFk` AS `ticketFk`,
+ `ts`.`state` AS `state`,
+ `ts`.`productionOrder` AS `productionOrder`,
+ `ts`.`alertLevel` AS `alertLevel`,
+ `ts`.`userFk` AS `userFk`,
+ `ts`.`code` AS `code`,
+ `ts`.`updated` AS `updated`,
+ `ts`.`isPicked` AS `isPicked`
+FROM
+ (`vn`.`ticketState` `ts`
+JOIN `vn`.`ticket` `t` ON
+ (`t`.`id` = `ts`.`ticketFk`))
+WHERE
+ `t`.`shipped` BETWEEN `util`.`VN_CURDATE`() AND `vn`.`MIDNIGHT`(`util`.`VN_CURDATE`());
diff --git a/db/versions/10820-limeAspidistra/00-grants.sql b/db/versions/10820-limeAspidistra/00-grants.sql
new file mode 100644
index 000000000..5e85236d4
--- /dev/null
+++ b/db/versions/10820-limeAspidistra/00-grants.sql
@@ -0,0 +1,14 @@
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`sale_replaceItem`() BEGIN END;
+GRANT EXECUTE ON PROCEDURE `vn`.`sale_replaceItem` TO `employee`;
+
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn`.`worker_isInDepartment`()
+ RETURNS int(11)
+ DETERMINISTIC
+BEGIN
+ RETURN 1;
+END$$
+DELIMITER ;
+
+GRANT EXECUTE ON FUNCTION `vn`.`worker_isInDepartment` TO `employee`;
+FLUSH PRIVILEGES;
diff --git a/db/versions/10827-purpleRaphis/00-firstScript.sql b/db/versions/10827-purpleRaphis/00-firstScript.sql
new file mode 100644
index 000000000..6f3a48ff1
--- /dev/null
+++ b/db/versions/10827-purpleRaphis/00-firstScript.sql
@@ -0,0 +1,10 @@
+-- Place your SQL code here
+CREATE TABLE `vn`.`negativeOrigin` (
+ `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
+ `itemFk` INT NOT NULL,
+ `type` ENUM('FALTAS', 'CONTENEDOR', 'ENTRADAS', 'OVERBOOKING') NOT NULL,
+ `dated` DATE DEFAULT CURRENT_DATE,
+ `quantity` DECIMAL(10,2) NOT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `unique_constraint` (`itemFk`, `type`, `dated`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
diff --git a/db/versions/10828-purpleRuscus/00-firstScript.sql b/db/versions/10828-purpleRuscus/00-firstScript.sql
new file mode 100644
index 000000000..6a02da353
--- /dev/null
+++ b/db/versions/10828-purpleRuscus/00-firstScript.sql
@@ -0,0 +1 @@
+REVOKE SELECT ON TABLE vn2008.clientes_regalos_lista_enc FROM employee;
\ No newline at end of file
diff --git a/db/versions/10828-purpleRuscus/01-RevokeClientes_regalos_lista.sql b/db/versions/10828-purpleRuscus/01-RevokeClientes_regalos_lista.sql
new file mode 100644
index 000000000..7971d9e47
--- /dev/null
+++ b/db/versions/10828-purpleRuscus/01-RevokeClientes_regalos_lista.sql
@@ -0,0 +1 @@
+REVOKE SELECT ON TABLE vn2008.credit FROM financialBoss;
\ No newline at end of file
diff --git a/db/versions/10832-purpleAralia/00-newWareHouse.sql b/db/versions/10832-purpleAralia/00-newWareHouse.sql
new file mode 100644
index 000000000..dd2c16bdb
--- /dev/null
+++ b/db/versions/10832-purpleAralia/00-newWareHouse.sql
@@ -0,0 +1,12 @@
+INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
+ VALUES
+ ('Collection', 'assign', 'WRITE', 'ALLOW', 'ROLE', 'production'),
+ ('ExpeditionPallet', 'getPallet', 'READ', 'ALLOW', 'ROLE', 'production'),
+ ('MachineWorker','updateInTime','WRITE','ALLOW','ROLE','production'),
+ ('MobileAppVersionControl','getVersion','READ','ALLOW','ROLE','production'),
+ ('SaleTracking','delete','WRITE','ALLOW','ROLE','production'),
+ ('SaleTracking','updateTracking','WRITE','ALLOW','ROLE','production'),
+ ('SaleTracking','setPicked','WRITE','ALLOW','ROLE','production'),
+ ('ExpeditionPallet', '*', 'READ', 'ALLOW', 'ROLE', 'production'),
+ ('Sale', 'getFromSectorCollection', 'READ', 'ALLOW', 'ROLE', 'production'),
+ ('ItemBarcode', 'delete', 'WRITE', 'ALLOW', 'ROLE', 'production');
\ No newline at end of file
diff --git a/db/versions/10832-purpleAralia/00-util_tx_commit.sql b/db/versions/10832-purpleAralia/00-util_tx_commit.sql
new file mode 100644
index 000000000..11be92c2e
--- /dev/null
+++ b/db/versions/10832-purpleAralia/00-util_tx_commit.sql
@@ -0,0 +1,15 @@
+DELIMITER $$
+$$
+
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`tx_commit`(IN tx BOOL)
+BEGIN
+/**
+ * Procedimiento para confirmar los cambios asociados a una transacción
+ *
+ * @param tx BOOL es true si existe transacción asociada
+*/
+ IF tx THEN
+ COMMIT;
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/versions/10832-purpleAralia/00-util_tx_rollback.sql b/db/versions/10832-purpleAralia/00-util_tx_rollback.sql
new file mode 100644
index 000000000..b6ac2cd12
--- /dev/null
+++ b/db/versions/10832-purpleAralia/00-util_tx_rollback.sql
@@ -0,0 +1,15 @@
+DELIMITER $$
+$$
+
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`tx_rollback`(tx BOOL)
+BEGIN
+/**
+ * Procedimiento para deshacer los cambios asociados a una transacción
+ *
+ * @param tx BOOL es true si existe transacción asociada
+*/
+ IF tx THEN
+ ROLLBACK;
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/versions/10832-purpleAralia/00-util_tx_start.sql b/db/versions/10832-purpleAralia/00-util_tx_start.sql
new file mode 100644
index 000000000..6e513790b
--- /dev/null
+++ b/db/versions/10832-purpleAralia/00-util_tx_start.sql
@@ -0,0 +1,17 @@
+
+
+DELIMITER $$
+$$
+
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`tx_start`(tx BOOL)
+BEGIN
+/**
+ * Procedimiento para iniciar una transacción
+ *
+ * @param tx BOOL es true si existe transacción asociada
+*/
+ IF tx THEN
+ START TRANSACTION;
+ END IF;
+END$$
+DELIMITER ;
diff --git a/db/versions/10832-purpleAralia/01-update_procedure_TravelCloneWithEntries.sql b/db/versions/10832-purpleAralia/01-update_procedure_TravelCloneWithEntries.sql
new file mode 100644
index 000000000..59041a5b3
--- /dev/null
+++ b/db/versions/10832-purpleAralia/01-update_procedure_TravelCloneWithEntries.sql
@@ -0,0 +1,85 @@
+DROP PROCEDURE IF EXISTS vn.travel_cloneWithEntries;
+
+DELIMITER $$
+$$
+CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`travel_cloneWithEntries`(
+ IN vTravelFk INT,
+ IN vDateStart DATE,
+ IN vDateEnd DATE,
+ IN vWarehouseOutFk INT,
+ IN vWarehouseInFk INT,
+ IN vRef VARCHAR(255),
+ IN vAgencyModeFk INT,
+ OUT vNewTravelFk INT)
+BEGIN
+/**
+ * Clona un travel junto con sus entradas y compras
+ * @param vTravelFk travel plantilla a clonar
+ * @param vDateStart fecha del shipment del nuevo travel
+ * @param vDateEnd fecha del landing del nuevo travel
+ * @param vWarehouseOutFk warehouse del salida del nuevo travel
+ * @param vWarehouseInFk warehouse de landing del nuevo travel
+ * @param vRef referencia del nuevo travel
+ * @param vAgencyModeFk del nuevo travel
+ * @param vNewTravelFk id del nuevo travel
+ */
+ DECLARE vNewEntryFk INT;
+ DECLARE vEvaNotes VARCHAR(255);
+ DECLARE vDone BOOL;
+ DECLARE vAuxEntryFk INT;
+ DECLARE vTx BOOLEAN DEFAULT @@in_transaction;
+ DECLARE vRsEntry CURSOR FOR
+ SELECT e.id
+ FROM entry e
+ JOIN travel t ON t.id = e.travelFk
+ WHERE e.travelFk = vTravelFk;
+
+ DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
+
+ DECLARE EXIT HANDLER FOR SQLEXCEPTION
+ BEGIN
+ CALL util.tx_rollback(vTx);
+ RESIGNAL;
+ END;
+
+ CALL util.tx_start(vTx);
+
+ INSERT INTO travel (shipped, landed, warehouseInFk, warehouseOutFk, agencyModeFk, `ref`, isDelivered, isReceived, m3, cargoSupplierFk, kg,clonedFrom)
+ SELECT vDateStart, vDateEnd, vWarehouseInFk, vWarehouseOutFk, vAgencyModeFk, vRef, isDelivered, isReceived, m3,cargoSupplierFk, kg,vTravelFk
+ FROM travel
+ WHERE id = vTravelFk;
+
+ SET vNewTravelFk = LAST_INSERT_ID();
+
+ SET vDone = FALSE;
+ SET @isModeInventory = TRUE;
+
+ OPEN vRsEntry;
+
+ l: LOOP
+ SET vDone = FALSE;
+ FETCH vRsEntry INTO vAuxEntryFk;
+
+ IF vDone THEN
+ LEAVE l;
+ END IF;
+
+ CALL entry_cloneHeader(vAuxEntryFk, vNewEntryFk, vNewTravelFk);
+ CALL entry_copyBuys(vAuxEntryFk, vNewEntryFk);
+
+ SELECT evaNotes INTO vEvaNotes
+ FROM entry
+ WHERE id = vAuxEntryFk;
+
+ UPDATE entry
+ SET evaNotes = vEvaNotes
+ WHERE id = vNewEntryFk;
+
+ END LOOP;
+
+ SET @isModeInventory = FALSE;
+ CLOSE vRsEntry;
+
+ CALL util.tx_commit(vTx);
+END$$
+DELIMITER ;
diff --git a/db/versions/10832-purpleAralia/02-grant_privileges_util_tx.sql b/db/versions/10832-purpleAralia/02-grant_privileges_util_tx.sql
new file mode 100644
index 000000000..bd49f6cb2
--- /dev/null
+++ b/db/versions/10832-purpleAralia/02-grant_privileges_util_tx.sql
@@ -0,0 +1,3 @@
+GRANT EXECUTE ON PROCEDURE util.tx_commit TO guest;
+GRANT EXECUTE ON PROCEDURE util.tx_rollback TO guest;
+GRANT EXECUTE ON PROCEDURE util.tx_start TO guest;
diff --git a/db/versions/10835-brownCarnation/00-firstScript.sql b/db/versions/10835-brownCarnation/00-firstScript.sql
new file mode 100644
index 000000000..be53d866c
--- /dev/null
+++ b/db/versions/10835-brownCarnation/00-firstScript.sql
@@ -0,0 +1,184 @@
+-- Place your SQL code here
+-- Place your SQL code here
+ALTER TABLE IF EXISTS vn2008.Agencias_province RENAME vn2008.Agencias_province__;
+ALTER TABLE IF EXISTS vn2008.Agencias_province__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+ALTER TABLE IF EXISTS vn2008.Baldas RENAME vn2008.Baldas__;
+ALTER TABLE IF EXISTS vn2008.Baldas__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+ALTER TABLE IF EXISTS vn2008.Brasa RENAME vn2008.Brasa__;
+ALTER TABLE IF EXISTS vn2008.Brasa__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla Clases
+ALTER TABLE IF EXISTS vn2008.Clases RENAME vn2008.Clases__;
+ALTER TABLE IF EXISTS vn2008.Clases__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla Clientes_dits
+ALTER TABLE IF EXISTS vn2008.Clientes_dits RENAME vn2008.Clientes_dits__;
+ALTER TABLE IF EXISTS vn2008.Clientes_dits__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla Clientes_empresa
+ALTER TABLE IF EXISTS vn2008.Clientes_empresa RENAME vn2008.Clientes_empresa__;
+ALTER TABLE IF EXISTS vn2008.Clientes_empresa__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla Clientes_event
+ALTER TABLE IF EXISTS vn2008.Clientes_event RENAME vn2008.Clientes_event__;
+ALTER TABLE IF EXISTS vn2008.Clientes_event__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla Clientes_potenciales
+ALTER TABLE IF EXISTS vn2008.Clientes_potenciales RENAME vn2008.Clientes_potenciales__;
+ALTER TABLE IF EXISTS vn2008.Clientes_potenciales__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla Compres_ok
+ALTER TABLE IF EXISTS vn2008.Compres_ok RENAME vn2008.Compres_ok__;
+ALTER TABLE IF EXISTS vn2008.Compres_ok__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla Consignatarios_devices
+ALTER TABLE IF EXISTS vn2008.Consignatarios_devices RENAME vn2008.Consignatarios_devices__;
+ALTER TABLE IF EXISTS vn2008.Consignatarios_devices__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla Conteo
+ALTER TABLE IF EXISTS vn2008.Conteo RENAME vn2008.Conteo__;
+ALTER TABLE IF EXISTS vn2008.Conteo__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla Entradas_kop
+ALTER TABLE IF EXISTS vn2008.Entradas_kop RENAME vn2008.Entradas_kop__;
+ALTER TABLE IF EXISTS vn2008.Entradas_kop__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla Espionajes
+ALTER TABLE IF EXISTS vn2008.Espionajes RENAME vn2008.Espionajes__;
+ALTER TABLE IF EXISTS vn2008.Espionajes__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla Estados
+ALTER TABLE IF EXISTS vn2008.Estados RENAME vn2008.Estados__;
+ALTER TABLE IF EXISTS vn2008.Estados__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla Familias
+ALTER TABLE IF EXISTS vn2008.Familias RENAME vn2008.Familias__;
+ALTER TABLE IF EXISTS vn2008.Familias__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla Forms
+ALTER TABLE IF EXISTS vn2008.Forms RENAME vn2008.Forms__;
+ALTER TABLE IF EXISTS vn2008.Forms__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla Grupos
+ALTER TABLE IF EXISTS vn2008.Grupos RENAME vn2008.Grupos__;
+ALTER TABLE IF EXISTS vn2008.Grupos__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla Informes
+ALTER TABLE IF EXISTS vn2008.Informes RENAME vn2008.Informes__;
+ALTER TABLE IF EXISTS vn2008.Informes__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla MoniRENAMEring
+ALTER TABLE IF EXISTS vn2008.MoniRENAMEring RENAME vn2008.MoniRENAMEring__;
+ALTER TABLE IF EXISTS vn2008.MoniRENAMEring__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla MovimienRENAMEs_avisar
+ALTER TABLE IF EXISTS vn2008.MovimienRENAMEs_avisar RENAME vn2008.MovimienRENAMEs_avisar__;
+ALTER TABLE IF EXISTS vn2008.MovimienRENAMEs_avisar__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla MovimienRENAMEs_revisar
+ALTER TABLE IF EXISTS vn2008.MovimienRENAMEs_revisar RENAME vn2008.MovimienRENAMEs_revisar__;
+ALTER TABLE IF EXISTS vn2008.MovimienRENAMEs_revisar__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla Proveedores_comunicados
+ALTER TABLE IF EXISTS vn2008.Proveedores_comunicados RENAME vn2008.Proveedores_comunicados__;
+ALTER TABLE IF EXISTS vn2008.Proveedores_comunicados__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla Proveedores_escriRENAMEs
+ALTER TABLE IF EXISTS vn2008.Proveedores_escriRENAMEs RENAME vn2008.Proveedores_escriRENAMEs__;
+ALTER TABLE IF EXISTS vn2008.Proveedores_escriRENAMEs__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla Tickets_stack
+ALTER TABLE IF EXISTS vn2008.Tickets_stack RENAME vn2008.Tickets_stack__;
+ALTER TABLE IF EXISTS vn2008.Tickets_stack__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla Tipos_f11
+ALTER TABLE IF EXISTS vn2008.Tipos_f11 RENAME vn2008.Tipos_f11__;
+ALTER TABLE IF EXISTS vn2008.Tipos_f11__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla accion_dits
+ALTER TABLE IF EXISTS vn2008.accion_dits RENAME vn2008.accion_dits__;
+ALTER TABLE IF EXISTS vn2008.accion_dits__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla agency_hour
+ALTER TABLE IF EXISTS vn2008.agency_hour RENAME vn2008.agency_hour__;
+ALTER TABLE IF EXISTS vn2008.agency_hour__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla agency_warehouse
+ALTER TABLE IF EXISTS vn2008.agency_warehouse RENAME vn2008.agency_warehouse__;
+ALTER TABLE IF EXISTS vn2008.agency_warehouse__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla call_information
+ALTER TABLE IF EXISTS vn2008.call_information RENAME vn2008.call_information__;
+ALTER TABLE IF EXISTS vn2008.call_information__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla call_option
+ALTER TABLE IF EXISTS vn2008.call_option RENAME vn2008.call_option__;
+ALTER TABLE IF EXISTS vn2008.call_option__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla cl_dep
+ALTER TABLE IF EXISTS vn2008.cl_dep RENAME vn2008.cl_dep__;
+ALTER TABLE IF EXISTS vn2008.cl_dep__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla cl_pet
+ALTER TABLE IF EXISTS vn2008.cl_pet RENAME vn2008.cl_pet__;
+ALTER TABLE IF EXISTS vn2008.cl_pet__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla cl_que
+ALTER TABLE IF EXISTS vn2008.cl_que RENAME vn2008.cl_que__;
+ALTER TABLE IF EXISTS vn2008.cl_que__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla commission
+ALTER TABLE IF EXISTS vn2008.commission RENAME vn2008.commission__;
+ALTER TABLE IF EXISTS vn2008.commission__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla config_host_forms
+ALTER TABLE IF EXISTS vn2008.config_host_forms RENAME vn2008.config_host_forms__;
+ALTER TABLE IF EXISTS vn2008.config_host_forms__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla container
+ALTER TABLE IF EXISTS vn2008.container RENAME vn2008.container__;
+ALTER TABLE IF EXISTS vn2008.container__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla cooler_path
+ALTER TABLE IF EXISTS vn2008.cooler_path RENAME vn2008.cooler_path__;
+ALTER TABLE IF EXISTS vn2008.cooler_path__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla credit_card
+ALTER TABLE IF EXISTS vn2008.credit_card RENAME vn2008.credit_card__;
+ALTER TABLE IF EXISTS vn2008.credit_card__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla cyc
+ALTER TABLE IF EXISTS vn2008.cyc RENAME vn2008.cyc__;
+ALTER TABLE IF EXISTS vn2008.cyc__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla cyc_declaration
+ALTER TABLE IF EXISTS vn2008.cyc_declaration RENAME vn2008.cyc_declaration__;
+ALTER TABLE IF EXISTS vn2008.cyc_declaration__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla edi_testigos
+ALTER TABLE IF EXISTS vn2008.edi_testigos RENAME vn2008.edi_testigos__;
+ALTER TABLE IF EXISTS vn2008.edi_testigos__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla emp_day_pay
+ALTER TABLE IF EXISTS vn2008.emp_day_pay RENAME vn2008.emp_day_pay__;
+ALTER TABLE IF EXISTS vn2008.emp_day_pay__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla expeditions_deleted
+ALTER TABLE IF EXISTS vn2008.expeditions_deleted RENAME vn2008.expeditions_deleted__;
+ALTER TABLE IF EXISTS vn2008.expeditions_deleted__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla expeditions_pictures
+ALTER TABLE IF EXISTS vn2008.expeditions_pictures RENAME vn2008.expeditions_pictures__;
+ALTER TABLE IF EXISTS vn2008.expeditions_pictures__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+ALTER TABLE IF EXISTS vn2008.cp RENAME vn2008.cp__;
+ALTER TABLE IF EXISTS vn2008.cp__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+ALTER TABLE IF EXISTS vn2008.duaDismissed RENAME vn2008.duaDismissed__;
+ALTER TABLE IF EXISTS vn2008.duaDismissed__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla config
+ALTER TABLE IF EXISTS vn2008.config RENAME vn2008.config__;
+ALTER TABLE IF EXISTS vn2008.config__ COMMENT='refs #6371 deprecated 2024-01-11';
\ No newline at end of file
diff --git a/db/versions/10835-brownCarnation/01-Bancos_poliza.sql b/db/versions/10835-brownCarnation/01-Bancos_poliza.sql
new file mode 100644
index 000000000..5f7dbf565
--- /dev/null
+++ b/db/versions/10835-brownCarnation/01-Bancos_poliza.sql
@@ -0,0 +1,16 @@
+-- Bancos_poliza
+DROP VIEW IF EXISTS vn.bankPolicy;
+
+ALTER TABLE IF EXISTS `vn2008`.`Bancos_poliza` RENAME `vn`.`bankPolicy`;
+
+ALTER TABLE IF EXISTS `vn`.`bankPolicy`
+CHANGE COLUMN IF EXISTS `poliza_id` `id` int(11) NOT NULL AUTO_INCREMENT,
+CHANGE COLUMN IF EXISTS `referencia` `ref` varchar(45) DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `importe` `amount` double NOT NULL,
+CHANGE COLUMN IF EXISTS `com_dispuesto` `committedFee` double DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `com_no_dispuesto` `nonCommittedFee` double DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `com_anual` `annualFee` double DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `apertura` `started` date NOT NULL,
+CHANGE COLUMN IF EXISTS `cierre` `ended` date DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `Id_Banco` `accountingFk` int(11) NOT NULL,
+CHANGE COLUMN IF EXISTS `empresa_id` `companyFk` int(10) unsigned NOT NULL DEFAULT 442;
diff --git a/db/versions/10835-brownCarnation/03-Entradas_orden.sql b/db/versions/10835-brownCarnation/03-Entradas_orden.sql
new file mode 100644
index 000000000..2f4429cda
--- /dev/null
+++ b/db/versions/10835-brownCarnation/03-Entradas_orden.sql
@@ -0,0 +1,5 @@
+ALTER TABLE IF EXISTS `vn2008`.`Entradas_orden` RENAME `vn`.`entryOrder`;
+
+ALTER TABLE IF EXISTS `vn`.`entryOrder`
+CHANGE COLUMN IF EXISTS `Id_Entrada` `entryFk` int(11) NOT NULL,
+CHANGE COLUMN IF EXISTS `orden` `order` int(11) NOT NULL DEFAULT 1 COMMENT '1.- Ordenar por articulo\n2.- Ordenar por compra\n';
diff --git a/db/versions/10835-brownCarnation/04-Pagares.sql b/db/versions/10835-brownCarnation/04-Pagares.sql
new file mode 100644
index 000000000..f87f426e0
--- /dev/null
+++ b/db/versions/10835-brownCarnation/04-Pagares.sql
@@ -0,0 +1,15 @@
+DROP VIEW IF EXISTS vn.promissoryNote;
+
+ALTER TABLE IF EXISTS vn2008.Pagares DROP COLUMN kk_Vencimiento;
+ALTER TABLE IF EXISTS vn2008.Pagares DROP COLUMN kk_Importe;
+ALTER TABLE IF EXISTS vn2008.Pagares DROP INDEX empresa_id;
+ALTER TABLE IF EXISTS vn2008.Pagares DROP COLUMN kk_empresa_id;
+ALTER TABLE IF EXISTS vn2008.Pagares DROP COLUMN kk_id_proveedor;
+
+ALTER TABLE IF EXISTS `vn2008`.`Pagares` RENAME `vn`.`promissoryNote`;
+
+ALTER TABLE IF EXISTS `vn`.`promissoryNote`
+CHANGE COLUMN IF EXISTS `Fechaemision` `issued` timestamp NOT NULL DEFAULT current_timestamp(),
+CHANGE COLUMN IF EXISTS `Id_Pagare` `id` int(11) NOT NULL AUTO_INCREMENT FIRST,
+CHANGE COLUMN IF EXISTS `Concepto` `Concept` varchar(50) DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `pago_id` `paymentFk` int(10) unsigned DEFAULT NULL;
diff --git a/db/versions/10835-brownCarnation/05-Proveedores_gestdoc.sql b/db/versions/10835-brownCarnation/05-Proveedores_gestdoc.sql
new file mode 100644
index 000000000..3450fe463
--- /dev/null
+++ b/db/versions/10835-brownCarnation/05-Proveedores_gestdoc.sql
@@ -0,0 +1,5 @@
+ALTER TABLE IF EXISTS `vn2008`.`Proveedores_gestdoc` RENAME `vn`.`supplierDms`;
+
+ALTER TABLE IF EXISTS `vn`.`supplierDms`
+CHANGE COLUMN IF EXISTS `Id_Proveedor` `supplierFk` int(11) NOT NULL,
+CHANGE COLUMN IF EXISTS `gestdoc_id` `dmsFk` int(11) NOT NULL;
\ No newline at end of file
diff --git a/db/versions/10835-brownCarnation/06-Remesas.sql b/db/versions/10835-brownCarnation/06-Remesas.sql
new file mode 100644
index 000000000..ef4240365
--- /dev/null
+++ b/db/versions/10835-brownCarnation/06-Remesas.sql
@@ -0,0 +1,7 @@
+ALTER TABLE IF EXISTS `vn2008`.`Remesas` RENAME `vn`.`remittance`;
+
+ALTER TABLE IF EXISTS `vn`.`remittance`
+CHANGE COLUMN IF EXISTS `Id_Remesa` `id` int(11) NOT NULL AUTO_INCREMENT,
+CHANGE COLUMN IF EXISTS `Fecha Remesa` `dated` datetime DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `Banco` `accountingFk` int(11) DEFAULT 0,
+CHANGE COLUMN IF EXISTS `empresa_id` `companyFk` int(10) unsigned NOT NULL DEFAULT 442;
\ No newline at end of file
diff --git a/db/versions/10835-brownCarnation/07-Saldos_Prevision.sql b/db/versions/10835-brownCarnation/07-Saldos_Prevision.sql
new file mode 100644
index 000000000..050b9a5ed
--- /dev/null
+++ b/db/versions/10835-brownCarnation/07-Saldos_Prevision.sql
@@ -0,0 +1,10 @@
+ALTER TABLE IF EXISTS `vn2008`.`Saldos_Prevision` RENAME `vn`.`forecastedBalance`;
+
+ALTER TABLE IF EXISTS `vn`.`forecastedBalance`
+CHANGE COLUMN IF EXISTS `Saldos_Prevision_id` `id` int(11) NOT NULL AUTO_INCREMENT,
+CHANGE COLUMN IF EXISTS `Descripcion` `description` varchar(45) DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `Importe` `amount` double NOT NULL DEFAULT 0,
+CHANGE COLUMN IF EXISTS `Fecha` `dated` date NOT NULL,
+CHANGE COLUMN IF EXISTS `Id_Banco` `accountingFk` int(11) DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `empresa_id` `companyFk` int(10) unsigned NOT NULL DEFAULT 442;
+
diff --git a/db/versions/10835-brownCarnation/08-Series.sql b/db/versions/10835-brownCarnation/08-Series.sql
new file mode 100644
index 000000000..e43ab0d5a
--- /dev/null
+++ b/db/versions/10835-brownCarnation/08-Series.sql
@@ -0,0 +1,2 @@
+ALTER TABLE IF EXISTS vn2008.Series RENAME vn2008.Series__;
+ALTER TABLE IF EXISTS vn2008.Series__ COMMENT='refs #6371 deprecated 2024-01-11';
\ No newline at end of file
diff --git a/db/versions/10835-brownCarnation/09-Split_lines.sql b/db/versions/10835-brownCarnation/09-Split_lines.sql
new file mode 100644
index 000000000..64186a978
--- /dev/null
+++ b/db/versions/10835-brownCarnation/09-Split_lines.sql
@@ -0,0 +1,7 @@
+ALTER TABLE IF EXISTS `vn2008`.`Split_lines` RENAME `vn`.`splitLine`;
+
+ALTER TABLE IF EXISTS `vn`.`splitLine`
+CHANGE COLUMN IF EXISTS `Id_Split_lines` `id` int(11) NOT NULL AUTO_INCREMENT,
+CHANGE COLUMN IF EXISTS `Id_Split` `splitFk` int(11) NOT NULL,
+CHANGE COLUMN IF EXISTS `Id_Article` `itemFk` int(11) DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `Id_Compra` `buyFk` int(11) DEFAULT NULL;
diff --git a/db/versions/10835-brownCarnation/10-Split.sql b/db/versions/10835-brownCarnation/10-Split.sql
new file mode 100644
index 000000000..f8321c96e
--- /dev/null
+++ b/db/versions/10835-brownCarnation/10-Split.sql
@@ -0,0 +1,8 @@
+ALTER TABLE IF EXISTS `vn2008`.`Splits` RENAME `vn`.`split`;
+
+ALTER TABLE IF EXISTS `vn`.`split`
+CHANGE COLUMN IF EXISTS `Id_Split` `id` int(11) NOT NULL AUTO_INCREMENT,
+CHANGE COLUMN IF EXISTS `Id_Ticket` `ticketFk` int(11) DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `Id_Entrada` `entryFk` int(11) DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `Fecha` `dated` datetime DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `Notas` `note` varchar(255) DEFAULT NULL;
diff --git a/db/versions/10835-brownCarnation/11-Vehiculos_consumo.sql b/db/versions/10835-brownCarnation/11-Vehiculos_consumo.sql
new file mode 100644
index 000000000..7d7c8a8e8
--- /dev/null
+++ b/db/versions/10835-brownCarnation/11-Vehiculos_consumo.sql
@@ -0,0 +1,13 @@
+ALTER TABLE IF EXISTS `vn2008`.`Vehiculos_consumo` RENAME `vn`.`vehicleConsumption`;
+
+ALTER TABLE IF EXISTS `vn`.`vehicleConsumption`
+CHANGE COLUMN IF EXISTS `Vehiculos_consumo_id` `id` int(11) NOT NULL AUTO_INCREMENT,
+CHANGE COLUMN IF EXISTS `Id_Vehiculo` `vehicleFk` int(10) unsigned NOT NULL,
+CHANGE COLUMN IF EXISTS `fecha` `dated` date NOT NULL,
+CHANGE COLUMN IF EXISTS `litros` `liters` double unsigned NOT NULL,
+CHANGE COLUMN IF EXISTS `precio` `price` double unsigned NOT NULL,
+CHANGE COLUMN IF EXISTS `peajes` `tolls` double DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `descuento` `discount` double DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `odbc_date` `created` timestamp NULL DEFAULT current_timestamp(),
+CHANGE COLUMN IF EXISTS `otros` `others` double DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `proveedoresFk` `supplierFk` int(10) unsigned DEFAULT NULL;
diff --git a/db/versions/10835-brownCarnation/12-account_conciliacion.sql b/db/versions/10835-brownCarnation/12-account_conciliacion.sql
new file mode 100644
index 000000000..22399da1b
--- /dev/null
+++ b/db/versions/10835-brownCarnation/12-account_conciliacion.sql
@@ -0,0 +1,14 @@
+DROP TRIGGER IF EXISTS vn2008.account_conciliacion_beforeInsert;
+
+ALTER TABLE IF EXISTS `vn2008`.`account_conciliacion` RENAME `vn`.`accountReconciliation`;
+
+ALTER TABLE IF EXISTS `vn`.`accountReconciliation`
+CHANGE COLUMN IF EXISTS `idaccount_conciliacion` `id` int(11) NOT NULL AUTO_INCREMENT,
+CHANGE COLUMN IF EXISTS `Id_Proveedores_account` `supplierAccountFk` mediumint(8) unsigned NOT NULL,
+CHANGE COLUMN IF EXISTS `Fechaoperacion` `operationDated` datetime NOT NULL,
+CHANGE COLUMN IF EXISTS `FechaValor` `valueDated` datetime NOT NULL,
+CHANGE COLUMN IF EXISTS `importe` `amount` double NOT NULL,
+CHANGE COLUMN IF EXISTS `Concepto` `concept` varchar(255) DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `DebeHaber` `debitCredit` smallint(6) NOT NULL,
+CHANGE COLUMN IF EXISTS `id_calculated` `calculatedCode` varchar(255) DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `odbc_date` `created` timestamp NULL DEFAULT current_timestamp();
diff --git a/db/versions/10835-brownCarnation/13-account_detail.sql b/db/versions/10835-brownCarnation/13-account_detail.sql
new file mode 100644
index 000000000..c20e8e400
--- /dev/null
+++ b/db/versions/10835-brownCarnation/13-account_detail.sql
@@ -0,0 +1,6 @@
+ALTER TABLE IF EXISTS `vn2008`.`account_detail` RENAME `vn`.`accountDetail`;
+
+ALTER TABLE IF EXISTS `vn`.`accountDetail`
+CHANGE COLUMN IF EXISTS `account_detail_id` `id` int(11) NOT NULL AUTO_INCREMENT,
+CHANGE COLUMN IF EXISTS `account_detail_type_id` `accountDetailTypeFk` int(11) NOT NULL,
+CHANGE COLUMN IF EXISTS `Id_Proveedores_account` `supplierAccountFk` mediumint(8) unsigned NOT NULL;
\ No newline at end of file
diff --git a/db/versions/10835-brownCarnation/14-account_detail_type.sql b/db/versions/10835-brownCarnation/14-account_detail_type.sql
new file mode 100644
index 000000000..80be31d1b
--- /dev/null
+++ b/db/versions/10835-brownCarnation/14-account_detail_type.sql
@@ -0,0 +1,4 @@
+ALTER TABLE IF EXISTS `vn2008`.`account_detail_type` RENAME `vn`.`accountDetailType`;
+
+ALTER TABLE IF EXISTS `vn`.`accountDetailType`
+CHANGE COLUMN IF EXISTS `account_detail_type_id` `id` int(11) NOT NULL AUTO_INCREMENT;
\ No newline at end of file
diff --git a/db/versions/10835-brownCarnation/15-agencia_descuadre.sql b/db/versions/10835-brownCarnation/15-agencia_descuadre.sql
new file mode 100644
index 000000000..1085b74f6
--- /dev/null
+++ b/db/versions/10835-brownCarnation/15-agencia_descuadre.sql
@@ -0,0 +1,3 @@
+-- Para la tabla agencia_descuadre
+ALTER TABLE IF EXISTS vn2008.agencia_descuadre RENAME vn2008.agencia_descuadre__;
+ALTER TABLE IF EXISTS vn2008.agencia_descuadre__ COMMENT='refs #6371 deprecated 2024-01-11';
\ No newline at end of file
diff --git a/db/versions/10835-brownCarnation/16-airline.sql b/db/versions/10835-brownCarnation/16-airline.sql
new file mode 100644
index 000000000..301499174
--- /dev/null
+++ b/db/versions/10835-brownCarnation/16-airline.sql
@@ -0,0 +1,4 @@
+ALTER TABLE IF EXISTS `vn2008`.`airline` RENAME `vn`.`airline`;
+
+ALTER TABLE IF EXISTS `vn`.`airline`
+CHANGE COLUMN IF EXISTS `airline_id` `id` smallint(2) unsigned NOT NULL AUTO_INCREMENT;
\ No newline at end of file
diff --git a/db/versions/10835-brownCarnation/17-airport.sql b/db/versions/10835-brownCarnation/17-airport.sql
new file mode 100644
index 000000000..c6e2d3929
--- /dev/null
+++ b/db/versions/10835-brownCarnation/17-airport.sql
@@ -0,0 +1,4 @@
+ALTER TABLE IF EXISTS `vn2008`.`airport` RENAME `vn`.`airport`;
+
+ALTER TABLE IF EXISTS `vn`.`airport`
+CHANGE COLUMN IF EXISTS `airport_id` `id` smallint(2) unsigned NOT NULL AUTO_INCREMENT;
\ No newline at end of file
diff --git a/db/versions/10835-brownCarnation/18-albaran.sql b/db/versions/10835-brownCarnation/18-albaran.sql
new file mode 100644
index 000000000..9635bb394
--- /dev/null
+++ b/db/versions/10835-brownCarnation/18-albaran.sql
@@ -0,0 +1,15 @@
+ALTER TABLE IF EXISTS `vn2008`.`albaran` RENAME `vn`.`deliveryNote`;
+
+ALTER TABLE IF EXISTS `vn`.`deliveryNote`
+CHANGE COLUMN IF EXISTS `albaran_id` `id` int(11) NOT NULL AUTO_INCREMENT,
+CHANGE COLUMN IF EXISTS `fecha` `shipped` date NOT NULL,
+CHANGE COLUMN IF EXISTS `fecha_entrega` `landed` date DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `valor` `amount` double DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `Id_Proveedor` `supplierFk` int(10) unsigned NOT NULL,
+CHANGE COLUMN IF EXISTS `empresa_id` `companyFk` int(10) unsigned NOT NULL,
+CHANGE COLUMN IF EXISTS `warehouse_id` `warehouseFk` smallint(6) unsigned NOT NULL,
+CHANGE COLUMN IF EXISTS `albaran_state_id` `stateFk` int(11) NOT NULL,
+CHANGE COLUMN IF EXISTS `Id_Trabajador` `workerFk` int(10) unsigned NOT NULL COMMENT 'Id_Trabajador hace referencia a la persona que ha introducido el albarán',
+CHANGE COLUMN IF EXISTS `Id_Responsable` `supervisorFk` int(10) unsigned NOT NULL,
+CHANGE COLUMN IF EXISTS `department_id` `departmentFk` int(11) NOT NULL,
+CHANGE COLUMN IF EXISTS `recibida_id` `invoiceInFk` mediumint(8) unsigned DEFAULT NULL;
\ No newline at end of file
diff --git a/db/versions/10835-brownCarnation/19-albaran_gestdoc.sql b/db/versions/10835-brownCarnation/19-albaran_gestdoc.sql
new file mode 100644
index 000000000..68f1df29e
--- /dev/null
+++ b/db/versions/10835-brownCarnation/19-albaran_gestdoc.sql
@@ -0,0 +1,5 @@
+ALTER TABLE IF EXISTS `vn2008`.`albaran_gestdoc` RENAME `vn`.`deliveryNoteDms`;
+
+ALTER TABLE IF EXISTS `vn`.`deliveryNoteDms`
+CHANGE COLUMN IF EXISTS `gestdoc_id` `dmsFk` int(11) NOT NULL,
+CHANGE COLUMN IF EXISTS `albaran_id` `deliveryNoteFk` int(11) NOT NULL;
\ No newline at end of file
diff --git a/db/versions/10835-brownCarnation/20-albaran_state.sql b/db/versions/10835-brownCarnation/20-albaran_state.sql
new file mode 100644
index 000000000..607ffb869
--- /dev/null
+++ b/db/versions/10835-brownCarnation/20-albaran_state.sql
@@ -0,0 +1,4 @@
+ALTER TABLE IF EXISTS `vn2008`.`albaran_state` RENAME `vn`.`deliveryNoteState`;
+
+ALTER TABLE IF EXISTS `vn`.`deliveryNoteState`
+CHANGE COLUMN IF EXISTS `albaran_state_id` `id`int(11) NOT NULL AUTO_INCREMENT;
\ No newline at end of file
diff --git a/db/versions/10835-brownCarnation/21-awb_component.sql b/db/versions/10835-brownCarnation/21-awb_component.sql
new file mode 100644
index 000000000..a53079444
--- /dev/null
+++ b/db/versions/10835-brownCarnation/21-awb_component.sql
@@ -0,0 +1,11 @@
+ALTER TABLE IF EXISTS `vn2008`.`awb_component` RENAME `vn`.`awbComponent`;
+
+ALTER TABLE IF EXISTS `vn`.`awbComponent`
+CHANGE COLUMN IF EXISTS `awb_id` `awbFk` smallint(11) unsigned DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `Id_Proveedor` `supplierFk` int(11) NOT NULL,
+CHANGE COLUMN IF EXISTS `Fecha` `dated__` date NOT NULL,
+CHANGE COLUMN IF EXISTS `awb_component_type_id` `typeFk` mediumint(3) unsigned DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `awb_role_id` `awbRoleFk` tinyint(1) unsigned NOT NULL DEFAULT 1,
+CHANGE COLUMN IF EXISTS `awb_unit_id` `awbUnitFk` varchar(10) DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `Id_Moneda` `currencyFk` tinyint(3) unsigned NOT NULL DEFAULT 2,
+CHANGE COLUMN IF EXISTS `recibida_id` `invoiceInFk` mediumint(8) unsigned DEFAULT NULL;
\ No newline at end of file
diff --git a/db/versions/10835-brownCarnation/22-awb_component_template.sql b/db/versions/10835-brownCarnation/22-awb_component_template.sql
new file mode 100644
index 000000000..78ae4cb19
--- /dev/null
+++ b/db/versions/10835-brownCarnation/22-awb_component_template.sql
@@ -0,0 +1,15 @@
+ALTER TABLE IF EXISTS `vn2008`.`awb_component_template` RENAME `vn`.`awbComponentTemplate`;
+
+ALTER TABLE IF EXISTS `vn`.`awbComponentTemplate`
+CHANGE COLUMN IF EXISTS `awb_component_template_id` `id` int(11) NOT NULL AUTO_INCREMENT,
+CHANGE COLUMN IF EXISTS `carguera_id` `freightFk` int(11) DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `airport_in` `airportIn` varchar(3) DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `airport_out` `airportOut` varchar(3) DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `airline_id` `airlineFk` smallint(2) unsigned DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `awb_component_type_id` `typeFk` mediumint(3) unsigned NOT NULL,
+CHANGE COLUMN IF EXISTS `Fecha` `dated` date NOT NULL,
+CHANGE COLUMN IF EXISTS `awb_role_id` `awbRoleFk` tinyint(1) unsigned NOT NULL,
+CHANGE COLUMN IF EXISTS `awb_unit_id` `awbUnit` varchar(10) DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `max_value` `maxValue` decimal(10,2) unsigned DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `min_value` `minValue` decimal(10,2) unsigned DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `Id_Moneda` `currencyFk` tinyint(3) unsigned NOT NULL DEFAULT 2
\ No newline at end of file
diff --git a/db/versions/10835-brownCarnation/23-awb_component_type.sql b/db/versions/10835-brownCarnation/23-awb_component_type.sql
new file mode 100644
index 000000000..85f4fb753
--- /dev/null
+++ b/db/versions/10835-brownCarnation/23-awb_component_type.sql
@@ -0,0 +1,4 @@
+ALTER TABLE IF EXISTS `vn2008`.`awb_component_type` RENAME `vn`.`awbComponentType`;
+
+ALTER TABLE IF EXISTS `vn`.`awbComponentType`
+CHANGE COLUMN IF EXISTS `awb_component_type_id` `id` mediumint(3) unsigned NOT NULL AUTO_INCREMENT;
\ No newline at end of file
diff --git a/db/versions/10835-brownCarnation/24-awb_gestdoc.sql b/db/versions/10835-brownCarnation/24-awb_gestdoc.sql
new file mode 100644
index 000000000..15ac67195
--- /dev/null
+++ b/db/versions/10835-brownCarnation/24-awb_gestdoc.sql
@@ -0,0 +1,6 @@
+ALTER TABLE IF EXISTS `vn2008`.`awb_gestdoc` RENAME `vn`.`awbDms`;
+
+ALTER TABLE IF EXISTS `vn`.`awbDms`
+CHANGE COLUMN IF EXISTS `awb_gestdoc_id` `id` int(11) NOT NULL AUTO_INCREMENT,
+CHANGE COLUMN IF EXISTS `awb_id` `awbFk` smallint(11) unsigned NOT NULL,
+CHANGE COLUMN IF EXISTS `gestdoc_id` `dmsFk` int(11) NOT NULL;
\ No newline at end of file
diff --git a/db/versions/10835-brownCarnation/25-awb_recibida.sql b/db/versions/10835-brownCarnation/25-awb_recibida.sql
new file mode 100644
index 000000000..82dc01ab2
--- /dev/null
+++ b/db/versions/10835-brownCarnation/25-awb_recibida.sql
@@ -0,0 +1,8 @@
+DROP TRIGGER IF EXISTS vn2008.awb_recibida_afterDelete;
+
+ALTER TABLE IF EXISTS `vn2008`.`awb_recibida` RENAME `vn`.`awbInvoiceIn`;
+
+ALTER TABLE IF EXISTS `vn`.`awbInvoiceIn`
+CHANGE COLUMN IF EXISTS `awb_id` `awbFk` smallint(5) unsigned NOT NULL,
+CHANGE COLUMN IF EXISTS `recibida_id` `invoiceInFk` mediumint(8) unsigned NOT NULL,
+CHANGE COLUMN IF EXISTS `dua` `sad` varchar(18) DEFAULT NULL;
diff --git a/db/versions/10835-brownCarnation/26-awb_role.sql b/db/versions/10835-brownCarnation/26-awb_role.sql
new file mode 100644
index 000000000..eb0e5594b
--- /dev/null
+++ b/db/versions/10835-brownCarnation/26-awb_role.sql
@@ -0,0 +1,4 @@
+ALTER TABLE IF EXISTS `vn2008`.`awb_role` RENAME `vn`.`awbRole`;
+
+ALTER TABLE IF EXISTS `vn`.`awbRole`
+CHANGE COLUMN IF EXISTS `awb_role_id` `id` tinyint(1) unsigned NOT NULL AUTO_INCREMENT;
\ No newline at end of file
diff --git a/db/versions/10835-brownCarnation/27-awb_unit.sql b/db/versions/10835-brownCarnation/27-awb_unit.sql
new file mode 100644
index 000000000..1ddf71b6d
--- /dev/null
+++ b/db/versions/10835-brownCarnation/27-awb_unit.sql
@@ -0,0 +1,4 @@
+ALTER TABLE `vn2008`.`awb_unit` RENAME `vn`.`awbUnit`;
+
+ALTER TABLE IF EXISTS `vn`.`awbUnit`
+CHANGE COLUMN IF EXISTS `awb_unit_id` `id` varchar(10) NOT NULL DEFAULT '';
\ No newline at end of file
diff --git a/db/versions/10835-brownCarnation/28-balance_nest_tree.sql b/db/versions/10835-brownCarnation/28-balance_nest_tree.sql
new file mode 100644
index 000000000..6a3fd1edd
--- /dev/null
+++ b/db/versions/10835-brownCarnation/28-balance_nest_tree.sql
@@ -0,0 +1,16 @@
+ALTER TABLE IF EXISTS `vn2008`.`balance_nest_tree` RENAME `vn`.`balanceNestTree`;
+
+ALTER TABLE IF EXISTS `vn`.`balanceNestTree`
+CHANGE COLUMN IF EXISTS `Id_Gasto` `expenseFk` varchar(10) DEFAULT NULL;
+
+ALTER TABLE vn.balanceNestTree
+ MODIFY COLUMN IF EXISTS expenseFk varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL NULL;
+
+UPDATE vn.balanceNestTree b
+ LEFT JOIN vn.expense e ON e.id = b.expenseFk COLLATE utf8mb3_general_ci
+ SET b.expenseFk = NULL
+ WHERE b.expenseFk =''
+ OR (e.id IS NULL AND b.expenseFk IS NOT NULL);
+
+ALTER TABLE IF EXISTS vn.balanceNestTree ADD CONSTRAINT balanceNestTree_expense_FK
+ FOREIGN KEY (expenseFk) REFERENCES vn.expense(id) ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/db/versions/10835-brownCarnation/29-buy_edi_k012.sql b/db/versions/10835-brownCarnation/29-buy_edi_k012.sql
new file mode 100644
index 000000000..78b1123a5
--- /dev/null
+++ b/db/versions/10835-brownCarnation/29-buy_edi_k012.sql
@@ -0,0 +1,5 @@
+ALTER TABLE IF EXISTS `vn2008`.`buy_edi_k012` RENAME `edi`.`ektK1`;
+
+ALTER TABLE IF EXISTS `edi`.`ektK1`
+CHANGE COLUMN IF EXISTS `buy_edi_k012_id` `id` smallint(6) unsigned NOT NULL,
+CHANGE COLUMN IF EXISTS `description` `description` varchar(50) NOT NULL;
\ No newline at end of file
diff --git a/db/versions/10835-brownCarnation/30-buy_edi_k03.sql b/db/versions/10835-brownCarnation/30-buy_edi_k03.sql
new file mode 100644
index 000000000..41d453274
--- /dev/null
+++ b/db/versions/10835-brownCarnation/30-buy_edi_k03.sql
@@ -0,0 +1,5 @@
+ALTER TABLE IF EXISTS `vn2008`.`buy_edi_k03` RENAME `edi`.`ektK3`;
+
+ALTER TABLE IF EXISTS `edi`.`ektK3`
+CHANGE COLUMN IF EXISTS `buy_edi_k03_id` `id` smallint(6) unsigned NOT NULL,
+CHANGE COLUMN IF EXISTS `description` `description` varchar(50) NOT NULL;
\ No newline at end of file
diff --git a/db/versions/10835-brownCarnation/31-buy_edi_k04.sql b/db/versions/10835-brownCarnation/31-buy_edi_k04.sql
new file mode 100644
index 000000000..7174f34e0
--- /dev/null
+++ b/db/versions/10835-brownCarnation/31-buy_edi_k04.sql
@@ -0,0 +1,5 @@
+ALTER TABLE IF EXISTS `vn2008`.`buy_edi_k04` RENAME `edi`.`ektK4`;
+
+ALTER TABLE IF EXISTS `edi`.`ektK4`
+CHANGE COLUMN IF EXISTS `buy_edi_k04_id` `id` smallint(6) unsigned NOT NULL,
+CHANGE COLUMN IF EXISTS `description` `description` varchar(50) NOT NULL;
\ No newline at end of file
diff --git a/db/versions/10835-brownCarnation/32-definitivo.sql b/db/versions/10835-brownCarnation/32-definitivo.sql
new file mode 100644
index 000000000..3628137f3
--- /dev/null
+++ b/db/versions/10835-brownCarnation/32-definitivo.sql
@@ -0,0 +1,13 @@
+ALTER TABLE IF EXISTS `vn2008`.`definitivo` RENAME `vn`.`dmsStorageBox`;
+
+ALTER TABLE IF EXISTS `vn`.`dmsStorageBox`
+CHANGE COLUMN IF EXISTS `definitivo_id` `id` int(11) NOT NULL,
+CHANGE COLUMN IF EXISTS `empresa_id` `companyFk` int(10) unsigned NOT NULL,
+CHANGE COLUMN IF EXISTS `desde` `started` bigint(20) NOT NULL,
+CHANGE COLUMN IF EXISTS `hasta` `ended` bigint(20) NOT NULL,
+CHANGE COLUMN IF EXISTS `fecha` `created` timestamp NOT NULL DEFAULT current_timestamp();
+
+ALTER TABLE IF EXISTS `vn`.`dmsStorageBox` COMMENT='Caja en la que se guardan la documentacion fisica de dms';
+
+ALTER TABLE IF EXISTS vn.dmsStorageBox ADD CONSTRAINT dmsStorageBox_company_FK
+ FOREIGN KEY (companyFk) REFERENCES vn.company(id);
\ No newline at end of file
diff --git a/db/versions/10835-brownCarnation/33-dropTables.sql b/db/versions/10835-brownCarnation/33-dropTables.sql
new file mode 100644
index 000000000..557d81623
--- /dev/null
+++ b/db/versions/10835-brownCarnation/33-dropTables.sql
@@ -0,0 +1,19 @@
+DROP TABLE IF EXISTS vn2008.Colores__;
+
+DROP TABLE IF EXISTS vn2008.Comparativa__;
+
+DROP TABLE IF EXISTS vn2008.`Enlaces Facturas__`;
+
+DROP TABLE IF EXISTS vn2008.Entradas_dits__;
+
+DROP TABLE IF EXISTS vn2008.Entradas_stack__;
+
+DROP TABLE IF EXISTS vn2008.Entradas_turno__;
+
+DROP TABLE IF EXISTS vn2008.EnvioMasivo__;
+
+DROP TABLE IF EXISTS vn2008.Estanterias__;
+
+DROP TABLE IF EXISTS vn2008.Estanterias_distri__;
+
+DROP TABLE IF EXISTS vn2008.Estanterias_distri_name__;
\ No newline at end of file
diff --git a/db/versions/10835-brownCarnation/34-permisos.sql b/db/versions/10835-brownCarnation/34-permisos.sql
new file mode 100644
index 000000000..611207c61
--- /dev/null
+++ b/db/versions/10835-brownCarnation/34-permisos.sql
@@ -0,0 +1,274 @@
+
+-- Bancos_poliza
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+ SQL SECURITY DEFINER
+ VIEW `vn2008`.`Bancos_poliza` AS
+SELECT 1;
+
+GRANT SELECT ON TABLE vn2008.Bancos_poliza TO `administrative`;
+GRANT SELECT ON TABLE vn.bankPolicy TO `administrative`;
+
+-- Entradas_orden
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+ SQL SECURITY DEFINER
+ VIEW `vn2008`.`Entradas_orden` AS
+SELECT 1;
+
+GRANT SELECT,INSERT,DELETE ON TABLE vn2008.Entradas_orden TO `buyer`;
+GRANT SELECT,INSERT,DELETE ON TABLE vn.entryOrder TO `buyer`;
+
+-- Proveedores_gestdoc
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+ SQL SECURITY DEFINER
+ VIEW `vn2008`.`Proveedores_gestdoc` AS
+SELECT 1;
+
+GRANT SELECT,INSERT,DELETE ON TABLE vn2008.Proveedores_gestdoc TO `administrative`;
+GRANT SELECT ON TABLE vn2008.Proveedores_gestdoc TO `buyer`;
+GRANT SELECT,INSERT ON TABLE vn2008.Proveedores_gestdoc TO `hr`;
+
+GRANT SELECT,INSERT,DELETE ON TABLE vn.supplierDms TO `administrative`;
+GRANT SELECT ON TABLE vn.supplierDms TO `buyer`;
+GRANT SELECT,INSERT ON TABLE vn.supplierDms TO `hr`;
+
+-- Remesas
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+ SQL SECURITY DEFINER
+ VIEW `vn2008`.`Remesas` AS
+SELECT 1;
+
+GRANT SELECT,INSERT ON TABLE vn2008.Remesas TO `financial`;
+GRANT SELECT,INSERT ON TABLE vn.remittance TO `financial`;
+
+-- Vehiculos_consumo
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+ SQL SECURITY DEFINER
+ VIEW `vn2008`.`Vehiculos_consumo` AS
+SELECT 1;
+
+GRANT SELECT ON TABLE vn2008.Vehiculos_consumo TO `administrative`;
+GRANT INSERT,UPDATE,DELETE ON TABLE vn2008.Vehiculos_consumo TO `productionAssi`;
+
+GRANT SELECT ON TABLE vn.vehicleConsumption TO `adminOfficer`;
+GRANT INSERT,UPDATE,DELETE ON TABLE vn.vehicleConsumption TO `productionAssi`;
+
+-- account_conciliacion
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+ SQL SECURITY DEFINER
+ VIEW `vn2008`.`account_conciliacion` AS
+SELECT 1;
+
+GRANT SELECT,INSERT,DELETE ON TABLE vn2008.account_conciliacion TO `financial`;
+GRANT SELECT,INSERT,DELETE ON TABLE vn.accountReconciliation TO `financial`;
+
+-- account_detail
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+ SQL SECURITY DEFINER
+ VIEW `vn2008`.`account_detail` AS
+SELECT 1;
+
+GRANT SELECT ON TABLE vn2008.account_detail TO `financial`;
+GRANT SELECT ON TABLE vn2008.account_detail TO `hr`;
+
+GRANT SELECT ON TABLE vn.accountDetail TO `financial`;
+GRANT SELECT ON TABLE vn.accountDetail TO `hr`;
+
+-- account_detail_type
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+ SQL SECURITY DEFINER
+ VIEW `vn2008`.`account_detail_type` AS
+SELECT 1;
+
+GRANT SELECT ON TABLE vn2008.account_detail_type TO `hr`;
+GRANT SELECT ON TABLE vn.accountDetailType TO `hr`;
+
+-- airline
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+ SQL SECURITY DEFINER
+ VIEW `vn2008`.`airline` AS
+SELECT 1;
+
+GRANT SELECT ON TABLE vn2008.airline TO `administrative`;
+GRANT SELECT,UPDATE ON TABLE vn2008.airline TO `logistic`;
+
+GRANT SELECT ON TABLE vn.airline TO `administrative`;
+GRANT SELECT,UPDATE ON TABLE vn.airline TO `logistic`;
+
+-- airport
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+ SQL SECURITY DEFINER
+ VIEW `vn2008`.`airport` AS
+SELECT 1;
+
+GRANT SELECT,INSERT,UPDATE ON TABLE vn2008.airport TO `logistic`;
+GRANT SELECT,INSERT,UPDATE ON TABLE vn.airport TO `logistic`;
+
+-- albaran
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+ SQL SECURITY DEFINER
+ VIEW `vn2008`.`albaran` AS
+SELECT 1;
+
+GRANT SELECT,INSERT,UPDATE,DELETE ON TABLE vn2008.albaran TO `administrative`;
+GRANT SELECT,INSERT,UPDATE,DELETE ON TABLE vn.deliveryNote TO `administrative`;
+
+-- albaran_gestdoc
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+ SQL SECURITY DEFINER
+ VIEW `vn2008`.`albaran_gestdoc` AS
+SELECT 1;
+
+GRANT SELECT,INSERT ON TABLE vn2008.albaran_gestdoc TO `administrative`;
+GRANT SELECT,INSERT ON TABLE vn.deliveryNoteDms TO `administrative`;
+
+-- albaran_state
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+ SQL SECURITY DEFINER
+ VIEW `vn2008`.`albaran_state` AS
+SELECT 1;
+
+GRANT SELECT ON TABLE vn2008.albaran_state TO `administrative`;
+GRANT SELECT ON TABLE vn.deliveryNoteState TO `administrative`;
+
+-- awb_component
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+ SQL SECURITY DEFINER
+ VIEW `vn2008`.`awb_component` AS
+SELECT 1;
+
+GRANT SELECT,INSERT,UPDATE,DELETE ON TABLE vn2008.awb_component TO `buyer`;
+GRANT SELECT,INSERT,UPDATE,DELETE ON TABLE vn2008.awb_component TO `logistic`;
+GRANT SELECT ON TABLE vn2008.awb_component TO `administrative`;
+
+GRANT SELECT,INSERT,UPDATE,DELETE ON TABLE vn.awbComponent TO `buyer`;
+GRANT SELECT,INSERT,UPDATE,DELETE ON TABLE vn.awbComponent TO `logistic`;
+GRANT SELECT ON TABLE vn.awbComponent TO `administrative`;
+
+-- awb_component_template
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+ SQL SECURITY DEFINER
+ VIEW `vn2008`.`awb_component_template` AS
+SELECT 1;
+
+GRANT SELECT,INSERT,UPDATE ON TABLE vn2008.awb_component_template TO `logistic`;
+GRANT SELECT,INSERT,UPDATE ON TABLE vn.awbComponentTemplate TO `logistic`;
+
+-- awb_component_type
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+ SQL SECURITY DEFINER
+ VIEW `vn2008`.`awb_component_type` AS
+SELECT 1;
+
+GRANT SELECT ON TABLE vn2008.awb_component_type TO `administrative`;
+GRANT SELECT,UPDATE ON TABLE vn2008.awb_component_type TO `logistic`;
+
+GRANT SELECT ON TABLE vn.awbComponentType TO `administrative`;
+GRANT SELECT,UPDATE ON TABLE vn.awbComponentType TO `logistic`;
+
+-- awb_gestdoc
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+ SQL SECURITY DEFINER
+ VIEW `vn2008`.`awb_gestdoc` AS
+SELECT 1;
+
+GRANT SELECT,INSERT ON TABLE vn2008.awb_gestdoc TO `buyer`;
+GRANT SELECT ON TABLE vn2008.awb_gestdoc TO `administrative`;
+GRANT INSERT ON TABLE vn2008.awb_gestdoc TO `logistic`;
+GRANT SELECT ON TABLE vn2008.awb_gestdoc TO `hr`;
+
+GRANT SELECT,INSERT ON TABLE vn.awbDms TO `buyer`;
+GRANT SELECT ON TABLE vn.awbDms TO `administrative`;
+GRANT INSERT ON TABLE vn.awbDms TO `logistic`;
+GRANT SELECT ON TABLE vn.awbDms TO `hr`;
+
+-- awb_recibida
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+ SQL SECURITY DEFINER
+ VIEW `vn2008`.`awb_recibida` AS
+SELECT 1;
+
+GRANT SELECT ON TABLE vn2008.awb_recibida TO `administrative`;
+GRANT SELECT ON TABLE vn2008.awb_recibida TO `hrBoss`;
+
+GRANT SELECT ON TABLE vn.awbInvoiceIn TO `administrative`;
+GRANT SELECT ON TABLE vn.awbInvoiceIn TO `hrBoss`;
+
+-- awb_role
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+ SQL SECURITY DEFINER
+ VIEW `vn2008`.`awb_role` AS
+SELECT 1;
+
+GRANT SELECT ON TABLE vn2008.awb_role TO `logistic`;
+GRANT SELECT ON TABLE vn.awbRole TO `logistic`;
+
+-- awb_unit
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+ SQL SECURITY DEFINER
+ VIEW `vn2008`.`awb_unit` AS
+SELECT 1;
+
+GRANT SELECT ON TABLE vn2008.awb_unit TO `logistic`;
+GRANT SELECT ON TABLE vn.awbUnit TO `logistic`;
+
+-- balance_nest_tree
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+ SQL SECURITY DEFINER
+ VIEW `vn2008`.`balance_nest_tree` AS
+SELECT 1;
+
+GRANT SELECT ON TABLE vn2008.balance_nest_tree TO `financialBoss`;
+GRANT SELECT ON TABLE vn.balanceNestTree TO `financialBoss`;
+
+-- buy_edi_k012
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+ SQL SECURITY DEFINER
+ VIEW `vn2008`.`buy_edi_k012` AS
+SELECT 1;
+
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+ SQL SECURITY DEFINER
+ VIEW `edi`.`ektK2` AS
+SELECT 1;
+
+GRANT SELECT ON TABLE vn2008.buy_edi_k012 TO `buyer`;
+GRANT SELECT ON TABLE vn2008.buy_edi_k012 TO `administrative`;
+
+GRANT SELECT ON TABLE edi.ektK1 TO `buyer`;
+GRANT SELECT ON TABLE edi.ektK1 TO `administrative`;
+
+GRANT SELECT ON TABLE edi.ektK2 TO `buyer`;
+GRANT SELECT ON TABLE edi.ektK2 TO `administrative`;
+
+-- buy_edi_k03
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+ SQL SECURITY DEFINER
+ VIEW `vn2008`.`buy_edi_k03` AS
+SELECT 1;
+
+GRANT SELECT ON TABLE vn2008.buy_edi_k03 TO `buyer`;
+GRANT SELECT ON TABLE vn2008.buy_edi_k03 TO `administrative`;
+
+GRANT SELECT ON TABLE edi.ektK3 TO `buyer`;
+GRANT SELECT ON TABLE edi.ektK3 TO `administrative`;
+
+-- buy_edi_k04
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+ SQL SECURITY DEFINER
+ VIEW `vn2008`.`buy_edi_k04` AS
+SELECT 1;
+
+GRANT SELECT ON TABLE vn2008.buy_edi_k04 TO `buyer`;
+GRANT SELECT ON TABLE vn2008.buy_edi_k04 TO `administrative`;
+
+GRANT SELECT ON TABLE edi.ektK4 TO `buyer`;
+GRANT SELECT ON TABLE edi.ektK4 TO `administrative`;
+
+-- definitivo
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+ SQL SECURITY DEFINER
+ VIEW `vn2008`.`definitivo` AS
+SELECT 1;
+
+GRANT SELECT,INSERT ON TABLE vn2008.definitivo TO `productionAssi`;
+GRANT SELECT ON TABLE vn.dmsStorageBox TO `productionAssi`;
diff --git a/db/versions/10841-orangeGalax/00-entryDms.sql b/db/versions/10841-orangeGalax/00-entryDms.sql
new file mode 100644
index 000000000..33ec1e3af
--- /dev/null
+++ b/db/versions/10841-orangeGalax/00-entryDms.sql
@@ -0,0 +1,15 @@
+CREATE OR REPLACE TABLE `vn`.`entryDms` (
+ `entryFk` int(11) NOT NULL,
+ `dmsFk` int(11) NOT NULL,
+ `editorFk` int(10) unsigned DEFAULT NULL,
+ PRIMARY KEY (`entryFk`,`dmsFk`),
+ KEY `gestdoc_id` (`dmsFk`),
+ KEY `entryDms_editor` (`editorFk`),
+ CONSTRAINT `entryDms_dms` FOREIGN KEY (`dmsFk`) REFERENCES `dms` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `entryDms_editor` FOREIGN KEY (`editorFk`) REFERENCES `account`.`user` (`id`),
+ CONSTRAINT `entryDms_entry` FOREIGN KEY (`entryFk`) REFERENCES `entry` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+ VALUES
+ ('EntryDms', '*', '*', 'ALLOW', 'ROLE', 'employee');
diff --git a/db/versions/10841-orangeGalax/00-entryDmsType.vn.sql b/db/versions/10841-orangeGalax/00-entryDmsType.vn.sql
new file mode 100644
index 000000000..d408ab827
--- /dev/null
+++ b/db/versions/10841-orangeGalax/00-entryDmsType.vn.sql
@@ -0,0 +1,2 @@
+INSERT INTO `vn`.`dmsType` (code, name, path__, writeRoleFk, readRoleFk, monthToDelete)
+ VALUES('entry', 'Entrada', '', 1, 1, NULL);
diff --git a/db/versions/10845-silverOrchid/00-firstScript.sql b/db/versions/10845-silverOrchid/00-firstScript.sql
new file mode 100644
index 000000000..7393bfe18
--- /dev/null
+++ b/db/versions/10845-silverOrchid/00-firstScript.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `vn`.`operator` MODIFY COLUMN linesLimit int(11) DEFAULT 20 NULL COMMENT 'Límite de lineas en una colección para la asignación de pedidos';
+ALTER TABLE `vn`.`operator` MODIFY COLUMN volumeLimit decimal(10,6) DEFAULT 0.5 NULL COMMENT 'Límite de volumen en una colección para la asignación de pedidos';
+ALTER TABLE `vn`.`operator` MODIFY COLUMN numberOfWagons int(11) DEFAULT 2 NULL;
diff --git a/db/versions/10848-blackAspidistra/00-firstScript.sql b/db/versions/10848-blackAspidistra/00-firstScript.sql
new file mode 100644
index 000000000..cc9a59a24
--- /dev/null
+++ b/db/versions/10848-blackAspidistra/00-firstScript.sql
@@ -0,0 +1,3 @@
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES
+ ('Ticket', 'makePdfList', '*', 'ALLOW', 'ROLE', 'employee'),
+ ('Ticket', 'invoiceTicketsAndPdf', '*', 'ALLOW', 'ROLE', 'employee');
diff --git a/db/versions/10849-chocolateCymbidium/00-roleLog.sql b/db/versions/10849-chocolateCymbidium/00-roleLog.sql
new file mode 100644
index 000000000..0f2eb1953
--- /dev/null
+++ b/db/versions/10849-chocolateCymbidium/00-roleLog.sql
@@ -0,0 +1 @@
+ALTER TABLE account.roleLog DROP FOREIGN KEY roleLog_ibfk_1;
diff --git a/db/versions/10849-chocolateCymbidium/01-userLog.sql b/db/versions/10849-chocolateCymbidium/01-userLog.sql
new file mode 100644
index 000000000..87d687afe
--- /dev/null
+++ b/db/versions/10849-chocolateCymbidium/01-userLog.sql
@@ -0,0 +1 @@
+ALTER TABLE account.userLog DROP FOREIGN KEY userLog_ibfk_1;
diff --git a/db/versions/10849-chocolateCymbidium/02-entryLog.sql b/db/versions/10849-chocolateCymbidium/02-entryLog.sql
new file mode 100644
index 000000000..e273f54a3
--- /dev/null
+++ b/db/versions/10849-chocolateCymbidium/02-entryLog.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.entryLog DROP FOREIGN KEY entryLog_ibfk_1;
diff --git a/db/versions/10849-chocolateCymbidium/03-clientLog.sql b/db/versions/10849-chocolateCymbidium/03-clientLog.sql
new file mode 100644
index 000000000..38a3424a1
--- /dev/null
+++ b/db/versions/10849-chocolateCymbidium/03-clientLog.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.clientLog DROP FOREIGN KEY clientLog_ibfk_1;
diff --git a/db/versions/10849-chocolateCymbidium/04-itemLog.sql b/db/versions/10849-chocolateCymbidium/04-itemLog.sql
new file mode 100644
index 000000000..7ad6a6b15
--- /dev/null
+++ b/db/versions/10849-chocolateCymbidium/04-itemLog.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.itemLog DROP FOREIGN KEY itemLogItemFk;
diff --git a/db/versions/10849-chocolateCymbidium/05-shelvingLog.sql b/db/versions/10849-chocolateCymbidium/05-shelvingLog.sql
new file mode 100644
index 000000000..031921bdf
--- /dev/null
+++ b/db/versions/10849-chocolateCymbidium/05-shelvingLog.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.shelvingLog DROP FOREIGN KEY shelvingLog_ibfk_1;
diff --git a/db/versions/10849-chocolateCymbidium/06-workerLog.sql b/db/versions/10849-chocolateCymbidium/06-workerLog.sql
new file mode 100644
index 000000000..c8d4faf44
--- /dev/null
+++ b/db/versions/10849-chocolateCymbidium/06-workerLog.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.workerLog DROP FOREIGN KEY workerFk;
diff --git a/db/versions/10849-chocolateCymbidium/07-deviceProductionLog.sql b/db/versions/10849-chocolateCymbidium/07-deviceProductionLog.sql
new file mode 100644
index 000000000..1cd5b54e9
--- /dev/null
+++ b/db/versions/10849-chocolateCymbidium/07-deviceProductionLog.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.deviceProductionLog DROP FOREIGN KEY deviceProductionOriginFk;
diff --git a/db/versions/10849-chocolateCymbidium/08-zoneLog.sql b/db/versions/10849-chocolateCymbidium/08-zoneLog.sql
new file mode 100644
index 000000000..b4ed11043
--- /dev/null
+++ b/db/versions/10849-chocolateCymbidium/08-zoneLog.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.zoneLog DROP FOREIGN KEY zoneLog_ibfk_1;
diff --git a/db/versions/10849-chocolateCymbidium/09-rateLog.sql b/db/versions/10849-chocolateCymbidium/09-rateLog.sql
new file mode 100644
index 000000000..33e2d4b93
--- /dev/null
+++ b/db/versions/10849-chocolateCymbidium/09-rateLog.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.rateLog DROP FOREIGN KEY rateOriginFk;
diff --git a/db/versions/10849-chocolateCymbidium/10-ticketLog.sql b/db/versions/10849-chocolateCymbidium/10-ticketLog.sql
new file mode 100644
index 000000000..e7117d3c6
--- /dev/null
+++ b/db/versions/10849-chocolateCymbidium/10-ticketLog.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.ticketLog DROP FOREIGN KEY ticketLog_ibfk_1;
diff --git a/db/versions/10849-chocolateCymbidium/11-userLog.sql b/db/versions/10849-chocolateCymbidium/11-userLog.sql
new file mode 100644
index 000000000..44aa9c495
--- /dev/null
+++ b/db/versions/10849-chocolateCymbidium/11-userLog.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.userLog DROP FOREIGN KEY userLog_ibfk_1;
diff --git a/db/versions/10849-chocolateCymbidium/12-routeLog.sql b/db/versions/10849-chocolateCymbidium/12-routeLog.sql
new file mode 100644
index 000000000..dbe8ce143
--- /dev/null
+++ b/db/versions/10849-chocolateCymbidium/12-routeLog.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.routeLog DROP FOREIGN KEY routeLog_ibfk_1;
diff --git a/db/versions/10849-chocolateCymbidium/13-claimLog.sql b/db/versions/10849-chocolateCymbidium/13-claimLog.sql
new file mode 100644
index 000000000..23ac00c9a
--- /dev/null
+++ b/db/versions/10849-chocolateCymbidium/13-claimLog.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.claimLog DROP FOREIGN KEY claimOriginFk;
diff --git a/db/versions/10849-chocolateCymbidium/14-supplierLog.sql b/db/versions/10849-chocolateCymbidium/14-supplierLog.sql
new file mode 100644
index 000000000..53626bbd9
--- /dev/null
+++ b/db/versions/10849-chocolateCymbidium/14-supplierLog.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.supplierLog DROP FOREIGN KEY supplierLog_supplierFk;
diff --git a/db/versions/10849-chocolateCymbidium/15-invoiceInLog.sql b/db/versions/10849-chocolateCymbidium/15-invoiceInLog.sql
new file mode 100644
index 000000000..18f015196
--- /dev/null
+++ b/db/versions/10849-chocolateCymbidium/15-invoiceInLog.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.invoiceInLog DROP FOREIGN KEY invoiceInLog_ibfk_1;
diff --git a/db/versions/10849-chocolateCymbidium/16-travelLog.sql b/db/versions/10849-chocolateCymbidium/16-travelLog.sql
new file mode 100644
index 000000000..18e68e376
--- /dev/null
+++ b/db/versions/10849-chocolateCymbidium/16-travelLog.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.travelLog DROP FOREIGN KEY travelLog_ibfk_1;
diff --git a/db/versions/10849-chocolateCymbidium/17-packingSiteDeviceLog.sql b/db/versions/10849-chocolateCymbidium/17-packingSiteDeviceLog.sql
new file mode 100644
index 000000000..2119c24d9
--- /dev/null
+++ b/db/versions/10849-chocolateCymbidium/17-packingSiteDeviceLog.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.packingSiteDeviceLog DROP FOREIGN KEY packingSiteDeviceLog_ibfk_1;
diff --git a/db/versions/10853-grayOak/00-firstScript.sql b/db/versions/10853-grayOak/00-firstScript.sql
new file mode 100644
index 000000000..4b07ce72d
--- /dev/null
+++ b/db/versions/10853-grayOak/00-firstScript.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.workerTimeControl ADD device varchar(255) DEFAULT NULL NULL COMMENT 'Dispositivo en el que se ha fichado' AFTER `order`;
\ No newline at end of file
diff --git a/db/versions/10853-grayOak/00-secondScript.sql b/db/versions/10853-grayOak/00-secondScript.sql
new file mode 100644
index 000000000..43a98b837
--- /dev/null
+++ b/db/versions/10853-grayOak/00-secondScript.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.workerTimeControl CHANGE direction direction enum('in','out','middle') CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT 'middle' NULL AFTER timed;
diff --git a/db/versions/10855-azureCamellia/00-firstScript.sql b/db/versions/10855-azureCamellia/00-firstScript.sql
new file mode 100644
index 000000000..32ef11e78
--- /dev/null
+++ b/db/versions/10855-azureCamellia/00-firstScript.sql
@@ -0,0 +1,6 @@
+-- Place your SQL code here
+
+USE vn;
+
+ALTER TABLE vn.item CHANGE packingShelve packingShelve__ int(11) DEFAULT NULL NULL COMMENT '@deprecated 2024-31-01';
+
diff --git a/db/versions/10856-greenAralia/00-cloneAcl.sql b/db/versions/10856-greenAralia/00-cloneAcl.sql
new file mode 100644
index 000000000..bc6e22ee0
--- /dev/null
+++ b/db/versions/10856-greenAralia/00-cloneAcl.sql
@@ -0,0 +1,4 @@
+UPDATE salix.ACL
+ SET property='clone'
+ WHERE model = 'Sale'
+ AND property = 'refund'
\ No newline at end of file
diff --git a/db/versions/10857-navyArborvitae/00-firstScript.sql b/db/versions/10857-navyArborvitae/00-firstScript.sql
new file mode 100644
index 000000000..64e4d5282
--- /dev/null
+++ b/db/versions/10857-navyArborvitae/00-firstScript.sql
@@ -0,0 +1,8 @@
+ALTER TABLE vn.agency
+ CHANGE warehouseAliasFk warehouseAliasFk__ SMALLINT(5) UNSIGNED DEFAULT NULL NULL COMMENT '@deprecated 2024-01-23 refs #5167';
+
+ALTER TABLE vn.warehouse
+ CHANGE aliasFk aliasFk__ SMALLINT(5) UNSIGNED DEFAULT NULL NULL COMMENT '@deprecated 2024-01-23 refs #5167';
+
+RENAME TABLE vn.warehouseAlias TO vn.warehouseAlias__;
+ALTER TABLE vn.warehouseAlias__ COMMENT='@deprecated 2024-01-23 refs #5167';
\ No newline at end of file
diff --git a/db/versions/10858-yellowPaniculata/00-firstScript.sql b/db/versions/10858-yellowPaniculata/00-firstScript.sql
new file mode 100644
index 000000000..b6642ed66
--- /dev/null
+++ b/db/versions/10858-yellowPaniculata/00-firstScript.sql
@@ -0,0 +1,4 @@
+REVOKE SELECT, INSERT, UPDATE ON TABLE vn2008.Rutas_Master FROM productionAssi;
+REVOKE SELECT ON TABLE vn2008.Rutas_monitor FROM employee;
+REVOKE SELECT, INSERT, UPDATE, DELETE ON TABLE vn2008.tarifas FROM buyer;
+REVOKE SELECT, UPDATE ON TABLE vn2008.tarifas FROM buyerBoss;
\ No newline at end of file
diff --git a/db/versions/10861-turquoiseChico/00-firstScript.sql b/db/versions/10861-turquoiseChico/00-firstScript.sql
new file mode 100644
index 000000000..4358fc852
--- /dev/null
+++ b/db/versions/10861-turquoiseChico/00-firstScript.sql
@@ -0,0 +1 @@
+REVOKE SELECT ON TABLE vn2008.Vistas FROM employee;
diff --git a/db/versions/10862-navyHydrangea/00-alterAgencyTermConfig.sql b/db/versions/10862-navyHydrangea/00-alterAgencyTermConfig.sql
new file mode 100644
index 000000000..3409b762e
--- /dev/null
+++ b/db/versions/10862-navyHydrangea/00-alterAgencyTermConfig.sql
@@ -0,0 +1,3 @@
+USE vn;
+ALTER TABLE vn.agencyTermConfig
+ ADD CONSTRAINT agencyTermConfig_expense_FK FOREIGN KEY (expenseFk) REFERENCES vn.expense(id) ON DELETE RESTRICT ON UPDATE CASCADE;
diff --git a/db/versions/10862-navyHydrangea/00-alterGastosResumen.sql b/db/versions/10862-navyHydrangea/00-alterGastosResumen.sql
new file mode 100644
index 000000000..307b8f205
--- /dev/null
+++ b/db/versions/10862-navyHydrangea/00-alterGastosResumen.sql
@@ -0,0 +1,11 @@
+USE vn;
+
+ALTER TABLE vn2008.gastos_resumen MODIFY COLUMN Id_Gasto varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL;
+
+DELETE gr.*
+ FROM vn2008.gastos_resumen gr LEFT JOIN vn.expense e ON gr.Id_Gasto = e.id
+ WHERE e.id IS NULL;
+
+ALTER TABLE vn2008.gastos_resumen
+ ADD CONSTRAINT gastos_resumen_expense_FK
+ FOREIGN KEY (Id_Gasto) REFERENCES vn.expense(id) ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/db/versions/10862-navyHydrangea/00-alterInvoiceOutTaxConfig.sql b/db/versions/10862-navyHydrangea/00-alterInvoiceOutTaxConfig.sql
new file mode 100644
index 000000000..fc5025c18
--- /dev/null
+++ b/db/versions/10862-navyHydrangea/00-alterInvoiceOutTaxConfig.sql
@@ -0,0 +1,5 @@
+USE vn;
+ALTER TABLE vn.invoiceOutTaxConfig MODIFY COLUMN expenseFk varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL NULL;
+
+ALTER TABLE vn.invoiceOutTaxConfig
+ ADD CONSTRAINT invoiceOutTaxConfig_expense_FK FOREIGN KEY (expenseFk) REFERENCES vn.expense(id) ON DELETE RESTRICT ON UPDATE CASCADE;
diff --git a/db/versions/10862-navyHydrangea/00-alterItemGroupToOffer.sql b/db/versions/10862-navyHydrangea/00-alterItemGroupToOffer.sql
new file mode 100644
index 000000000..68611c13c
--- /dev/null
+++ b/db/versions/10862-navyHydrangea/00-alterItemGroupToOffer.sql
@@ -0,0 +1,5 @@
+USE edi;
+ALTER TABLE edi.item_groupToOffer MODIFY COLUMN expenseFk varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT '7001000000' NULL;
+
+ALTER TABLE edi.item_groupToOffer
+ ADD CONSTRAINT item_groupToOffer_expense_FK FOREIGN KEY (expenseFk) REFERENCES vn.expense(id) ON DELETE RESTRICT ON UPDATE CASCADE;
diff --git a/db/versions/10862-navyHydrangea/01-ventasContablesPk.sql b/db/versions/10862-navyHydrangea/01-ventasContablesPk.sql
new file mode 100644
index 000000000..3f8bf2c79
--- /dev/null
+++ b/db/versions/10862-navyHydrangea/01-ventasContablesPk.sql
@@ -0,0 +1,14 @@
+USE vn;
+-- Eliminar la clave primaria actual
+ALTER TABLE bs.ventas_contables DROP PRIMARY KEY;
+
+-- Agregar la nueva clave primaria incluyendo el campo `gasto`
+ALTER TABLE bs.ventas_contables ADD PRIMARY KEY (`year`, `month`, `grupo`, `reino_id`, `tipo_id`, `empresa_id`, `gasto`);
+
+DELETE vc.* FROM bs.ventas_contables vc LEFT JOIN vn.expense e ON e.id = vc.gasto WHERE e.id IS NULL;
+
+ALTER TABLE bs.ventas_contables
+ MODIFY COLUMN gasto VARCHAR(10)
+ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL;
+
+ALTER TABLE bs.ventas_contables ADD CONSTRAINT ventas_contables_expense_FK FOREIGN KEY (gasto) REFERENCES vn.expense(id) ON DELETE RESTRICT ON UPDATE CASCADE;
diff --git a/db/versions/10862-navyHydrangea/02-updateExpenseRegularize.sql b/db/versions/10862-navyHydrangea/02-updateExpenseRegularize.sql
new file mode 100644
index 000000000..90d865c1d
--- /dev/null
+++ b/db/versions/10862-navyHydrangea/02-updateExpenseRegularize.sql
@@ -0,0 +1,8 @@
+DELETE FROM vn.expense
+ WHERE id ='' AND id IS NULL AND isWithheld = FALSE;
+UPDATE vn.expense
+ SET id='7002090000'
+ WHERE id='7002009000';
+UPDATE vn.expense
+ SET id='7001090000'
+ WHERE id='7001009000';
diff --git a/db/versions/10862-navyHydrangea/03-updateExpense.sql b/db/versions/10862-navyHydrangea/03-updateExpense.sql
new file mode 100644
index 000000000..a44c4c504
--- /dev/null
+++ b/db/versions/10862-navyHydrangea/03-updateExpense.sql
@@ -0,0 +1,44 @@
+UPDATE vn.expense
+SET id = CASE id
+ WHEN 7000010000 THEN 7001001000
+ WHEN 7000020000 THEN 7001002000
+ WHEN 7000030000 THEN 7001003000
+ WHEN 7000040000 THEN 7001004000
+ WHEN 7000050000 THEN 7001005000
+ WHEN 7000060000 THEN 7001006000
+ WHEN 7000070000 THEN 7001007000
+ WHEN 7002060000 THEN 7001206000
+ WHEN 7002070000 THEN 7001207000
+ WHEN 7002030000 THEN 7001203000
+ WHEN 7002040000 THEN 7001204000
+ WHEN 7002050000 THEN 7001205000
+ WHEN 7002020000 THEN 7001202000
+ WHEN 7002010000 THEN 7001201000
+ WHEN 7001060000 THEN 7001106000
+ WHEN 7001070000 THEN 7001107000
+ WHEN 7001030000 THEN 7001103000
+ WHEN 7001040000 THEN 7001104000
+ WHEN 7001050000 THEN 7001105000
+ WHEN 7001020000 THEN 7001102000
+ WHEN 7001010000 THEN 7001101000
+ WHEN 7000080000 THEN 7040008000
+ WHEN 7001080000 THEN 7000108000
+ WHEN 7002080000 THEN 7001208000
+ WHEN 7000090000 THEN 7001009000
+ WHEN 7002090000 THEN 7001209000
+ WHEN 7002100000 THEN 7001210000
+ WHEN 7001090000 THEN 7001109000
+ WHEN 7001100000 THEN 7001110000
+ WHEN 7000120000 THEN 7001012000
+ WHEN 7002120000 THEN 7001212000
+ WHEN 7000130000 THEN 7001013000
+ WHEN 7000140000 THEN 7001014000
+ ELSE id
+END
+WHERE id IN (7000010000, 7000020000, 7000030000, 7000040000, 7000050000,
+ 7000060000, 7000070000, 7002060000, 7002070000, 7002030000,
+ 7002040000, 7002050000, 7002020000, 7002010000, 7001060000,
+ 7001070000, 7001030000, 7001040000, 7001050000, 7001020000,
+ 7001010000, 7000080000, 7001080000, 7002080000, 7000090000,
+ 7002090000, 7002100000, 7001090000, 7001100000,
+ 7000120000, 7002120000, 7000130000, 7000140000);
diff --git a/db/versions/10862-navyHydrangea/04-updateExpenseConflict.sql b/db/versions/10862-navyHydrangea/04-updateExpenseConflict.sql
new file mode 100644
index 000000000..0e008081b
--- /dev/null
+++ b/db/versions/10862-navyHydrangea/04-updateExpenseConflict.sql
@@ -0,0 +1,6 @@
+UPDATE vn.expense
+SET id = CASE id
+ WHEN 7000100000 THEN 7001010000
+ ELSE id
+END
+WHERE id IN (7000100000);
diff --git a/db/versions/10863-brownIvy/00-firstScript.sql b/db/versions/10863-brownIvy/00-firstScript.sql
new file mode 100644
index 000000000..d3b79ae66
--- /dev/null
+++ b/db/versions/10863-brownIvy/00-firstScript.sql
@@ -0,0 +1,4 @@
+-- Place your SQL code here
+UPDATE vn.supplier
+ SET name = UPPER(name),
+ nickname = UPPER(nickname);
diff --git a/db/versions/10865-goldenGalax/00-firstScript.sql b/db/versions/10865-goldenGalax/00-firstScript.sql
new file mode 100644
index 000000000..889477b5c
--- /dev/null
+++ b/db/versions/10865-goldenGalax/00-firstScript.sql
@@ -0,0 +1,15 @@
+REVOKE UPDATE ON TABLE vn2008.Vehiculos FROM officeBoss;
+REVOKE SELECT ON TABLE vn2008.Vehiculos FROM claimManager;
+REVOKE SELECT, INSERT, UPDATE ON TABLE vn2008.Vehiculos FROM deliveryAssistant;
+REVOKE SELECT ON TABLE vn2008.versiones FROM employee;
+REVOKE INSERT ON TABLE vn2008.XDiario FROM financial;
+REVOKE SELECT, INSERT, UPDATE ON TABLE vn2008.XDiario FROM buyer;
+REVOKE SELECT, INSERT, UPDATE, DELETE ON TABLE vn2008.XDiario FROM administrative;
+REVOKE SELECT, INSERT, UPDATE, DELETE ON TABLE vn2008.XDiario FROM hr;
+REVOKE SELECT, INSERT, UPDATE, DELETE ON TABLE vn2008.XDiario FROM buyerBoss;
+REVOKE SELECT, INSERT ON TABLE vn2008.workerDocument FROM hr;
+REVOKE SELECT ON TABLE vn2008.warehouse FROM guest;
+REVOKE SELECT ON TABLE vn2008.warehouse FROM employee;
+REVOKE SELECT, INSERT, UPDATE ON TABLE vn2008.workerTeam FROM salesAssistant;
+REVOKE DELETE ON TABLE vn2008.workerTeam FROM salesBoss;
+REVOKE SELECT ON TABLE vn2008.v_compres FROM administrative;
\ No newline at end of file
diff --git a/db/versions/10867-yellowAsparagus/00-createAclInvoiceIn.sql b/db/versions/10867-yellowAsparagus/00-createAclInvoiceIn.sql
new file mode 100644
index 000000000..927903d47
--- /dev/null
+++ b/db/versions/10867-yellowAsparagus/00-createAclInvoiceIn.sql
@@ -0,0 +1,4 @@
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+ VALUES
+ ('InvoiceIn', 'corrective', 'WRITE', 'ALLOW', 'ROLE', 'administrative'),
+ ('InvoiceInCorrection', '*', '*', 'ALLOW', 'ROLE', 'administrative');
\ No newline at end of file
diff --git a/db/versions/10867-yellowAsparagus/01-createInvoiceInCorrection.sql b/db/versions/10867-yellowAsparagus/01-createInvoiceInCorrection.sql
new file mode 100644
index 000000000..0d084da9e
--- /dev/null
+++ b/db/versions/10867-yellowAsparagus/01-createInvoiceInCorrection.sql
@@ -0,0 +1,17 @@
+CREATE TABLE IF NOT EXISTS `vn`.`invoiceInCorrection` (
+ `correctingFk` mediumint(8) UNSIGNED NOT NULL COMMENT 'Factura rectificativa',
+ `correctedFk` mediumint(8) UNSIGNED NOT NULL COMMENT 'Factura rectificada',
+ `cplusRectificationTypeFk` int(10) UNSIGNED NOT NULL,
+ `siiTypeInvoiceOutFk` int(10) UNSIGNED NOT NULL,
+ `invoiceCorrectionTypeFk` int(11) NOT NULL DEFAULT 3,
+ PRIMARY KEY (`correctingFk`),
+ KEY `invoiceInCorrection_correctedFk` (`correctedFk`),
+ KEY `invoiceInCorrection_cplusRectificationTypeFk` (`cplusRectificationTypeFk`),
+ KEY `invoiceInCorrection_siiTypeInvoiceOut` (`siiTypeInvoiceOutFk`),
+ KEY `invoiceInCorrection_invoiceCorrectionTypeFk` (`invoiceCorrectionTypeFk`),
+ CONSTRAINT `invoiceInCorrection_correctedFk` FOREIGN KEY (`correctedFk`) REFERENCES `invoiceIn` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `invoiceInCorrection_correctingFk` FOREIGN KEY (`correctingFk`) REFERENCES `invoiceIn` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `invoiceInCorrection_siiTypeInvoiceOut` FOREIGN KEY (`siiTypeInvoiceOutFk`) REFERENCES `siiTypeInvoiceOut` (`id`) ON UPDATE CASCADE,
+ CONSTRAINT `invoiceInCorrection_invoiceCorrectionTypeFk` FOREIGN KEY (`invoiceCorrectionTypeFk`) REFERENCES `invoiceCorrectionType` (`id`) ON UPDATE CASCADE,
+ CONSTRAINT `invoiceInCorrection_cplusRectificationTypeFk` FOREIGN KEY (`cplusRectificationTypeFk`) REFERENCES `cplusRectificationType` (`id`) ON UPDATE CASCADE
+);
\ No newline at end of file
diff --git a/db/versions/10868-grayChico/00-firstScript.sql b/db/versions/10868-grayChico/00-firstScript.sql
new file mode 100644
index 000000000..d0b98362c
--- /dev/null
+++ b/db/versions/10868-grayChico/00-firstScript.sql
@@ -0,0 +1,15 @@
+REVOKE SELECT ON TABLE vn2008.expeditions FROM employee;
+REVOKE SELECT, INSERT, UPDATE, DELETE ON TABLE vn2008.Gastos FROM administrative;
+REVOKE SELECT ON TABLE vn2008.Facturas FROM salesPerson;
+REVOKE SELECT ON TABLE vn2008.Facturas FROM logistic;
+REVOKE SELECT ON TABLE vn2008.Facturas FROM palletizer;
+REVOKE SELECT ON TABLE vn2008.Facturas FROM hr;
+REVOKE SELECT ON TABLE vn2008.gestdoc FROM employee;
+REVOKE INSERT, UPDATE ON TABLE vn2008.gestdoc FROM administrative;
+REVOKE DELETE ON TABLE vn2008.gestdoc FROM hr;
+REVOKE SELECT ON TABLE vn2008.gesttip FROM employee;
+REVOKE SELECT ON TABLE vn2008.Greuges FROM employee;
+REVOKE SELECT ON TABLE vn2008.Greuges_type FROM financial;
+REVOKE SELECT ON TABLE vn2008.intrastat_data FROM buyer;
+REVOKE SELECT, INSERT, UPDATE, DELETE ON TABLE vn2008.intrastat_data FROM administrative;
+REVOKE SELECT, INSERT ON TABLE vn2008.invoiceCorrection FROM administrative;
diff --git a/db/versions/10869-crimsonDracena/00-firstScript.sql b/db/versions/10869-crimsonDracena/00-firstScript.sql
new file mode 100644
index 000000000..0042d24e3
--- /dev/null
+++ b/db/versions/10869-crimsonDracena/00-firstScript.sql
@@ -0,0 +1 @@
+REVOKE SELECT ON TABLE vn2008.reference_min FROM logistic;
diff --git a/db/versions/10871-wheatCyca/00-firstScript.sql b/db/versions/10871-wheatCyca/00-firstScript.sql
new file mode 100644
index 000000000..62aff7dac
--- /dev/null
+++ b/db/versions/10871-wheatCyca/00-firstScript.sql
@@ -0,0 +1 @@
+REVOKE SELECT ON TABLE vn2008.Articles_botanical FROM buyer, administrative;
diff --git a/db/versions/10872-pinkLilium/00-aclUpdateFiscalData.sql b/db/versions/10872-pinkLilium/00-aclUpdateFiscalData.sql
new file mode 100644
index 000000000..24f5346a8
--- /dev/null
+++ b/db/versions/10872-pinkLilium/00-aclUpdateFiscalData.sql
@@ -0,0 +1,3 @@
+INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId)
+ VALUES ('Supplier', 'updateAllFiscalData', 'WRITE', 'ALLOW', 'ROLE', 'administrative'),
+ ('Supplier', 'updateFiscalData', 'WRITE', 'ALLOW', 'ROLE', 'buyer');
\ No newline at end of file
diff --git a/db/versions/10873-greenPaniculata/00-firstScript.sql b/db/versions/10873-greenPaniculata/00-firstScript.sql
new file mode 100644
index 000000000..3125eb7aa
--- /dev/null
+++ b/db/versions/10873-greenPaniculata/00-firstScript.sql
@@ -0,0 +1,60 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`accountNumberToIban`(
+ vAccount VARCHAR(20)
+)
+ RETURNS varchar(4) CHARSET utf8mb3 COLLATE utf8mb3_general_ci
+ DETERMINISTIC
+BEGIN
+/**
+* Calcula y genera el código IBAN correspondiente
+* a un número de cuenta bancaria español.
+*
+* @param vAccount Número de cuenta bancaria
+* @return vIban Código IBAN de 4 caracteres.
+*/
+ DECLARE vIban VARCHAR(4);
+
+ SELECT
+ CONCAT('ES',
+ RIGHT(
+ CONCAT(0,
+ 98-MOD(
+ CONCAT(
+ MOD(
+ CONCAT(
+ MOD(
+ CONCAT(
+ MOD(
+ SUBSTRING(vAccount, 1, 8),
+ 97
+ ),
+ SUBSTRING(vAccount,9,8)
+ ),
+ 97
+ ),
+ SUBSTRING(
+ CONCAT(vAccount, 142800),
+ 17,
+ 8
+ )
+ ),
+ 97
+ ),
+ SUBSTRING(
+ CONCAT(vAccount, 142800),
+ 25,
+ 2
+ )
+ ),
+ 97
+ )
+ ),
+ 2
+ )
+ ) INTO vIban;
+
+ RETURN vIban;
+END$$
+DELIMITER ;
+
+GRANT EXECUTE ON FUNCTION util.accountNumberToIban TO hr, financial;
diff --git a/db/versions/10874-yellowRose/00-firstScript.sql b/db/versions/10874-yellowRose/00-firstScript.sql
new file mode 100644
index 000000000..6d5b1ee86
--- /dev/null
+++ b/db/versions/10874-yellowRose/00-firstScript.sql
@@ -0,0 +1,38 @@
+ALTER TABLE vn.sectorType CHANGE description code varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL;
+
+-- Si no pongo lo de bajo da error en la view vn.itemShelvingAvailable
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+ SQL SECURITY DEFINER
+ VIEW `vn`.`itemShelvingStock`
+AS SELECT `ish`.`itemFk` AS `itemFk`,
+ sum(`ish`.`visible`) AS `visible`,
+ min(`ish`.`packing`) AS `packing`,
+ min(`ish`.`grouping`) AS `grouping`,
+ `s`.`description` AS `sector`,
+ sum(`ish`.`visible`) AS `visibleOriginal`,
+ 0 AS `removed`,
+ `p`.`sectorFk` AS `sectorFk`,
+ `s`.`warehouseFk` AS `warehouseFk`,
+ `ish`.`shelvingFk` AS `shelvingFk`,
+ `p`.`code` AS `parkingCode`,
+ `sh`.`parkingFk` AS `parkingFk`,
+ `ish`.`id` AS `itemShelvingFk`,
+ `ish`.`created` AS `created`,
+ `st`.`code` = 'previousPrepared' AS `isPreviousPrepared`
+FROM (
+ (
+ (
+ (
+ `vn`.`itemShelving` `ish`
+ LEFT JOIN `vn`.`shelving` `sh` ON(`sh`.`code` = `ish`.`shelvingFk`)
+ )
+ LEFT JOIN `vn`.`parking` `p` ON(`p`.`id` = `sh`.`parkingFk`)
+ )
+ LEFT JOIN `vn`.`sector` `s` ON(`s`.`id` = `p`.`sectorFk`)
+ )
+ LEFT JOIN `vn`.`sectorType` `st` ON(`st`.`id` = `s`.`typeFk`)
+ )
+WHERE `ish`.`visible` <> 0
+ AND `p`.`sectorFk` <> 0
+GROUP BY `ish`.`itemFk`,
+ `p`.`sectorFk`;
\ No newline at end of file
diff --git a/db/versions/10876-goldenRoebelini/00-firstScript.sql b/db/versions/10876-goldenRoebelini/00-firstScript.sql
new file mode 100644
index 000000000..c089f8950
--- /dev/null
+++ b/db/versions/10876-goldenRoebelini/00-firstScript.sql
@@ -0,0 +1,17 @@
+-- Para la tabla Monitoring
+ALTER TABLE IF EXISTS vn2008.Monitoring RENAME vn2008.Monitoring__;
+ALTER TABLE IF EXISTS vn2008.Monitoring__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+-- Para la tabla Movimientos_avisar
+ALTER TABLE IF EXISTS vn2008.Movimientos_avisar RENAME vn2008.Movimientos_avisar__;
+ALTER TABLE IF EXISTS vn2008.Movimientos_avisar__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+
+-- Para la tabla Movimientos_revisar
+ALTER TABLE IF EXISTS vn2008.Movimientos_revisar RENAME vn2008.Movimientos_revisar__;
+ALTER TABLE IF EXISTS vn2008.Movimientos_revisar__ COMMENT='refs #6371 deprecated 2024-01-11';
+
+
+-- Para la tabla Proveedores_escritos
+ALTER TABLE IF EXISTS vn2008.Proveedores_escritos RENAME vn2008.Proveedores_escritos__;
+ALTER TABLE IF EXISTS vn2008.Proveedores_escritos__ COMMENT='refs #6371 deprecated 2024-01-11';
\ No newline at end of file
diff --git a/db/versions/10878-blueSalal/00-firstScript.sql b/db/versions/10878-blueSalal/00-firstScript.sql
new file mode 100644
index 000000000..64506fa61
--- /dev/null
+++ b/db/versions/10878-blueSalal/00-firstScript.sql
@@ -0,0 +1,35 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`supplier_statement`()
+BEGIN
+ SELECT 1;
+END$$
+DELIMITER ;
+
+GRANT EXECUTE ON PROCEDURE vn.supplier_statement TO administrative, buyer, hrBoss;
+
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`XDiario_check`()
+BEGIN
+ SELECT 1;
+END$$
+DELIMITER ;
+
+GRANT EXECUTE ON PROCEDURE vn.XDiario_check TO adminBoss;
+
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`travel_getDetailFromContinent`()
+BEGIN
+ SELECT 1;
+END$$
+DELIMITER ;
+
+GRANT EXECUTE ON PROCEDURE vn.travel_getDetailFromContinent TO buyer;
+
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`entry_getTransfer`()
+BEGIN
+ SELECT 1;
+END$$
+DELIMITER ;
+
+GRANT EXECUTE ON PROCEDURE vn.entry_getTransfer TO claimManager, buyer;
\ No newline at end of file
diff --git a/db/versions/10879-maroonCymbidium/00-firstScript.sql b/db/versions/10879-maroonCymbidium/00-firstScript.sql
new file mode 100644
index 000000000..7efc4d6ab
--- /dev/null
+++ b/db/versions/10879-maroonCymbidium/00-firstScript.sql
@@ -0,0 +1,34 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn`.`intrastat_estimateNet`(
+ vSelf INT,
+ vStems INT
+)
+ RETURNS double
+ DETERMINISTIC
+BEGIN
+/**
+* Calcula un valor neto estimado en función de
+* datos históricos de facturas intrastat.
+*
+* @param vSelf Id de intrastat
+* @param vStems Número de unidades
+* @return vNet
+*/
+ DECLARE vNet DOUBLE;
+
+ SELECT ROUND(vStems / (SUM(average) / COUNT(average)), 2) INTO vNet
+ FROM (
+ SELECT *, stems / net average
+ FROM invoiceInIntrastat
+ WHERE intrastatFk = vSelf
+ AND net
+ AND stems > 0
+ ORDER BY dated DESC
+ LIMIT 20
+ ) sub;
+
+ RETURN vNet/2;
+END$$
+DELIMITER ;
+
+GRANT EXECUTE ON FUNCTION vn.intrastat_estimateNet TO administrative;
\ No newline at end of file
diff --git a/db/versions/10880-salmonHydrangea/00-firstScript.sql b/db/versions/10880-salmonHydrangea/00-firstScript.sql
new file mode 100644
index 000000000..934fc2020
--- /dev/null
+++ b/db/versions/10880-salmonHydrangea/00-firstScript.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.buy ADD buyerFk int(10) unsigned DEFAULT NULL NULL;
diff --git a/db/versions/10881-greenHydrangea/00-alterTableNotification.sql b/db/versions/10881-greenHydrangea/00-alterTableNotification.sql
new file mode 100644
index 000000000..068d77839
--- /dev/null
+++ b/db/versions/10881-greenHydrangea/00-alterTableNotification.sql
@@ -0,0 +1 @@
+ALTER TABLE util.notification MODIFY COLUMN id int(11) auto_increment NOT NULL;
diff --git a/db/versions/10881-greenHydrangea/01-notification.sql b/db/versions/10881-greenHydrangea/01-notification.sql
new file mode 100644
index 000000000..ab5480548
--- /dev/null
+++ b/db/versions/10881-greenHydrangea/01-notification.sql
@@ -0,0 +1,15 @@
+INSERT IGNORE INTO util.notification ( `name`,`description`)
+ VALUES
+ ( 'zone-included','An email to notify zoneCollisions');
+
+-- Change value if destionation user should be different
+SET @DESTINATION_USER = "pepe";
+
+SET @MaxId = LAST_INSERT_ID();
+
+INSERT IGNORE INTO util.notificationSubscription (notificationFk,userFk)
+ VALUES(
+ @MaxId, (SELECT id from `account`.`user` where name = @DESTINATION_USER));
+
+INSERT IGNORE INTO util.notificationAcl (notificationFk,roleFk)
+ SELECT @MaxId, (SELECT role from `account`.`user` where name = @DESTINATION_USER) FROM util.notification WHERE name= "zone-included";
diff --git a/db/versions/10882-blueRuscus/00-vehicle.sql b/db/versions/10882-blueRuscus/00-vehicle.sql
new file mode 100644
index 000000000..337778cef
--- /dev/null
+++ b/db/versions/10882-blueRuscus/00-vehicle.sql
@@ -0,0 +1,13 @@
+ALTER TABLE vn.vehicle ADD supplierFk int(10) unsigned NULL COMMENT 'supplier from whom the vehicle was purchased';
+ALTER TABLE vn.vehicle ADD CONSTRAINT vehicle_supplierFk FOREIGN KEY (supplierFk) REFERENCES vn.supplier(id);
+
+ALTER TABLE vn.vehicle ADD import decimal(10,2) NULL;
+
+ALTER TABLE vn.vehicle ADD supplierCoolerFk int(10) unsigned NULL;
+ALTER TABLE vn.vehicle ADD CONSTRAINT vehicle_supplierCoolerFk FOREIGN KEY (supplierCoolerFk) REFERENCES vn.supplier(id) ON DELETE RESTRICT ON UPDATE CASCADE;
+
+ALTER TABLE vn.vehicle ADD vin varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL;
+
+ALTER TABLE vn.vehicle ADD bankPolicyFk int(11) NULL;
+ALTER TABLE vn.vehicle ADD CONSTRAINT vehicle_bankPolicyFk FOREIGN KEY (bankPolicyFk) REFERENCES vn.bankPolicy(id) ON DELETE RESTRICT ON UPDATE CASCADE;
+
diff --git a/db/versions/10883-azureRuscus/00-firstScript.sql b/db/versions/10883-azureRuscus/00-firstScript.sql
new file mode 100644
index 000000000..89fdbf781
--- /dev/null
+++ b/db/versions/10883-azureRuscus/00-firstScript.sql
@@ -0,0 +1,6 @@
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+ SQL SECURITY DEFINER
+ VIEW `vn2008`.`credit`AS
+SELECT 1;
+
+GRANT SELECT ON TABLE vn2008.credit TO financialBoss;
\ No newline at end of file
diff --git a/db/versions/10884-maroonGerbera/00-firstScript.sql b/db/versions/10884-maroonGerbera/00-firstScript.sql
new file mode 100644
index 000000000..704342a7c
--- /dev/null
+++ b/db/versions/10884-maroonGerbera/00-firstScript.sql
@@ -0,0 +1 @@
+DROP TABLE vn.timeControlDevice;
diff --git a/db/versions/10885-wheatHydrangea/00-revokeUpdateClient.sql b/db/versions/10885-wheatHydrangea/00-revokeUpdateClient.sql
new file mode 100644
index 000000000..b22e09615
--- /dev/null
+++ b/db/versions/10885-wheatHydrangea/00-revokeUpdateClient.sql
@@ -0,0 +1,37 @@
+REVOKE UPDATE ON vn.ticket FROM employee;
+
+GRANT UPDATE (id,
+ warehouseFk,
+ shipped,
+ nickname,
+ refFk,
+ addressFk,
+ workerFk,
+ observations,
+ isSigned,
+ isLabeled,
+ isPrinted,
+ packages,
+ location,
+ hour,
+ created,
+ isBlocked,
+ solution,
+ routeFk,
+ priority,
+ hasPriority,
+ companyFk,
+ agencyModeFk,
+ landed,
+ isBoxed,
+ isDeleted,
+ zoneFk,
+ zonePrice,
+ zoneBonus,
+ totalWithVat,
+ totalWithoutVat,
+ weight,
+ clonedFrom,
+ cmrFk,
+ editorFk)
+ ON vn.ticket TO employee;
diff --git a/db/versions/10887-floranet/00-schemaAndUser.sql b/db/versions/10887-floranet/00-schemaAndUser.sql
new file mode 100644
index 000000000..34da92550
--- /dev/null
+++ b/db/versions/10887-floranet/00-schemaAndUser.sql
@@ -0,0 +1,14 @@
+
+CREATE SCHEMA IF NOT EXISTS `floranet`;
+
+CREATE ROLE IF NOT EXISTS 'floranet' ;
+
+GRANT Create temporary tables ON floranet.* TO 'floranet';
+
+GRANT Execute ON floranet.* TO 'floranet';
+
+GRANT Lock tables ON floranet.* TO 'floranet';
+
+CREATE USER IF NOT EXISTS 'floranet'@'%';
+
+GRANT floranet TO floranet@'%';
\ No newline at end of file
diff --git a/db/versions/10887-floranet/01-tables.sql b/db/versions/10887-floranet/01-tables.sql
new file mode 100644
index 000000000..b63c81c21
--- /dev/null
+++ b/db/versions/10887-floranet/01-tables.sql
@@ -0,0 +1,61 @@
+CREATE OR REPLACE TABLE floranet.`builder` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `itemFk` int(11) NOT NULL,
+ `elementFk` int(11) NOT NULL,
+ `quantity` int(10) unsigned NOT NULL DEFAULT 1,
+ PRIMARY KEY (`id`),
+ KEY `builder_FK` (`itemFk`),
+ KEY `builder_FK_1` (`elementFk`),
+ CONSTRAINT `builder_FK` FOREIGN KEY (`itemFk`) REFERENCES `vn`.`item` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='Links handmade products with their elements';
+
+CREATE OR REPLACE TABLE floranet.`element` (
+ `itemFk` int(11) NOT NULL,
+ `typeFk` smallint(5) unsigned DEFAULT NULL,
+ `size` int(11) DEFAULT NULL,
+ `inkFk` char(3) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+ `originFk` tinyint(2) unsigned DEFAULT NULL,
+ `name` varchar(30) DEFAULT NULL,
+ `quantity` int(11) NOT NULL DEFAULT 1,
+ PRIMARY KEY (`itemFk`),
+ KEY `element_FK` (`itemFk`),
+ KEY `element_FK_1` (`typeFk`),
+ KEY `element_FK_2` (`inkFk`),
+ KEY `element_FK_3` (`originFk`),
+ CONSTRAINT `element_FK` FOREIGN KEY (`itemFk`) REFERENCES `vn`.`item` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `element_FK_1` FOREIGN KEY (`typeFk`) REFERENCES `vn`.`itemType` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `element_FK_2` FOREIGN KEY (`inkFk`) REFERENCES `vn`.`ink` (`id`) ON UPDATE CASCADE,
+ CONSTRAINT `element_FK_3` FOREIGN KEY (`originFk`) REFERENCES `vn`.`origin` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='Filtro para localizar posibles items que coincidan con la descripción';
+
+ALTER TABLE floranet.builder ADD CONSTRAINT `builder_FK_1` FOREIGN KEY (`elementFk`) REFERENCES `element` (`itemFk`) ON UPDATE CASCADE;
+
+CREATE OR REPLACE TABLE floranet.catalogue
+(id INT AUTO_INCREMENT PRIMARY KEY,
+ name VARCHAR(50),
+ price DECIMAL(10,2) NOT NULL,
+ itemFk INT NOT NULL,
+ dated DATE,
+ postalCode VARCHAR(12),
+ `type` VARCHAR(50),
+ image VARCHAR(255),
+ description TEXT,
+ created TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+ payed DATETIME,
+ FOREIGN KEY (itemFk) REFERENCES vn.item(id) ON DELETE RESTRICT ON UPDATE CASCADE);
+
+
+CREATE OR REPLACE TABLE floranet.`order`
+(id INT AUTO_INCREMENT PRIMARY KEY,
+ catalogueFk INT UNIQUE,
+ customerName VARCHAR(100),
+ email VARCHAR(100),
+ customerPhone VARCHAR(15),
+ message VARCHAR(255),
+ deliveryName VARCHAR(100),
+ address VARCHAR(200),
+ deliveryPhone VARCHAR(100),
+ isPaid BOOL NOT NULL DEFAULT FALSE,
+ payed DATETIME,
+ created TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+ FOREIGN KEY (catalogueFk) REFERENCES catalogue(id) ON DELETE RESTRICT ON UPDATE CASCADE);
\ No newline at end of file
diff --git a/db/versions/10888-brownBirch/00-firstScript.sql b/db/versions/10888-brownBirch/00-firstScript.sql
new file mode 100644
index 000000000..7c8f96339
--- /dev/null
+++ b/db/versions/10888-brownBirch/00-firstScript.sql
@@ -0,0 +1,6 @@
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+ SQL SECURITY DEFINER
+VIEW `vn2008`.`credit`AS
+ SELECT 1;
+
+GRANT SELECT ON TABLE vn2008.credit TO financialBoss;
diff --git a/db/versions/10889-redMedeola/00-firstScript.sql b/db/versions/10889-redMedeola/00-firstScript.sql
new file mode 100644
index 000000000..ecae0234f
--- /dev/null
+++ b/db/versions/10889-redMedeola/00-firstScript.sql
@@ -0,0 +1,24 @@
+-- Place your SQL code here
+CREATE TABLE IF NOT EXISTS `vn`.`mrwConfig` (
+ `id` INT auto_increment NULL,
+ `url` varchar(100) NULL,
+ `user` varchar(100) NULL,
+ `password` varchar(100) NULL,
+ `franchiseCode` varchar(100) NULL,
+ `subscriberCode` varchar(100) NULL,
+ CONSTRAINT mrwConfig_pk PRIMARY KEY (id)
+)
+ENGINE=InnoDB
+DEFAULT CHARSET=utf8mb3
+COLLATE=utf8mb3_unicode_ci;
+
+ALTER TABLE `vn`.`packingSite` ADD `hasNewLabelMrwMethod` BOOL NULL;
+
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+ VALUES('MrwConfig', 'cancelShipment', 'WRITE', 'ALLOW', 'ROLE', 'employee');
+
+INSERT INTO `salix`.`ACL` (`model`,`property`,`accessType`,`permission`,`principalType`,`principalId`)
+ VALUES ('MrwConfig','createShipment','WRITE','ALLOW','ROLE','employee');
+
+
+
diff --git a/db/versions/10890-redOrchid/00-firstScript.sql b/db/versions/10890-redOrchid/00-firstScript.sql
new file mode 100644
index 000000000..17bf974a1
--- /dev/null
+++ b/db/versions/10890-redOrchid/00-firstScript.sql
@@ -0,0 +1,3 @@
+-- Place your SQL code here
+INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId)
+VALUES( 'Ticket', 'myLastModified', '*', 'ALLOW', 'ROLE', 'production');
\ No newline at end of file
diff --git a/db/versions/10891-chocolateRuscus/00-firstScript.sql b/db/versions/10891-chocolateRuscus/00-firstScript.sql
new file mode 100644
index 000000000..711850323
--- /dev/null
+++ b/db/versions/10891-chocolateRuscus/00-firstScript.sql
@@ -0,0 +1,6 @@
+ALTER TABLE vn.client DROP FOREIGN KEY tipos_de_cliente;
+ALTER TABLE vn.client CHANGE COLUMN clientTypeFk clientTypeFk__ INT NOT NULL DEFAULT 1 COMMENT '@deprecated 2024-02-20 refs #6784';
+ALTER TABLE vn.clientType CHANGE COLUMN id id__ INT NOT NULL COMMENT '@deprecated 2024-02-20 refs #6784';
+ALTER TABLE vn.clientType DROP PRIMARY KEY;
+ALTER TABLE vn.clientType ADD PRIMARY KEY (code);
+
diff --git a/db/versions/10892-yellowGerbera/00-firstScript.sql b/db/versions/10892-yellowGerbera/00-firstScript.sql
new file mode 100644
index 000000000..52dbdbee1
--- /dev/null
+++ b/db/versions/10892-yellowGerbera/00-firstScript.sql
@@ -0,0 +1,19 @@
+SET @isTriggerDisabled := TRUE;
+
+UPDATE vn.buy
+ SET packing = 1
+ WHERE packing IS NULL
+ OR packing <= 0;
+
+UPDATE vn.itemShelving
+ SET packing = 1
+ WHERE packing IS NULL
+ OR NOT packing;
+
+SET @isTriggerDisabled := FALSE;
+
+ALTER TABLE vn.buy MODIFY COLUMN packing int(11) NOT NULL DEFAULT 1 CHECK(packing > 0);
+ALTER TABLE vn.itemShelving MODIFY COLUMN packing int(11) NOT NULL DEFAULT 1 CHECK(packing > 0);
+
+-- Antes tenia '0=sin obligar 1=groping 2=packing' (groping → grouping)
+ALTER TABLE vn.buy MODIFY COLUMN groupingMode tinyint(4) DEFAULT 0 NOT NULL COMMENT '0=sin obligar 1=grouping 2=packing';
diff --git a/db/versions/10893-limeFern/00-sage.sql b/db/versions/10893-limeFern/00-sage.sql
new file mode 100644
index 000000000..d4c7e6221
--- /dev/null
+++ b/db/versions/10893-limeFern/00-sage.sql
@@ -0,0 +1,73 @@
+-- Auto-generated SQL script #202403061303
+UPDATE vn.company
+ SET companyCode=0
+ WHERE id=69;
+UPDATE vn.company
+ SET companyCode=1
+ WHERE id=442;
+UPDATE vn.company
+ SET companyCode=4
+ WHERE id=567;
+UPDATE vn.company
+ SET companyCode=2
+ WHERE id=791;
+UPDATE vn.company
+ SET companyCode=3
+ WHERE id=792;
+UPDATE vn.company
+ SET companyCode=5
+ WHERE id=965;
+UPDATE vn.company
+ SET companyCode=7
+ WHERE id=1381;
+UPDATE vn.company
+ SET companyCode=3
+ WHERE id=1463;
+UPDATE vn.company
+ SET companyCode=8
+ WHERE id=2142;
+UPDATE vn.company
+ SET companyCode=6
+ WHERE id=2393;
+UPDATE vn.company
+ SET companyCode=9
+ WHERE id=3869;
+
+-- Auto-generated SQL script #202403061311
+UPDATE vn.company
+ SET sage200Company=NULL
+ WHERE id=69;
+UPDATE vn.company
+ SET sage200Company=NULL
+ WHERE id=442;
+UPDATE vn.company
+ SET sage200Company=NULL
+ WHERE id=567;
+UPDATE vn.company
+ SET sage200Company=NULL
+ WHERE id=791;
+UPDATE vn.company
+ SET sage200Company=NULL
+ WHERE id=792;
+UPDATE vn.company
+ SET sage200Company=NULL
+ WHERE id=965;
+UPDATE vn.company
+ SET sage200Company=NULL
+ WHERE id=1381;
+UPDATE vn.company
+ SET sage200Company=NULL
+ WHERE id=1463;
+UPDATE vn.company
+ SET sage200Company=NULL
+ WHERE id=2142;
+UPDATE vn.company
+ SET sage200Company=NULL
+ WHERE id=2393;
+UPDATE vn.company
+ SET sage200Company=NULL
+ WHERE id=3869;
+
+
+ALTER TABLE vn.company CHANGE sage200Company sage200Company__ int(2) DEFAULT NULL NULL COMMENT '@deprecated 06/03/2024';
+ALTER TABLE vn.company MODIFY COLUMN sage200Company__ int(2) DEFAULT NULL NULL COMMENT '@deprecated 06/03/2024';
diff --git a/db/versions/10896-salmonOrchid/01-financialProductType.sql b/db/versions/10896-salmonOrchid/01-financialProductType.sql
new file mode 100644
index 000000000..c5d51e015
--- /dev/null
+++ b/db/versions/10896-salmonOrchid/01-financialProductType.sql
@@ -0,0 +1 @@
+ALTER TABLE IF EXISTS `vn2008`.`financialProductType` RENAME `vn`.`financialProductType`;
diff --git a/db/versions/10896-salmonOrchid/02-flight.sql b/db/versions/10896-salmonOrchid/02-flight.sql
new file mode 100644
index 000000000..657fa2aa1
--- /dev/null
+++ b/db/versions/10896-salmonOrchid/02-flight.sql
@@ -0,0 +1,8 @@
+ALTER TABLE IF EXISTS `vn2008`.`flight` RENAME `vn`.`flight`;
+
+ALTER TABLE IF EXISTS `vn`.`flight`
+CHANGE COLUMN IF EXISTS `flight_id` `id` varchar(10) NOT NULL,
+CHANGE COLUMN IF EXISTS `airline_id` `airlineFk` smallint(2) unsigned DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `route` `flightPath` varchar(20) DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `airport_out` `airportArrivalFk` varchar(3) NOT NULL,
+CHANGE COLUMN IF EXISTS `airport_in` `airportDepartureFk` varchar(3) NOT NULL;
\ No newline at end of file
diff --git a/db/versions/10896-salmonOrchid/03-gastos_resumen.sql b/db/versions/10896-salmonOrchid/03-gastos_resumen.sql
new file mode 100644
index 000000000..1f5101df5
--- /dev/null
+++ b/db/versions/10896-salmonOrchid/03-gastos_resumen.sql
@@ -0,0 +1,32 @@
+DELETE FROM vn2008.gastos_resumen
+ WHERE Id_Gasto IN (
+ SELECT DISTINCT g.Id_Gasto
+ FROM vn2008.gastos_resumen g
+ LEFT JOIN vn.expense e ON e.id = g.Id_Gasto COLLATE utf8mb3_general_ci
+ WHERE e.id IS NULL
+ );
+
+ALTER TABLE `vn2008`.`gastos_resumen` DROP FOREIGN KEY gastos_resumen_expense_FK;
+ALTER TABLE IF EXISTS `vn2008`.`gastos_resumen` RENAME `vn`.`expenseManual`;
+ALTER TABLE `vn`.`expenseManual`
+CHANGE COLUMN IF EXISTS `Id_Gasto` `expenseFk` varchar(10) NOT NULL,
+CHANGE COLUMN IF EXISTS `importe` `amount` decimal(10,2) DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `empresa_id` `companyFk` int(11) NOT NULL;
+
+ALTER TABLE `vn`.`expenseManual` MODIFY COLUMN IF EXISTS expenseFk varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL;
+
+ALTER TABLE `vn`.`expenseManual` DROP PRIMARY KEY;
+
+ALTER TABLE `vn`.`expenseManual` MODIFY COLUMN companyFk int(10) unsigned NULL;
+
+ALTER TABLE `vn`.`expenseManual` ADD CONSTRAINT expenseManual_expense_FK FOREIGN KEY IF NOT EXISTS (expenseFk) REFERENCES vn.expense(id) ON DELETE CASCADE ON UPDATE CASCADE;
+
+UPDATE `vn`.`expenseManual`
+ SET companyFK= NULL
+ WHERE companyFk= 0;
+
+ALTER TABLE `vn`.`expenseManual` ADD CONSTRAINT expenseManual_company_FK FOREIGN KEY IF NOT EXISTS (companyFk) REFERENCES vn.company(id) ON DELETE CASCADE ON UPDATE CASCADE;
+
+ALTER TABLE `vn`.`expenseManual` ADD COLUMN id INT UNSIGNED AUTO_INCREMENT PRIMARY KEY FIRST;
+
+ALTER TABLE `vn`.`expenseManual` ADD CONSTRAINT expenseManual_unique UNIQUE KEY IF NOT EXISTS (expenseFk,`year`,`month`,companyFk);
\ No newline at end of file
diff --git a/db/versions/10896-salmonOrchid/04-integra2.sql b/db/versions/10896-salmonOrchid/04-integra2.sql
new file mode 100644
index 000000000..663b28d78
--- /dev/null
+++ b/db/versions/10896-salmonOrchid/04-integra2.sql
@@ -0,0 +1,10 @@
+ALTER TABLE IF EXISTS `vn2008`.`integra2` RENAME `vn`.`integra2`;
+
+ALTER TABLE IF EXISTS `vn`.`integra2`
+CHANGE COLUMN IF EXISTS `postal_code` `postCode` varchar(10) NOT NULL,
+CHANGE COLUMN IF EXISTS `frequency` `frequency` decimal(10,2) DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `warehouse_id` `warehouseFk` smallint(6) unsigned NOT NULL;
+
+ALTER TABLE IF EXISTS vn.integra2 ADD CONSTRAINT integra2_warehouse_FK
+FOREIGN KEY (warehouseFk) REFERENCES vn.warehouse(id) ON DELETE CASCADE ON UPDATE CASCADE;
+
diff --git a/db/versions/10896-salmonOrchid/05-integra2_province.sql b/db/versions/10896-salmonOrchid/05-integra2_province.sql
new file mode 100644
index 000000000..31f8f4156
--- /dev/null
+++ b/db/versions/10896-salmonOrchid/05-integra2_province.sql
@@ -0,0 +1,4 @@
+ALTER TABLE IF EXISTS `vn2008`.`integra2_province` RENAME `vn`.`integra2Province`;
+ALTER TABLE IF EXISTS `vn`.`integra2Province`
+CHANGE COLUMN IF EXISTS `franquicia` `franchise` varchar(65) NOT NULL,
+CHANGE COLUMN IF EXISTS `province_id` `provinceFk` smallint(6) unsigned NOT NULL;
diff --git a/db/versions/10896-salmonOrchid/06-intervalos__delete.sql b/db/versions/10896-salmonOrchid/06-intervalos__delete.sql
new file mode 100644
index 000000000..18d4f57ca
--- /dev/null
+++ b/db/versions/10896-salmonOrchid/06-intervalos__delete.sql
@@ -0,0 +1 @@
+DROP TABLE IF EXISTS vn2008.intervalos__;
\ No newline at end of file
diff --git a/db/versions/10896-salmonOrchid/10-mail_templates__delete.sql b/db/versions/10896-salmonOrchid/10-mail_templates__delete.sql
new file mode 100644
index 000000000..e30aae925
--- /dev/null
+++ b/db/versions/10896-salmonOrchid/10-mail_templates__delete.sql
@@ -0,0 +1 @@
+DROP TABLE IF EXISTS vn2008.mail_templates__;
diff --git a/db/versions/10896-salmonOrchid/12-ticket_location__delete.sql b/db/versions/10896-salmonOrchid/12-ticket_location__delete.sql
new file mode 100644
index 000000000..a7dbbfb95
--- /dev/null
+++ b/db/versions/10896-salmonOrchid/12-ticket_location__delete.sql
@@ -0,0 +1 @@
+DROP TABLE IF EXISTS vn2008.ticket_location__;
\ No newline at end of file
diff --git a/db/versions/10896-salmonOrchid/13-turn__delete.sql b/db/versions/10896-salmonOrchid/13-turn__delete.sql
new file mode 100644
index 000000000..7aa69e57d
--- /dev/null
+++ b/db/versions/10896-salmonOrchid/13-turn__delete.sql
@@ -0,0 +1 @@
+DROP TABLE IF EXISTS vn2008.turn__;
\ No newline at end of file
diff --git a/db/versions/10896-salmonOrchid/14-movement_label.sql b/db/versions/10896-salmonOrchid/14-movement_label.sql
new file mode 100644
index 000000000..194df6e1e
--- /dev/null
+++ b/db/versions/10896-salmonOrchid/14-movement_label.sql
@@ -0,0 +1,12 @@
+DROP TRIGGER IF EXISTS `vn2008`.`movement_label_afterUpdate`;
+
+ALTER TABLE vn2008.movement_label DROP FOREIGN KEY movement_label_ibfk_1;
+
+DROP VIEW IF EXISTS `vn`.`saleLabel`;
+
+ALTER TABLE IF EXISTS `vn2008`.`movement_label` RENAME `vn`.`saleLabel`;
+
+ALTER TABLE IF EXISTS `vn`.`saleLabel`
+CHANGE COLUMN IF EXISTS `Id_movimiento` `saleFk` int(11) NOT NULL;
+
+ALTER TABLE `vn`.`saleLabel` ADD CONSTRAINT saleLabel_sale_FK FOREIGN KEY (saleFk) REFERENCES vn.sale(id) ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/db/versions/10896-salmonOrchid/15-pago_sdc.sql b/db/versions/10896-salmonOrchid/15-pago_sdc.sql
new file mode 100644
index 000000000..1b63b9c54
--- /dev/null
+++ b/db/versions/10896-salmonOrchid/15-pago_sdc.sql
@@ -0,0 +1,11 @@
+DROP VIEW IF EXISTS `vn`.`exchangeInsurance`;
+
+ALTER TABLE IF EXISTS `vn2008`.`pago_sdc` RENAME `vn`.`exchangeInsurance`;
+
+ALTER TABLE IF EXISTS `vn`.`exchangeInsurance`
+CHANGE COLUMN IF EXISTS `pago_sdc_id` `id` int(11) NOT NULL AUTO_INCREMENT,
+CHANGE COLUMN IF EXISTS `importe` `amount` decimal(10,2) NOT NULL,
+CHANGE COLUMN IF EXISTS `fecha` `dated` date NOT NULL,
+CHANGE COLUMN IF EXISTS `vencimiento` `dueDated` date NOT NULL,
+CHANGE COLUMN IF EXISTS `entity_id` `entityFk` int(10) unsigned NOT NULL,
+CHANGE COLUMN IF EXISTS `empresa_id` `companyFk`int(10) unsigned NOT NULL DEFAULT 442;
diff --git a/db/versions/10896-salmonOrchid/25-warehouse_pickup.sql b/db/versions/10896-salmonOrchid/25-warehouse_pickup.sql
new file mode 100644
index 000000000..d6f2ae18d
--- /dev/null
+++ b/db/versions/10896-salmonOrchid/25-warehouse_pickup.sql
@@ -0,0 +1,7 @@
+ALTER TABLE IF EXISTS `vn2008`.`warehouse_pickup` RENAME `vn`.`warehousePickup`;
+
+ALTER TABLE IF EXISTS `vn`.`warehousePickup`
+CHANGE COLUMN IF EXISTS `warehouse_id` `warehouseFk` smallint(5) unsigned NOT NULL,
+CHANGE COLUMN IF EXISTS `agency_id` `agencyModeFk` int(11) DEFAULT NULL;
+
+ALTER TABLE `vn`.`warehousePickup` COMMENT='Agencia de recogida para cada almacén';
diff --git a/db/versions/10896-salmonOrchid/29-kk.sql b/db/versions/10896-salmonOrchid/29-kk.sql
new file mode 100644
index 000000000..201a1c806
--- /dev/null
+++ b/db/versions/10896-salmonOrchid/29-kk.sql
@@ -0,0 +1,155 @@
+ALTER TABLE IF EXISTS vn2008.template_bionic_component RENAME vn2008.template_bionic_component__;
+ALTER TABLE IF EXISTS vn2008.template_bionic_component__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.template_bionic_lot RENAME vn2008.template_bionic_lot__;
+ALTER TABLE IF EXISTS vn2008.template_bionic_lot__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.template_bionic_price RENAME vn2008.template_bionic_price__;
+ALTER TABLE IF EXISTS vn2008.template_bionic_price__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.tmpNEWTARIFAS RENAME vn2008.tmpNEWTARIFAS__;
+ALTER TABLE IF EXISTS vn2008.tmpNEWTARIFAS__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.unaryScanFilter RENAME vn2008.unaryScanFilter__;
+ALTER TABLE IF EXISTS vn2008.unaryScanFilter__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.unary_source RENAME vn2008.unary_source__;
+ALTER TABLE IF EXISTS vn2008.unary_source__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.viaxpress RENAME vn2008.viaxpress__;
+ALTER TABLE IF EXISTS vn2008.viaxpress__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.warehouse_filtro RENAME vn2008.warehouse_filtro__;
+ALTER TABLE IF EXISTS vn2008.warehouse_filtro__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.warehouse_group RENAME vn2008.warehouse_group__;
+ALTER TABLE IF EXISTS vn2008.warehouse_group__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.warehouse_joined RENAME vn2008.warehouse_joined__;
+ALTER TABLE IF EXISTS vn2008.warehouse_joined__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.warehouse_lc RENAME vn2008.warehouse_lc__;
+ALTER TABLE IF EXISTS vn2008.warehouse_lc__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.wh_selection RENAME vn2008.wh_selection__;
+ALTER TABLE IF EXISTS vn2008.wh_selection__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.trolley RENAME vn2008.trolley__;
+ALTER TABLE IF EXISTS vn2008.trolley__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.zones RENAME vn2008.zones__;
+ALTER TABLE IF EXISTS vn2008.zones__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.tblIVA RENAME vn2008.tblIVA__;
+ALTER TABLE IF EXISTS vn2008.tblIVA__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.filtros RENAME vn2008.filtros__;
+ALTER TABLE IF EXISTS vn2008.filtros__ COMMENT='refs #6372 @deprecated 2023-11-21;';
+
+ALTER TABLE IF EXISTS vn2008.form_query RENAME vn2008.form_query__;
+ALTER TABLE IF EXISTS vn2008.form_query__ COMMENT='refs #6372 @deprecated 2023-11-21;';
+
+ALTER TABLE IF EXISTS vn2008.guillen RENAME vn2008.guillen__;
+ALTER TABLE IF EXISTS vn2008.guillen__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.guillen_carry RENAME vn2008.guillen_carry__;
+ALTER TABLE IF EXISTS vn2008.guillen_carry__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.integra2_escala RENAME vn2008.integra2_escala__;
+ALTER TABLE IF EXISTS vn2008.integra2_escala__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.invoice_observation RENAME vn2008.invoice_observation__;
+ALTER TABLE IF EXISTS vn2008.invoice_observation__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.nichos RENAME vn2008.nichos__;
+ALTER TABLE IF EXISTS vn2008.nichos__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.payroll_bonificaciones RENAME vn2008.payroll_bonificaciones__;
+ALTER TABLE IF EXISTS vn2008.payroll_bonificaciones__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.payroll_datos RENAME vn2008.payroll_datos__;
+ALTER TABLE IF EXISTS vn2008.payroll_datos__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.payroll_embargos RENAME vn2008.payroll_embargos__;
+ALTER TABLE IF EXISTS vn2008.payroll_embargos__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.payroll_tipobasess RENAME vn2008.payroll_tipobasess__;
+ALTER TABLE IF EXISTS vn2008.payroll_tipobasess__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.preparation_exception RENAME vn2008.preparation_exception__;
+ALTER TABLE IF EXISTS vn2008.preparation_exception__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.payrroll_apEmpresarial RENAME vn2008.payrroll_apEmpresarial__;
+ALTER TABLE IF EXISTS vn2008.payrroll_apEmpresarial__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.rec_translator RENAME vn2008.rec_translator__;
+ALTER TABLE IF EXISTS vn2008.rec_translator__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.recibida_agricola RENAME vn2008.recibida_agricola__;
+ALTER TABLE IF EXISTS vn2008.recibida_agricola__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.rounding RENAME vn2008.rounding__;
+ALTER TABLE IF EXISTS vn2008.rounding__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.scanTree RENAME vn2008.scanTree__;
+ALTER TABLE IF EXISTS vn2008.scanTree__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.sort_merge_results_ernesto RENAME vn2008.sort_merge_results_ernesto__;
+ALTER TABLE IF EXISTS vn2008.sort_merge_results_ernesto__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.route RENAME vn2008.route__;
+ALTER TABLE IF EXISTS vn2008.route__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.travel_reserve RENAME vn2008.travel_reserve__;
+ALTER TABLE IF EXISTS vn2008.travel_reserve__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.wks RENAME vn2008.wks__;
+ALTER TABLE IF EXISTS vn2008.wks__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.unary RENAME vn2008.unary__;
+ALTER TABLE IF EXISTS vn2008.unary__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.unary_scan RENAME vn2008.unary_scan__;
+ALTER TABLE IF EXISTS vn2008.unary_scan__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.unary_scan_line RENAME vn2008.unary_scan_line__;
+ALTER TABLE IF EXISTS vn2008.unary_scan_line__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.unary_scan_line_buy RENAME vn2008.unary_scan_line_buy__;
+ALTER TABLE IF EXISTS vn2008.unary_scan_line_buy__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.unary_scan_line_expedition RENAME vn2008.unary_scan_line_expedition__;
+ALTER TABLE IF EXISTS vn2008.unary_scan_line_expedition__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.widget RENAME vn2008.widget__;
+ALTER TABLE IF EXISTS vn2008.widget__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.scan RENAME vn2008.scan__;
+ALTER TABLE IF EXISTS vn2008.scan__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.scan_line RENAME vn2008.scan_line__;
+ALTER TABLE IF EXISTS vn2008.scan_line__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.tipsa RENAME vn2008.tipsa__;
+ALTER TABLE IF EXISTS vn2008.tipsa__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.payroll_basess RENAME vn2008.payroll_basess__;
+ALTER TABLE IF EXISTS vn2008.payroll_basess__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.pago_sdc RENAME vn2008.pago_sdc__;
+ALTER TABLE IF EXISTS vn2008.pago_sdc__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.transport RENAME vn2008.transport__;
+ALTER TABLE IF EXISTS vn2008.transport__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.travel_pattern RENAME vn2008.travel_pattern__;
+ALTER TABLE IF EXISTS vn2008.travel_pattern__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.jerarquia RENAME vn2008.jerarquia__;
+ALTER TABLE IF EXISTS vn2008.jerarquia__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.language RENAME vn2008.language__;
+ALTER TABLE IF EXISTS vn2008.language__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.link RENAME vn2008.link__;
+ALTER TABLE IF EXISTS vn2008.link__ COMMENT='refs #6372 @deprecated 2023-12-13;';
diff --git a/db/versions/10896-salmonOrchid/30-permissions.sql b/db/versions/10896-salmonOrchid/30-permissions.sql
new file mode 100644
index 000000000..fd7c6c58e
--- /dev/null
+++ b/db/versions/10896-salmonOrchid/30-permissions.sql
@@ -0,0 +1,32 @@
+-- flight
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+ SQL SECURITY DEFINER
+VIEW `vn2008`.`flight` AS
+ SELECT 1;
+GRANT SELECT, INSERT, UPDATE ON TABLE vn2008.flight TO `logistic`;
+GRANT SELECT, INSERT, UPDATE ON TABLE vn.flight TO `logistic`;
+-- integra2_province
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+ SQL SECURITY DEFINER
+VIEW `vn2008`.`integra2_province` AS
+ SELECT 1;
+GRANT SELECT ON TABLE vn2008.integra2_province TO `employee`;
+GRANT SELECT ON TABLE vn.integra2Province TO `employee`;
+-- link
+
+GRANT SELECT ON TABLE vn.company TO `administrative`;
+GRANT SELECT ON TABLE vn.company TO `hr`;
+
+-- warehouse_pickup
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+ SQL SECURITY DEFINER
+VIEW `vn2008`.`warehouse_pickup` AS
+ SELECT 1;
+GRANT SELECT ON TABLE vn2008.warehouse_pickup TO `logistic`;
+GRANT SELECT ON TABLE vn.warehousePickup TO `logistic`;
+GRANT SELECT ON TABLE vn2008.warehouse_pickup TO `claimManager`;
+GRANT SELECT ON TABLE vn.warehousePickup TO `claimManager`;
+GRANT SELECT ON TABLE vn2008.warehouse_pickup TO `employee`;
+GRANT SELECT ON TABLE vn.warehousePickup TO `employee`;
+GRANT SELECT ON TABLE vn2008.warehouse_pickup TO `deliveryAssistant`;
+GRANT SELECT ON TABLE vn.warehousePickup TO `deliveryAssistant`;
diff --git a/db/versions/10898-workerActivity/00-table.sql b/db/versions/10898-workerActivity/00-table.sql
new file mode 100644
index 000000000..ec517b929
--- /dev/null
+++ b/db/versions/10898-workerActivity/00-table.sql
@@ -0,0 +1,13 @@
+-- Place your SQL code here
+CREATE TABLE vn.workerActivity (
+id INT PRIMARY KEY AUTO_INCREMENT,
+created TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+model ENUM('COM', 'ENT', 'TPV', 'ENC', 'LAB', 'ETI') NOT NULL,
+workerFk INT(10) UNSIGNED NOT NULL,
+event ENUM('open', 'close', 'insert', 'delete', 'update', 'refresh') NOT NULL,
+description VARCHAR(255) DEFAULT NULL,
+CONSTRAINT fk_workerActivity_worker FOREIGN KEY (workerFk)
+ REFERENCES vn.worker (id)
+ ON DELETE CASCADE
+ ON UPDATE CASCADE
+);
\ No newline at end of file
diff --git a/db/versions/10903-pinkIvy/00-professionalCategoryAddCode.sql b/db/versions/10903-pinkIvy/00-professionalCategoryAddCode.sql
new file mode 100644
index 000000000..7caa42f32
--- /dev/null
+++ b/db/versions/10903-pinkIvy/00-professionalCategoryAddCode.sql
@@ -0,0 +1,6 @@
+ALTER TABLE vn.professionalCategory DROP COLUMN IF EXISTS code;
+ALTER TABLE IF EXISTS vn.professionalCategory ADD COLUMN code VARCHAR(25) DEFAULT NULL;
+
+UPDATE vn.professionalCategory
+ SET code = 'driverCE'
+ WHERE name = 'Conductor C + E';
\ No newline at end of file
diff --git a/db/versions/10905-grayIvy/00-firstScript.sql b/db/versions/10905-grayIvy/00-firstScript.sql
new file mode 100644
index 000000000..cca41cd48
--- /dev/null
+++ b/db/versions/10905-grayIvy/00-firstScript.sql
@@ -0,0 +1,36 @@
+USE vn;
+
+CREATE OR REPLACE TABLE vn.workerActivityType (
+ `code` varchar(20) NOT NULL,
+ `description` varchar(45) NOT NULL,
+ PRIMARY KEY (`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+ALTER TABLE vn.department ADD workerActivityTypeFk varchar(20) NULL COMMENT 'Indica la actitividad que desempeña por defecto ese departamento';
+ALTER TABLE vn.department ADD CONSTRAINT department_workerActivityType_FK FOREIGN KEY (workerActivityTypeFk) REFERENCES vn.workerActivityType(code) ON DELETE CASCADE ON UPDATE CASCADE;
+
+
+
+INSERT INTO vn.workerActivityType (code, description) VALUES('ON_CHECKING', 'REVISION');
+INSERT INTO vn.workerActivityType (code, description) VALUES('PREVIOUS_CAM', 'CAMARA');
+INSERT INTO vn.workerActivityType (code, description) VALUES('PREVIOUS_ART', 'ARTIFICIAL');
+INSERT INTO vn.workerActivityType (code, description) VALUES('ON_PREPARATION', 'SACADO');
+INSERT INTO vn.workerActivityType (code, description) VALUES('PACKING', 'ENCAJADO');
+INSERT INTO vn.workerActivityType (code, description) VALUES('FIELD', 'CAMPOS');
+INSERT INTO vn.workerActivityType (code, description) VALUES('DELIVERY', 'REPARTO');
+INSERT INTO vn.workerActivityType (code, description) VALUES('STORAGE', 'ALMACENAJE');
+INSERT INTO vn.workerActivityType (code, description) VALUES('PALLETIZING', 'PALETIZADO');
+INSERT INTO vn.workerActivityType (code, description) VALUES('STOP', 'PARADA');
+
+
+INSERT INTO salix.ACL ( model, property, accessType, permission, principalType, principalId) VALUES('WorkerActivityType', '*', 'READ', 'ALLOW', 'ROLE', 'production');
+INSERT INTO salix.ACL ( model, property, accessType, permission, principalType, principalId) VALUES('WorkerActivity', '*', '*', 'ALLOW', 'ROLE', 'production');
+
+
+ALTER TABLE vn.workerActivity MODIFY COLUMN event enum('open','close','insert','delete','update','refresh') CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NULL;
+ALTER TABLE vn.workerActivity MODIFY COLUMN model enum('COM','ENT','TPV','ENC','LAB','ETI','APP') CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL;
+
+
+ALTER TABLE vn.workerActivity ADD workerActivityTypeFk varchar(20) NULL;
+ALTER TABLE vn.workerActivity ADD CONSTRAINT workerActivity_workerActivityType_FK FOREIGN KEY (workerActivityTypeFk) REFERENCES vn.workerActivityType(code) ON DELETE CASCADE ON UPDATE CASCADE;
+
diff --git a/db/versions/10906-limeIvy/00-firstScript.sql b/db/versions/10906-limeIvy/00-firstScript.sql
new file mode 100644
index 000000000..6ce187d20
--- /dev/null
+++ b/db/versions/10906-limeIvy/00-firstScript.sql
@@ -0,0 +1,6 @@
+ALTER TABLE vn.professionalCategory DROP COLUMN IF EXISTS code;
+ALTER TABLE IF EXISTS vn.professionalCategory ADD COLUMN code VARCHAR(25) UNIQUE DEFAULT NULL;
+
+UPDATE vn.professionalCategory
+ SET code = 'driverCE'
+ WHERE name = 'Conductor C + E';
\ No newline at end of file
diff --git a/db/versions/10908-blueAsparagus/00-createSupplierDms.sql b/db/versions/10908-blueAsparagus/00-createSupplierDms.sql
new file mode 100644
index 000000000..bc0a40f11
--- /dev/null
+++ b/db/versions/10908-blueAsparagus/00-createSupplierDms.sql
@@ -0,0 +1,25 @@
+DELETE FROM vn.supplierDms
+ WHERE dmsFk IN (
+ SELECT sd.dmsFk
+ FROM vn.supplierDms sd
+ LEFT JOIN vn.dms d ON d.id = sd.dmsFk
+ WHERE d.id IS NULL
+ );
+
+DELETE FROM vn.supplierDms
+ WHERE supplierFk IN (
+ SELECT sd.supplierFk
+ FROM vn.supplierDms sd
+ LEFT JOIN vn.supplier s ON s.id = sd.supplierFk
+ WHERE s.id IS NULL
+ );
+
+ALTER TABLE `vn`.`supplierDms`
+ MODIFY COLUMN supplierFk int(10) unsigned NOT NULL,
+ ADD editorFk INT UNSIGNED NULL,
+ ADD CONSTRAINT user_Fk FOREIGN KEY (editorFk) REFERENCES account.`user`(id),
+ ADD CONSTRAINT dms_Fk FOREIGN KEY (dmsFk) REFERENCES vn.dms(id) ON DELETE CASCADE ON UPDATE CASCADE,
+ ADD CONSTRAINT supplier_Fk FOREIGN KEY (supplierFk) REFERENCES vn.supplier(id) ON UPDATE CASCADE;
+
+ALTER TABLE `vn`.`supplierLog`
+ MODIFY COLUMN `changedModel` ENUM('Supplier','SupplierAddress','SupplierAccount','SupplierContact','SupplierDms') NOT NULL DEFAULT 'Supplier';
\ No newline at end of file
diff --git a/db/versions/10909-crimsonLaurel/00-firstScript.sql b/db/versions/10909-crimsonLaurel/00-firstScript.sql
new file mode 100644
index 000000000..58e679dff
--- /dev/null
+++ b/db/versions/10909-crimsonLaurel/00-firstScript.sql
@@ -0,0 +1,5 @@
+DELETE FROM vn.entryObservation
+ WHERE observationTypeFk IS NULL;
+
+ALTER TABLE vn.entryObservation
+ MODIFY COLUMN observationTypeFk tinyint(3) unsigned NOT NULL;
diff --git a/db/versions/10912-brownCataractarum/00-firstScript.sql b/db/versions/10912-brownCataractarum/00-firstScript.sql
new file mode 100644
index 000000000..51aea42a1
--- /dev/null
+++ b/db/versions/10912-brownCataractarum/00-firstScript.sql
@@ -0,0 +1,12 @@
+ALTER TABLE vn.country
+ MODIFY COLUMN code varchar(2) NOT NULL;
+
+ALTER TABLE vn.country
+ ADD CONSTRAINT country_unique UNIQUE KEY (code);
+
+ALTER TABLE vn.transitoryDuaUnified
+ ADD countryCodeFk varchar(2) DEFAULT 'EC' NOT NULL;
+
+ALTER TABLE vn.transitoryDuaUnified
+ ADD CONSTRAINT transitoryDuaUnified_country_FK FOREIGN KEY (countryCodeFk)
+ REFERENCES vn.country(code);
diff --git a/db/versions/10913-bronzeGalax/00-firstScript.sql b/db/versions/10913-bronzeGalax/00-firstScript.sql
new file mode 100644
index 000000000..aef0c8738
--- /dev/null
+++ b/db/versions/10913-bronzeGalax/00-firstScript.sql
@@ -0,0 +1,4 @@
+-- Place your SQL code here
+RENAME TABLE IF EXISTS vn.claimRma TO vn.claimRma__;
+ALTER TABLE IF EXISTS vn.claimRma__ COMMENT='kkeada el 2024-02-26 por Pablo';
+ALTER TABLE vn.claim CHANGE IF EXISTS rma rma__ varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL;
diff --git a/db/versions/10914-aquaBirch/00-firstScript.sql b/db/versions/10914-aquaBirch/00-firstScript.sql
new file mode 100644
index 000000000..a182d5407
--- /dev/null
+++ b/db/versions/10914-aquaBirch/00-firstScript.sql
@@ -0,0 +1,6 @@
+-- Place your SQL code here
+ALTER TABLE IF EXISTS vn2008.dock__ RENAME vn2008.dock;
+ALTER TABLE IF EXISTS vn2008.dock COMMENT='';
+
+ALTER TABLE IF EXISTS vn2008.Tramos__ RENAME vn2008.Tramos;
+ALTER TABLE IF EXISTS vn2008.Tramos COMMENT='';
\ No newline at end of file
diff --git a/db/versions/10915-limeMastic/00-firstScript.sql b/db/versions/10915-limeMastic/00-firstScript.sql
new file mode 100644
index 000000000..be83a4984
--- /dev/null
+++ b/db/versions/10915-limeMastic/00-firstScript.sql
@@ -0,0 +1,2 @@
+DELETE IGNORE FROM bs.nightTask
+ WHERE `procedure` = 'clean_launcher';
diff --git a/db/versions/10918-wheatRose/00-firstScript.sql b/db/versions/10918-wheatRose/00-firstScript.sql
new file mode 100644
index 000000000..5d0fb1c32
--- /dev/null
+++ b/db/versions/10918-wheatRose/00-firstScript.sql
@@ -0,0 +1,2 @@
+DELETE FROM bs.nightTask
+ WHERE `procedure` = 'emailYesterdayPurchasesLauncher';
diff --git a/db/versions/10919-brownMoss/00-firstScript.sql b/db/versions/10919-brownMoss/00-firstScript.sql
new file mode 100644
index 000000000..640d2180a
--- /dev/null
+++ b/db/versions/10919-brownMoss/00-firstScript.sql
@@ -0,0 +1,3 @@
+-- Place your SQL code here
+
+
diff --git a/db/versions/10922-salmonCordyline/00-firstScript.sql b/db/versions/10922-salmonCordyline/00-firstScript.sql
new file mode 100644
index 000000000..37557d326
--- /dev/null
+++ b/db/versions/10922-salmonCordyline/00-firstScript.sql
@@ -0,0 +1 @@
+ALTER TABLE vn.warehouse AUTO_INCREMENT=92;
diff --git a/db/versions/10923-pinkOak/00-createParkingLog.sql b/db/versions/10923-pinkOak/00-createParkingLog.sql
new file mode 100644
index 000000000..f31f58196
--- /dev/null
+++ b/db/versions/10923-pinkOak/00-createParkingLog.sql
@@ -0,0 +1,60 @@
+CREATE OR REPLACE TABLE vn.parkingLog (
+
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+
+ `originFk` int(11) DEFAULT NULL,
+
+ `userFk` int(10) unsigned DEFAULT NULL,
+
+ `action` set('insert','update','delete','select') NOT NULL,
+
+ `creationDate` timestamp NULL DEFAULT current_timestamp(),
+
+ `description` text CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL,
+
+ `changedModel` enum('Parking','SaleGroup','SaleGroupDetail') NOT NULL DEFAULT 'Parking',
+
+ `oldInstance` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`oldInstance`)),
+
+ `newInstance` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`newInstance`)),
+
+ `changedModelId` int(11) NOT NULL,
+
+ `changedModelValue` varchar(45) DEFAULT NULL,
+
+ PRIMARY KEY (`id`),
+
+ KEY `logParkinguserFk` (`userFk`),
+
+ KEY `parkingLog_changedModel` (`changedModel`,`changedModelId`,`creationDate`),
+
+ KEY `parkingLog_originFk` (`originFk`,`creationDate`),
+
+ CONSTRAINT `parkingOriginFk` FOREIGN KEY (`originFk`) REFERENCES `parking` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+
+ CONSTRAINT `parkingUserFk` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+
+) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+ALTER TABLE vn.parking DROP COLUMN IF EXISTS editorFk;
+ALTER TABLE IF EXISTS vn.parking ADD COLUMN editorFk INT;
+
+ALTER TABLE vn.saleGroupDetail DROP COLUMN IF EXISTS editorFk;
+ALTER TABLE IF EXISTS vn.saleGroupDetail ADD COLUMN editorFk INT;
+
+
+ALTER TABLE vn.ticketLog
+ MODIFY COLUMN changedModel ENUM(
+ 'Ticket',
+ 'Sale',
+ 'TicketWeekly',
+ 'TicketTracking',
+ 'TicketService',
+ 'TicketRequest',
+ 'TicketRefund',
+ 'TicketPackaging',
+ 'TicketObservation',
+ 'TicketDms',
+ 'Expedition',
+ 'Sms'
+ ) NOT NULL DEFAULT 'Ticket';
diff --git a/db/versions/10923-pinkOak/01-aclParkingLog.sql b/db/versions/10923-pinkOak/01-aclParkingLog.sql
new file mode 100644
index 000000000..8f7e55d63
--- /dev/null
+++ b/db/versions/10923-pinkOak/01-aclParkingLog.sql
@@ -0,0 +1,2 @@
+INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId)
+ VALUES ('ParkingLog', '*', 'READ', 'ALLOW', 'ROLE', 'employee');
\ No newline at end of file
diff --git a/db/versions/10924-pinkCordyline/00-firstScript.sql b/db/versions/10924-pinkCordyline/00-firstScript.sql
new file mode 100644
index 000000000..1c6c1c0f8
--- /dev/null
+++ b/db/versions/10924-pinkCordyline/00-firstScript.sql
@@ -0,0 +1,31 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`balanceNestTree_addChild`()
+BEGIN
+ SELECT 1;
+END$$
+DELIMITER ;
+GRANT EXECUTE ON PROCEDURE vn.balanceNestTree_addChild TO adminBoss;
+
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`balanceNestTree_delete`()
+BEGIN
+ SELECT 1;
+END$$
+DELIMITER ;
+GRANT EXECUTE ON PROCEDURE vn.balanceNestTree_delete TO adminBoss;
+
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`balanceNestTree_move`()
+BEGIN
+ SELECT 1;
+END$$
+DELIMITER ;
+GRANT EXECUTE ON PROCEDURE vn.balanceNestTree_move TO adminBoss;
+
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`payment_add`()
+BEGIN
+ SELECT 1;
+END$$
+DELIMITER ;
+GRANT EXECUTE ON PROCEDURE vn.payment_add TO financial;
diff --git a/db/versions/10925-orangeLaurel/00-firstScript.sql b/db/versions/10925-orangeLaurel/00-firstScript.sql
new file mode 100644
index 000000000..049627082
--- /dev/null
+++ b/db/versions/10925-orangeLaurel/00-firstScript.sql
@@ -0,0 +1,15 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`confection_controlSource`()
+BEGIN
+ SELECT 1;
+END$$
+DELIMITER ;
+GRANT EXECUTE ON PROCEDURE vn.confection_controlSource TO handmadeBoss, productionAssi, artificialBoss;
+
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`remittance_calc`()
+BEGIN
+ SELECT 1;
+END$$
+DELIMITER ;
+GRANT EXECUTE ON PROCEDURE vn.remittance_calc TO financial;
\ No newline at end of file
diff --git a/db/versions/10926-limeFern/00-refactorClaimState.sql b/db/versions/10926-limeFern/00-refactorClaimState.sql
new file mode 100644
index 000000000..bb2dc349a
--- /dev/null
+++ b/db/versions/10926-limeFern/00-refactorClaimState.sql
@@ -0,0 +1,8 @@
+UPDATE vn.claim c
+ JOIN vn.claimState cs ON cs.id = c.claimStateFk
+ JOIN vn.claimState ns ON ns.code = 'resolved'
+ SET c.claimStateFk = ns.id
+ WHERE cs.code IN ('managed', 'mana', 'lack', 'relocation');
+
+DELETE FROM vn.claimState
+ WHERE code IN ('managed', 'mana', 'lack', 'relocation');
diff --git a/db/versions/10928-orangeEucalyptus/00-firstScript.sql b/db/versions/10928-orangeEucalyptus/00-firstScript.sql
new file mode 100644
index 000000000..58d3605de
--- /dev/null
+++ b/db/versions/10928-orangeEucalyptus/00-firstScript.sql
@@ -0,0 +1,5 @@
+REVOKE SELECT ON TABLE vn.bank FROM administrative, hr;
+GRANT SELECT ON TABLE vn.accounting TO administrative, hr;
+UPDATE salix.ACL
+ SET model = 'Accounting'
+ WHERE model = 'Bank';
diff --git a/db/versions/10929-orangeAnthurium/00-firstScript.sql b/db/versions/10929-orangeAnthurium/00-firstScript.sql
new file mode 100644
index 000000000..299ac63c7
--- /dev/null
+++ b/db/versions/10929-orangeAnthurium/00-firstScript.sql
@@ -0,0 +1,2 @@
+-- Place your SQL code here
+ALTER TABLE dipole.expedition_PrintOut MODIFY COLUMN street varchar(42) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT ' ' NOT NULL;
\ No newline at end of file
diff --git a/db/versions/10932-azureEucalyptus/00-firstScript.sql b/db/versions/10932-azureEucalyptus/00-firstScript.sql
new file mode 100644
index 000000000..399819cc4
--- /dev/null
+++ b/db/versions/10932-azureEucalyptus/00-firstScript.sql
@@ -0,0 +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;
diff --git a/db/versions/10940-aquaLilium/00-firstScript.sql b/db/versions/10940-aquaLilium/00-firstScript.sql
new file mode 100644
index 000000000..fb4fa33ff
--- /dev/null
+++ b/db/versions/10940-aquaLilium/00-firstScript.sql
@@ -0,0 +1,8 @@
+
+ ALTER TABLE vn.department
+ ADD COLUMN pbxQueue varchar(128) CHARACTER
+ SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL NULL;
+
+ ALTER TABLE vn.department
+ ADD CONSTRAINT department_queue_FK
+ FOREIGN KEY (pbxQueue) REFERENCES pbx.queue(name) ON DELETE RESTRICT ON UPDATE CASCADE;
diff --git a/db/versions/10941-limePaniculata/00-restoreVn2008Jerarquia.sql b/db/versions/10941-limePaniculata/00-restoreVn2008Jerarquia.sql
new file mode 100644
index 000000000..3f6a52bef
--- /dev/null
+++ b/db/versions/10941-limePaniculata/00-restoreVn2008Jerarquia.sql
@@ -0,0 +1 @@
+ALTER TABLE IF EXISTS vn2008.jerarquia__ RENAME vn2008.jerarquia;
diff --git a/db/versions/10946-blueChrysanthemum/00-firstScript.sql b/db/versions/10946-blueChrysanthemum/00-firstScript.sql
new file mode 100644
index 000000000..c73903f65
--- /dev/null
+++ b/db/versions/10946-blueChrysanthemum/00-firstScript.sql
@@ -0,0 +1,4 @@
+ALTER TABLE IF EXISTS vn2008.unary_scan RENAME vn2008.unary_scan__;
+ALTER TABLE IF EXISTS vn2008.unary_scan_line RENAME vn2008.unary_scan_line__;
+ALTER TABLE IF EXISTS vn2008.unary_scan_line_buy RENAME vn2008.unary_scan_line_buy__;
+ALTER TABLE IF EXISTS vn2008.unary_scan_line_expedition RENAME vn2008.unary_scan_line_expedition__;
diff --git a/db/versions/10953-redChico/00-account.sql b/db/versions/10953-redChico/00-account.sql
new file mode 100644
index 000000000..e6944a686
--- /dev/null
+++ b/db/versions/10953-redChico/00-account.sql
@@ -0,0 +1,23 @@
+-- account.accountConfig
+ALTER TABLE account.accountConfig MODIFY COLUMN id tinyint(3) unsigned NOT NULL;
+ALTER TABLE account.accountConfig ADD CONSTRAINT accountConfig_check CHECK (id = 1);
+
+-- account.ldapConfig
+ALTER TABLE account.ldapConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE account.ldapConfig ADD CONSTRAINT ldapConfig_check CHECK (id = 1);
+
+-- account.mailConfig
+ALTER TABLE account.mailConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE account.mailConfig ADD CONSTRAINT mailConfig_check CHECK (id = 1);
+
+-- account.roleConfig
+ALTER TABLE account.roleConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE account.roleConfig ADD CONSTRAINT roleConfig_check CHECK (id = 1);
+
+-- account.sambaConfig
+ALTER TABLE account.sambaConfig MODIFY COLUMN id tinyint(3) unsigned NOT NULL;
+ALTER TABLE account.sambaConfig ADD CONSTRAINT sambaConfig_check CHECK (id = 1);
+
+-- account.userConfig
+ALTER TABLE account.userConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE account.userConfig ADD CONSTRAINT userConfig_check CHECK (id = 1);
diff --git a/db/versions/10953-redChico/01-bs.sql b/db/versions/10953-redChico/01-bs.sql
new file mode 100644
index 000000000..e451c8205
--- /dev/null
+++ b/db/versions/10953-redChico/01-bs.sql
@@ -0,0 +1,7 @@
+-- bs.nightTaskConfig
+ALTER TABLE bs.nightTaskConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE bs.nightTaskConfig ADD CONSTRAINT nightTaskConfig_check CHECK (id = 1);
+
+-- bs.workerProductivityConfig
+ALTER TABLE bs.workerProductivityConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE bs.workerProductivityConfig ADD CONSTRAINT workerProductivityConfig_check CHECK (id = 1);
diff --git a/db/versions/10953-redChico/02-edi.sql b/db/versions/10953-redChico/02-edi.sql
new file mode 100644
index 000000000..e97cfcec8
--- /dev/null
+++ b/db/versions/10953-redChico/02-edi.sql
@@ -0,0 +1,15 @@
+-- edi.exchangeConfig
+ALTER TABLE edi.exchangeConfig MODIFY COLUMN id tinyint(3) unsigned NOT NULL;
+ALTER TABLE edi.exchangeConfig ADD CONSTRAINT exchangeConfig_check CHECK (id = 1);
+
+-- edi.ftpConfig
+ALTER TABLE edi.ftpConfig MODIFY COLUMN id tinyint(3) unsigned NOT NULL;
+ALTER TABLE edi.ftpConfig ADD CONSTRAINT ftpConfig_check CHECK (id = 1);
+
+-- edi.imapConfig (Tiene más de 1 registro en producción)
+-- ALTER TABLE edi.imapConfig MODIFY COLUMN id tinyint(3) unsigned NOT NULL;
+-- ALTER TABLE edi.imapConfig ADD CONSTRAINT imapConfig_check CHECK (id = 1);
+
+-- edi.offerRefreshConfig
+ALTER TABLE edi.offerRefreshConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE edi.offerRefreshConfig ADD CONSTRAINT offerRefreshConfig_check CHECK (id = 1);
\ No newline at end of file
diff --git a/db/versions/10953-redChico/03-hedera.sql b/db/versions/10953-redChico/03-hedera.sql
new file mode 100644
index 000000000..3c86fb593
--- /dev/null
+++ b/db/versions/10953-redChico/03-hedera.sql
@@ -0,0 +1,27 @@
+-- hedera.config
+ALTER TABLE hedera.config MODIFY COLUMN id tinyint(3) unsigned NOT NULL;
+ALTER TABLE hedera.config ADD CONSTRAINT config_check CHECK (id = 1);
+
+-- hedera.imageConfig
+ALTER TABLE hedera.imageConfig MODIFY COLUMN id tinyint(3) unsigned NOT NULL;
+ALTER TABLE hedera.imageConfig ADD CONSTRAINT imageConfig_check CHECK (id = 1);
+
+-- hedera.mailConfig
+ALTER TABLE hedera.mailConfig MODIFY COLUMN id tinyint(3) unsigned NOT NULL;
+ALTER TABLE hedera.mailConfig ADD CONSTRAINT mailConfig_check CHECK (id = 1);
+
+-- hedera.orderConfig
+ALTER TABLE hedera.orderConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE hedera.orderConfig ADD CONSTRAINT orderConfig_check CHECK (id = 1);
+
+-- hedera.shelfConfig (Tiene más de 1 registro en producción)
+-- ALTER TABLE hedera.shelfConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+-- ALTER TABLE hedera.shelfConfig ADD CONSTRAINT shelfConfig_check CHECK (id = 1);
+
+-- hedera.tpvConfig
+ALTER TABLE hedera.tpvConfig MODIFY COLUMN id tinyint(3) unsigned NOT NULL;
+ALTER TABLE hedera.tpvConfig ADD CONSTRAINT tpvConfig_check CHECK (id = 1);
+
+-- hedera.tpvImapConfig
+ALTER TABLE hedera.tpvImapConfig MODIFY COLUMN id tinyint(3) unsigned NOT NULL;
+ALTER TABLE hedera.tpvImapConfig ADD CONSTRAINT tpvImapConfig_check CHECK (id = 1);
diff --git a/db/versions/10953-redChico/04-pbx.sql b/db/versions/10953-redChico/04-pbx.sql
new file mode 100644
index 000000000..49f4172c4
--- /dev/null
+++ b/db/versions/10953-redChico/04-pbx.sql
@@ -0,0 +1,15 @@
+-- pbx.config
+ALTER TABLE pbx.config MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE pbx.config ADD CONSTRAINT config_check CHECK (id = 1);
+
+-- pbx.followmeConfig
+ALTER TABLE pbx.followmeConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE pbx.followmeConfig ADD CONSTRAINT followmeConfig_check CHECK (id = 1);
+
+-- pbx.queueConfig (Tiene más de 1 registro en producción)
+-- ALTER TABLE pbx.queueConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+-- ALTER TABLE pbx.queueConfig ADD CONSTRAINT queueConfig_check CHECK (id = 1);
+
+-- pbx.sipConfig
+ALTER TABLE pbx.sipConfig MODIFY COLUMN id mediumint(8) unsigned NOT NULL;
+ALTER TABLE pbx.sipConfig ADD CONSTRAINT sipConfig_check CHECK (id = 1);
diff --git a/db/versions/10953-redChico/05-sage.sql b/db/versions/10953-redChico/05-sage.sql
new file mode 100644
index 000000000..ee60f5f7d
--- /dev/null
+++ b/db/versions/10953-redChico/05-sage.sql
@@ -0,0 +1,3 @@
+-- sage.config
+ALTER TABLE sage.config MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE sage.config ADD CONSTRAINT config_check CHECK (id = 1);
diff --git a/db/versions/10953-redChico/06-salix.sql b/db/versions/10953-redChico/06-salix.sql
new file mode 100644
index 000000000..d6a248f0d
--- /dev/null
+++ b/db/versions/10953-redChico/06-salix.sql
@@ -0,0 +1,7 @@
+-- salix.accessTokenConfig
+ALTER TABLE salix.accessTokenConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE salix.accessTokenConfig ADD CONSTRAINT accessTokenConfig_check CHECK (id = 1);
+
+-- salix.printConfig
+ALTER TABLE salix.printConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE salix.printConfig ADD CONSTRAINT printConfig_check CHECK (id = 1);
diff --git a/db/versions/10953-redChico/06-srt.sql b/db/versions/10953-redChico/06-srt.sql
new file mode 100644
index 000000000..53000eee6
--- /dev/null
+++ b/db/versions/10953-redChico/06-srt.sql
@@ -0,0 +1,3 @@
+-- srt.config
+ALTER TABLE srt.config MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE srt.config ADD CONSTRAINT config_check CHECK (id = 1);
diff --git a/db/versions/10953-redChico/07-util.sql b/db/versions/10953-redChico/07-util.sql
new file mode 100644
index 000000000..152dce3d1
--- /dev/null
+++ b/db/versions/10953-redChico/07-util.sql
@@ -0,0 +1,11 @@
+-- util.config
+ALTER TABLE util.config MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE util.config ADD CONSTRAINT config_check CHECK (id = 1);
+
+-- util.notificationConfig
+ALTER TABLE util.notificationConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE util.notificationConfig ADD CONSTRAINT notificationConfig_check CHECK (id = 1);
+
+-- util.versionConfig
+ALTER TABLE util.versionConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE util.versionConfig ADD CONSTRAINT versionConfig_check CHECK (id = 1);
diff --git a/db/versions/10953-redChico/08-vn.sql b/db/versions/10953-redChico/08-vn.sql
new file mode 100644
index 000000000..14bd3b13f
--- /dev/null
+++ b/db/versions/10953-redChico/08-vn.sql
@@ -0,0 +1,87 @@
+-- vn.accountingConfig
+ALTER TABLE vn.accountingConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.accountingConfig ADD CONSTRAINT accountingConfig_check CHECK (id = 1);
+
+-- vn.auctionConfig
+ALTER TABLE vn.auctionConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.auctionConfig ADD CONSTRAINT auctionConfig_check CHECK (id = 1);
+
+-- vn.autoRadioConfig
+ALTER TABLE vn.autoRadioConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.autoRadioConfig ADD CONSTRAINT autoRadioConfig_check CHECK (id = 1);
+
+-- vn.bankEntityConfig
+ALTER TABLE vn.bankEntityConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.bankEntityConfig ADD CONSTRAINT bankEntityConfig_check CHECK (id = 1);
+
+-- vn.bionicConfig
+ALTER TABLE vn.bionicConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.bionicConfig ADD CONSTRAINT bionicConfig_check CHECK (id = 1);
+
+-- vn.buyConfig
+ALTER TABLE vn.buyConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.buyConfig ADD CONSTRAINT buyConfig_check CHECK (id = 1);
+
+-- vn.chatConfig
+ALTER TABLE vn.chatConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.chatConfig ADD CONSTRAINT chatConfig_check CHECK (id = 1);
+
+-- vn.claimConfig
+ALTER TABLE vn.claimConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.claimConfig ADD CONSTRAINT claimConfig_check CHECK (id = 1);
+
+-- vn.clientConfig
+ALTER TABLE vn.clientConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.clientConfig ADD CONSTRAINT clientConfig_check CHECK (id = 1);
+
+-- vn.comparativeAddConfig
+ALTER TABLE vn.comparativeAddConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.comparativeAddConfig ADD CONSTRAINT comparativeAddConfig_check CHECK (id = 1);
+
+-- vn.comparativeConfig
+ALTER TABLE vn.comparativeConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.comparativeConfig ADD CONSTRAINT comparativeConfig_check CHECK (id = 1);
+
+-- vn.config
+ALTER TABLE vn.config MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.config ADD CONSTRAINT config_check CHECK (id = 1);
+
+-- vn.conveyorConfig (Tiene más de 1 registro en producción)
+-- ALTER TABLE vn.conveyorConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+-- ALTER TABLE vn.conveyorConfig ADD CONSTRAINT conveyorConfig_check CHECK (id = 1);
+
+-- vn.deviceProductionConfig
+ALTER TABLE vn.deviceProductionConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.deviceProductionConfig ADD CONSTRAINT deviceProductionConfig_check CHECK (id = 1);
+
+-- vn.docuwareConfig
+ALTER TABLE vn.docuwareConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.docuwareConfig ADD CONSTRAINT docuwareConfig_check CHECK (id = 1);
+
+-- vn.floramondoConfig
+ALTER TABLE vn.floramondoConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.floramondoConfig ADD CONSTRAINT floramondoConfig_check CHECK (id = 1);
+
+-- vn.franceExpressConfig
+ALTER TABLE vn.franceExpressConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.franceExpressConfig ADD CONSTRAINT franceExpressConfig_check CHECK (id = 1);
+
+-- vn.glsConfig
+ALTER TABLE vn.glsConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.glsConfig ADD CONSTRAINT glsConfig_check CHECK (id = 1);
+
+-- vn.greugeConfig
+ALTER TABLE vn.greugeConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.greugeConfig ADD CONSTRAINT greugeConfig_check CHECK (id = 1);
+
+-- vn.inventoryConfig
+ALTER TABLE vn.inventoryConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.inventoryConfig ADD CONSTRAINT inventoryConfig_check CHECK (id = 1);
+
+-- vn.invoiceInConfig
+ALTER TABLE vn.invoiceInConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.invoiceInConfig ADD CONSTRAINT invoiceInConfig_check CHECK (id = 1);
+
+-- vn.invoiceOutConfig
+ALTER TABLE vn.invoiceOutConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.invoiceOutConfig ADD CONSTRAINT invoiceOutConfig_check CHECK (id = 1);
diff --git a/db/versions/10953-redChico/08-vn2.sql b/db/versions/10953-redChico/08-vn2.sql
new file mode 100644
index 000000000..42985365e
--- /dev/null
+++ b/db/versions/10953-redChico/08-vn2.sql
@@ -0,0 +1,91 @@
+-- vn.invoiceOutTaxConfig (Tiene más de 1 registro en producción)
+-- ALTER TABLE vn.invoiceOutTaxConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+-- ALTER TABLE vn.invoiceOutTaxConfig ADD CONSTRAINT invoiceOutTaxConfig_check CHECK (id = 1);
+
+-- vn.itemConfig
+ALTER TABLE vn.itemConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.itemConfig ADD CONSTRAINT itemConfig_check CHECK (id = 1);
+
+-- vn.machineWorkerConfig
+ALTER TABLE vn.machineWorkerConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.machineWorkerConfig ADD CONSTRAINT machineWorkerConfig_check CHECK (id = 1);
+
+-- vn.mdbConfig
+ALTER TABLE vn.mdbConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.mdbConfig ADD CONSTRAINT mdbConfig_check CHECK (id = 1);
+
+-- vn.mrwConfig
+ALTER TABLE vn.mrwConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.mrwConfig ADD CONSTRAINT mrwConfig_check CHECK (id = 1);
+
+-- vn.osTicketConfig
+ALTER TABLE vn.osTicketConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.osTicketConfig ADD CONSTRAINT osTicketConfig_check CHECK (id = 1);
+
+-- vn.packagingConfig
+ALTER TABLE vn.packagingConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.packagingConfig ADD CONSTRAINT packagingConfig_check CHECK (id = 1);
+
+-- vn.packingSiteConfig
+ALTER TABLE vn.packingSiteConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.packingSiteConfig ADD CONSTRAINT packingSiteConfig_check CHECK (id = 1);
+
+-- vn.productionConfig
+ALTER TABLE vn.productionConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.productionConfig ADD CONSTRAINT productionConfig_check CHECK (id = 1);
+
+-- vn.rateConfig
+ALTER TABLE vn.rateConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.rateConfig ADD CONSTRAINT rateConfig_check CHECK (id = 1);
+
+-- vn.routeConfig
+ALTER TABLE vn.routeConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.routeConfig ADD CONSTRAINT routeConfig_check CHECK (id = 1);
+
+-- vn.salespersonConfig
+ALTER TABLE vn.salespersonConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.salespersonConfig ADD CONSTRAINT salespersonConfig_check CHECK (id = 1);
+
+-- vn.sendingConfig
+ALTER TABLE vn.sendingConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.sendingConfig ADD CONSTRAINT sendingConfig_check CHECK (id = 1);
+
+-- vn.smsConfig
+ALTER TABLE vn.smsConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.smsConfig ADD CONSTRAINT smsConfig_check CHECK (id = 1);
+
+-- vn.ticketConfig
+ALTER TABLE vn.ticketConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.ticketConfig ADD CONSTRAINT ticketConfig_check CHECK (id = 1);
+
+-- vn.tillConfig
+ALTER TABLE vn.tillConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.tillConfig ADD CONSTRAINT tillConfig_check CHECK (id = 1);
+
+-- vn.travelConfig
+ALTER TABLE vn.travelConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.travelConfig ADD CONSTRAINT travelConfig_check CHECK (id = 1);
+
+-- vn.viaexpressConfig
+ALTER TABLE vn.viaexpressConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.viaexpressConfig ADD CONSTRAINT viaexpressConfig_check CHECK (id = 1);
+
+-- vn.wagonConfig
+ALTER TABLE vn.wagonConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.wagonConfig ADD CONSTRAINT wagonConfig_check CHECK (id = 1);
+
+-- vn.workerConfig
+ALTER TABLE vn.workerConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.workerConfig ADD CONSTRAINT workerConfig_check CHECK (id = 1);
+
+-- vn.workerTimeControlConfig
+ALTER TABLE vn.workerTimeControlConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.workerTimeControlConfig ADD CONSTRAINT workerTimeControlConfig_check CHECK (id = 1);
+
+-- vn.zipConfig
+ALTER TABLE vn.zipConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.zipConfig ADD CONSTRAINT zipConfig_check CHECK (id = 1);
+
+-- vn.zoneConfig
+ALTER TABLE vn.zoneConfig MODIFY COLUMN id int(10) unsigned NOT NULL;
+ALTER TABLE vn.zoneConfig ADD CONSTRAINT zoneConfig_check CHECK (id = 1);
diff --git a/db/versions/10956-brownBirch/00-firstScript.sql b/db/versions/10956-brownBirch/00-firstScript.sql
new file mode 100644
index 000000000..bcd15432c
--- /dev/null
+++ b/db/versions/10956-brownBirch/00-firstScript.sql
@@ -0,0 +1,12 @@
+CREATE TABLE floranet.`addressPostCode` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `addressFk` int(11) NOT NULL,
+ `postCode` varchar(30) NOT NULL,
+ `hoursInAdvance` int(10) unsigned NOT NULL DEFAULT 24,
+ `dayOfWeek` int(10) unsigned NOT NULL,
+ `deliveryCost` decimal(10,2) NOT NULL DEFAULT 0.00,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `addressPostCode_unique` (`postCode`,`addressFk`,`dayOfWeek`),
+ KEY `addressPostCode_address_FK` (`addressFk`),
+ CONSTRAINT `addressPostCode_address_FK` FOREIGN KEY (`addressFk`) REFERENCES `vn`.`address` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='Client''s address registered for floranet network';
\ No newline at end of file
diff --git a/db/changes/233601/00-aclWorker.sql b/db/versions/10957-goldenAnthurium/00-aclTicketClone.sql
similarity index 55%
rename from db/changes/233601/00-aclWorker.sql
rename to db/versions/10957-goldenAnthurium/00-aclTicketClone.sql
index e79d8f738..6387b77b0 100644
--- a/db/changes/233601/00-aclWorker.sql
+++ b/db/versions/10957-goldenAnthurium/00-aclTicketClone.sql
@@ -1,3 +1,2 @@
INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
- VALUES
- ('Worker', 'search', 'READ', 'ALLOW', 'ROLE', 'employee');
+ VALUES('Ticket', 'clone', 'WRITE', 'ALLOW', 'ROLE', 'administrative');
\ No newline at end of file
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;
diff --git a/db/versions/10962-greenOrchid/00-firstScript.sql b/db/versions/10962-greenOrchid/00-firstScript.sql
new file mode 100644
index 000000000..c34f5d00b
--- /dev/null
+++ b/db/versions/10962-greenOrchid/00-firstScript.sql
@@ -0,0 +1,7 @@
+-- Place your SQL code here
+USE vn;
+
+INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
+ VALUES
+ ('ExpeditionPallet', '*', 'READ', 'ALLOW', 'ROLE', 'production'),
+ ('Ticket', 'addSaleByCode', 'WRITE', 'ALLOW', 'ROLE', 'production');
\ No newline at end of file
diff --git a/db/versions/10964-silverDracena/00-firstScript.sql b/db/versions/10964-silverDracena/00-firstScript.sql
new file mode 100644
index 000000000..dbc4ba8a0
--- /dev/null
+++ b/db/versions/10964-silverDracena/00-firstScript.sql
@@ -0,0 +1,2 @@
+-- Place your SQL code here
+ALTER TABLE vn.entry CHANGE isBlocked isBlocked__ tinyint(4) DEFAULT 0 NOT NULL COMMENT '@deprecated 27/03/2024';
diff --git a/db/versions/10967-wheatLilium/00-firstScript.sql b/db/versions/10967-wheatLilium/00-firstScript.sql
new file mode 100644
index 000000000..40cfe45bd
--- /dev/null
+++ b/db/versions/10967-wheatLilium/00-firstScript.sql
@@ -0,0 +1,4 @@
+-- Place your SQL code here
+
+INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId)
+ VALUES('ItemShelving', 'hasItemOlder', 'READ', 'ALLOW', 'ROLE', 'production');
diff --git a/db/versions/10968-salmonBamboo/00-firstScript.sql b/db/versions/10968-salmonBamboo/00-firstScript.sql
new file mode 100644
index 000000000..b79201071
--- /dev/null
+++ b/db/versions/10968-salmonBamboo/00-firstScript.sql
@@ -0,0 +1,3 @@
+ALTER TABLE vn.professionalCategory DROP COLUMN dayBreak, DROP COLUMN `level`;
+ALTER TABLE vn.professionalCategory
+ CHANGE name description varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL;
diff --git a/db/.archive/224701/00-acl_receiptPdf.sql b/db/versions/10969-silverCataractarum/00-aclSupplierDms.sql
similarity index 54%
rename from db/.archive/224701/00-acl_receiptPdf.sql
rename to db/versions/10969-silverCataractarum/00-aclSupplierDms.sql
index 42f84b87d..48c7438f1 100644
--- a/db/.archive/224701/00-acl_receiptPdf.sql
+++ b/db/versions/10969-silverCataractarum/00-aclSupplierDms.sql
@@ -1,3 +1,3 @@
+-- Place your SQL code here
INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
- VALUES
- ('Receipt', 'receiptPdf', '*', 'ALLOW', 'ROLE', 'salesAssistant');
+ VALUES('SupplierDms', '*', '*', 'ALLOW', 'ROLE', 'employee');
\ No newline at end of file
diff --git a/db/versions/10970-bronzeGerbera/00-specialPrice.sql b/db/versions/10970-bronzeGerbera/00-specialPrice.sql
new file mode 100644
index 000000000..e2e46fb1f
--- /dev/null
+++ b/db/versions/10970-bronzeGerbera/00-specialPrice.sql
@@ -0,0 +1,10 @@
+ALTER TABLE vn.specialPrice MODIFY COLUMN clientFk int(11) NULL;
+ALTER TABLE vn.specialPrice ADD started date NOT NULL DEFAULT '2024-01-01';
+ALTER TABLE vn.specialPrice ADD ended date NULL;
+ALTER TABLE vn.specialPrice MODIFY COLUMN itemFk int(11) NOT NULL;
+ALTER TABLE vn.specialPrice MODIFY COLUMN value DECIMAL(10,2) NOT NULL;
+
+
+ALTER TABLE vn.`specialPrice`
+ ADD CONSTRAINT `check_date_range`
+ CHECK (`ended` IS NULL OR `ended` >= `started`);
diff --git a/db/versions/10973-purpleAsparagus/00-firstScript.sql b/db/versions/10973-purpleAsparagus/00-firstScript.sql
new file mode 100644
index 000000000..f5b838529
--- /dev/null
+++ b/db/versions/10973-purpleAsparagus/00-firstScript.sql
@@ -0,0 +1,2 @@
+-- Place your SQL code here
+ALTER TABLE vn.productionConfig ADD defaultFreightItemFk INT UNSIGNED DEFAULT 71 NOT NULL COMMENT 'Default value for expedition table';
diff --git a/db/versions/10975-whiteIvy/00-action.sql b/db/versions/10975-whiteIvy/00-action.sql
new file mode 100644
index 000000000..3f9cf9d8b
--- /dev/null
+++ b/db/versions/10975-whiteIvy/00-action.sql
@@ -0,0 +1 @@
+CREATE INDEX expeditionLog_action_IDX USING BTREE ON srt.expeditionLog (`action`);
diff --git a/db/versions/10975-whiteIvy/01-expeditionFk.sql b/db/versions/10975-whiteIvy/01-expeditionFk.sql
new file mode 100644
index 000000000..ac1e01e6f
--- /dev/null
+++ b/db/versions/10975-whiteIvy/01-expeditionFk.sql
@@ -0,0 +1 @@
+CREATE INDEX expeditionLog_expeditionFk_IDX USING BTREE ON srt.expeditionLog (expeditionFk);
diff --git a/docker-compose.yml b/docker-compose.yml
index 0d2db1a63..5bb168093 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,10 +1,11 @@
version: '3.7'
services:
front:
- image: registry.verdnatura.es/salix-front:${BRANCH_NAME:?}
+ image: registry.verdnatura.es/salix-front:${VERSION:?}
build:
- context: .
- dockerfile: front/Dockerfile
+ context: front
+ environment:
+ - TZ
ports:
- 80
deploy:
@@ -16,12 +17,16 @@ services:
limits:
memory: 1G
back:
- image: registry.verdnatura.es/salix-back:${BRANCH_NAME:?}
- build: .
+ image: registry.verdnatura.es/salix-back:${VERSION:?}
+ build:
+ context: .
+ dockerfile: back/Dockerfile
+ environment:
+ - TZ
+ - NODE_ENV
+ - DEBUG
ports:
- 3000
- environment:
- - NODE_ENV
configs:
- source: datasources
target: /etc/salix/datasources.json
diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js
index 6f78d7c4e..dba430e66 100644
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@@ -145,6 +145,7 @@ export default {
adController: 'vn-account-samba vn-textfield[ng-model="$ctrl.config.adController"]',
adUser: 'vn-account-samba vn-textfield[ng-model="$ctrl.config.adUser"]',
adPassword: 'vn-account-samba vn-textfield[ng-model="$ctrl.config.adPassword"]',
+ userDn: 'vn-account-samba vn-textfield[ng-model="$ctrl.config.userDn"]',
verifyCert: 'vn-account-samba vn-check[ng-model="$ctrl.config.verifyCert"]',
save: 'vn-account-samba vn-submit'
},
@@ -409,11 +410,11 @@ export default {
inactiveIcon: 'vn-item-descriptor vn-icon[icon="icon-unavailable"]'
},
itemRequest: {
- firstRequestItemID: 'vn-item-request vn-tbody > vn-tr:nth-child(1) > vn-td-editable:nth-child(7)',
- firstRequestQuantity: 'vn-item-request vn-tbody > vn-tr:nth-child(1) > vn-td-editable:nth-child(8)',
- firstRequestConcept: 'vn-item-request vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(9)',
- firstRequestStatus: 'vn-item-request vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(10)',
- secondRequestStatus: 'vn-item-request vn-tbody > vn-tr:nth-child(2) > vn-td:nth-child(10)',
+ firstRequestItemID: 'vn-item-request vn-tbody > vn-tr:nth-child(1) > vn-td-editable:nth-child(8)',
+ firstRequestQuantity: 'vn-item-request vn-tbody > vn-tr:nth-child(1) > vn-td-editable:nth-child(9)',
+ firstRequestConcept: 'vn-item-request vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(10)',
+ firstRequestStatus: 'vn-item-request vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(11)',
+ secondRequestStatus: 'vn-item-request vn-tbody > vn-tr:nth-child(2) > vn-td:nth-child(11)',
secondRequestDecline: 'vn-item-request vn-tr:nth-child(2) vn-icon-button[icon="thumb_down"]',
declineReason: 'vn-textarea[ng-model="$ctrl.denyObservation"]'
},
@@ -722,7 +723,7 @@ export default {
isFullMovable: 'vn-check[ng-model="filter.isFullMovable"]',
warehouseFk: 'vn-autocomplete[label="Warehouse"]',
tableButtonSearch: 'vn-button[vn-tooltip="Search"]',
- moveButton: 'vn-button[vn-tooltip="Advance tickets"]',
+ moveButton: 'vn-button[vn-tooltip="Advance tickets with negatives"]',
acceptButton: '.vn-confirm.shown button[response="accept"]',
firstCheck: 'tbody > tr:nth-child(2) > td > vn-check',
tableId: 'vn-textfield[name="id"]',
@@ -734,7 +735,7 @@ export default {
},
createStateView: {
state: 'vn-autocomplete[ng-model="$ctrl.stateFk"]',
- worker: 'vn-worker-autocomplete[ng-model="$ctrl.workerFk"]',
+ worker: 'vn-worker-autocomplete[ng-model="$ctrl.userFk"]',
saveStateButton: `button[type=submit]`
},
claimsIndex: {
@@ -1192,7 +1193,7 @@ export default {
secondBuyPacking: 'vn-entry-buy-index tbody:nth-child(3) > tr:nth-child(1) vn-input-number[ng-model="buy.packing"]',
secondBuyWeight: 'vn-entry-buy-index tbody:nth-child(3) > tr:nth-child(1) vn-input-number[ng-model="buy.weight"]',
secondBuyStickers: 'vn-entry-buy-index tbody:nth-child(3) > tr:nth-child(1) vn-input-number[ng-model="buy.stickers"]',
- secondBuyPackage: 'vn-entry-buy-index tbody:nth-child(3) > tr:nth-child(1) vn-autocomplete[ng-model="buy.packageFk"]',
+ secondBuyPackage: 'vn-entry-buy-index tbody:nth-child(3) > tr:nth-child(1) vn-autocomplete[ng-model="buy.packagingFk"]',
secondBuyQuantity: 'vn-entry-buy-index tbody:nth-child(3) > tr:nth-child(1) vn-input-number[ng-model="buy.quantity"]',
secondBuyItem: 'vn-entry-buy-index tbody:nth-child(3) > tr:nth-child(1) vn-autocomplete[ng-model="buy.itemFk"]',
importButton: 'vn-entry-buy-index vn-icon[icon="publish"]',
diff --git a/e2e/paths/03-worker/04_time_control.spec.js b/e2e/paths/03-worker/04_time_control.spec.js
index 5f64aa6ce..c6589d2e3 100644
--- a/e2e/paths/03-worker/04_time_control.spec.js
+++ b/e2e/paths/03-worker/04_time_control.spec.js
@@ -56,63 +56,6 @@ describe('Worker time control path', () => {
expect(result).toContain(month);
});
- it(`should return error when insert 'out' of first entry`, async() => {
- pending('https://redmine.verdnatura.es/issues/4707');
- await page.waitToClick(selectors.workerTimeControl.mondayAddTimeButton);
- await page.pickTime(selectors.workerTimeControl.dialogTimeInput, eightAm);
- await page.autocompleteSearch(selectors.workerTimeControl.dialogTimeDirection, 'out');
- await page.respondToDialog('accept');
- const message = await page.waitForSnackbar();
-
- expect(message.text).toBeDefined();
- });
-
- it(`should insert 'in' monday`, async() => {
- pending('https://redmine.verdnatura.es/issues/4707');
- await page.waitToClick(selectors.workerTimeControl.mondayAddTimeButton);
- await page.pickTime(selectors.workerTimeControl.dialogTimeInput, eightAm);
- await page.autocompleteSearch(selectors.workerTimeControl.dialogTimeDirection, 'in');
- await page.respondToDialog('accept');
- const result = await page.waitToGetProperty(selectors.workerTimeControl.firstEntryOfMonday, 'innerText');
-
- expect(result).toEqual(eightAm);
- });
-
- it(`should insert 'out' monday`, async() => {
- pending('https://redmine.verdnatura.es/issues/4707');
- await page.waitToClick(selectors.workerTimeControl.mondayAddTimeButton);
- await page.pickTime(selectors.workerTimeControl.dialogTimeInput, fourPm);
- await page.autocompleteSearch(selectors.workerTimeControl.dialogTimeDirection, 'out');
- await page.respondToDialog('accept');
- const result = await page.waitToGetProperty(selectors.workerTimeControl.secondEntryOfMonday, 'innerText');
-
- expect(result).toEqual(fourPm);
- });
-
- it(`should check Hank Pym worked 8:20 hours`, async() => {
- pending('https://redmine.verdnatura.es/issues/4707');
- await page.waitForTextInElement(selectors.workerTimeControl.mondayWorkedHours, '08:20 h.');
- await page.waitForTextInElement(selectors.workerTimeControl.weekWorkedHours, '08:20 h.');
- });
-
- it('should remove first entry of monday', async() => {
- pending('https://redmine.verdnatura.es/issues/4707');
- await page.waitForTextInElement(selectors.workerTimeControl.firstEntryOfMonday, eightAm);
- await page.waitForTextInElement(selectors.workerTimeControl.secondEntryOfMonday, fourPm);
- await page.waitToClick(selectors.workerTimeControl.firstEntryOfMondayDelete);
- await page.respondToDialog('accept');
- const message = await page.waitForSnackbar();
-
- expect(message.text).toContain('Entry removed');
- });
-
- it(`should be the 'out' the first entry of monday`, async() => {
- pending('https://redmine.verdnatura.es/issues/4707');
- const result = await page.waitToGetProperty(selectors.workerTimeControl.firstEntryOfMonday, 'innerText');
-
- expect(result).toEqual(fourPm);
- });
-
it('should change week of month', async() => {
await page.click(selectors.workerTimeControl.thrirdWeekDay);
const result = await page.getProperty(selectors.workerTimeControl.mondayWorkedHours, 'innerText');
diff --git a/e2e/paths/04-item/02_basic_data.spec.js b/e2e/paths/04-item/02_basic_data.spec.js
index f177a98df..3bad18303 100644
--- a/e2e/paths/04-item/02_basic_data.spec.js
+++ b/e2e/paths/04-item/02_basic_data.spec.js
@@ -27,11 +27,8 @@ describe('Item Edit basic data path', () => {
it(`should edit the item basic data and confirm the item data was edited`, async() => {
const values = {
- name: 'Rose of Purity',
- longName: 'RS Rose of Purity',
type: 'Anthurium',
intrastat: 'Coral y materiales similares',
- origin: 'Spain',
relevancy: 1,
generic: 'Pallet',
isActive: false,
diff --git a/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js b/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js
index 6264073f6..4f54ad860 100644
--- a/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js
+++ b/e2e/paths/05-ticket/01-sale/02_edit_sale.spec.js
@@ -134,14 +134,6 @@ describe('Ticket Edit sale path', () => {
await page.accessToSection('ticket.card.sale');
});
- it('should try to add a higher quantity value and then receive an error', async() => {
- await page.waitToClick(selectors.ticketSales.firstSaleQuantityCell);
- await page.type(selectors.ticketSales.firstSaleQuantity, '11\u000d');
- const message = await page.waitForSnackbar();
-
- expect(message.text).toContain('The new quantity should be smaller than the old one');
- });
-
it('should remove 1 from the first sale quantity', async() => {
await page.waitToClick(selectors.ticketSales.firstSaleQuantityCell);
await page.waitForSelector(selectors.ticketSales.firstSaleQuantity);
@@ -196,17 +188,6 @@ describe('Ticket Edit sale path', () => {
expect(result).toContain('22.50');
});
- it('should check in the history that logs has been added', async() => {
- pending('https://redmine.verdnatura.es/issues/5455');
- await page.reload({waitUntil: ['networkidle0', 'domcontentloaded']});
- await page.waitToClick(selectors.ticketSales.firstSaleHistoryButton);
- await page.waitForSelector(selectors.ticketSales.firstSaleHistory);
- const result = await page.countElement(selectors.ticketSales.firstSaleHistory);
-
- expect(result).toBeGreaterThan(0);
- await page.waitToClick(selectors.ticketSales.closeHistory);
- });
-
it('should recalculate price of sales', async() => {
await page.waitToClick(selectors.ticketSales.firstSaleCheckbox);
await page.waitToClick(selectors.ticketSales.secondSaleCheckbox);
@@ -220,7 +201,7 @@ describe('Ticket Edit sale path', () => {
it('should log in as salesAssistant and navigate to ticket sales', async() => {
await page.loginAndModule('salesAssistant', 'ticket');
- await page.accessToSearchResult('17');
+ await page.accessToSearchResult('15');
await page.accessToSection('ticket.card.sale');
});
@@ -244,7 +225,8 @@ describe('Ticket Edit sale path', () => {
});
it('should show error trying to delete a ticket with a refund', async() => {
- await page.accessToSearchResult('16');
+ await page.loginAndModule('production', 'ticket');
+ await page.accessToSearchResult('8');
await page.waitToClick(selectors.ticketDescriptor.moreMenu);
await page.waitToClick(selectors.ticketDescriptor.moreMenuDeleteTicket);
await page.waitToClick(selectors.globalItems.acceptButton);
@@ -324,7 +306,7 @@ describe('Ticket Edit sale path', () => {
});
it('should confirm the transfered quantity is the correct one', async() => {
- const result = await page.waitToGetProperty(selectors.ticketSales.secondSaleQuantityCell, 'innerText');
+ const result = await page.waitToGetProperty(selectors.ticketSales.firstSaleQuantityCell, 'innerText');
expect(result).toContain('20');
});
@@ -378,7 +360,7 @@ describe('Ticket Edit sale path', () => {
await page.waitToClick(selectors.ticketSales.moveToNewTicketButton);
const message = await page.waitForSnackbar();
- expect(message.text).toContain(`You can't create a ticket for a inactive client`);
+ expect(message.text).toContain(`You can't create a ticket for an inactive client`);
await page.closePopup();
});
diff --git a/e2e/paths/05-ticket/02_expeditions_and_log.spec.js b/e2e/paths/05-ticket/02_expeditions_and_log.spec.js
index b97576940..4e8005043 100644
--- a/e2e/paths/05-ticket/02_expeditions_and_log.spec.js
+++ b/e2e/paths/05-ticket/02_expeditions_and_log.spec.js
@@ -27,6 +27,6 @@ describe('Ticket expeditions and log path', () => {
const result = await page
.countElement(selectors.ticketExpedition.expeditionRow);
- expect(result).toEqual(4);
+ expect(result).toEqual(6);
});
});
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/e2e/paths/05-ticket/11_diary.spec.js b/e2e/paths/05-ticket/11_diary.spec.js
deleted file mode 100644
index e4c63855a..000000000
--- a/e2e/paths/05-ticket/11_diary.spec.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import selectors from '../../helpers/selectors.js';
-import getBrowser from '../../helpers/puppeteer';
-
-// #2221 Local MySQL8 crashes when rest method Items/getBalance is called
-xdescribe('Ticket diary path', () => {
- let page;
-
- beforeAll(async() => {
- page = (await getBrowser()).page;
- await page.loginAndModule('employee', 'ticket');
- });
-
- afterAll(async() => {
- await page.browser().close();
- });
-
- it(`should navigate to item diary from ticket sale and check the lines`, async() => {
- await page.accessToSearchResult('1');
- await page.waitToClick(selectors.ticketSummary.firstSaleItemId);
- await page.waitToClick(selectors.ticketSummary.popoverDiaryButton);
- await page.waitForState('item.card.diary');
-
- const secondIdClass = await page.getClassName(selectors.itemDiary.secondTicketId);
- const fourthBalanceClass = await page.getClassName(selectors.itemDiary.fourthBalance);
- const firstBalanceClass = await page.getClassName(selectors.itemDiary.firstBalance);
-
- expect(secondIdClass).toContain('message');
- expect(fourthBalanceClass).toContain('message');
- expect(firstBalanceClass).toContain('balance');
- });
-});
diff --git a/e2e/paths/05-ticket/18_index_payout.spec.js b/e2e/paths/05-ticket/18_index_payout.spec.js
index 7e5201d11..9c5518424 100644
--- a/e2e/paths/05-ticket/18_index_payout.spec.js
+++ b/e2e/paths/05-ticket/18_index_payout.spec.js
@@ -35,7 +35,7 @@ describe('Ticket index payout path', () => {
await page.waitToClick(selectors.ticketsIndex.openAdvancedSearchButton);
await page.write(selectors.ticketsIndex.advancedSearchClient, '1101');
await page.keyboard.press('Enter');
- await page.waitForNumberOfElements(selectors.ticketsIndex.anySearchResult, 9);
+ await page.waitForNumberOfElements(selectors.ticketsIndex.anySearchResult, 10);
await page.waitToClick(selectors.ticketsIndex.firstTicketCheckbox);
await page.waitToClick(selectors.ticketsIndex.secondTicketCheckbox);
diff --git a/e2e/paths/06-claim/01_basic_data.spec.js b/e2e/paths/06-claim/01_basic_data.spec.js
index 0a08cad9f..2df95bd4a 100644
--- a/e2e/paths/06-claim/01_basic_data.spec.js
+++ b/e2e/paths/06-claim/01_basic_data.spec.js
@@ -21,7 +21,7 @@ describe('Claim edit basic data path', () => {
});
it(`should edit claim state and observation fields`, async() => {
- await page.autocompleteSearch(selectors.claimBasicData.claimState, 'Gestionado');
+ await page.autocompleteSearch(selectors.claimBasicData.claimState, 'Resuelto');
await page.clearInput(selectors.claimBasicData.packages);
await page.write(selectors.claimBasicData.packages, '2');
await page.waitToClick(selectors.claimBasicData.saveButton);
@@ -48,7 +48,7 @@ describe('Claim edit basic data path', () => {
await page.waitForSelector(selectors.claimBasicData.claimState);
const result = await page.waitToGetProperty(selectors.claimBasicData.claimState, 'value');
- expect(result).toEqual('Gestionado');
+ expect(result).toEqual('Resuelto');
});
it('should confirm the "is paid with mana" and "Pick up" checkbox are checked', async() => {
diff --git a/e2e/paths/06-claim/02_detail.spec.js b/e2e/paths/06-claim/02_detail.spec.js
deleted file mode 100644
index eb4ac5d71..000000000
--- a/e2e/paths/06-claim/02_detail.spec.js
+++ /dev/null
@@ -1,114 +0,0 @@
-import selectors from '../../helpers/selectors.js';
-import getBrowser from '../../helpers/puppeteer.js';
-
-// #1528 e2e claim/detail
-xdescribe('Claim detail', () => {
- let browser;
- let page;
-
- beforeAll(async() => {
- browser = await getBrowser();
- page = browser.page;
- await page.loginAndModule('salesPerson', 'claim');
- await page.accessToSearchResult('1');
- await page.accessToSection('claim.card.detail');
- });
-
- afterAll(async() => {
- await browser.close();
- });
-
- it('should add the first claimable item from ticket to the claim', async() => {
- await page.waitToClick(selectors.claimDetail.addItemButton);
- await page.waitToClick(selectors.claimDetail.firstClaimableSaleFromTicket);
- const message = await page.waitForSnackbar();
-
- expect(message.text).toContain('Data saved!');
- });
-
- it('should confirm the claim contains now two items', async() => {
- const result = await page.countElement(selectors.claimDetail.claimDetailLine);
-
- expect(result).toEqual(2);
- });
-
- it('should edit de first item claimed quantity', async() => {
- await page.clearInput(selectors.claimDetail.firstItemQuantityInput); // selector deleted, find new upon fixes
- await page.write(selectors.claimDetail.firstItemQuantityInput, '4'); // selector deleted, find new upon fixes
- await page.keyboard.press('Enter');
- const message = await page.waitForSnackbar();
-
- expect(message.text).toContain('Data saved!');
- });
-
- it('should confirm the first item quantity, and the claimed total were correctly edited', async() => {
- const claimedQuantity = page
- .waitToGetProperty(selectors.claimDetail.firstItemQuantityInput, 'value'); // selector deleted, find new upon fixes
-
- const totalClaimed = page
- .waitToGetProperty(selectors.claimDetail.totalClaimed, 'innerText');
-
- expect(claimedQuantity).toEqual('4');
- expect(totalClaimed).toContain('€47.62');
- });
-
- it('should login as salesAssistant and navigate to the claim.detail section', async() => {
- await page.loginAndModule('salesAssistant', 'claim');
- await page.accessToSearchResult('1');
- await page.accessToSection('claim.card.detail');
- let url = await page.expectURL('/detail'); // replace with waitForState
-
- expect(url).toBe(true);
- });
-
- it('should edit de second item claimed discount', async() => {
- await page.waitToClick(selectors.claimDetail.secondItemDiscount);
- await page.write(selectors.claimDetail.discount, '100');
- await page.keyboard.press('Enter');
- const message = await page.waitForSnackbar();
-
- expect(message.text).toContain('Data saved!');
- });
-
- it('should check the mana is the expected one', async() => {
- await page.waitToClick(selectors.claimDetail.secondItemDiscount);
- const result = await page.waitToGetProperty(selectors.claimDetail.discoutPopoverMana, 'innerText');
-
- expect(result).toContain('MANÁ: €106');
- });
-
- it('should delete the second item from the claim', async() => {
- await page.waitToClick(selectors.claimDetail.secondItemDeleteButton);
- const message = await page.waitForSnackbar();
-
- expect(message.text).toContain('Data saved!');
- });
-
- it('should confirm the claim contains now one item', async() => {
- const result = await page.countElement(selectors.claimDetail.claimDetailLine);
-
- expect(result).toEqual(1);
- });
-
- it('should add the deleted ticket from to the claim', async() => {
- await page.waitToClick(selectors.claimDetail.addItemButton);
- await page.waitToClick(selectors.claimDetail.firstClaimableSaleFromTicket);
- const message = await page.waitForSnackbar();
-
- expect(message.text).toContain('Data saved!');
- });
-
- it(`should have been redirected to the next section in claims`, async() => {
- let url = await page.expectURL('development'); // replace with waitForState
-
- expect(url).toBe(true);
- });
-
- it('should navigate back to claim.detail to confirm the claim contains now two items', async() => {
- await page.accessToSection('claim.card.detail');
- await page.waitForSelector(selectors.claimDetail.claimDetailLine);
- const result = await page.countElement(selectors.claimDetail.claimDetailLine);
-
- expect(result).toEqual(2);
- });
-});
diff --git a/e2e/paths/08-route/03_create_and_clone.spec.js b/e2e/paths/08-route/03_create_and_clone.spec.js
index 0b8da98b4..31c0cfc18 100644
--- a/e2e/paths/08-route/03_create_and_clone.spec.js
+++ b/e2e/paths/08-route/03_create_and_clone.spec.js
@@ -26,7 +26,7 @@ describe('Route create path', () => {
await page.waitToClick(selectors.createRouteView.submitButton);
const message = await page.waitForSnackbar();
- expect(message.text).toContain('Access denied');
+ expect(message.text).toContain('Access Denied');
});
});
diff --git a/e2e/paths/09-invoice-out/01_summary.spec.js b/e2e/paths/09-invoice-out/01_summary.spec.js
index 728f0130a..09ac66ffc 100644
--- a/e2e/paths/09-invoice-out/01_summary.spec.js
+++ b/e2e/paths/09-invoice-out/01_summary.spec.js
@@ -28,7 +28,6 @@ describe('InvoiceOut summary path', () => {
it('should contain the tax breakdown', async() => {
const firstTax = await page.waitToGetProperty(selectors.invoiceOutSummary.taxOne, 'innerText');
-
const secondTax = await page.waitToGetProperty(selectors.invoiceOutSummary.taxTwo, 'innerText');
expect(firstTax).toContain('10%');
@@ -37,10 +36,9 @@ describe('InvoiceOut summary path', () => {
it('should contain the tickets info', async() => {
const firstTicket = await page.waitToGetProperty(selectors.invoiceOutSummary.ticketOne, 'innerText');
-
const secondTicket = await page.waitToGetProperty(selectors.invoiceOutSummary.ticketTwo, 'innerText');
expect(firstTicket).toContain('Bat cave');
- expect(secondTicket).toContain('Stark tower');
+ expect(secondTicket).toContain('Bat cave');
});
});
diff --git a/e2e/paths/10-travel/02_basic_data_and_log.spec.js b/e2e/paths/10-travel/02_basic_data_and_log.spec.js
index 5abf8a65e..701e6b1b4 100644
--- a/e2e/paths/10-travel/02_basic_data_and_log.spec.js
+++ b/e2e/paths/10-travel/02_basic_data_and_log.spec.js
@@ -23,8 +23,14 @@ describe('Travel basic data path', () => {
});
it('should set a wrong delivery date then receive an error on submit', async() => {
+ await page.loginAndModule('buyer', 'travel');
+ await page.write(selectors.travelIndex.generalSearchFilter, '4');
+ await page.keyboard.press('Enter');
+ await page.accessToSection('travel.card.basicData');
+ await page.waitForState('travel.card.basicData');
+
const lastMonth = Date.vnNew();
- lastMonth.setMonth(lastMonth.getMonth() - 1);
+ lastMonth.setMonth(lastMonth.getMonth() - 2);
await page.pickDate(selectors.travelBasicData.deliveryDate, lastMonth);
await page.waitToClick(selectors.travelBasicData.save);
@@ -39,7 +45,7 @@ describe('Travel basic data path', () => {
await page.waitToClick(selectors.travelBasicData.undoChanges);
const result = await page.waitToGetProperty(selectors.travelBasicData.reference, 'value');
- expect(result).toEqual('third travel');
+ expect(result).toEqual('fourth travel');
});
it('should now edit the whole form then save', async() => {
@@ -88,17 +94,4 @@ describe('Travel basic data path', () => {
it(`should check the received checkbox was saved even tho it doesn't make sense`, async() => {
await page.waitForClassPresent(selectors.travelBasicData.received, 'checked');
});
-
- it('should navigate to the travel logs', async() => {
- pending('https://redmine.verdnatura.es/issues/5455');
- await page.accessToSection('travel.card.log');
- await page.waitForState('travel.card.log');
- });
-
- it('should check the 1st log contains details from the changes made', async() => {
- pending('https://redmine.verdnatura.es/issues/5455');
- const result = await page.waitToGetProperty(selectors.travelLog.firstLogFirstTD, 'innerText');
-
- expect(result).toContain('new reference!');
- });
});
diff --git a/e2e/paths/13-supplier/01_summary_and_descriptor.spec.js b/e2e/paths/13-supplier/01_summary_and_descriptor.spec.js
index 591a6116a..e82f851ea 100644
--- a/e2e/paths/13-supplier/01_summary_and_descriptor.spec.js
+++ b/e2e/paths/13-supplier/01_summary_and_descriptor.spec.js
@@ -24,7 +24,7 @@ describe('Supplier summary & descriptor path', () => {
it(`should confirm there's data on the summary header`, async() => {
const result = await page.waitToGetProperty(selectors.supplierSummary.header, 'innerText');
- expect(result).toContain('Plants SL - 1');
+ expect(result).toContain('PLANTS SL - 1');
});
it(`should confirm there's data on the summary basic data`, async() => {
diff --git a/e2e/paths/13-supplier/02_basic_data.spec.js b/e2e/paths/13-supplier/02_basic_data.spec.js
index 72ea6d890..79a9898ca 100644
--- a/e2e/paths/13-supplier/02_basic_data.spec.js
+++ b/e2e/paths/13-supplier/02_basic_data.spec.js
@@ -41,10 +41,10 @@ describe('Supplier basic data path', () => {
expect(result).toEqual('Plants Nick SL');
});
- it('should check the isSerious checkbox is now unchecked', async() => {
+ it('should check the isSerious checkbox is now checked', async() => {
const result = await page.checkboxState(selectors.supplierBasicData.isSerious);
- expect(result).toBe('unchecked');
+ expect(result).toBe('checked');
});
it('should check the isActive checkbox is now unchecked', async() => {
diff --git a/e2e/paths/13-supplier/03_fiscal_data.spec.js b/e2e/paths/13-supplier/03_fiscal_data.spec.js
index 891b769c9..ccd9d7809 100644
--- a/e2e/paths/13-supplier/03_fiscal_data.spec.js
+++ b/e2e/paths/13-supplier/03_fiscal_data.spec.js
@@ -1,20 +1,5 @@
import getBrowser from '../../helpers/puppeteer';
-const $ = {
- saveButton: 'vn-supplier-fiscal-data button[type="submit"]',
-};
-const $inputs = {
- province: 'vn-supplier-fiscal-data [name="province"]',
- country: 'vn-supplier-fiscal-data [name="country"]',
- postcode: 'vn-supplier-fiscal-data [name="postcode"]',
- city: 'vn-supplier-fiscal-data [name="city"]',
- socialName: 'vn-supplier-fiscal-data [name="socialName"]',
- taxNumber: 'vn-supplier-fiscal-data [name="taxNumber"]',
- account: 'vn-supplier-fiscal-data [name="account"]',
- sageWithholding: 'vn-supplier-fiscal-data [ng-model="$ctrl.supplier.sageWithholdingFk"]',
- sageTaxType: 'vn-supplier-fiscal-data [ng-model="$ctrl.supplier.sageTaxTypeFk"]'
-};
-
describe('Supplier fiscal data path', () => {
let browser;
let page;
@@ -30,7 +15,7 @@ describe('Supplier fiscal data path', () => {
await browser.close();
});
- it('should attempt to edit the fiscal data and check data is saved', async() => {
+ it('should attempt to edit the fiscal data and check data iss saved', async() => {
await page.accessToSection('supplier.card.fiscalData');
const form = 'vn-supplier-fiscal-data form';
@@ -39,17 +24,17 @@ describe('Supplier fiscal data path', () => {
country: null,
postcode: null,
city: 'Valencia',
- socialName: 'Farmer King SL',
- taxNumber: 'Wrong tax number',
+ socialName: 'FARMER KING SL',
+ taxNumber: '12345678Z',
account: '0123456789',
sageWithholding: 'retencion estimacion objetiva',
sageTaxType: 'operaciones no sujetas'
};
- const errorMessage = await page.sendForm(form, values);
- const message = await page.sendForm(form, {
- taxNumber: '12345678Z'
+ const errorMessage = await page.sendForm(form, {
+ taxNumber: 'Wrong tax number'
});
+ const message = await page.sendForm(form, values);
await page.reloadSection('supplier.card.fiscalData');
const formValues = await page.fetchForm(form, Object.keys(values));
@@ -61,7 +46,7 @@ describe('Supplier fiscal data path', () => {
country: 'España',
postcode: '46000',
city: 'Valencia',
- socialName: 'Farmer King SL',
+ socialName: 'FARMER KING SL',
taxNumber: '12345678Z',
account: '0123456789',
sageWithholding: 'RETENCION ESTIMACION OBJETIVA',
diff --git a/e2e/paths/14-account/05_connections.spec.js b/e2e/paths/14-account/05_connections.spec.js
index 89b286101..49d5f612d 100644
--- a/e2e/paths/14-account/05_connections.spec.js
+++ b/e2e/paths/14-account/05_connections.spec.js
@@ -22,12 +22,4 @@ describe('Account Connections path', () => {
expect(firstResult).toContain(account);
});
-
- it('should kill this connection and then get redirected to the login page', async() => {
- await page.waitToClick(selectors.accountConnections.deleteFirstConnection);
- await page.waitToClick(selectors.globalItems.acceptButton);
- const message = await page.waitForSnackbar();
-
- expect(message.text).toContain('Your session has expired, please login again');
- });
});
diff --git a/e2e/paths/14-account/06_accounts.spec.js b/e2e/paths/14-account/06_accounts.spec.js
index 83893e0cf..8bd6ea7d5 100644
--- a/e2e/paths/14-account/06_accounts.spec.js
+++ b/e2e/paths/14-account/06_accounts.spec.js
@@ -23,18 +23,6 @@ describe('Account Accounts path', () => {
expect(message.text).toContain('Roles synchronized!');
});
- it('should sync user', async() => {
- await page.waitToClick(selectors.accountAccounts.syncUser);
- await page.write(selectors.accountAccounts.syncUserName, 'sysadmin');
- await page.write(selectors.accountAccounts.syncUserPassword, 'nightmare');
-
- await page.waitToClick(selectors.accountAccounts.buttonAccept);
-
- const message = await page.waitForSnackbar();
-
- expect(message.text).toContain('User synchronized!');
- });
-
it('should relogin', async() => {
await page.loginAndModule('sysadmin', 'account');
await page.accessToSection('account.accounts');
diff --git a/e2e/paths/14-account/08_samba.spec.js b/e2e/paths/14-account/08_samba.spec.js
index 6e7ef9bbf..a92344acb 100644
--- a/e2e/paths/14-account/08_samba.spec.js
+++ b/e2e/paths/14-account/08_samba.spec.js
@@ -20,8 +20,9 @@ describe('Account Samba path', () => {
await page.waitToClick(selectors.accountSamba.checkEnable);
await page.write(selectors.accountSamba.adDomain, '1234');
await page.write(selectors.accountSamba.adController, '1234');
- await page.write(selectors.accountSamba.adUser, 'nightmare');
- await page.write(selectors.accountSamba.adPassword, 'sysadmin');
+ await page.write(selectors.accountSamba.adUser, 'sysadmin');
+ await page.write(selectors.accountSamba.adPassword, 'nightmare');
+ await page.write(selectors.accountSamba.userDn, 'testDn');
await page.waitToClick(selectors.accountSamba.verifyCert);
await page.waitToClick(selectors.accountSamba.save);
diff --git a/e2e/helpers/tests.js b/e2e/tests.js
similarity index 69%
rename from e2e/helpers/tests.js
rename to e2e/tests.js
index 992ec051f..829056f4c 100644
--- a/e2e/helpers/tests.js
+++ b/e2e/tests.js
@@ -1,11 +1,16 @@
+/* eslint-disable no-console */
require('@babel/register')({presets: ['@babel/env']});
require('core-js/stable');
require('regenerator-runtime/runtime');
require('vn-loopback/server/boot/date')();
+const getopts = require('getopts');
+
+const path = require('path');
+const Myt = require('@verdnatura/myt/myt');
+const Run = require('@verdnatura/myt/myt-run');
const axios = require('axios');
-const Docker = require('../../db/docker.js');
-const e2eConfig = require('./config.js');
+const e2eConfig = require('./helpers/config.js');
const log = require('fancy-log');
process.on('warning', warning => {
@@ -15,12 +20,17 @@ process.on('warning', warning => {
});
async function test() {
- if (process.argv[2] === 'show')
+ const opts = getopts(process.argv.slice(2), {
+ boolean: ['show']
+ });
+ if (opts.show)
process.env.E2E_SHOW = true;
- const container = new Docker('salix-db');
-
- await container.run();
+ console.log('Building and running DB container.');
+ const myt = new Myt();
+ await myt.init({workspace: path.join(__dirname, '..')});
+ await myt.run(Run);
+ await myt.deinit();
const Jasmine = require('jasmine');
const jasmine = new Jasmine();
@@ -49,6 +59,20 @@ async function test() {
random: false,
});
+ const SpecReporter = require('jasmine-spec-reporter').SpecReporter;
+ jasmine.addReporter(new SpecReporter({
+ spec: {
+ displaySuccessful: false,
+ displayPending: false,
+ displayDuration: false,
+ displayFailed: true,
+ displayErrorMessages: true,
+ },
+ summary: {
+ displayPending: false,
+ }
+ }));
+
await backendStatus();
jasmine.jasmine.DEFAULT_TIMEOUT_INTERVAL = 30000;
@@ -56,7 +80,7 @@ async function test() {
}
async function backendStatus() {
- log('Awaiting backend connection...');
+ log('Awaiting backend connection.');
const milliseconds = 1000;
const maxAttempts = 10;
diff --git a/front/Dockerfile b/front/Dockerfile
index 098ee161e..c507d863c 100644
--- a/front/Dockerfile
+++ b/front/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:stretch-slim
+FROM debian:bookworm-slim
EXPOSE 80
ENV TZ Europe/Madrid
@@ -10,7 +10,7 @@ RUN apt-get update \
&& ln -sf /dev/stderr /var/log/nginx/error.log
WORKDIR /etc/nginx
-COPY front/nginx.conf sites-available/salix
+COPY nginx.conf sites-available/salix
RUN rm sites-enabled/default && ln -s ../sites-available/salix sites-enabled/salix
COPY dist /salix/dist
diff --git a/front/core/components/treeview/index.spec.js b/front/core/components/treeview/index.spec.js
index 9277f3ee4..1979d517f 100644
--- a/front/core/components/treeview/index.spec.js
+++ b/front/core/components/treeview/index.spec.js
@@ -33,18 +33,6 @@ describe('Component vnTreeview', () => {
$element.remove();
});
- // See how to test DOM element in Jest
- xdescribe('undrop()', () => {
- it(`should reset all drop events and properties`, () => {
- controller.dropping = angular.element(`![]()
+ ng-src="/api/Images/user/160x160/{{::userLog.userFk}}/download?access_token={{::$ctrl.vnToken.tokenMultimedia}}">
@@ -181,7 +181,7 @@
val="{{::nickname}}">
REGISTRO DE LA JORNADA DE LOS TRABAJADORES
+|
+ Según la información recogida en el sistema, adjuntamos la tabla con los registros. Cualquier incidencia rogamos la comunique a laboral@verdnatura.es.
+ De no recibir incidencia por su parte, se entenderá que el registro es correcto. + |
+ ||||
| Empresa: Verdnatura Levante SL | +||||
| Trabajador: ',rh.firstname,' ',rh.lastName, ' | +NIF: ',rh.fi, ' | +|||
| AÑO: ',rh.año, ' | +MES: ',UPPER(rh.mes), ' | +Calendario Laboral: ',rh.hoursWeek,' horas semanales | +||
+
| Fecha: | +Día: | +Fichadas: | +Horas a trabajar: | +Horas trabajadas: | +Balance: | +
| ', DATE_FORMAT( rh.dated, '%d-%m-%y'), + ' | ', CONCAT(UCASE(LEFT(DAYNAME(rh.dated), 1)), SUBSTRING(DAYNAME(rh.dated), 2)), + ' | ', IFNULL(rh.timeWorkDay,' '),' ', IFNULL(rh.type,' '), + ' | ', rh.tm, + ' | ', SUBSTRING_INDEX(rh.tc, '.', 1), + ' | ', SUBSTRING_INDEX(rh.balance, '.', 1), ' | + | + | + | Total horas trabajadas: | +', SUBSTRING_INDEX(SEC_TO_TIME(SUM(TIME_TO_SEC(rh.tc))), '.', 1),' | +', SUBSTRING_INDEX(SEC_TO_TIME(SUM(TIME_TO_SEC(rh.balance))), '.', 1),' | + +
', + 'Eliminado artículo ', OLD.itemFk, ' tras estado encajado del ticket.
Este email se ha generado automáticamente' ) + ); + END IF; + + IF OLD.quantity > 0 THEN + UPDATE vn.collection c + JOIN vn.ticketCollection tc ON tc.collectionFk = c.id AND tc.ticketFk = OLD.ticketFk + JOIN vn.item i ON i.id = OLD.itemFk + AND (c.itemPackingTypeFk = i.itemPackingTypeFk + OR ISNULL(c.itemPackingTypeFk)) + SET c.saleTotalCount = c.saleTotalCount - 1, + c.salePickedCount = c.salePickedCount - ABS(OLD.isPicked); + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/sale_afterInsert.sql b/db/routines/vn/triggers/sale_afterInsert.sql new file mode 100644 index 000000000..d4c2d60f5 --- /dev/null +++ b/db/routines/vn/triggers/sale_afterInsert.sql @@ -0,0 +1,34 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`sale_afterInsert` + AFTER INSERT ON `sale` + FOR EACH ROW +BEGIN + IF (SELECT COUNT(*) from item i WHERE id = NEW.itemFk AND family = 'SER') THEN + CALL util.throw('Cannot insert a service item into a ticket'); + END IF; + + CALL stock.log_add('sale', NEW.id, NULL); + CALL ticket_requestRecalc(NEW.ticketFk); + + IF NEW.quantity > 0 THEN + + UPDATE vn.collection c + JOIN vn.ticketCollection tc ON tc.collectionFk = c.id + AND tc.ticketFk = NEW.ticketFk + JOIN vn.item i ON i.id = NEW.itemFk + AND (c.itemPackingTypeFk = i.itemPackingTypeFk + OR c.itemPackingTypeFk IS NULL) + SET c.saleTotalCount = c.saleTotalCount + 1; + + INSERT IGNORE INTO `vn`.`routeRecalc` (`routeFk`) + SELECT r.id + FROM vn.sale s + JOIN vn.ticket t ON t.id = s.ticketFk + JOIN vn.route r ON r.id = t.routeFk + WHERE r.isOk = FALSE + AND s.id = NEW.id + AND r.created >= util.VN_CURDATE() + GROUP BY r.id; + END IF; +END$$ +DELIMITER ; diff --git a/db/.archive/224701/00-sale_afterUpdate.sql b/db/routines/vn/triggers/sale_afterUpdate.sql similarity index 83% rename from db/.archive/224701/00-sale_afterUpdate.sql rename to db/routines/vn/triggers/sale_afterUpdate.sql index 407fb52c9..0d21f08d7 100644 --- a/db/.archive/224701/00-sale_afterUpdate.sql +++ b/db/routines/vn/triggers/sale_afterUpdate.sql @@ -1,17 +1,11 @@ -DROP TRIGGER IF EXISTS vn.sale_afterUpdate; -USE vn; - DELIMITER $$ -$$ -CREATE DEFINER=`root`@`localhost` TRIGGER `vn`.`sale_afterUpdate` +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`sale_afterUpdate` AFTER UPDATE ON `sale` FOR EACH ROW BEGIN DECLARE vIsToSendMail BOOL; - DECLARE vPickedLines INT; - DECLARE vCollectionFk INT; DECLARE vUserRole VARCHAR(255); - + IF !(NEW.id <=> OLD.id) OR !(NEW.ticketFk <=> OLD.ticketFk) OR !(NEW.itemFk <=> OLD.itemFk) @@ -34,64 +28,61 @@ BEGIN UPDATE ticketRequest SET ticketFk = NEW.ticketFk WHERE saleFk = NEW.id; END IF; - + SELECT account.myUser_getName() INTO vUserRole; SELECT account.user_getMysqlRole(vUserRole) INTO vUserRole; IF !(OLD.quantity <=> NEW.quantity) THEN - SELECT COUNT(*) INTO vIsToSendMail - FROM vncontrol.inter i - JOIN vn.state s ON s.id = i.state_id - WHERE s.code='PACKED' - AND i.Id_Ticket = OLD.ticketFk + SELECT COUNT(*) INTO vIsToSendMail + FROM ticketTracking tt + JOIN vn.state s ON s.id = tt.stateFk + WHERE s.code='PACKED' + AND tt.ticketFk = OLD.ticketFk AND vUserRole IN ('salesPerson', 'salesTeamBoss') LIMIT 1; - - IF vIsToSendMail THEN + + IF vIsToSendMail THEN CALL vn.mail_insert('jefesventas@verdnatura.es', 'noreply@verdnatura.es', CONCAT('Ticket ', OLD.ticketFk ,' modificada cantidad tras encajado'), CONCAT('Ticket ', OLD.ticketFk ,'.
', - 'Modificada la catidad de ', OLD.quantity, ' a ' , NEW.quantity, + 'Modificada la catidad de ', OLD.quantity, ' a ' , NEW.quantity, ' del artículo ', OLD.itemFk, ' tras estado encajado del ticket.
', 'Este email se ha generado automáticamente' ) ); - END IF; + END IF; IF (OLD.quantity > NEW.quantity) THEN INSERT INTO saleComponent(saleFk, componentFk, value) - SELECT NEW.id, cm.id, sc.value + SELECT NEW.id, cm.id, sc.value FROM saleComponent sc JOIN component cd ON cd.id = sc.componentFk JOIN component cm ON cm.code = 'mana' WHERE saleFk = NEW.id AND cd.code = 'lastUnitsDiscount' ON DUPLICATE KEY UPDATE value = sc.value + VALUES(value); - - DELETE sc.* + + DELETE sc.* FROM vn.saleComponent sc JOIN component c ON c.id = sc.componentFk WHERE saleFk = NEW.id AND c.code = 'lastUnitsDiscount'; - END IF; + END IF; INSERT IGNORE INTO `vn`.`routeRecalc` (`routeFk`) - SELECT r.id + SELECT r.id FROM vn.sale s JOIN vn.ticket t ON t.id = s.ticketFk JOIN vn.route r ON r.id = t.routeFk - WHERE r.isOk = FALSE + WHERE r.isOk = FALSE AND s.id = NEW.id - AND r.created >= CURDATE() + AND r.created >= util.VN_CURDATE() GROUP BY r.id; END IF; IF !(ABS(NEW.isPicked) <=> ABS(OLD.isPicked)) AND NEW.quantity > 0 THEN - UPDATE vn.collection c JOIN vn.ticketCollection tc ON tc.collectionFk = c.id AND tc.ticketFk = NEW.ticketFk SET c.salePickedCount = c.salePickedCount + IF(NEW.isPicked != 0, 1, -1); - END IF; IF !(NEW.quantity <=> OLD.quantity) AND (NEW.quantity = 0 OR OLD.quantity = 0) THEN - UPDATE vn.collection c JOIN vn.ticketCollection tc ON tc.collectionFk = c.id AND tc.ticketFk = NEW.ticketFk SET c.saleTotalCount = c.saleTotalCount + IF(OLD.quantity = 0, 1, -1); diff --git a/db/routines/vn/triggers/sale_beforeDelete.sql b/db/routines/vn/triggers/sale_beforeDelete.sql new file mode 100644 index 000000000..a91e7f010 --- /dev/null +++ b/db/routines/vn/triggers/sale_beforeDelete.sql @@ -0,0 +1,18 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`sale_beforeDelete` + BEFORE DELETE ON `sale` + FOR EACH ROW +BEGIN + IF OLD.quantity > 0 THEN + INSERT IGNORE INTO `vn`.`routeRecalc` (`routeFk`) + SELECT r.id + FROM vn.sale s + JOIN vn.ticket t ON t.id = s.ticketFk + JOIN vn.route r ON r.id = t.routeFk + WHERE r.isOk = FALSE + AND s.id = OLD.id + AND r.created >= util.VN_CURDATE() + GROUP BY r.id; + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/sale_beforeInsert.sql b/db/routines/vn/triggers/sale_beforeInsert.sql new file mode 100644 index 000000000..0ef368513 --- /dev/null +++ b/db/routines/vn/triggers/sale_beforeInsert.sql @@ -0,0 +1,9 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`sale_beforeInsert` + BEFORE INSERT ON `sale` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); + SET NEW.originalQuantity = NEW.quantity; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/sale_beforeUpdate.sql b/db/routines/vn/triggers/sale_beforeUpdate.sql new file mode 100644 index 000000000..c5a748503 --- /dev/null +++ b/db/routines/vn/triggers/sale_beforeUpdate.sql @@ -0,0 +1,23 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`sale_beforeUpdate` + BEFORE UPDATE ON `sale` + FOR EACH ROW +BEGIN +/* + IF (SELECT COUNT(*) from item i WHERE id = NEW.itemFk AND family = 'SER') THEN + CALL util.throw('Cannot insert a service item into a ticket'); + END IF; +*/ + SET NEW.editorFk = account.myUser_getId(); + + IF NEW.discount > 100 THEN + SET NEW.discount = 0; + END IF; + + IF old.discount > 0 AND NEW.discount = 0 THEN + INSERT INTO ticketLog + SET originFk = NEW.ticketFk, userFk = account.myUser_getId(), `action` = 'insert', + description = CONCAT('Cambio de descuento del item :', ' ', new.itemFk, ' de ', old.discount ,' a 0 '); + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/sharingCart_beforeDelete.sql b/db/routines/vn/triggers/sharingCart_beforeDelete.sql new file mode 100644 index 000000000..6996b3138 --- /dev/null +++ b/db/routines/vn/triggers/sharingCart_beforeDelete.sql @@ -0,0 +1,11 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`sharingCart_beforeDelete` + BEFORE DELETE ON `sharingCart` + FOR EACH ROW +BEGIN + DELETE sc FROM sharingCartDaily sc + WHERE sc.dated BETWEEN OLD.started AND OLD.ended AND + sc.ownerFk = OLD.workerFk AND + sc.substituteFk = OLD.workerSubstitute; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/sharingCart_beforeInsert.sql b/db/routines/vn/triggers/sharingCart_beforeInsert.sql new file mode 100644 index 000000000..116337b62 --- /dev/null +++ b/db/routines/vn/triggers/sharingCart_beforeInsert.sql @@ -0,0 +1,15 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`sharingCart_beforeInsert` + BEFORE INSERT ON `sharingCart` + FOR EACH ROW +BEGIN + IF NEW.workerFk = NEW.workerSubstitute THEN + CALL util.throw ('worker and workerSubstitute must be different'); + ELSE + INSERT IGNORE INTO sharingCartDaily (ownerFk, substituteFk, dated) + SELECT NEW.workerFk, NEW.workerSubstitute, dated + FROM time + WHERE dated BETWEEN NEW.started AND NEW.ended; + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/sharingCart_beforeUpdate.sql b/db/routines/vn/triggers/sharingCart_beforeUpdate.sql new file mode 100644 index 000000000..91cbfb3d0 --- /dev/null +++ b/db/routines/vn/triggers/sharingCart_beforeUpdate.sql @@ -0,0 +1,21 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`sharingCart_beforeUpdate` + BEFORE UPDATE ON `sharingCart` + FOR EACH ROW +BEGIN + IF NEW.workerFk = NEW.workerSubstitute THEN + CALL util.throw ('worker and workerSubstitute must be different'); + ELSE + DELETE sc FROM sharingCartDaily sc + WHERE sc.dated BETWEEN OLD.started AND OLD.ended AND + sc.ownerFk = OLD.workerFk AND + sc.substituteFk = OLD.workerSubstitute; + + INSERT IGNORE INTO sharingCartDaily (ownerFk, substituteFk, dated) + SELECT NEW.workerFk, NEW.workerSubstitute, dated + FROM time + WHERE dated BETWEEN NEW.started AND NEW.ended; + + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/sharingClient_beforeInsert.sql b/db/routines/vn/triggers/sharingClient_beforeInsert.sql new file mode 100644 index 000000000..eea65e74c --- /dev/null +++ b/db/routines/vn/triggers/sharingClient_beforeInsert.sql @@ -0,0 +1,9 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`sharingClient_beforeInsert` + BEFORE INSERT ON `sharingClient` + FOR EACH ROW +BEGIN + SET NEW.ended = GREATEST(util.VN_CURDATE(),NEW.ended); + SET NEW.started = GREATEST(util.VN_CURDATE(),NEW.started); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/sharingClient_beforeUpdate.sql b/db/routines/vn/triggers/sharingClient_beforeUpdate.sql new file mode 100644 index 000000000..fceab691c --- /dev/null +++ b/db/routines/vn/triggers/sharingClient_beforeUpdate.sql @@ -0,0 +1,9 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`sharingClient_beforeUpdate` + BEFORE UPDATE ON `sharingClient` + FOR EACH ROW +BEGIN + SET NEW.ended = GREATEST(util.VN_CURDATE(),NEW.ended); + SET NEW.started = GREATEST(util.VN_CURDATE(),NEW.started); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/shelving_afterDelete.sql b/db/routines/vn/triggers/shelving_afterDelete.sql new file mode 100644 index 000000000..964a866e7 --- /dev/null +++ b/db/routines/vn/triggers/shelving_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`shelving_afterDelete` + AFTER DELETE ON `shelving` + FOR EACH ROW +BEGIN + INSERT INTO shelvingLog + SET `action` = 'delete', + `changedModel` = 'Shelving', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/shelving_beforeInsert.sql b/db/routines/vn/triggers/shelving_beforeInsert.sql new file mode 100644 index 000000000..ef3c7030c --- /dev/null +++ b/db/routines/vn/triggers/shelving_beforeInsert.sql @@ -0,0 +1,13 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`shelving_beforeInsert` + BEFORE INSERT ON `shelving` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); + + IF NEW.code = "" THEN + CALL util.throw('NOT_EMPTY_CODE_ALLOWED'); + END IF; + +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/shelving_beforeUpdate.sql b/db/routines/vn/triggers/shelving_beforeUpdate.sql new file mode 100644 index 000000000..89e7cb7e9 --- /dev/null +++ b/db/routines/vn/triggers/shelving_beforeUpdate.sql @@ -0,0 +1,16 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`shelving_beforeUpdate` + BEFORE UPDATE ON `shelving` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); + + IF NEW.code = "" THEN + CALL util.throw('NOT_EMPTY_CODE_ALLOWED'); + END IF; + + IF NOT(OLD.parkingFk <=> NEW.parkingFK) THEN + SET NEW.isMoving = FALSE; + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/solunionCAP_afterInsert.sql b/db/routines/vn/triggers/solunionCAP_afterInsert.sql new file mode 100644 index 000000000..8524689a7 --- /dev/null +++ b/db/routines/vn/triggers/solunionCAP_afterInsert.sql @@ -0,0 +1,11 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`solunionCAP_afterInsert` + AFTER INSERT ON `solunionCAP` + FOR EACH ROW +BEGIN + UPDATE vn2008.Clientes c + JOIN creditClassification cc ON c.Id_Cliente = cc.client + JOIN creditInsurance ci ON ci.creditClassification = cc.id + SET creditInsurance = ci.credit * 2 WHERE ci.id = NEW.creditInsurance; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/solunionCAP_afterUpdate.sql b/db/routines/vn/triggers/solunionCAP_afterUpdate.sql new file mode 100644 index 000000000..688241515 --- /dev/null +++ b/db/routines/vn/triggers/solunionCAP_afterUpdate.sql @@ -0,0 +1,18 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`solunionCAP_afterUpdate` + AFTER UPDATE ON `solunionCAP` + FOR EACH ROW +BEGIN + IF NEW.dateLeaving IS NOT NULL THEN + UPDATE vn2008.Clientes c + JOIN creditClassification cc ON c.Id_Cliente = cc.client + JOIN creditInsurance ci ON ci.creditClassification = cc.id + SET creditInsurance = ci.credit WHERE ci.id = OLD.creditInsurance; + ELSE + UPDATE vn2008.Clientes c + JOIN creditClassification cc ON c.Id_Cliente = cc.client + JOIN creditInsurance ci ON ci.creditClassification = cc.id + SET creditInsurance = ci.credit * 2 WHERE ci.id = OLD.creditInsurance; + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/solunionCAP_beforeDelete.sql b/db/routines/vn/triggers/solunionCAP_beforeDelete.sql new file mode 100644 index 000000000..85d65a949 --- /dev/null +++ b/db/routines/vn/triggers/solunionCAP_beforeDelete.sql @@ -0,0 +1,11 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`solunionCAP_beforeDelete` + BEFORE DELETE ON `solunionCAP` + FOR EACH ROW +BEGIN + UPDATE vn2008.Clientes c + JOIN creditClassification cc ON c.Id_Cliente = cc.client + JOIN creditInsurance ci ON ci.creditClassification = cc.id + SET creditInsurance = ci.credit WHERE ci.id = OLD.creditInsurance; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/specie_beforeInsert.sql b/db/routines/vn/triggers/specie_beforeInsert.sql new file mode 100644 index 000000000..68abf0d30 --- /dev/null +++ b/db/routines/vn/triggers/specie_beforeInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`specie_beforeInsert` + BEFORE INSERT ON `specie` + FOR EACH ROW +BEGIN + SET NEW.name = LCASE(NEW.name); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/specie_beforeUpdate.sql b/db/routines/vn/triggers/specie_beforeUpdate.sql new file mode 100644 index 000000000..364b1d52f --- /dev/null +++ b/db/routines/vn/triggers/specie_beforeUpdate.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`specie_beforeUpdate` + BEFORE UPDATE ON `specie` + FOR EACH ROW +BEGIN + SET NEW.name = LCASE(NEW.name); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/supplierAccount_afterDelete.sql b/db/routines/vn/triggers/supplierAccount_afterDelete.sql new file mode 100644 index 000000000..23c2cd4a4 --- /dev/null +++ b/db/routines/vn/triggers/supplierAccount_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`supplierAccount_afterDelete` + AFTER DELETE ON `supplierAccount` + FOR EACH ROW +BEGIN + INSERT INTO supplierLog + SET `action` = 'delete', + `changedModel` = 'SupplierAccount', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/supplierAccount_beforeInsert.sql b/db/routines/vn/triggers/supplierAccount_beforeInsert.sql new file mode 100644 index 000000000..512f172e1 --- /dev/null +++ b/db/routines/vn/triggers/supplierAccount_beforeInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`supplierAccount_beforeInsert` + BEFORE INSERT ON `supplierAccount` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/supplierAccount_beforeUpdate.sql b/db/routines/vn/triggers/supplierAccount_beforeUpdate.sql new file mode 100644 index 000000000..0fac19deb --- /dev/null +++ b/db/routines/vn/triggers/supplierAccount_beforeUpdate.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`supplierAccount_beforeUpdate` + BEFORE UPDATE ON `supplierAccount` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/supplierAddress_afterDelete.sql b/db/routines/vn/triggers/supplierAddress_afterDelete.sql new file mode 100644 index 000000000..69dd94dfe --- /dev/null +++ b/db/routines/vn/triggers/supplierAddress_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`supplierAddress_afterDelete` + AFTER DELETE ON `supplierAddress` + FOR EACH ROW +BEGIN + INSERT INTO supplierLog + SET `action` = 'delete', + `changedModel` = 'SupplierAddress', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/supplierAddress_beforeInsert.sql b/db/routines/vn/triggers/supplierAddress_beforeInsert.sql new file mode 100644 index 000000000..db8d0ea94 --- /dev/null +++ b/db/routines/vn/triggers/supplierAddress_beforeInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`supplierAddress_beforeInsert` + BEFORE INSERT ON `supplierAddress` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/supplierAddress_beforeUpdate.sql b/db/routines/vn/triggers/supplierAddress_beforeUpdate.sql new file mode 100644 index 000000000..8e484e4de --- /dev/null +++ b/db/routines/vn/triggers/supplierAddress_beforeUpdate.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`supplierAddress_beforeUpdate` + BEFORE UPDATE ON `supplierAddress` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/supplierContact_afterDelete.sql b/db/routines/vn/triggers/supplierContact_afterDelete.sql new file mode 100644 index 000000000..401ec9e9e --- /dev/null +++ b/db/routines/vn/triggers/supplierContact_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`supplierContact_afterDelete` + AFTER DELETE ON `supplierContact` + FOR EACH ROW +BEGIN + INSERT INTO supplierLog + SET `action` = 'delete', + `changedModel` = 'SupplierContact', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/supplierContact_beforeInsert.sql b/db/routines/vn/triggers/supplierContact_beforeInsert.sql new file mode 100644 index 000000000..76e78ba5a --- /dev/null +++ b/db/routines/vn/triggers/supplierContact_beforeInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`supplierContact_beforeInsert` + BEFORE INSERT ON `supplierContact` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/supplierContact_beforeUpdate.sql b/db/routines/vn/triggers/supplierContact_beforeUpdate.sql new file mode 100644 index 000000000..24723656a --- /dev/null +++ b/db/routines/vn/triggers/supplierContact_beforeUpdate.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`supplierContact_beforeUpdate` + BEFORE UPDATE ON `supplierContact` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/supplierDms_afterDelete.sql b/db/routines/vn/triggers/supplierDms_afterDelete.sql new file mode 100644 index 000000000..482decbb6 --- /dev/null +++ b/db/routines/vn/triggers/supplierDms_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`supplierDms_afterDelete` + AFTER DELETE ON `supplierDms` + FOR EACH ROW +BEGIN + INSERT INTO clientLog + SET `action` = 'delete', + `changedModel` = 'supplierDms', + `changedModelId` = OLD.dmsFk, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; \ No newline at end of file diff --git a/db/routines/vn/triggers/supplierDms_beforeInsert.sql b/db/routines/vn/triggers/supplierDms_beforeInsert.sql new file mode 100644 index 000000000..130428d1e --- /dev/null +++ b/db/routines/vn/triggers/supplierDms_beforeInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`supplierDms_beforeInsert` + BEFORE INSERT ON `supplierDms` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/supplierDms_beforeUpdate.sql b/db/routines/vn/triggers/supplierDms_beforeUpdate.sql new file mode 100644 index 000000000..54dcef049 --- /dev/null +++ b/db/routines/vn/triggers/supplierDms_beforeUpdate.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`supplierDms_beforeUpdate` + BEFORE UPDATE ON `supplierDms` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/supplier_afterDelete.sql b/db/routines/vn/triggers/supplier_afterDelete.sql new file mode 100644 index 000000000..d4b8e0d21 --- /dev/null +++ b/db/routines/vn/triggers/supplier_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`supplier_afterDelete` + AFTER DELETE ON `supplier` + FOR EACH ROW +BEGIN + INSERT INTO supplierLog + SET `action` = 'delete', + `changedModel` = 'Supplier', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/supplier_beforeInsert.sql b/db/routines/vn/triggers/supplier_beforeInsert.sql new file mode 100644 index 000000000..aef8d02ab --- /dev/null +++ b/db/routines/vn/triggers/supplier_beforeInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`supplier_beforeInsert` + BEFORE INSERT ON `supplier` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/.archive/225201/00-supplier_beforeUpdate.sql b/db/routines/vn/triggers/supplier_beforeUpdate.sql similarity index 88% rename from db/.archive/225201/00-supplier_beforeUpdate.sql rename to db/routines/vn/triggers/supplier_beforeUpdate.sql index 08af8666b..f462d6f57 100644 --- a/db/.archive/225201/00-supplier_beforeUpdate.sql +++ b/db/routines/vn/triggers/supplier_beforeUpdate.sql @@ -1,9 +1,5 @@ -DROP TRIGGER IF EXISTS `vn`.`supplier_beforeUpdate`; -USE `vn`; - DELIMITER $$ -$$ -CREATE DEFINER=`root`@`localhost` TRIGGER `vn`.`supplier_beforeUpdate` +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`supplier_beforeUpdate` BEFORE UPDATE ON `supplier` FOR EACH ROW BEGIN @@ -14,6 +10,8 @@ BEGIN DECLARE vOldPayMethodName VARCHAR(20); DECLARE vNewPayMethodName VARCHAR(20); + SET NEW.editorFk = account.myUser_getId(); + SELECT hasVerified INTO vPayMethodHasVerified FROM payMethod WHERE id = NEW.payMethodFk; diff --git a/db/routines/vn/triggers/tag_beforeInsert.sql b/db/routines/vn/triggers/tag_beforeInsert.sql new file mode 100644 index 000000000..27057754d --- /dev/null +++ b/db/routines/vn/triggers/tag_beforeInsert.sql @@ -0,0 +1,10 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`tag_beforeInsert` + BEFORE INSERT ON `tag` + FOR EACH ROW +BEGIN + IF NEW.ediTypeFk IS NULL AND (SELECT COUNT(*) FROM tag WHERE `name` = NEW.`name`) THEN + CALL util.throw('name duplicated'); + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketCollection_afterDelete.sql b/db/routines/vn/triggers/ticketCollection_afterDelete.sql new file mode 100644 index 000000000..e0917452a --- /dev/null +++ b/db/routines/vn/triggers/ticketCollection_afterDelete.sql @@ -0,0 +1,28 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketCollection_afterDelete` + AFTER DELETE ON `ticketCollection` + FOR EACH ROW +BEGIN + + DECLARE vSalesRemaining INT; + + SELECT count(*) INTO vSalesRemaining + FROM vn.ticketCollection tc + JOIN sale s ON s.ticketFk = tc.ticketFk + WHERE collectionFk = OLD.collectionFk + AND tc.id != OLD.id; + + IF NOT vSalesRemaining THEN + + DELETE FROM vn.collection WHERE id = OLD.collectionFk; + + ELSE + + UPDATE vn.collection + SET saleTotalCount = vSalesRemaining + WHERE id = OLD.collectionFk; + + END IF; + +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketDms_afterDelete.sql b/db/routines/vn/triggers/ticketDms_afterDelete.sql new file mode 100644 index 000000000..834079520 --- /dev/null +++ b/db/routines/vn/triggers/ticketDms_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketDms_afterDelete` + AFTER DELETE ON `ticketDms` + FOR EACH ROW +BEGIN + INSERT INTO ticketLog + SET `action` = 'delete', + `changedModel` = 'ticketDms', + `changedModelId` = OLD.ticketFk, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketDms_beforeDelete.sql b/db/routines/vn/triggers/ticketDms_beforeDelete.sql new file mode 100644 index 000000000..9c251fba1 --- /dev/null +++ b/db/routines/vn/triggers/ticketDms_beforeDelete.sql @@ -0,0 +1,16 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketDms_beforeDelete` + BEFORE DELETE ON `ticketDms` + FOR EACH ROW +BEGIN + UPDATE dms + SET dmsTypeFk = (SELECT id + FROM dmsType + WHERE `code` = 'trash' + ) + WHERE id = OLD.dmsFk AND ( SELECT IF(COUNT(*) > 0, FALSE, TRUE) + FROM ticketDms + WHERE dmsFk = OLD.dmsFk + ) ; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketDms_beforeInsert.sql b/db/routines/vn/triggers/ticketDms_beforeInsert.sql new file mode 100644 index 000000000..0c00dba28 --- /dev/null +++ b/db/routines/vn/triggers/ticketDms_beforeInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketDms_beforeInsert` + BEFORE INSERT ON `ticketDms` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketDms_beforeUpdate.sql b/db/routines/vn/triggers/ticketDms_beforeUpdate.sql new file mode 100644 index 000000000..aab22dd99 --- /dev/null +++ b/db/routines/vn/triggers/ticketDms_beforeUpdate.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketDms_beforeUpdate` + BEFORE UPDATE ON `ticketDms` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketObservation_afterDelete.sql b/db/routines/vn/triggers/ticketObservation_afterDelete.sql new file mode 100644 index 000000000..f8d88add6 --- /dev/null +++ b/db/routines/vn/triggers/ticketObservation_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketObservation_afterDelete` + AFTER DELETE ON `ticketObservation` + FOR EACH ROW +BEGIN + INSERT INTO ticketLog + SET `action` = 'delete', + `changedModel` = 'TicketObservation', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketObservation_beforeInsert.sql b/db/routines/vn/triggers/ticketObservation_beforeInsert.sql new file mode 100644 index 000000000..ce141d56a --- /dev/null +++ b/db/routines/vn/triggers/ticketObservation_beforeInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketObservation_beforeInsert` + BEFORE INSERT ON `ticketObservation` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketObservation_beforeUpdate.sql b/db/routines/vn/triggers/ticketObservation_beforeUpdate.sql new file mode 100644 index 000000000..466e17e85 --- /dev/null +++ b/db/routines/vn/triggers/ticketObservation_beforeUpdate.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketObservation_beforeUpdate` + BEFORE UPDATE ON `ticketObservation` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketPackaging_afterDelete.sql b/db/routines/vn/triggers/ticketPackaging_afterDelete.sql new file mode 100644 index 000000000..320f7e01e --- /dev/null +++ b/db/routines/vn/triggers/ticketPackaging_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketPackaging_afterDelete` + AFTER DELETE ON `ticketPackaging` + FOR EACH ROW +BEGIN + INSERT INTO ticketLog + SET `action` = 'delete', + `changedModel` = 'TicketPackaging', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketPackaging_beforeInsert.sql b/db/routines/vn/triggers/ticketPackaging_beforeInsert.sql new file mode 100644 index 000000000..a58955e0d --- /dev/null +++ b/db/routines/vn/triggers/ticketPackaging_beforeInsert.sql @@ -0,0 +1,10 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketPackaging_beforeInsert` + BEFORE INSERT ON `ticketPackaging` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); + SET NEW.workerFk = account.myUser_getId(); + +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketPackaging_beforeUpdate.sql b/db/routines/vn/triggers/ticketPackaging_beforeUpdate.sql new file mode 100644 index 000000000..5d15249c4 --- /dev/null +++ b/db/routines/vn/triggers/ticketPackaging_beforeUpdate.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketPackaging_beforeUpdate` + BEFORE UPDATE ON `ticketPackaging` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketParking_beforeInsert.sql b/db/routines/vn/triggers/ticketParking_beforeInsert.sql new file mode 100644 index 000000000..2add4f3ea --- /dev/null +++ b/db/routines/vn/triggers/ticketParking_beforeInsert.sql @@ -0,0 +1,10 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketParking_beforeInsert` + BEFORE INSERT ON `ticketParking` + FOR EACH ROW +BEGIN + + SET NEW.workerFk = vn.getUser(); + +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketRefund_afterDelete.sql b/db/routines/vn/triggers/ticketRefund_afterDelete.sql new file mode 100644 index 000000000..167030d4a --- /dev/null +++ b/db/routines/vn/triggers/ticketRefund_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketRefund_afterDelete` + AFTER DELETE ON `ticketRefund` + FOR EACH ROW +BEGIN + INSERT INTO ticketLog + SET `action` = 'delete', + `changedModel` = 'TicketRefund', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketRefund_beforeInsert.sql b/db/routines/vn/triggers/ticketRefund_beforeInsert.sql new file mode 100644 index 000000000..7893f6c51 --- /dev/null +++ b/db/routines/vn/triggers/ticketRefund_beforeInsert.sql @@ -0,0 +1,9 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketRefund_beforeInsert` + BEFORE INSERT ON `ticketRefund` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); + CALL ticketRefund_beforeUpsert(NEW.refundTicketFk, NEW.originalTicketFk); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketRefund_beforeUpdate.sql b/db/routines/vn/triggers/ticketRefund_beforeUpdate.sql new file mode 100644 index 000000000..51c7db8f2 --- /dev/null +++ b/db/routines/vn/triggers/ticketRefund_beforeUpdate.sql @@ -0,0 +1,9 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketRefund_beforeUpdate` + BEFORE UPDATE ON `ticketRefund` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); + CALL ticketRefund_beforeUpsert(NEW.refundTicketFk, NEW.originalTicketFk); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketRequest_afterDelete.sql b/db/routines/vn/triggers/ticketRequest_afterDelete.sql new file mode 100644 index 000000000..a8932a744 --- /dev/null +++ b/db/routines/vn/triggers/ticketRequest_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketRequest_afterDelete` + AFTER DELETE ON `ticketRequest` + FOR EACH ROW +BEGIN + INSERT INTO ticketLog + SET `action` = 'delete', + `changedModel` = 'TicketRequest', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketRequest_beforeInsert.sql b/db/routines/vn/triggers/ticketRequest_beforeInsert.sql new file mode 100644 index 000000000..d17459912 --- /dev/null +++ b/db/routines/vn/triggers/ticketRequest_beforeInsert.sql @@ -0,0 +1,20 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketRequest_beforeInsert` + BEFORE INSERT ON `ticketRequest` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); + + IF NEW.ticketFk IS NULL THEN + SET NEW.ticketFk = (SELECT s.ticketFk FROM sale s WHERE s.id = NEW.saleFk); + END IF; + + IF NEW.requesterFk IS NULL THEN + SET NEW.requesterFk = (SELECT w.id FROM worker w WHERE w.code = NEW.salesPersonCode); + END IF; + + IF NEW.attenderFk IS NULL THEN + SET NEW.attenderFk = (SELECT w.id FROM worker w WHERE w.code = NEW.buyerCode); + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketRequest_beforeUpdate.sql b/db/routines/vn/triggers/ticketRequest_beforeUpdate.sql new file mode 100644 index 000000000..e5e9c307e --- /dev/null +++ b/db/routines/vn/triggers/ticketRequest_beforeUpdate.sql @@ -0,0 +1,20 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketRequest_beforeUpdate` + BEFORE UPDATE ON `ticketRequest` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); + + IF NEW.saleFk <> OLD.saleFk THEN + SET NEW.ticketFk = (SELECT s.ticketFk FROM sale s WHERE s.id = NEW.saleFk); + END IF; + + IF NEW.salesPersonCode <> OLD.salesPersonCode THEN + SET NEW.requesterFk = (SELECT w.id FROM worker w WHERE w.code = NEW.salesPersonCode); + END IF; + + IF NEW.buyerCode <> OLD.buyerCode THEN + SET NEW.attenderFk = (SELECT w.id FROM worker w WHERE w.code = NEW.buyerCode); + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketService_afterDelete.sql b/db/routines/vn/triggers/ticketService_afterDelete.sql new file mode 100644 index 000000000..11d5aaf24 --- /dev/null +++ b/db/routines/vn/triggers/ticketService_afterDelete.sql @@ -0,0 +1,15 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketService_afterDelete` + AFTER DELETE ON `ticketService` + FOR EACH ROW +BEGIN + INSERT INTO ticketLog + SET `action` = 'delete', + `changedModel` = 'TicketService', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); + + CALL ticket_requestRecalc(OLD.ticketFk); + +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketService_afterInsert.sql b/db/routines/vn/triggers/ticketService_afterInsert.sql new file mode 100644 index 000000000..b9142ff72 --- /dev/null +++ b/db/routines/vn/triggers/ticketService_afterInsert.sql @@ -0,0 +1,10 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketService_afterInsert` + AFTER INSERT ON `ticketService` + FOR EACH ROW +BEGIN + + CALL ticket_requestRecalc(NEW.ticketFk); + +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketService_afterUpdate.sql b/db/routines/vn/triggers/ticketService_afterUpdate.sql new file mode 100644 index 000000000..ecc9e9a5a --- /dev/null +++ b/db/routines/vn/triggers/ticketService_afterUpdate.sql @@ -0,0 +1,13 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketService_afterUpdate` + AFTER UPDATE ON `ticketService` + FOR EACH ROW +BEGIN + IF !(NEW.price <=> OLD.price) + OR !(NEW.ticketFk <=> OLD.ticketFk) + OR !(NEW.quantity <=> OLD.quantity) THEN + CALL ticket_requestRecalc(NEW.ticketFk); + CALL ticket_requestRecalc(OLD.ticketFk); + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketService_beforeInsert.sql b/db/routines/vn/triggers/ticketService_beforeInsert.sql new file mode 100644 index 000000000..81b7e5e91 --- /dev/null +++ b/db/routines/vn/triggers/ticketService_beforeInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketService_beforeInsert` + BEFORE INSERT ON `ticketService` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketService_beforeUpdate.sql b/db/routines/vn/triggers/ticketService_beforeUpdate.sql new file mode 100644 index 000000000..a24af8269 --- /dev/null +++ b/db/routines/vn/triggers/ticketService_beforeUpdate.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketService_beforeUpdate` + BEFORE UPDATE ON `ticketService` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketTracking_afterDelete.sql b/db/routines/vn/triggers/ticketTracking_afterDelete.sql new file mode 100644 index 000000000..2f1bbbcee --- /dev/null +++ b/db/routines/vn/triggers/ticketTracking_afterDelete.sql @@ -0,0 +1,40 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketTracking_afterDelete` + AFTER DELETE ON `ticketTracking` + FOR EACH ROW +BEGIN + DECLARE vTicketFk INT; + DECLARE vTicketTrackingFk INT; + DECLARE vStateName VARCHAR(15); + + DECLARE CONTINUE HANDLER FOR SQLSTATE '23000' + BEGIN + DELETE FROM vn.ticketLastState + WHERE ticketFk = OLD.ticketFk; + END; + + INSERT INTO ticketLog + SET `action` = 'delete', + `changedModel` = 'TicketTracking', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); + + CALL util.debugAdd('deletedState', + CONCAT('interFk: ', OLD.id, + ' ticketFk: ', OLD.ticketFk, + ' stateFk: ', OLD.stateFk)); + + SELECT i.ticketFk, i.id, s.`name` + INTO vTicketFk, vTicketTrackingFk, vStateName + FROM ticketTracking i + JOIN state s ON i.stateFk = s.id + WHERE ticketFk = OLD.ticketFk + ORDER BY created DESC + LIMIT 1; + + IF vTicketFk > 0 THEN + REPLACE INTO ticketLastState(ticketFk, ticketTrackingFk,name) + VALUES(vTicketFk, vTicketTrackingFk, vStateName); + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketTracking_afterInsert.sql b/db/routines/vn/triggers/ticketTracking_afterInsert.sql new file mode 100644 index 000000000..b246cd44f --- /dev/null +++ b/db/routines/vn/triggers/ticketTracking_afterInsert.sql @@ -0,0 +1,13 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketTracking_afterInsert` + AFTER INSERT ON `ticketTracking` + FOR EACH ROW +BEGIN + DECLARE vNumTicketsPrepared INT; + + REPLACE vn.ticketLastState(ticketFk, ticketTrackingFk, name) + SELECT NEW.ticketFk, NEW.id, `name` + FROM state + WHERE id = NEW.stateFk; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketTracking_afterUpdate.sql b/db/routines/vn/triggers/ticketTracking_afterUpdate.sql new file mode 100644 index 000000000..ce5586569 --- /dev/null +++ b/db/routines/vn/triggers/ticketTracking_afterUpdate.sql @@ -0,0 +1,32 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketTracking_afterUpdate` + AFTER UPDATE ON `ticketTracking` + FOR EACH ROW +BEGIN + DECLARE vTicketFk INT; + DECLARE vTicketTrackingFk INT; + DECLARE vStateName VARCHAR(15); + + IF NEW.stateFk <> OLD.stateFk THEN + REPLACE vn.ticketLastState(ticketFk, ticketTrackingFk, name) + SELECT NEW.ticketFk, NEW.id, `name` + FROM state + WHERE id = NEW.stateFk; + END IF; + + IF NEW.ticketFk <> OLD.ticketFk THEN + SELECT i.ticketFk, i.id, s.`name` + INTO vTicketFk, vTicketTrackingFk, vStateName + FROM ticketTracking i + JOIN state s ON i.stateFk = s.id + WHERE ticketFk = NEW.ticketFk + ORDER BY created DESC + LIMIT 1; + + IF vTicketFk > 0 THEN + REPLACE INTO ticketLastState(ticketFk, ticketTrackingFk,name) + VALUES(vTicketFk, vTicketTrackingFk, vStateName); + END IF; + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketTracking_beforeInsert.sql b/db/routines/vn/triggers/ticketTracking_beforeInsert.sql new file mode 100644 index 000000000..685713aea --- /dev/null +++ b/db/routines/vn/triggers/ticketTracking_beforeInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketTracking_beforeInsert` + BEFORE INSERT ON `ticketTracking` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketTracking_beforeUpdate.sql b/db/routines/vn/triggers/ticketTracking_beforeUpdate.sql new file mode 100644 index 000000000..ec875387e --- /dev/null +++ b/db/routines/vn/triggers/ticketTracking_beforeUpdate.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketTracking_beforeUpdate` + BEFORE UPDATE ON `ticketTracking` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketWeekly_afterDelete.sql b/db/routines/vn/triggers/ticketWeekly_afterDelete.sql new file mode 100644 index 000000000..d0ef0b8df --- /dev/null +++ b/db/routines/vn/triggers/ticketWeekly_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketWeekly_afterDelete` + AFTER DELETE ON `ticketWeekly` + FOR EACH ROW +BEGIN + INSERT INTO ticketLog + SET `action` = 'delete', + `changedModel` = 'TicketWeekly', + `changedModelId` = OLD.ticketFk, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketWeekly_beforeInsert.sql b/db/routines/vn/triggers/ticketWeekly_beforeInsert.sql new file mode 100644 index 000000000..e4a61d203 --- /dev/null +++ b/db/routines/vn/triggers/ticketWeekly_beforeInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketWeekly_beforeInsert` + BEFORE INSERT ON `ticketWeekly` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticketWeekly_beforeUpdate.sql b/db/routines/vn/triggers/ticketWeekly_beforeUpdate.sql new file mode 100644 index 000000000..1a631bec1 --- /dev/null +++ b/db/routines/vn/triggers/ticketWeekly_beforeUpdate.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticketWeekly_beforeUpdate` + BEFORE UPDATE ON `ticketWeekly` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticket_afterDelete.sql b/db/routines/vn/triggers/ticket_afterDelete.sql new file mode 100644 index 000000000..c80f3dbe1 --- /dev/null +++ b/db/routines/vn/triggers/ticket_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticket_afterDelete` + AFTER DELETE ON `ticket` + FOR EACH ROW +BEGIN + INSERT INTO ticketLog + SET `action` = 'delete', + `changedModel` = 'Ticket', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticket_afterInsert.sql b/db/routines/vn/triggers/ticket_afterInsert.sql new file mode 100644 index 000000000..0fad0aaee --- /dev/null +++ b/db/routines/vn/triggers/ticket_afterInsert.sql @@ -0,0 +1,38 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticket_afterInsert` + AFTER INSERT ON `ticket` + FOR EACH ROW +BEGIN + + DECLARE vClientType VARCHAR(255); + DECLARE vStateCode VARCHAR(255); + DECLARE vTransferorFirstShipped DATE; + + -- Borrar cuando se cambie el insert ticket en la APP móvil + + SELECT typeFk INTO vClientType + FROM vn.`client` WHERE id = NEW.clientFk; + + IF vClientType = 'loses' THEN + SET vStateCode = 'DELIVERED'; + ELSE + SET vStateCode = 'FREE'; + END IF; + + CALL ticket_setState(NEW.id, vStateCode); + + IF YEAR(NEW.shipped) > 2000 THEN + + SELECT cnb.firstShipped INTO vTransferorFirstShipped + FROM bs.clientNewBorn cnb + JOIN `client` c ON c.transferorFk = cnb.clientFk + WHERE c.id = NEW.clientFk; + + INSERT INTO bs.clientNewBorn(clientFk, firstShipped, lastShipped) + VALUES(NEW.clientFk, IFNULL(vTransferorFirstShipped, util.VN_CURDATE()), util.VN_CURDATE()) + ON DUPLICATE KEY UPDATE lastShipped = util.VN_CURDATE(); + + END IF; + +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticket_afterUpdate.sql b/db/routines/vn/triggers/ticket_afterUpdate.sql new file mode 100644 index 000000000..df939c9d1 --- /dev/null +++ b/db/routines/vn/triggers/ticket_afterUpdate.sql @@ -0,0 +1,26 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticket_afterUpdate` + AFTER UPDATE ON `ticket` + FOR EACH ROW +BEGIN + + IF !(NEW.id <=> OLD.id) + OR !(NEW.warehouseFk <=> OLD.warehouseFk) + OR !(NEW.shipped <=> OLD.shipped) THEN + CALL stock.log_add('ticket', NEW.id, OLD.id); + END IF; + + IF !(NEW.clientFk <=> OLD.clientFk) + OR !(NEW.addressFk <=> OLD.addressFk) + OR !(NEW.companyFk <=> OLD.companyFk) THEN + CALL ticket_requestRecalc(NEW.id); + END IF; + + IF NEW.routeFk <> OLD.routeFk THEN + UPDATE expedition + SET hasNewRoute = TRUE + WHERE ticketFk = NEW.id; + END IF; + +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticket_beforeDelete.sql b/db/routines/vn/triggers/ticket_beforeDelete.sql new file mode 100644 index 000000000..02c5352e6 --- /dev/null +++ b/db/routines/vn/triggers/ticket_beforeDelete.sql @@ -0,0 +1,18 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticket_beforeDelete` + BEFORE DELETE ON `ticket` + FOR EACH ROW +BEGIN + INSERT IGNORE INTO `vn`.`routeRecalc` (`routeFk`) + SELECT r.id + FROM vn.route r + WHERE r.isOk = FALSE + AND r.id = OLD.routeFk + AND r.created >= util.VN_CURDATE() + GROUP BY r.id; + + DELETE FROM sale WHERE ticketFk = OLD.id; + + DELETE FROM ticketDms WHERE ticketFk = OLD.id; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticket_beforeInsert.sql b/db/routines/vn/triggers/ticket_beforeInsert.sql new file mode 100644 index 000000000..7e0fc57b8 --- /dev/null +++ b/db/routines/vn/triggers/ticket_beforeInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticket_beforeInsert` + BEFORE INSERT ON `ticket` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/ticket_beforeUpdate.sql b/db/routines/vn/triggers/ticket_beforeUpdate.sql new file mode 100644 index 000000000..72831bc3d --- /dev/null +++ b/db/routines/vn/triggers/ticket_beforeUpdate.sql @@ -0,0 +1,67 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticket_beforeUpdate` + BEFORE UPDATE ON `ticket` + FOR EACH ROW +BEGIN + DECLARE vNewTime TIME; + + SET NEW.editorFk = account.myUser_getId(); + + IF NOT (NEW.routeFk <=> OLD.routeFk) THEN + INSERT IGNORE INTO `vn`.`routeRecalc` (`routeFk`) + SELECT r.id + FROM vn.route r + WHERE r.isOk = FALSE + AND r.id IN (OLD.routeFk,NEW.routeFk) + AND r.created >= util.VN_CURDATE() + GROUP BY r.id; + END IF; + + IF NOT (DATE(NEW.shipped) <=> DATE(OLD.shipped)) THEN + IF YEAR(NEW.shipped) < 2000 THEN + SIGNAL SQLSTATE '46000' + SET MESSAGE_TEXT = 'Year cannot be lesser than 2000'; + END IF; + + IF YEAR(NEW.shipped) = 2000 THEN + SET NEW.isDeleted = TRUE; + END IF; + + END IF; + + IF NOT (NEW.isDeleted <=> OLD.isDeleted) AND NEW.isDeleted THEN + INSERT IGNORE INTO `vn`.`routeRecalc` (`routeFk`) + SELECT r.id + FROM vn.ticket t + JOIN vn.route r ON r.id = t.routeFk + WHERE r.isOk = FALSE + AND t.id = NEW.id + AND r.created >= util.VN_CURDATE() + GROUP BY r.id; + SET NEW.shipped = DATE_FORMAT(NEW.shipped, '2000-%m-%d %T'); + SET NEW.landed = DATE_FORMAT(NEW.landed, '2000-%m-%d %T'); + SET NEW.routeFk = NULL; + SET NEW.zoneFk = NULL; + END IF; + + IF NEW.routeFk AND NEW.isDeleted THEN + CALL util.throw ('This ticket is deleted'); + END IF; + + IF NOT (NEW.routeFk <=> OLD.routeFk) AND NEW.routeFk IS NOT NULL THEN + SELECT MAX(TIME(shipped)) INTO vNewTime + FROM vn.ticket + WHERE routeFk = NEW.routeFk + HAVING MAX(TIME(shipped)) > TIME(NEW.shipped); + + IF vNewTime THEN + SET NEW.shipped = TIMESTAMP(DATE(NEW.shipped), vNewTime); + END IF; + INSERT IGNORE INTO zoneAgencyMode (agencyModeFk,zoneFk) + SELECT r.agencyModeFk, NEW.zoneFk FROM route r + WHERE r.id = NEW.routeFk; + + CALL vn.routeUpdateM3(NEW.routeFk); + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/time_afterUpdate.sql b/db/routines/vn/triggers/time_afterUpdate.sql new file mode 100644 index 000000000..1eb735923 --- /dev/null +++ b/db/routines/vn/triggers/time_afterUpdate.sql @@ -0,0 +1,13 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`time_afterUpdate` + AFTER UPDATE ON `time` + FOR EACH ROW +BEGIN + /*INSERT INTO vn.mail SET + `sender` = 'jgallego@verdnatura.es', + `replyTo` = 'jgallego@verdnatura.es', + `subject` = 'tabla time modificada', + `body` = CONCAT(account.myUser_getName(), ' ha modificado la tabla time ', + NEW.`dated`);*/ +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/town_afterDelete.sql b/db/routines/vn/triggers/town_afterDelete.sql new file mode 100644 index 000000000..e6ca82d80 --- /dev/null +++ b/db/routines/vn/triggers/town_afterDelete.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`town_afterDelete` + AFTER DELETE ON `town` + FOR EACH ROW +BEGIN + CALL zoneGeo_delete(OLD.geoFk); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/town_afterUpdate.sql b/db/routines/vn/triggers/town_afterUpdate.sql new file mode 100644 index 000000000..830428061 --- /dev/null +++ b/db/routines/vn/triggers/town_afterUpdate.sql @@ -0,0 +1,16 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`town_afterUpdate` + AFTER UPDATE ON `town` + FOR EACH ROW +BEGIN + IF !(OLD.provinceFk <=> NEW.provinceFk) THEN + CALL zoneGeo_setParent(NEW.geoFk, + (SELECT geoFk FROM province WHERE id = NEW.provinceFk)); + END IF; + + IF !(OLD.`name` <=> NEW.`name`) THEN + UPDATE zoneGeo SET `name` = NEW.`name` + WHERE id = NEW.geoFk; + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/town_beforeInsert.sql b/db/routines/vn/triggers/town_beforeInsert.sql new file mode 100644 index 000000000..f3a060b2d --- /dev/null +++ b/db/routines/vn/triggers/town_beforeInsert.sql @@ -0,0 +1,9 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`town_beforeInsert` + BEFORE INSERT ON `town` + FOR EACH ROW +BEGIN + SET NEW.geoFk = zoneGeo_new('town', NEW.`name`, + (SELECT geoFk FROM province WHERE id = NEW.provinceFk)); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/town_beforeUpdate.sql b/db/routines/vn/triggers/town_beforeUpdate.sql new file mode 100644 index 000000000..e607b3f41 --- /dev/null +++ b/db/routines/vn/triggers/town_beforeUpdate.sql @@ -0,0 +1,10 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`town_beforeUpdate` + BEFORE UPDATE ON `town` + FOR EACH ROW +BEGIN + -- IF !(OLD.geoFk <=> NEW.geoFk) THEN + -- CALL zoneGeo_throwNotEditable; + -- END IF; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/travelThermograph_afterDelete.sql b/db/routines/vn/triggers/travelThermograph_afterDelete.sql new file mode 100644 index 000000000..14a875799 --- /dev/null +++ b/db/routines/vn/triggers/travelThermograph_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`travelThermograph_afterDelete` + AFTER DELETE ON `travelThermograph` + FOR EACH ROW +BEGIN + INSERT INTO travelLog + SET `action` = 'delete', + `changedModel` = 'TravelThermograph', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/travelThermograph_beforeInsert.sql b/db/routines/vn/triggers/travelThermograph_beforeInsert.sql new file mode 100644 index 000000000..4ebe14e75 --- /dev/null +++ b/db/routines/vn/triggers/travelThermograph_beforeInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`travelThermograph_beforeInsert` + BEFORE INSERT ON `travelThermograph` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/travelThermograph_beforeUpdate.sql b/db/routines/vn/triggers/travelThermograph_beforeUpdate.sql new file mode 100644 index 000000000..381e655f3 --- /dev/null +++ b/db/routines/vn/triggers/travelThermograph_beforeUpdate.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`travelThermograph_beforeUpdate` + BEFORE UPDATE ON `travelThermograph` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/travel_afterDelete.sql b/db/routines/vn/triggers/travel_afterDelete.sql new file mode 100644 index 000000000..a528793e9 --- /dev/null +++ b/db/routines/vn/triggers/travel_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`travel_afterDelete` + AFTER DELETE ON `travel` + FOR EACH ROW +BEGIN + INSERT INTO travelLog + SET `action` = 'delete', + `changedModel` = 'Travel', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/travel_afterUpdate.sql b/db/routines/vn/triggers/travel_afterUpdate.sql new file mode 100644 index 000000000..38cd3ba13 --- /dev/null +++ b/db/routines/vn/triggers/travel_afterUpdate.sql @@ -0,0 +1,27 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`travel_afterUpdate` + AFTER UPDATE ON `travel` + FOR EACH ROW +BEGIN + CALL stock.log_add('travel', NEW.id, OLD.id); + + IF NOT(NEW.shipped <=> OLD.shipped) THEN + UPDATE entry + SET commission = entry_getCommission(travelFk, currencyFk,supplierFk) + WHERE travelFk = NEW.id; + END IF; + + IF NOT (NEW.agencyModeFk <=> OLD.agencyModeFk) THEN + IF (SELECT hasWeightVolumetric FROM agencyMode WHERE id = NEW.agencyModeFk) THEN + CREATE OR REPLACE TEMPORARY TABLE tmp.buysToCheck + SELECT b.id + FROM entry e + JOIN buy b ON b.entryFk = e.id + JOIN item i ON i.id = b.itemFk + WHERE e.travelFk = NEW.id; + + CALL buy_checkItem(); + END IF; + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/travel_beforeInsert.sql b/db/routines/vn/triggers/travel_beforeInsert.sql new file mode 100644 index 000000000..817bd69bb --- /dev/null +++ b/db/routines/vn/triggers/travel_beforeInsert.sql @@ -0,0 +1,16 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`travel_beforeInsert` + BEFORE INSERT ON `travel` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); + + CALL travel_checkDates(NEW.shipped, NEW.landed); + + CALL travel_checkWarehouseIsFeedStock(NEW.warehouseInFk); + + IF NEW.awbFk IS NOT NULL AND NOT travel_hasUniqueAwb(NEW.id) THEN + CALL util.throw('The AWB is incorrect, there is a different AWB in the associated entries'); + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/travel_beforeUpdate.sql b/db/routines/vn/triggers/travel_beforeUpdate.sql new file mode 100644 index 000000000..5e43c8761 --- /dev/null +++ b/db/routines/vn/triggers/travel_beforeUpdate.sql @@ -0,0 +1,40 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`travel_beforeUpdate` + BEFORE UPDATE ON `travel` + FOR EACH ROW +BEGIN + DECLARE vHasAnyInvoiceBooked BOOL; + + SET NEW.editorFk = account.myUser_getId(); + + IF NOT (NEW.landed <=> OLD.landed) + OR NOT (NEW.shipped <=> OLD.shipped) THEN + CALL travel_checkDates(NEW.shipped, NEW.landed); + END IF; + + IF NOT (NEW.isReceived <=> OLD.isReceived) THEN + CALL travel_checkPackaging(NEW.id); + END IF; + + IF NOT (NEW.warehouseInFk <=> OLD.warehouseInFk) THEN + CALL travel_checkWarehouseIsFeedStock(NEW.warehouseInFk); + END IF; + + IF NOT (NEW.awbFk <=> OLD.awbFk)THEN + SELECT COUNT(*) INTO vHasAnyInvoiceBooked + FROM travel t + JOIN entry e ON e.travelFk = t.id + JOIN invoiceIn ii ON ii.id = e.invoiceInFk + WHERE t.id = NEW.id + AND ii.isBooked; + + IF vHasAnyInvoiceBooked THEN + CALL util.throw('The travel has entries with booked invoices'); + END IF; + END IF; + + IF (NOT(NEW.awbFk <=> OLD.awbFk)) AND NEW.awbFk IS NOT NULL AND NOT travel_hasUniqueAwb(NEW.id) THEN + CALL util.throw('The AWB is incorrect, there is a different AWB in the associated entries'); + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/vehicle_beforeInsert.sql b/db/routines/vn/triggers/vehicle_beforeInsert.sql new file mode 100644 index 000000000..046e11703 --- /dev/null +++ b/db/routines/vn/triggers/vehicle_beforeInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`vehicle_beforeInsert` + BEFORE INSERT ON `vehicle` + FOR EACH ROW +BEGIN + CALL vehicle_checkNumberPlate(NEW.numberPlate, NEW.countryCodeFk); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/vehicle_beforeUpdate.sql b/db/routines/vn/triggers/vehicle_beforeUpdate.sql new file mode 100644 index 000000000..d61005468 --- /dev/null +++ b/db/routines/vn/triggers/vehicle_beforeUpdate.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`vehicle_beforeUpdate` + BEFORE UPDATE ON `vehicle` + FOR EACH ROW +BEGIN + CALL vehicle_checkNumberPlate(NEW.numberPlate, NEW.countryCodeFk); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/warehouse_afterInsert.sql b/db/routines/vn/triggers/warehouse_afterInsert.sql new file mode 100644 index 000000000..97a8c4152 --- /dev/null +++ b/db/routines/vn/triggers/warehouse_afterInsert.sql @@ -0,0 +1,10 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`warehouse_afterInsert` + BEFORE UPDATE ON `warehouse` + FOR EACH ROW +BEGIN + IF NEW.isFeedStock AND NEW.isInventory THEN + CALL util.throw("isFeedStock and isInventory cannot both be true"); + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/workerDocument_afterDelete.sql b/db/routines/vn/triggers/workerDocument_afterDelete.sql new file mode 100644 index 000000000..b266d3bf6 --- /dev/null +++ b/db/routines/vn/triggers/workerDocument_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`workerDocument_afterDelete` + AFTER DELETE ON `workerDocument` + FOR EACH ROW +BEGIN + INSERT INTO workerLog + SET `action` = 'delete', + `changedModel` = 'WorkerDocument', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/workerDocument_beforeInsert.sql b/db/routines/vn/triggers/workerDocument_beforeInsert.sql new file mode 100644 index 000000000..2a795ba38 --- /dev/null +++ b/db/routines/vn/triggers/workerDocument_beforeInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`workerDocument_beforeInsert` + BEFORE INSERT ON `workerDocument` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/workerDocument_beforeUpdate.sql b/db/routines/vn/triggers/workerDocument_beforeUpdate.sql new file mode 100644 index 000000000..ffa137b3a --- /dev/null +++ b/db/routines/vn/triggers/workerDocument_beforeUpdate.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`workerDocument_beforeUpdate` + BEFORE UPDATE ON `workerDocument` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/workerIncome_afterDelete.sql b/db/routines/vn/triggers/workerIncome_afterDelete.sql new file mode 100644 index 000000000..e19df59a8 --- /dev/null +++ b/db/routines/vn/triggers/workerIncome_afterDelete.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`workerIncome_afterDelete` + AFTER DELETE ON `workerIncome` + FOR EACH ROW +BEGIN + CALL worker_updateBalance(OLD.workerFk,-OLD.credit,-OLD.debit); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/workerIncome_afterInsert.sql b/db/routines/vn/triggers/workerIncome_afterInsert.sql new file mode 100644 index 000000000..8837f9c07 --- /dev/null +++ b/db/routines/vn/triggers/workerIncome_afterInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`workerIncome_afterInsert` + AFTER INSERT ON `workerIncome` + FOR EACH ROW +BEGIN + CALL worker_updateBalance(NEW.workerFk,NEW.credit,NEW.debit); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/workerIncome_afterUpdate.sql b/db/routines/vn/triggers/workerIncome_afterUpdate.sql new file mode 100644 index 000000000..a2584df22 --- /dev/null +++ b/db/routines/vn/triggers/workerIncome_afterUpdate.sql @@ -0,0 +1,10 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`workerIncome_afterUpdate` + AFTER UPDATE ON `workerIncome` + FOR EACH ROW +BEGIN + CALL worker_updateBalance(NEW.workerFk,-OLD.credit,-OLD.debit); + + CALL worker_updateBalance(NEW.workerFk,NEW.credit,NEW.debit); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/workerTimeControl_afterDelete.sql b/db/routines/vn/triggers/workerTimeControl_afterDelete.sql new file mode 100644 index 000000000..19653c913 --- /dev/null +++ b/db/routines/vn/triggers/workerTimeControl_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`workerTimeControl_afterDelete` + AFTER DELETE ON `workerTimeControl` + FOR EACH ROW +BEGIN + INSERT INTO workerLog + SET `action` = 'delete', + `changedModel` = 'WorkerTimeControl', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/workerTimeControl_afterInsert.sql b/db/routines/vn/triggers/workerTimeControl_afterInsert.sql new file mode 100644 index 000000000..b8b9c3b01 --- /dev/null +++ b/db/routines/vn/triggers/workerTimeControl_afterInsert.sql @@ -0,0 +1,10 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`workerTimeControl_afterInsert` + AFTER INSERT ON `workerTimeControl` + FOR EACH ROW +BEGIN + IF NEW.timed > (util.VN_NOW() + INTERVAL 1 DAY) THEN + CALL util.throw('date in the future'); + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/workerTimeControl_beforeInsert.sql b/db/routines/vn/triggers/workerTimeControl_beforeInsert.sql new file mode 100644 index 000000000..ad7acb784 --- /dev/null +++ b/db/routines/vn/triggers/workerTimeControl_beforeInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`workerTimeControl_beforeInsert` + BEFORE INSERT ON `workerTimeControl` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/workerTimeControl_beforeUpdate.sql b/db/routines/vn/triggers/workerTimeControl_beforeUpdate.sql new file mode 100644 index 000000000..bb391ad61 --- /dev/null +++ b/db/routines/vn/triggers/workerTimeControl_beforeUpdate.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`workerTimeControl_beforeUpdate` + BEFORE UPDATE ON `workerTimeControl` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/worker_afterDelete.sql b/db/routines/vn/triggers/worker_afterDelete.sql new file mode 100644 index 000000000..0104248ff --- /dev/null +++ b/db/routines/vn/triggers/worker_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`worker_afterDelete` + AFTER DELETE ON `worker` + FOR EACH ROW +BEGIN + INSERT INTO workerLog + SET `action` = 'delete', + `changedModel` = 'Worker', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/worker_beforeInsert.sql b/db/routines/vn/triggers/worker_beforeInsert.sql new file mode 100644 index 000000000..8830bd77e --- /dev/null +++ b/db/routines/vn/triggers/worker_beforeInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`worker_beforeInsert` + BEFORE INSERT ON `worker` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/worker_beforeUpdate.sql b/db/routines/vn/triggers/worker_beforeUpdate.sql new file mode 100644 index 000000000..05705d273 --- /dev/null +++ b/db/routines/vn/triggers/worker_beforeUpdate.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`worker_beforeUpdate` + BEFORE UPDATE ON `worker` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/workingHours_beforeInsert.sql b/db/routines/vn/triggers/workingHours_beforeInsert.sql new file mode 100644 index 000000000..dce726f10 --- /dev/null +++ b/db/routines/vn/triggers/workingHours_beforeInsert.sql @@ -0,0 +1,10 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`workingHours_beforeInsert` + BEFORE INSERT ON `workingHours` + FOR EACH ROW +BEGIN + IF (SELECT COUNT(*) FROM workingHours WHERE userId = NEW.userId AND DATE(timeIn) = util.VN_CURDATE()) > 0 THEN + CALL util.throw ('ALREADY_LOGGED'); + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/zoneEvent_afterDelete.sql b/db/routines/vn/triggers/zoneEvent_afterDelete.sql new file mode 100644 index 000000000..1eecc21dc --- /dev/null +++ b/db/routines/vn/triggers/zoneEvent_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`zoneEvent_afterDelete` + AFTER DELETE ON `zoneEvent` + FOR EACH ROW +BEGIN + INSERT INTO zoneLog + SET `action` = 'delete', + `changedModel` = 'zoneEvent', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/zoneEvent_beforeInsert.sql b/db/routines/vn/triggers/zoneEvent_beforeInsert.sql new file mode 100644 index 000000000..ae1542851 --- /dev/null +++ b/db/routines/vn/triggers/zoneEvent_beforeInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`zoneEvent_beforeInsert` + BEFORE INSERT ON `zoneEvent` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/zoneEvent_beforeUpdate.sql b/db/routines/vn/triggers/zoneEvent_beforeUpdate.sql new file mode 100644 index 000000000..09698a2c9 --- /dev/null +++ b/db/routines/vn/triggers/zoneEvent_beforeUpdate.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`zoneEvent_beforeUpdate` + BEFORE UPDATE ON `zoneEvent` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/zoneExclusion_afterDelete.sql b/db/routines/vn/triggers/zoneExclusion_afterDelete.sql new file mode 100644 index 000000000..6c8a441aa --- /dev/null +++ b/db/routines/vn/triggers/zoneExclusion_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`zoneExclusion_afterDelete` + AFTER DELETE ON `zoneExclusion` + FOR EACH ROW +BEGIN + INSERT INTO zoneLog + SET `action` = 'delete', + `changedModel` = 'zoneExclusion', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/zoneExclusion_beforeInsert.sql b/db/routines/vn/triggers/zoneExclusion_beforeInsert.sql new file mode 100644 index 000000000..6b2d2f5c7 --- /dev/null +++ b/db/routines/vn/triggers/zoneExclusion_beforeInsert.sql @@ -0,0 +1,10 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`zoneExclusion_beforeInsert` + BEFORE INSERT ON `zoneExclusion` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); + SET NEW.userFk = account.myUser_getId(); + +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/zoneExclusion_beforeUpdate.sql b/db/routines/vn/triggers/zoneExclusion_beforeUpdate.sql new file mode 100644 index 000000000..1daa6d2f0 --- /dev/null +++ b/db/routines/vn/triggers/zoneExclusion_beforeUpdate.sql @@ -0,0 +1,10 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`zoneExclusion_beforeUpdate` + BEFORE UPDATE ON `zoneExclusion` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); + SET NEW.userFk = account.myUser_getId(); + +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/zoneGeo_beforeInsert.sql b/db/routines/vn/triggers/zoneGeo_beforeInsert.sql new file mode 100644 index 000000000..1dbefbed9 --- /dev/null +++ b/db/routines/vn/triggers/zoneGeo_beforeInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`zoneGeo_beforeInsert` + BEFORE INSERT ON `zoneGeo` + FOR EACH ROW +BEGIN + CALL zoneGeo_checkName(NEW.`name`); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/zoneGeo_beforeUpdate.sql b/db/routines/vn/triggers/zoneGeo_beforeUpdate.sql new file mode 100644 index 000000000..0fdd7a682 --- /dev/null +++ b/db/routines/vn/triggers/zoneGeo_beforeUpdate.sql @@ -0,0 +1,10 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`zoneGeo_beforeUpdate` + BEFORE UPDATE ON `zoneGeo` + FOR EACH ROW +BEGIN + IF !(OLD.`name` <=> NEW.`name`) THEN + CALL zoneGeo_checkName(NEW.`name`); + END IF; +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/zoneIncluded_afterDelete.sql b/db/routines/vn/triggers/zoneIncluded_afterDelete.sql new file mode 100644 index 000000000..18332bb55 --- /dev/null +++ b/db/routines/vn/triggers/zoneIncluded_afterDelete.sql @@ -0,0 +1,13 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`zoneIncluded_afterDelete` + AFTER DELETE ON `zoneIncluded` + FOR EACH ROW +BEGIN + INSERT INTO zoneLog + SET `action` = 'delete', + `changedModel` = 'zoneIncluded', + `changedModelId` = OLD.zoneFk, + `userFk` = account.myUser_getId(); + +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/zoneIncluded_beforeInsert.sql b/db/routines/vn/triggers/zoneIncluded_beforeInsert.sql new file mode 100644 index 000000000..18895c9a5 --- /dev/null +++ b/db/routines/vn/triggers/zoneIncluded_beforeInsert.sql @@ -0,0 +1,9 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`zoneIncluded_beforeInsert` + BEFORE INSERT ON `zoneIncluded` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); + +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/zoneIncluded_beforeUpdate.sql b/db/routines/vn/triggers/zoneIncluded_beforeUpdate.sql new file mode 100644 index 000000000..e3f0a27e2 --- /dev/null +++ b/db/routines/vn/triggers/zoneIncluded_beforeUpdate.sql @@ -0,0 +1,9 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`zoneIncluded_beforeUpdate` + BEFORE UPDATE ON `zoneIncluded` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); + +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/zoneWarehouse_afterDelete.sql b/db/routines/vn/triggers/zoneWarehouse_afterDelete.sql new file mode 100644 index 000000000..3befff38a --- /dev/null +++ b/db/routines/vn/triggers/zoneWarehouse_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`zoneWarehouse_afterDelete` + AFTER DELETE ON `zoneWarehouse` + FOR EACH ROW +BEGIN + INSERT INTO zoneLog + SET `action` = 'delete', + `changedModel` = 'ZoneWarehouse', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/zoneWarehouse_beforeInsert.sql b/db/routines/vn/triggers/zoneWarehouse_beforeInsert.sql new file mode 100644 index 000000000..099e66587 --- /dev/null +++ b/db/routines/vn/triggers/zoneWarehouse_beforeInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`zoneWarehouse_beforeInsert` + BEFORE INSERT ON `zoneWarehouse` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/zoneWarehouse_beforeUpdate.sql b/db/routines/vn/triggers/zoneWarehouse_beforeUpdate.sql new file mode 100644 index 000000000..2a6563dc5 --- /dev/null +++ b/db/routines/vn/triggers/zoneWarehouse_beforeUpdate.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`zoneWarehouse_beforeUpdate` + BEFORE UPDATE ON `zoneWarehouse` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/zone_afterDelete.sql b/db/routines/vn/triggers/zone_afterDelete.sql new file mode 100644 index 000000000..463fa89e8 --- /dev/null +++ b/db/routines/vn/triggers/zone_afterDelete.sql @@ -0,0 +1,12 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`zone_afterDelete` + AFTER DELETE ON `zone` + FOR EACH ROW +BEGIN + INSERT INTO zoneLog + SET `action` = 'delete', + `changedModel` = 'Zone', + `changedModelId` = OLD.id, + `userFk` = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/zone_beforeInsert.sql b/db/routines/vn/triggers/zone_beforeInsert.sql new file mode 100644 index 000000000..e0449a989 --- /dev/null +++ b/db/routines/vn/triggers/zone_beforeInsert.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`zone_beforeInsert` + BEFORE INSERT ON `zone` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/triggers/zone_beforeUpdate.sql b/db/routines/vn/triggers/zone_beforeUpdate.sql new file mode 100644 index 000000000..f945ad32c --- /dev/null +++ b/db/routines/vn/triggers/zone_beforeUpdate.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`zone_beforeUpdate` + BEFORE UPDATE ON `zone` + FOR EACH ROW +BEGIN + SET NEW.editorFk = account.myUser_getId(); +END$$ +DELIMITER ; diff --git a/db/routines/vn/views/NewView.sql b/db/routines/vn/views/NewView.sql new file mode 100644 index 000000000..389564966 --- /dev/null +++ b/db/routines/vn/views/NewView.sql @@ -0,0 +1,19 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`NewView` +AS SELECT `c`.`id` AS `clientFk`, + max(`t`.`shipped`) AS `lastShipped`, + `pc`.`notBuyingMonths` AS `notBuyingMonths` +FROM ( + ( + `vn`.`client` `c` + JOIN `vn`.`productionConfig` `pc` + ) + LEFT JOIN `vn`.`ticket` `t` ON( + `c`.`id` = `t`.`clientFk` + AND `t`.`shipped` < `util`.`VN_CURDATE`() + INTERVAL - `pc`.`rookieDays` DAY + ) + ) +GROUP BY `c`.`id` +HAVING `lastShipped` IS NULL + OR `lastShipped` < `util`.`VN_CURDATE`() + INTERVAL - `notBuyingMonths` MONTH diff --git a/db/routines/vn/views/agencyTerm.sql b/db/routines/vn/views/agencyTerm.sql new file mode 100644 index 000000000..5f54cf39f --- /dev/null +++ b/db/routines/vn/views/agencyTerm.sql @@ -0,0 +1,12 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`agencyTerm` +AS SELECT `sat`.`agencyFk` AS `agencyFk`, + `sat`.`minimumPackages` AS `minimumPackages`, + `sat`.`kmPrice` AS `kmPrice`, + `sat`.`packagePrice` AS `packagePrice`, + `sat`.`routePrice` AS `routePrice`, + `sat`.`minimumKm` AS `minimumKm`, + `sat`.`minimumM3` AS `minimumM3`, + `sat`.`m3Price` AS `m3Price` +FROM `vn`.`supplierAgencyTerm` `sat` diff --git a/db/routines/vn/views/annualAverageInvoiced.sql b/db/routines/vn/views/annualAverageInvoiced.sql new file mode 100644 index 000000000..30e81e1ec --- /dev/null +++ b/db/routines/vn/views/annualAverageInvoiced.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`annualAverageInvoiced` +AS SELECT `cec`.`clientFk` AS `clientFk`, + `cec`.`invoiced` AS `invoiced` +FROM `bs`.`clientAnnualConsumption` `cec` diff --git a/db/routines/vn/views/awbVolume.sql b/db/routines/vn/views/awbVolume.sql new file mode 100644 index 000000000..df3b1ed1a --- /dev/null +++ b/db/routines/vn/views/awbVolume.sql @@ -0,0 +1,31 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`awbVolume` +AS SELECT `t`.`awbFk` AS `awbFk`, + `b`.`stickers` * `i`.`density` * IF( + `p`.`volume` > 0, + `p`.`volume`, + `p`.`width` * `p`.`depth` * IF(`p`.`height` = 0, `i`.`size` + 10, `p`.`height`) + ) / (`vc`.`aerealVolumetricDensity` * 1000) AS `volume`, + `b`.`id` AS `buyFk` +FROM ( + ( + ( + ( + ( + ( + `vn`.`buy` `b` + JOIN `vn`.`item` `i` ON(`b`.`itemFk` = `i`.`id`) + ) + JOIN `vn`.`itemType` `it` ON(`i`.`typeFk` = `it`.`id`) + ) + JOIN `vn`.`packaging` `p` ON(`p`.`id` = `b`.`packagingFk`) + ) + JOIN `vn`.`entry` `e` ON(`b`.`entryFk` = `e`.`id`) + ) + JOIN `vn`.`travel` `t` ON(`t`.`id` = `e`.`travelFk`) + ) + JOIN `vn`.`volumeConfig` `vc` + ) +WHERE `t`.`shipped` > makedate(year(`util`.`VN_CURDATE`()) - 1, 1) + AND `t`.`awbFk` <> 0 diff --git a/db/routines/vn/views/businessCalendar.sql b/db/routines/vn/views/businessCalendar.sql new file mode 100644 index 000000000..feda22793 --- /dev/null +++ b/db/routines/vn/views/businessCalendar.sql @@ -0,0 +1,8 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`businessCalendar` +AS SELECT `c`.`id` AS `id`, + `c`.`businessFk` AS `businessFk`, + `c`.`dayOffTypeFk` AS `absenceTypeFk`, + `c`.`dated` AS `dated` +FROM `vn`.`calendar` `c` diff --git a/db/routines/vn/views/buyer.sql b/db/routines/vn/views/buyer.sql new file mode 100644 index 000000000..7114c50bc --- /dev/null +++ b/db/routines/vn/views/buyer.sql @@ -0,0 +1,11 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`buyer` +AS SELECT DISTINCT `u`.`id` AS `userFk`, + `u`.`nickname` AS `nickname` +FROM ( + `account`.`user` `u` + JOIN `vn`.`itemType` `it` ON(`it`.`workerFk` = `u`.`id`) + ) +WHERE `u`.`active` <> 0 +ORDER BY `u`.`nickname` diff --git a/db/routines/vn/views/buyerSales.sql b/db/routines/vn/views/buyerSales.sql new file mode 100644 index 000000000..b67e17569 --- /dev/null +++ b/db/routines/vn/views/buyerSales.sql @@ -0,0 +1,17 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`buyerSales` +AS SELECT `v`.`importe` AS `importe`, + `w`.`code` AS `comprador`, + `t`.`year` AS `año`, + `t`.`week` AS `semana` +FROM ( + ( + ( + `bs`.`ventas` `v` + JOIN `vn`.`time` `t` ON(`t`.`dated` = `v`.`fecha`) + ) + JOIN `vn`.`itemType` `it` ON(`it`.`id` = `v`.`tipo_id`) + ) + JOIN `vn`.`worker` `w` ON(`w`.`id` = `it`.`workerFk`) + ) diff --git a/db/routines/vn/views/clientLost.sql b/db/routines/vn/views/clientLost.sql new file mode 100644 index 000000000..764782d08 --- /dev/null +++ b/db/routines/vn/views/clientLost.sql @@ -0,0 +1,19 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`clientLost` +AS SELECT `c`.`id` AS `clientFk`, + max(`t`.`shipped`) AS `lastShipped`, + `pc`.`notBuyingMonths` AS `notBuyingMonths` +FROM ( + ( + `vn`.`client` `c` + JOIN `vn`.`productionConfig` `pc` + ) + LEFT JOIN `vn`.`ticket` `t` ON( + `c`.`id` = `t`.`clientFk` + AND `t`.`shipped` < `util`.`VN_CURDATE`() + INTERVAL - `pc`.`rookieDays` DAY + ) + ) +GROUP BY `c`.`id` +HAVING `lastShipped` IS NULL + OR `lastShipped` < `util`.`VN_CURDATE`() + INTERVAL - `notBuyingMonths` MONTH diff --git a/db/routines/vn/views/clientPhoneBook.sql b/db/routines/vn/views/clientPhoneBook.sql new file mode 100644 index 000000000..7ab2a99db --- /dev/null +++ b/db/routines/vn/views/clientPhoneBook.sql @@ -0,0 +1,41 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`clientPhoneBook` +AS SELECT `c`.`id` AS `clientFk`, + trim(`c`.`phone`) AS `phone` +FROM `vn`.`client` `c` +WHERE `c`.`phone` <> 0 + AND `c`.`isActive` <> 0 +UNION +SELECT `c`.`id` AS `clientFk`, + trim(`c`.`mobile`) AS `phone` +FROM `vn`.`client` `c` +WHERE `c`.`mobile` <> 0 + AND `c`.`isActive` <> 0 +UNION +SELECT `a`.`clientFk` AS `clientFk`, + trim(`a`.`phone`) AS `phone` +FROM ( + `vn`.`address` `a` + JOIN `vn`.`client` `c` ON(`c`.`id` = `a`.`clientFk`) + ) +WHERE `a`.`phone` <> 0 + AND `c`.`isActive` <> 0 +UNION +SELECT `a`.`clientFk` AS `clientFk`, + trim(`a`.`mobile`) AS `phone` +FROM ( + `vn`.`address` `a` + JOIN `vn`.`client` `c` ON(`c`.`id` = `a`.`clientFk`) + ) +WHERE `a`.`mobile` <> 0 + AND `c`.`isActive` <> 0 +UNION +SELECT `cc`.`clientFk` AS `clientFk`, + trim(`cc`.`phone`) AS `phone` +FROM ( + `vn`.`clientContact` `cc` + LEFT JOIN `vn`.`client` `c` ON(`c`.`id` = `cc`.`clientFk`) + ) +WHERE `c`.`phone` <> 0 + AND `c`.`isActive` <> 0 diff --git a/db/routines/vn/views/companyL10n.sql b/db/routines/vn/views/companyL10n.sql new file mode 100644 index 000000000..fa5c4c5d8 --- /dev/null +++ b/db/routines/vn/views/companyL10n.sql @@ -0,0 +1,12 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`companyL10n` +AS SELECT `c`.`id` AS `id`, + IFNULL(`ci`.`footnotes`, `c`.`footnotes`) AS `footnotes` +FROM ( + `vn`.`company` `c` + LEFT JOIN `vn`.`companyI18n` `ci` ON( + `ci`.`companyFk` = `c`.`id` + AND `ci`.`lang` = `util`.`LANG`() + ) + ) diff --git a/db/routines/vn/views/defaulter.sql b/db/routines/vn/views/defaulter.sql new file mode 100644 index 000000000..9d48978b2 --- /dev/null +++ b/db/routines/vn/views/defaulter.sql @@ -0,0 +1,20 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`defaulter` +AS SELECT `d`.`clientFk` AS `clientFk`, + `d`.`created` AS `created`, + `d`.`amount` AS `amount`, + `d`.`defaulterSinced` AS `defaulterSinced`, + `d`.`hasChanged` AS `hasChanged`, + `c`.`countryFk` AS `country`, + `c`.`payMethodFk` AS `payMethod` +FROM ( + ( + ( + `bs`.`defaulter` `d` + JOIN `vn`.`client` `c` ON(`c`.`id` = `d`.`clientFk`) + ) + JOIN `vn`.`country` `co` ON(`co`.`id` = `c`.`countryFk`) + ) + JOIN `vn`.`payMethod` `pm` ON(`pm`.`id` = `c`.`payMethodFk`) + ) diff --git a/db/routines/vn/views/departmentTree.sql b/db/routines/vn/views/departmentTree.sql new file mode 100644 index 000000000..6f5a1205a --- /dev/null +++ b/db/routines/vn/views/departmentTree.sql @@ -0,0 +1,17 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`departmentTree` +AS SELECT `node`.`id` AS `id`, + concat( + CONVERT( + repeat(repeat(' ', 5), COUNT(`parent`.`id`) - 1) USING utf8mb3 + ), + `node`.`name` + ) AS `dep` +FROM ( + `vn`.`department` `node` + JOIN `vn`.`department` `parent` + ) +WHERE `node`.`lft` BETWEEN `parent`.`lft` AND `parent`.`rgt` +GROUP BY `node`.`id` +ORDER BY `node`.`lft` diff --git a/db/routines/vn/views/ediGenus.sql b/db/routines/vn/views/ediGenus.sql new file mode 100644 index 000000000..4546afa33 --- /dev/null +++ b/db/routines/vn/views/ediGenus.sql @@ -0,0 +1,9 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`ediGenus` +AS SELECT `g`.`genus_id` AS `id`, + `g`.`latin_genus_name` AS `latinGenusName`, + `g`.`entry_date` AS `entried`, + `g`.`expiry_date` AS `dued`, + `g`.`change_date_time` AS `modified` +FROM `edi`.`genus` `g` diff --git a/db/routines/vn/views/ediSpecie.sql b/db/routines/vn/views/ediSpecie.sql new file mode 100644 index 000000000..9587cb530 --- /dev/null +++ b/db/routines/vn/views/ediSpecie.sql @@ -0,0 +1,10 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`ediSpecie` +AS SELECT `s`.`specie_id` AS `id`, + `s`.`genus_id` AS `genusFk`, + `s`.`latin_species_name` AS `latinSpeciesName`, + `s`.`entry_date` AS `entried`, + `s`.`expiry_date` AS `dued`, + `s`.`change_date_time` AS `modified` +FROM `edi`.`specie` `s` diff --git a/db/routines/vn/views/ektSubAddress.sql b/db/routines/vn/views/ektSubAddress.sql new file mode 100644 index 000000000..11f6e2e70 --- /dev/null +++ b/db/routines/vn/views/ektSubAddress.sql @@ -0,0 +1,12 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`ektSubAddress` +AS SELECT `eea`.`sub` AS `sub`, + `a`.`clientFk` AS `clientFk`, + `a`.`nickname` AS `nickname`, + `eea`.`addressFk` AS `addressFk` +FROM ( + `vn`.`ektEntryAssign` `eea` + JOIN `vn`.`address` `a` ON(`a`.`id` = `eea`.`addressFk`) + ) +GROUP BY `eea`.`sub` diff --git a/db/routines/vn/views/especialPrice.sql b/db/routines/vn/views/especialPrice.sql new file mode 100644 index 000000000..08b9b434a --- /dev/null +++ b/db/routines/vn/views/especialPrice.sql @@ -0,0 +1,8 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`especialPrice` +AS SELECT `p`.`Id_PrecioEspecial` AS `id`, + `p`.`Id_Cliente` AS `clientFk`, + `p`.`Id_Article` AS `itemFk`, + `p`.`PrecioEspecial` AS `value` +FROM `vn2008`.`PreciosEspeciales` `p` diff --git a/db/routines/vn/views/exchangeInsurance.sql b/db/routines/vn/views/exchangeInsurance.sql new file mode 100644 index 000000000..5df3c2f1d --- /dev/null +++ b/db/routines/vn/views/exchangeInsurance.sql @@ -0,0 +1,16 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`exchangeInsurance` +AS SELECT `vn2008`.`pago_sdc`.`pago_sdc_id` AS `id`, + `vn2008`.`pago_sdc`.`importe` AS `amount`, + `vn2008`.`pago_sdc`.`fecha` AS `dated`, + `vn2008`.`pago_sdc`.`vencimiento` AS `finished`, + `vn2008`.`pago_sdc`.`entity_id` AS `entityFk`, + `vn2008`.`pago_sdc`.`ref` AS `ref`, + `vn2008`.`pago_sdc`.`rate` AS `rate`, + `vn2008`.`pago_sdc`.`empresa_id` AS `companyFk`, + `vn2008`.`pago_sdc`.`financialProductTypefk` AS `financialProductTypefk`, + `vn2008`.`pago_sdc`.`upperBarrier` AS `upperBarrier`, + `vn2008`.`pago_sdc`.`lowerBarrier` AS `lowerBarrier`, + `vn2008`.`pago_sdc`.`strike` AS `strike` +FROM `vn2008`.`pago_sdc` diff --git a/db/routines/vn/views/exchangeInsuranceEntry.sql b/db/routines/vn/views/exchangeInsuranceEntry.sql new file mode 100644 index 000000000..e9c7a7bbe --- /dev/null +++ b/db/routines/vn/views/exchangeInsuranceEntry.sql @@ -0,0 +1,28 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`exchangeInsuranceEntry` +AS SELECT max(`tr`.`landed`) AS `dated`, + cast( + sum( + (`b`.`buyingValue` + `b`.`freightValue`) * `b`.`quantity` + ) AS decimal(10, 2) + ) AS `Dolares`, + cast( + sum( + (`b`.`buyingValue` + `b`.`freightValue`) * `b`.`quantity` + ) / sum( + (100 + `e`.`commission`) / 100 * (`b`.`buyingValue` + `b`.`freightValue`) * `b`.`quantity` + ) AS decimal(10, 4) + ) AS `rate` +FROM ( + ( + `vn`.`entry` `e` + JOIN `vn`.`buy` `b` ON(`e`.`id` = `b`.`entryFk`) + ) + JOIN `vn`.`travel` `tr` ON(`tr`.`id` = `e`.`travelFk`) + ) +WHERE `tr`.`landed` BETWEEN '2016-01-31' AND `util`.`VN_CURDATE`() + AND `e`.`commission` < 0 + AND `e`.`currencyFk` = 2 +GROUP BY MONTH(`tr`.`landed`), + year(`tr`.`landed`) diff --git a/db/routines/vn/views/exchangeInsuranceIn.sql b/db/routines/vn/views/exchangeInsuranceIn.sql new file mode 100644 index 000000000..aa27cfb4c --- /dev/null +++ b/db/routines/vn/views/exchangeInsuranceIn.sql @@ -0,0 +1,12 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`exchangeInsuranceIn` +AS SELECT `exchangeInsuranceInPrevious`.`dated` AS `dated`, + sum(`exchangeInsuranceInPrevious`.`amount`) AS `amount`, + cast( + sum( + `exchangeInsuranceInPrevious`.`amount` * `exchangeInsuranceInPrevious`.`rate` + ) / sum(`exchangeInsuranceInPrevious`.`amount`) AS decimal(10, 4) + ) AS `rate` +FROM `vn`.`exchangeInsuranceInPrevious` +GROUP BY `exchangeInsuranceInPrevious`.`dated` diff --git a/db/routines/vn/views/exchangeInsuranceInPrevious.sql b/db/routines/vn/views/exchangeInsuranceInPrevious.sql new file mode 100644 index 000000000..3f997e8bf --- /dev/null +++ b/db/routines/vn/views/exchangeInsuranceInPrevious.sql @@ -0,0 +1,9 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`exchangeInsuranceInPrevious` +AS SELECT `ei`.`dueDated` AS `dated`, + `ei`.`amount` AS `amount`, + `ei`.`rate` AS `rate` +FROM `vn`.`exchangeInsurance` `ei` +WHERE `ei`.`amount` <> 0 + AND `ei`.`financialProductTypefk` = 'SC' diff --git a/db/routines/vn/views/exchangeInsuranceOut.sql b/db/routines/vn/views/exchangeInsuranceOut.sql new file mode 100644 index 000000000..5c41dbb24 --- /dev/null +++ b/db/routines/vn/views/exchangeInsuranceOut.sql @@ -0,0 +1,17 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`exchangeInsuranceOut` +AS SELECT `p`.`received` AS `received`, + sum(`p`.`divisa`) AS `divisa`, + sum(`p`.`divisa`) / sum(`p`.`amount`) AS `rate` +FROM ( + ( + `vn`.`payment` `p` + JOIN `vn`.`accounting` `a` ON(`a`.`id` = `p`.`bankFk`) + ) + JOIN `vn`.`accountingType` `at2` ON(`at2`.`id` = `a`.`accountingTypeFk`) + ) +WHERE `p`.`currencyFk` = 2 + AND `at2`.`code` = 'wireTransfer' + AND `p`.`supplierFk` <> 2213 +GROUP BY `p`.`received` diff --git a/db/routines/vn/views/exchangeReportSource.sql b/db/routines/vn/views/exchangeReportSource.sql new file mode 100644 index 000000000..6a2b9bb7e --- /dev/null +++ b/db/routines/vn/views/exchangeReportSource.sql @@ -0,0 +1,22 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`exchangeReportSource` +AS SELECT `e`.`dated` AS `dated`, + cast(sum(`e`.`amountIn`) AS decimal(10, 2)) AS `amountIn`, + cast(sum(`e`.`rateIn`) AS decimal(10, 4)) AS `rateIn`, + cast(sum(`e`.`amountOut`) AS decimal(10, 2)) AS `amountOut`, + cast(sum(`e`.`rateOut`) AS decimal(10, 4)) AS `rateOut`, + cast(sum(`e`.`amountEntry`) AS decimal(10, 2)) AS `amountEntry`, + cast(sum(`e`.`rateEntry`) AS decimal(10, 4)) AS `rateEntry`, + cast( + IFNULL(`rr`.`value`, `rrc`.`simulatedValue`) AS decimal(10, 4) + ) AS `rateECB` +FROM ( + ( + `vn`.`exchangeReportSourcePrevious` `e` + LEFT JOIN `vn`.`referenceRate` `rr` ON(`rr`.`dated` = `e`.`dated`) + ) + JOIN `vn`.`referenceRateConfig` `rrc` ON(1) + ) +GROUP BY `e`.`dated` +ORDER BY `e`.`dated` diff --git a/db/routines/vn/views/exchangeReportSourcePrevious.sql b/db/routines/vn/views/exchangeReportSourcePrevious.sql new file mode 100644 index 000000000..b9e8ba8c1 --- /dev/null +++ b/db/routines/vn/views/exchangeReportSourcePrevious.sql @@ -0,0 +1,29 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`exchangeReportSourcePrevious` +AS SELECT `exchangeInsuranceIn`.`dated` AS `dated`, + `exchangeInsuranceIn`.`amount` AS `amountIn`, + `exchangeInsuranceIn`.`rate` AS `rateIn`, + 0.00 AS `amountOut`, + 0.00 AS `rateOut`, + 0.00 AS `amountEntry`, + 0.00 AS `rateEntry` +FROM `vn`.`exchangeInsuranceIn` +UNION ALL +SELECT `exchangeInsuranceOut`.`received` AS `received`, + 0.00 AS `amountIn`, + 0.00 AS `ratedIn`, + `exchangeInsuranceOut`.`divisa` AS `amountOut`, + `exchangeInsuranceOut`.`rate` AS `ratedOut`, + 0.00 AS `amountEntry`, + 0.00 AS `rateEntry` +FROM `vn`.`exchangeInsuranceOut` +UNION ALL +SELECT `exchangeInsuranceEntry`.`dated` AS `dated`, + 0.00 AS `amountIn`, + 0.00 AS `ratedIn`, + 0.00 AS `amountOut`, + 0.00 AS `ratedOut`, + `exchangeInsuranceEntry`.`Dolares` AS `amountEntry`, + `exchangeInsuranceEntry`.`rate` AS `rateEntry` +FROM `vn`.`exchangeInsuranceEntry` diff --git a/db/routines/vn/views/expeditionCommon.sql b/db/routines/vn/views/expeditionCommon.sql new file mode 100644 index 000000000..f03966c05 --- /dev/null +++ b/db/routines/vn/views/expeditionCommon.sql @@ -0,0 +1,31 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`expeditionCommon` +AS SELECT `et`.`id` AS `truckFk`, + `et`.`eta` AS `eta`, + IFNULL(ucase(`et`.`description`), 'SIN ESCANEAR') AS `description`, + `es`.`palletFk` AS `palletFk`, + `t`.`routeFk` AS `routeFk`, + `es`.`id` AS `scanFk`, + `e`.`id` AS `expeditionFk`, + `r`.`expeditionTruckFk` AS `expeditionTruckFk`, + `t`.`warehouseFk` AS `warehouseFk`, + `e`.`created` AS `lastPacked`, + `t`.`id` AS `ticketFk` +FROM ( + ( + ( + ( + ( + `vn`.`expeditionTruck` `et` + LEFT JOIN `vn`.`routesMonitor` `r` ON(`et`.`id` = `r`.`expeditionTruckFk`) + ) + LEFT JOIN `vn`.`ticket` `t` ON(`r`.`routeFk` = `t`.`routeFk`) + ) + LEFT JOIN `vn`.`expedition` `e` ON(`t`.`id` = `e`.`ticketFk`) + ) + LEFT JOIN `vn`.`expeditionScan` `es` ON(`e`.`id` = `es`.`expeditionFk`) + ) + LEFT JOIN `vn`.`expeditionPallet` `ep` ON(`es`.`palletFk` = `ep`.`id`) + ) +WHERE `et`.`eta` >= `util`.`VN_CURDATE`() diff --git a/db/routines/vn/views/expeditionPallet_Print.sql b/db/routines/vn/views/expeditionPallet_Print.sql new file mode 100644 index 000000000..07627e817 --- /dev/null +++ b/db/routines/vn/views/expeditionPallet_Print.sql @@ -0,0 +1,39 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`expeditionPallet_Print` +AS SELECT `et2`.`description` AS `truck`, + `t`.`routeFk` AS `routeFk`, + `r`.`description` AS `zone`, + COUNT(`es`.`id`) AS `eti`, + `ep`.`id` AS `palletFk`, + `et`.`id` <=> `rm`.`expeditionTruckFk` AS `isMatch`, + `t`.`warehouseFk` AS `warehouseFk`, + IF( + `r`.`created` > `util`.`VN_CURDATE`() + INTERVAL 1 DAY, + ucase(dayname(`r`.`created`)), + NULL + ) AS `nombreDia` +FROM ( + ( + ( + ( + ( + ( + ( + `vn`.`expeditionTruck` `et` + JOIN `vn`.`expeditionPallet` `ep` ON(`ep`.`truckFk` = `et`.`id`) + ) + JOIN `vn`.`expeditionScan` `es` ON(`es`.`palletFk` = `ep`.`id`) + ) + JOIN `vn`.`expedition` `e` ON(`e`.`id` = `es`.`expeditionFk`) + ) + JOIN `vn`.`ticket` `t` ON(`t`.`id` = `e`.`ticketFk`) + ) + JOIN `vn`.`route` `r` ON(`r`.`id` = `t`.`routeFk`) + ) + LEFT JOIN `vn`.`routesMonitor` `rm` ON(`rm`.`routeFk` = `r`.`id`) + ) + LEFT JOIN `vn`.`expeditionTruck` `et2` ON(`et2`.`id` = `rm`.`expeditionTruckFk`) + ) +GROUP BY `ep`.`id`, + `t`.`routeFk` diff --git a/db/routines/vn/views/expeditionRoute_Monitor.sql b/db/routines/vn/views/expeditionRoute_Monitor.sql new file mode 100644 index 000000000..774f21433 --- /dev/null +++ b/db/routines/vn/views/expeditionRoute_Monitor.sql @@ -0,0 +1,27 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`expeditionRoute_Monitor` +AS SELECT `r`.`id` AS `routeFk`, + COUNT(DISTINCT IF(`e`.`id` IS NULL, `t`.`id`, NULL)) AS `tickets`, + COUNT(DISTINCT `e`.`id`) AS `expeditions`, + COUNT(DISTINCT `es`.`id`) AS `scanned`, + max(`e`.`created`) AS `lastPacked`, + `r`.`created` AS `created` +FROM ( + ( + ( + ( + ( + `vn`.`route` `r` + LEFT JOIN `vn`.`routesMonitor` `rm` ON(`r`.`id` = `rm`.`routeFk`) + ) + LEFT JOIN `vn`.`expeditionTruck` `et` ON(`et`.`id` = `rm`.`expeditionTruckFk`) + ) + JOIN `vn`.`ticket` `t` ON(`t`.`routeFk` = `r`.`id`) + ) + LEFT JOIN `vn`.`expedition` `e` ON(`e`.`ticketFk` = `t`.`id`) + ) + LEFT JOIN `vn`.`expeditionScan` `es` ON(`es`.`expeditionFk` = `e`.`id`) + ) +WHERE `r`.`created` >= `util`.`yesterday`() +GROUP BY `r`.`id` diff --git a/db/routines/vn/views/expeditionRoute_freeTickets.sql b/db/routines/vn/views/expeditionRoute_freeTickets.sql new file mode 100644 index 000000000..85e6297c9 --- /dev/null +++ b/db/routines/vn/views/expeditionRoute_freeTickets.sql @@ -0,0 +1,26 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`expeditionRoute_freeTickets` +AS SELECT `t`.`routeFk` AS `routeFk`, + `tss`.`ticketFk` AS `ticket`, + `s`.`name` AS `code`, + `w`.`name` AS `almacen`, + `tss`.`updated` AS `updated`, + `p`.`code` AS `parkingCode` +FROM ( + ( + ( + ( + ( + `vn`.`ticketState` `tss` + JOIN `vn`.`ticket` `t` ON(`t`.`id` = `tss`.`ticketFk`) + ) + JOIN `vn`.`warehouse` `w` ON(`w`.`id` = `t`.`warehouseFk`) + ) + JOIN `vn`.`state` `s` ON(`s`.`id` = `tss`.`state`) + ) + LEFT JOIN `vn`.`ticketParking` `tp` ON(`tp`.`ticketFk` = `t`.`id`) + ) + LEFT JOIN `vn`.`parking` `p` ON(`p`.`id` = `tp`.`parkingFk`) + ) +WHERE IFNULL(`t`.`packages`, 0) = 0 diff --git a/db/routines/vn/views/expeditionScan_Monitor.sql b/db/routines/vn/views/expeditionScan_Monitor.sql new file mode 100644 index 000000000..7566a0bfd --- /dev/null +++ b/db/routines/vn/views/expeditionScan_Monitor.sql @@ -0,0 +1,19 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`expeditionScan_Monitor` +AS SELECT `et`.`id` AS `truckFk`, + `et`.`eta` AS `ETD`, + `et`.`description` AS `description`, + `ep`.`id` AS `palletFk`, + `ep`.`position` AS `position`, + `ep`.`built` AS `built`, + `es`.`id` AS `scanFk`, + `es`.`expeditionFk` AS `expeditionFk`, + `es`.`scanned` AS `scanned` +FROM ( + ( + `vn`.`expeditionTruck` `et` + LEFT JOIN `vn`.`expeditionPallet` `ep` ON(`ep`.`truckFk` = `et`.`id`) + ) + LEFT JOIN `vn`.`expeditionScan` `es` ON(`es`.`palletFk` = `ep`.`id`) + ) diff --git a/db/routines/vn/views/expeditionSticker.sql b/db/routines/vn/views/expeditionSticker.sql new file mode 100644 index 000000000..2b6bf18d2 --- /dev/null +++ b/db/routines/vn/views/expeditionSticker.sql @@ -0,0 +1,61 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`expeditionSticker` +AS SELECT `e`.`id` AS `expeditionFk`, + `e`.`ticketFk` AS `ticketFk`, + `t`.`addressFk` AS `addressFk`, + `t`.`clientFk` AS `clientFk`, + `a`.`street` AS `street`, + `a`.`postalCode` AS `postalCode`, + `a`.`city` AS `city`, + `a`.`nickname` AS `nickname`, + concat('R(', right(`t`.`routeFk`, 3), ')') AS `routeFk`, + `rm`.`beachFk` AS `beachFk`, + IF( + `t`.`routeFk`, + IFNULL( + `et`.`description`, + REPLACE(`am`.`name`, 'ZONA ', 'Z') + ), + `z`.`name` + ) AS `zona`, + `p`.`name` AS `province`, + IFNULL( + `c`.`mobile`, + IFNULL(`a`.`mobile`, IFNULL(`c`.`phone`, `a`.`phone`)) + ) AS `phone`, + `w`.`code` AS `workerCode` +FROM ( + ( + ( + ( + ( + ( + ( + ( + ( + ( + ( + `vn`.`expedition` `e` + JOIN `vn`.`ticket` `t` ON(`t`.`id` = `e`.`ticketFk`) + ) + JOIN `vn`.`address` `a` ON(`a`.`id` = `t`.`addressFk`) + ) + JOIN `vn`.`province` `p` ON(`p`.`id` = `a`.`provinceFk`) + ) + LEFT JOIN `vn`.`routesMonitor` `rm` ON(`rm`.`routeFk` = `t`.`routeFk`) + ) + LEFT JOIN `vn`.`expeditionTruck` `et` ON(`et`.`id` = `rm`.`expeditionTruckFk`) + ) + LEFT JOIN `vn`.`beach` `b` ON(`b`.`code` = `rm`.`beachFk`) + ) + LEFT JOIN `vn`.`zone` `z` ON(`z`.`id` = `t`.`zoneFk`) + ) + LEFT JOIN `vn`.`route` `r` ON(`r`.`id` = `t`.`routeFk`) + ) + LEFT JOIN `vn`.`agencyMode` `am` ON(`am`.`id` = `r`.`agencyModeFk`) + ) + JOIN `vn`.`client` `c` ON(`c`.`id` = `a`.`clientFk`) + ) + JOIN `vn`.`worker` `w` ON(`w`.`id` = `e`.`workerFk`) + ) diff --git a/db/routines/vn/views/expeditionTicket_NoBoxes.sql b/db/routines/vn/views/expeditionTicket_NoBoxes.sql new file mode 100644 index 000000000..080edd3ac --- /dev/null +++ b/db/routines/vn/views/expeditionTicket_NoBoxes.sql @@ -0,0 +1,19 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`expeditionTicket_NoBoxes` +AS SELECT `t`.`id` AS `ticketFk`, + `t`.`warehouseFk` AS `warehouseFk`, + `t`.`routeFk` AS `routeFk`, + `et`.`description` AS `description` +FROM ( + ( + ( + `vn`.`ticket` `t` + LEFT JOIN `vn`.`expedition` `e` ON(`e`.`ticketFk` = `t`.`id`) + ) + JOIN `vn`.`routesMonitor` `rm` ON(`rm`.`routeFk` = `t`.`routeFk`) + ) + JOIN `vn`.`expeditionTruck` `et` ON(`et`.`id` = `rm`.`expeditionTruckFk`) + ) +WHERE `e`.`id` IS NULL + AND `et`.`eta` > `util`.`VN_CURDATE`() diff --git a/db/routines/vn/views/expeditionTimeExpended.sql b/db/routines/vn/views/expeditionTimeExpended.sql new file mode 100644 index 000000000..65aeb72b2 --- /dev/null +++ b/db/routines/vn/views/expeditionTimeExpended.sql @@ -0,0 +1,18 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`expeditionTimeExpended` +AS SELECT `e`.`ticketFk` AS `ticketFk`, + min(`e`.`created`) AS `started`, + max(`e`.`created`) AS `finished`, + max(`e`.`counter`) AS `cajas`, + `w`.`code` AS `code`, + `t`.`warehouseFk` AS `warehouseFk` +FROM ( + ( + `vn`.`expedition` `e` + JOIN `vn`.`worker` `w` ON(`w`.`id` = `e`.`workerFk`) + ) + JOIN `vn`.`ticket` `t` ON(`t`.`id` = `e`.`ticketFk`) + ) +WHERE `e`.`created` > `util`.`VN_CURDATE`() +GROUP BY `e`.`ticketFk` diff --git a/db/routines/vn/views/expeditionTruck_Control.sql b/db/routines/vn/views/expeditionTruck_Control.sql new file mode 100644 index 000000000..838e1f89e --- /dev/null +++ b/db/routines/vn/views/expeditionTruck_Control.sql @@ -0,0 +1,19 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`expeditionTruck_Control` +AS SELECT `e`.`truckFk` AS `id`, + `e`.`eta` AS `ETD`, + `e`.`description` AS `description`, + COUNT( + DISTINCT IF(`e`.`expeditionFk` IS NULL, `e`.`ticketFk`, NULL) + ) AS `ticketsSinBultos`, + COUNT(DISTINCT `e`.`palletFk`) AS `pallets`, + COUNT(DISTINCT `e`.`routeFk`) AS `routes`, + COUNT(DISTINCT `e`.`scanFk`) AS `scans`, + COUNT(DISTINCT `e`.`expeditionFk`) AS `expeditions`, + sum(`e`.`truckFk` <> `e`.`expeditionTruckFk`) AS `fallos`, + max(`e`.`lastPacked`) AS `lastPacked` +FROM `vn`.`expeditionCommon` `e` +GROUP BY `e`.`truckFk` +ORDER BY sum(`e`.`truckFk` <> `e`.`expeditionTruckFk`) DESC, + `e`.`eta` diff --git a/db/routines/vn/views/expeditionTruck_Control_Detail.sql b/db/routines/vn/views/expeditionTruck_Control_Detail.sql new file mode 100644 index 000000000..96a5b78e6 --- /dev/null +++ b/db/routines/vn/views/expeditionTruck_Control_Detail.sql @@ -0,0 +1,18 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`expeditionTruck_Control_Detail` +AS SELECT `e`.`truckFk` AS `id`, + `e`.`eta` AS `eta`, + `e`.`description` AS `destino`, + `e`.`palletFk` AS `pallet`, + COUNT(DISTINCT `e`.`routeFk`) AS `routes`, + COUNT(DISTINCT `e`.`scanFk`) AS `scans`, + COUNT(DISTINCT `e`.`expeditionTruckFk`) AS `destinos`, + sum(`e`.`truckFk` <> `e`.`expeditionTruckFk`) AS `fallos`, + max(`e`.`lastPacked`) AS `lastPacked` +FROM `vn`.`expeditionCommon` `e` +GROUP BY `e`.`truckFk`, + `e`.`palletFk` +ORDER BY sum(`e`.`truckFk` <> `e`.`expeditionTruckFk`) DESC, + `e`.`eta`, + `e`.`truckFk` diff --git a/db/routines/vn/views/expeditionTruck_Control_Detail_Pallet.sql b/db/routines/vn/views/expeditionTruck_Control_Detail_Pallet.sql new file mode 100644 index 000000000..01bdbf795 --- /dev/null +++ b/db/routines/vn/views/expeditionTruck_Control_Detail_Pallet.sql @@ -0,0 +1,22 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`expeditionTruck_Control_Detail_Pallet` +AS SELECT `e`.`truckFk` AS `id`, + `e`.`eta` AS `eta`, + `e`.`description` AS `destino`, + `e`.`palletFk` AS `pallet`, + `e`.`routeFk` AS `route`, + COUNT(DISTINCT `e`.`scanFk`) AS `scans`, + `et`.`description` AS `destinos`, + sum(`e`.`truckFk` <> `e`.`expeditionTruckFk`) AS `fallos`, + `e`.`expeditionTruckFk` AS `expeditionTruckFk`, + max(`e`.`lastPacked`) AS `lastPacked` +FROM ( + `vn`.`expeditionCommon` `e` + LEFT JOIN `vn`.`expeditionTruck` `et` ON(`et`.`id` = `e`.`expeditionTruckFk`) + ) +GROUP BY `e`.`truckFk`, + `e`.`palletFk`, + `e`.`routeFk` +ORDER BY sum(`e`.`truckFk` <> `e`.`expeditionTruckFk`) DESC, + `e`.`palletFk` diff --git a/db/routines/vn/views/firstTicketShipped.sql b/db/routines/vn/views/firstTicketShipped.sql new file mode 100644 index 000000000..c01a17976 --- /dev/null +++ b/db/routines/vn/views/firstTicketShipped.sql @@ -0,0 +1,8 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`firstTicketShipped` +AS SELECT min(`vn`.`ticket`.`shipped`) AS `shipped`, + `vn`.`ticket`.`clientFk` AS `clientFk` +FROM `vn`.`ticket` +WHERE `vn`.`ticket`.`shipped` > '2001-01-01' +GROUP BY `vn`.`ticket`.`clientFk` diff --git a/db/routines/vn/views/floraHollandBuyedItems.sql b/db/routines/vn/views/floraHollandBuyedItems.sql new file mode 100644 index 000000000..b695c49fd --- /dev/null +++ b/db/routines/vn/views/floraHollandBuyedItems.sql @@ -0,0 +1,31 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`floraHollandBuyedItems` +AS SELECT `b`.`itemFk` AS `itemFk`, + `i`.`longName` AS `longName`, + `b`.`quantity` AS `quantity`, + `b`.`buyingValue` AS `buyingValue`, + `tr`.`landed` AS `landed`, + `e`.`companyFk` AS `companyFk` +FROM ( + ( + ( + ( + ( + `vn`.`buy` `b` + JOIN `vn`.`item` `i` ON(`b`.`itemFk` = `i`.`id`) + ) + JOIN `vn`.`itemType` `it` ON(`it`.`id` = `i`.`typeFk`) + ) + JOIN `vn`.`itemCategory` `ic` ON(`ic`.`id` = `it`.`categoryFk`) + ) + JOIN `vn`.`entry` `e` ON(`e`.`id` = `b`.`entryFk`) + ) + JOIN `vn`.`travel` `tr` ON( + `tr`.`id` = `e`.`travelFk` + AND `ic`.`id` NOT IN (8, 6) + AND `b`.`buyingValue` <> 0 + AND `b`.`quantity` <> 0 + AND `e`.`supplierFk` IN (1664, 1665, 1666, 1465, 1433) + ) + ) diff --git a/db/routines/vn/views/inkL10n.sql b/db/routines/vn/views/inkL10n.sql new file mode 100644 index 000000000..14958ff0a --- /dev/null +++ b/db/routines/vn/views/inkL10n.sql @@ -0,0 +1,12 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`inkL10n` +AS SELECT `k`.`id` AS `id`, + IFNULL(`i`.`name`, `k`.`name`) AS `name` +FROM ( + `vn`.`ink` `k` + LEFT JOIN `vn`.`inkI18n` `i` ON( + `i`.`inkFk` = `k`.`id` + AND `i`.`lang` = `util`.`lang`() + ) + ) diff --git a/db/routines/vn/views/invoiceCorrectionDataSource.sql b/db/routines/vn/views/invoiceCorrectionDataSource.sql new file mode 100644 index 000000000..d401c20f1 --- /dev/null +++ b/db/routines/vn/views/invoiceCorrectionDataSource.sql @@ -0,0 +1,16 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`invoiceCorrectionDataSource` +AS SELECT `s`.`itemFk` AS `itemFk`, + `s`.`quantity` AS `quantity`, + `s`.`concept` AS `concept`, + `s`.`price` AS `price`, + `s`.`discount` AS `discount`, + `t`.`refFk` AS `refFk`, + `s`.`id` AS `saleFk`, + `t`.`shipped` AS `shipped` +FROM ( + `vn`.`sale` `s` + JOIN `vn`.`ticket` `t` ON(`t`.`id` = `s`.`ticketFk`) + ) +WHERE `t`.`shipped` > `util`.`VN_CURDATE`() + INTERVAL -3 year diff --git a/db/routines/vn/views/itemBotanicalWithGenus.sql b/db/routines/vn/views/itemBotanicalWithGenus.sql new file mode 100644 index 000000000..3bc0b943d --- /dev/null +++ b/db/routines/vn/views/itemBotanicalWithGenus.sql @@ -0,0 +1,12 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`itemBotanicalWithGenus` +AS SELECT `ib`.`itemFk` AS `itemFk`, + concat(`g`.`name`, ' ', IFNULL(`s`.`name`, '')) AS `ediBotanic` +FROM ( + ( + `vn`.`itemBotanical` `ib` + LEFT JOIN `vn`.`specie` `s` ON(`s`.`id` = `ib`.`specieFk`) + ) + LEFT JOIN `vn`.`genus` `g` ON(`g`.`id` = `ib`.`genusFk`) + ) diff --git a/db/routines/vn/views/itemCategoryL10n.sql b/db/routines/vn/views/itemCategoryL10n.sql new file mode 100644 index 000000000..08a7c7321 --- /dev/null +++ b/db/routines/vn/views/itemCategoryL10n.sql @@ -0,0 +1,12 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`itemCategoryL10n` +AS SELECT `c`.`id` AS `id`, + IFNULL(`i`.`name`, `c`.`name`) AS `name` +FROM ( + `vn`.`itemCategory` `c` + LEFT JOIN `vn`.`itemCategoryI18n` `i` ON( + `i`.`categoryFk` = `c`.`id` + AND `i`.`lang` = `util`.`lang`() + ) + ) diff --git a/db/routines/vn/views/itemColor.sql b/db/routines/vn/views/itemColor.sql new file mode 100644 index 000000000..5ab8a4c4f --- /dev/null +++ b/db/routines/vn/views/itemColor.sql @@ -0,0 +1,10 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`itemColor` +AS SELECT `it`.`itemFk` AS `itemFk`, + `it`.`value` AS `color` +FROM ( + `vn`.`itemTag` `it` + JOIN `vn`.`tag` `t` ON(`t`.`id` = `it`.`tagFk`) + ) +WHERE `t`.`code` = 'COLOR' diff --git a/db/routines/vn/views/itemEntryIn.sql b/db/routines/vn/views/itemEntryIn.sql new file mode 100644 index 000000000..184ccbf59 --- /dev/null +++ b/db/routines/vn/views/itemEntryIn.sql @@ -0,0 +1,19 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`itemEntryIn` +AS SELECT `t`.`warehouseInFk` AS `warehouseInFk`, + `t`.`landed` AS `landed`, + `b`.`itemFk` AS `itemFk`, + `b`.`quantity` AS `quantity`, + `t`.`isReceived` AS `isReceived`, + `e`.`isRaid` AS `isVirtualStock`, + `e`.`id` AS `entryFk` +FROM ( + ( + `vn`.`buy` `b` + JOIN `vn`.`entry` `e` ON(`b`.`entryFk` = `e`.`id`) + ) + JOIN `vn`.`travel` `t` ON(`e`.`travelFk` = `t`.`id`) + ) +WHERE `e`.`isExcludedFromAvailable` = 0 + AND `b`.`quantity` <> 0 diff --git a/db/routines/vn/views/itemEntryOut.sql b/db/routines/vn/views/itemEntryOut.sql new file mode 100644 index 000000000..82b065985 --- /dev/null +++ b/db/routines/vn/views/itemEntryOut.sql @@ -0,0 +1,19 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`itemEntryOut` +AS SELECT `t`.`warehouseOutFk` AS `warehouseOutFk`, + `t`.`shipped` AS `shipped`, + `b`.`itemFk` AS `itemFk`, + - `b`.`quantity` AS `quantity`, + `t`.`isDelivered` AS `isDelivered`, + `e`.`id` AS `entryFk` +FROM ( + ( + `vn`.`buy` `b` + JOIN `vn`.`entry` `e` ON(`b`.`entryFk` = `e`.`id`) + ) + JOIN `vn`.`travel` `t` ON(`e`.`travelFk` = `t`.`id`) + ) +WHERE `e`.`isExcludedFromAvailable` = 0 + AND `e`.`isRaid` = 0 + AND `b`.`quantity` <> 0 diff --git a/db/routines/vn/views/itemInk.sql b/db/routines/vn/views/itemInk.sql new file mode 100644 index 000000000..d13a862e7 --- /dev/null +++ b/db/routines/vn/views/itemInk.sql @@ -0,0 +1,12 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`itemInk` +AS SELECT `i`.`longName` AS `longName`, + `i`.`inkFk` AS `inkFk`, + `vn`.`ink`.`name` AS `color` +FROM ( + `vn`.`item` `i` + JOIN `vn`.`ink` ON(`vn`.`ink`.`id` = `i`.`inkFk`) + ) +WHERE `vn`.`ink`.`isRealColor` <> 0 +GROUP BY `i`.`longName` diff --git a/db/routines/vn/views/itemPlacementSupplyList.sql b/db/routines/vn/views/itemPlacementSupplyList.sql new file mode 100644 index 000000000..10e7ae3ef --- /dev/null +++ b/db/routines/vn/views/itemPlacementSupplyList.sql @@ -0,0 +1,34 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`itemPlacementSupplyList` +AS SELECT `ips`.`id` AS `id`, + `ips`.`itemFk` AS `itemFk`, + `ips`.`quantity` AS `quantity`, + `ips`.`priority` AS `priority`, + IFNULL(`isps`.`created`, `ips`.`created`) AS `created`, + `ips`.`userFk` AS `userFk`, + `ips`.`repoUserFk` AS `repoUserFk`, + `ips`.`quantity` - sum(IFNULL(`isps`.`quantity`, 0)) AS `saldo`, + concat(`i`.`longName`, ' ', `i`.`size`) AS `longName`, + `i`.`subName` AS `subName`, + `i`.`size` AS `size`, + `w`.`code` AS `workerCode`, + `rw`.`code` AS `repoCode`, + `ips`.`sectorFk` AS `sectorFk` +FROM ( + ( + ( + ( + `vn`.`itemPlacementSupply` `ips` + JOIN `vn`.`item` `i` ON(`i`.`id` = `ips`.`itemFk`) + ) + LEFT JOIN `vn`.`worker` `w` ON(`w`.`id` = `ips`.`userFk`) + ) + LEFT JOIN `vn`.`worker` `rw` ON(`rw`.`id` = `ips`.`repoUserFk`) + ) + LEFT JOIN `vn`.`itemShelvingPlacementSupply` `isps` ON(`isps`.`itemPlacementSupplyFk` = `ips`.`id`) + ) +WHERE `ips`.`created` >= `util`.`VN_CURDATE`() +GROUP BY `ips`.`priority`, + `ips`.`id`, + `ips`.`sectorFk` diff --git a/db/routines/vn/views/itemProductor.sql b/db/routines/vn/views/itemProductor.sql new file mode 100644 index 000000000..f6cb0eb19 --- /dev/null +++ b/db/routines/vn/views/itemProductor.sql @@ -0,0 +1,10 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`itemProductor` +AS SELECT `it`.`itemFk` AS `itemFk`, + `it`.`value` AS `productor` +FROM ( + `vn`.`itemTag` `it` + JOIN `vn`.`tag` `t` ON(`t`.`id` = `it`.`tagFk`) + ) +WHERE `t`.`code` = 'PRODUCER' diff --git a/db/routines/vn/views/itemSearch.sql b/db/routines/vn/views/itemSearch.sql new file mode 100644 index 000000000..6a21b9e92 --- /dev/null +++ b/db/routines/vn/views/itemSearch.sql @@ -0,0 +1,17 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`itemSearch` +AS SELECT `s`.`itemFk` AS `itemFk`, + `s`.`concept` AS `concept`, + `s`.`quantity` AS `quantity`, + `t`.`nickname` AS `nickname`, + `t`.`shipped` AS `shipped` +FROM ( + ( + `vn`.`sale` `s` + JOIN `vn`.`ticket` `t` ON(`t`.`id` = `s`.`ticketFk`) + ) + JOIN `vn`.`warehouse` `w` ON(`w`.`id` = `t`.`warehouseFk`) + ) +WHERE `t`.`shipped` BETWEEN `util`.`yesterday`() AND `util`.`tomorrow`() + AND `w`.`name` IN ('VNH', 'Floramondo') diff --git a/db/routines/vn/views/itemShelvingAvailable.sql b/db/routines/vn/views/itemShelvingAvailable.sql new file mode 100644 index 000000000..868d6a963 --- /dev/null +++ b/db/routines/vn/views/itemShelvingAvailable.sql @@ -0,0 +1,59 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`itemShelvingAvailable` +AS SELECT `s`.`id` AS `saleFk`, + `tst`.`updated` AS `Modificado`, + `s`.`ticketFk` AS `ticketFk`, + 0 AS `isPicked`, + `s`.`itemFk` AS `itemFk`, + `s`.`quantity` AS `quantity`, + `s`.`concept` AS `concept`, + `i`.`size` AS `size`, + `st`.`name` AS `Estado`, + `st`.`sectorProdPriority` AS `sectorProdPriority`, + `stock`.`visible` AS `available`, + `stock`.`sectorFk` AS `sectorFk`, + `stock`.`shelvingFk` AS `matricula`, + `stock`.`parkingFk` AS `parking`, + `stock`.`itemShelvingFk` AS `itemShelving`, + `am`.`name` AS `Agency`, + `t`.`shipped` AS `shipped`, + `stock`.`grouping` AS `grouping`, + `stock`.`packing` AS `packing`, + `z`.`hour` AS `hour`, + `st`.`isPreviousPreparable` AS `isPreviousPreparable`, + `sv`.`physicalVolume` AS `physicalVolume`, + `t`.`warehouseFk` AS `warehouseFk` +FROM ( + ( + ( + ( + ( + ( + ( + ( + ( + `vn`.`sale` `s` + JOIN `vn`.`ticket` `t` ON(`t`.`id` = `s`.`ticketFk`) + ) + JOIN `vn`.`agencyMode` `am` ON(`am`.`id` = `t`.`agencyModeFk`) + ) + JOIN `vn`.`ticketStateToday` `tst` ON(`tst`.`ticketFk` = `t`.`id`) + ) + JOIN `vn`.`state` `st` ON(`st`.`id` = `tst`.`state`) + ) + JOIN `vn`.`item` `i` ON(`i`.`id` = `s`.`itemFk`) + ) + JOIN `vn`.`itemShelvingStock` `stock` ON(`stock`.`itemFk` = `i`.`id`) + ) + LEFT JOIN `vn`.`saleTracking` `stk` ON(`stk`.`saleFk` = `s`.`id`) + ) + LEFT JOIN `vn`.`zone` `z` ON(`z`.`id` = `t`.`zoneFk`) + ) + LEFT JOIN `vn`.`saleVolume` `sv` ON(`sv`.`saleFk` = `s`.`id`) + ) +WHERE `t`.`shipped` BETWEEN `util`.`yesterday`() AND `util`.`dayend`(`util`.`VN_CURDATE`()) + AND `stk`.`id` IS NULL + AND `stock`.`visible` > 0 + AND `stk`.`saleFk` IS NULL + AND `st`.`isPreviousPreparable` <> 0 diff --git a/db/routines/vn/views/itemShelvingList.sql b/db/routines/vn/views/itemShelvingList.sql new file mode 100644 index 000000000..570bf0be6 --- /dev/null +++ b/db/routines/vn/views/itemShelvingList.sql @@ -0,0 +1,24 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`itemShelvingList` +AS SELECT `ish`.`shelvingFk` AS `shelvingFk`, + `ish`.`visible` AS `visible`, + `ish`.`created` AS `created`, + `pk`.`code` AS `parking`, + `ish`.`itemFk` AS `itemFk`, + `i`.`longName` AS `longName`, + `i`.`size` AS `size`, + `i`.`subName` AS `subName`, + `sh`.`parked` AS `parked`, + `pk`.`sectorFk` AS `sectorFk` +FROM ( + ( + ( + `vn`.`itemShelving` `ish` + JOIN `vn`.`shelving` `sh` ON(`sh`.`code` = `ish`.`shelvingFk`) + ) + JOIN `vn`.`item` `i` ON(`i`.`id` = `ish`.`itemFk`) + ) + LEFT JOIN `vn`.`parking` `pk` ON(`pk`.`id` = `sh`.`parkingFk`) + ) +ORDER BY `ish`.`created` diff --git a/db/routines/vn/views/itemShelvingPlacementSupplyStock.sql b/db/routines/vn/views/itemShelvingPlacementSupplyStock.sql new file mode 100644 index 000000000..217aaf6ac --- /dev/null +++ b/db/routines/vn/views/itemShelvingPlacementSupplyStock.sql @@ -0,0 +1,27 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`itemShelvingPlacementSupplyStock` +AS SELECT `ish`.`id` AS `itemShelvingFk`, + `ish`.`itemFk` AS `itemFk`, + `ish`.`packing` AS `packing`, + `ish`.`visible` AS `stock`, + `i`.`longName` AS `longName`, + `i`.`size` AS `size`, + `i`.`subName` AS `subName`, + `sh`.`code` AS `shelving`, + `p`.`code` AS `parking`, + `ish`.`created` AS `created`, + IFNULL(`sh`.`priority`, 1) AS `priority`, + `p`.`id` AS `parkingFk`, + `p`.`sectorFk` AS `sectorFk` +FROM ( + ( + ( + `vn`.`itemShelving` `ish` + JOIN `vn`.`shelving` `sh` ON(`sh`.`code` = `ish`.`shelvingFk`) + ) + LEFT JOIN `vn`.`parking` `p` ON(`p`.`id` = `sh`.`parkingFk`) + ) + JOIN `vn`.`item` `i` ON(`i`.`id` = `ish`.`itemFk`) + ) +GROUP BY `ish`.`id` diff --git a/db/routines/vn/views/itemShelvingSaleSum.sql b/db/routines/vn/views/itemShelvingSaleSum.sql new file mode 100644 index 000000000..566e20a69 --- /dev/null +++ b/db/routines/vn/views/itemShelvingSaleSum.sql @@ -0,0 +1,20 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`itemShelvingSaleSum` +AS SELECT `iss`.`id` AS `id`, + `iss`.`itemShelvingFk` AS `itemShelvingFk`, + `iss`.`saleFk` AS `saleFk`, + sum(`iss`.`quantity`) AS `quantity`, + `iss`.`created` AS `created`, + `p`.`sectorFk` AS `sectorFk` +FROM ( + ( + ( + `vn`.`itemShelvingSale` `iss` + JOIN `vn`.`itemShelving` `ish` ON(`ish`.`id` = `iss`.`itemShelvingFk`) + ) + JOIN `vn`.`shelving` `sh` ON(`sh`.`code` = `ish`.`shelvingFk`) + ) + JOIN `vn`.`parking` `p` ON(`p`.`id` = `sh`.`parkingFk`) + ) +GROUP BY `iss`.`saleFk` diff --git a/db/routines/vn/views/itemShelvingStock.sql b/db/routines/vn/views/itemShelvingStock.sql new file mode 100644 index 000000000..e0825eae5 --- /dev/null +++ b/db/routines/vn/views/itemShelvingStock.sql @@ -0,0 +1,35 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`itemShelvingStock` +AS SELECT `ish`.`itemFk` AS `itemFk`, + sum(`ish`.`visible`) AS `visible`, + min(`ish`.`packing`) AS `packing`, + min(`ish`.`grouping`) AS `grouping`, + `s`.`description` AS `sector`, + sum(`ish`.`visible`) AS `visibleOriginal`, + 0 AS `removed`, + `p`.`sectorFk` AS `sectorFk`, + `s`.`warehouseFk` AS `warehouseFk`, + `ish`.`shelvingFk` AS `shelvingFk`, + `p`.`code` AS `parkingCode`, + `sh`.`parkingFk` AS `parkingFk`, + `ish`.`id` AS `itemShelvingFk`, + `ish`.`created` AS `created`, + `st`.`code` = 'previousPrepared' AS `isPreviousPrepared` +FROM ( + ( + ( + ( + `vn`.`itemShelving` `ish` + LEFT JOIN `vn`.`shelving` `sh` ON(`sh`.`code` = `ish`.`shelvingFk`) + ) + LEFT JOIN `vn`.`parking` `p` ON(`p`.`id` = `sh`.`parkingFk`) + ) + LEFT JOIN `vn`.`sector` `s` ON(`s`.`id` = `p`.`sectorFk`) + ) + LEFT JOIN `vn`.`sectorType` `st` ON(`st`.`id` = `s`.`typeFk`) + ) +WHERE `ish`.`visible` <> 0 + AND `p`.`sectorFk` <> 0 +GROUP BY `ish`.`itemFk`, + `p`.`sectorFk` diff --git a/db/routines/vn/views/itemShelvingStockFull.sql b/db/routines/vn/views/itemShelvingStockFull.sql new file mode 100644 index 000000000..71ce5ed79 --- /dev/null +++ b/db/routines/vn/views/itemShelvingStockFull.sql @@ -0,0 +1,29 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`itemShelvingStockFull` +AS SELECT `ish`.`itemFk` AS `itemFk`, + `ish`.`visible` AS `quantity`, + `ish`.`packing` AS `packing`, + `ish`.`grouping` AS `grouping`, + `s`.`description` AS `sector`, + `issr`.`removed` AS `removed`, + `p`.`sectorFk` AS `sectorFk`, + `s`.`warehouseFk` AS `warehouseFk`, + `ish`.`shelvingFk` AS `shelvingFk`, + `p`.`code` AS `parkingCode`, + `sh`.`parkingFk` AS `parkingFk`, + `ish`.`id` AS `itemShelvingFk`, + `ish`.`created` AS `created` +FROM ( + ( + ( + ( + `vn`.`itemShelving` `ish` + JOIN `vn`.`shelving` `sh` ON(`sh`.`code` = `ish`.`shelvingFk`) + ) + JOIN `vn`.`parking` `p` ON(`p`.`id` = `sh`.`parkingFk`) + ) + JOIN `vn`.`sector` `s` ON(`s`.`id` = `p`.`sectorFk`) + ) + LEFT JOIN `vn`.`itemShelvingStockRemoved` `issr` ON(`issr`.`itemShelvingFk` = `ish`.`id`) + ) diff --git a/db/routines/vn/views/itemShelvingStockRemoved.sql b/db/routines/vn/views/itemShelvingStockRemoved.sql new file mode 100644 index 000000000..fb201e0f1 --- /dev/null +++ b/db/routines/vn/views/itemShelvingStockRemoved.sql @@ -0,0 +1,14 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`itemShelvingStockRemoved` +AS SELECT `ish`.`id` AS `itemShelvingFk`, + `ish`.`itemFk` AS `itemFk`, + 0 AS `removed` +FROM ( + ( + `vn`.`itemShelving` `ish` + LEFT JOIN `vn`.`itemShelvingSale` `iss` ON(`iss`.`itemShelvingFk` = `ish`.`id`) + ) + LEFT JOIN `vn`.`itemShelvingPlacementSupply` `isps` ON(`isps`.`itemShelvingFk` = `ish`.`id`) + ) +GROUP BY `ish`.`id` diff --git a/db/routines/vn/views/itemTagged.sql b/db/routines/vn/views/itemTagged.sql new file mode 100644 index 000000000..c22354bda --- /dev/null +++ b/db/routines/vn/views/itemTagged.sql @@ -0,0 +1,5 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`itemTagged` +AS SELECT DISTINCT `vn`.`itemTag`.`itemFk` AS `itemFk` +FROM `vn`.`itemTag` diff --git a/db/routines/vn/views/itemTaxCountrySpain.sql b/db/routines/vn/views/itemTaxCountrySpain.sql new file mode 100644 index 000000000..9dfaf0b41 --- /dev/null +++ b/db/routines/vn/views/itemTaxCountrySpain.sql @@ -0,0 +1,20 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`itemTaxCountrySpain` +AS SELECT `i`.`id` AS `id`, + `i`.`name` AS `name`, + `i`.`typeFk` AS `typeFk`, + `i`.`stems` AS `stems`, + `i`.`description` AS `description`, + `i`.`intrastatFk` AS `intrastatFk`, + `i`.`expenseFk` AS `expenseFk`, + `i`.`comment` AS `comment`, + `i`.`relevancy` AS `relevancy`, + `i`.`image` AS `image`, + `i`.`generic` AS `generic`, + `itc`.`taxClassFk` AS `taxClassFk` +FROM ( + `vn`.`item` `i` + JOIN `vn`.`itemTaxCountry` `itc` ON(`itc`.`itemFk` = `i`.`id`) + ) +WHERE `itc`.`countryFk` = 1 diff --git a/db/routines/vn/views/itemTicketOut.sql b/db/routines/vn/views/itemTicketOut.sql new file mode 100644 index 000000000..d9bbd54bd --- /dev/null +++ b/db/routines/vn/views/itemTicketOut.sql @@ -0,0 +1,17 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`itemTicketOut` +AS SELECT `t`.`warehouseFk` AS `warehouseFk`, + `t`.`shipped` AS `shipped`, + `s`.`itemFk` AS `itemFk`, + - `s`.`quantity` AS `quantity`, + `s`.`isPicked` AS `isPicked`, + `s`.`reserved` AS `reserved`, + `t`.`refFk` AS `refFk`, + `s`.`id` AS `saleFk`, + `s`.`ticketFk` AS `ticketFk` +FROM ( + `vn`.`sale` `s` + JOIN `vn`.`ticket` `t` ON(`s`.`ticketFk` = `t`.`id`) + ) +WHERE `s`.`quantity` <> 0 diff --git a/db/routines/vn/views/itemTypeL10n.sql b/db/routines/vn/views/itemTypeL10n.sql new file mode 100644 index 000000000..03d72f0d4 --- /dev/null +++ b/db/routines/vn/views/itemTypeL10n.sql @@ -0,0 +1,12 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`itemTypeL10n` +AS SELECT `t`.`id` AS `id`, + IFNULL(`i`.`name`, `t`.`name`) AS `name` +FROM ( + `vn`.`itemType` `t` + LEFT JOIN `vn`.`itemTypeI18n` `i` ON( + `i`.`typeFk` = `t`.`id` + AND `i`.`lang` = `util`.`LANG`() + ) + ) diff --git a/db/routines/vn/views/item_Free_Id.sql b/db/routines/vn/views/item_Free_Id.sql new file mode 100644 index 000000000..36464004c --- /dev/null +++ b/db/routines/vn/views/item_Free_Id.sql @@ -0,0 +1,10 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`item_Free_Id` +AS SELECT `i1`.`id` + 1 AS `newId` +FROM ( + `vn`.`item` `i1` + LEFT JOIN `vn`.`item` `i2` ON(`i1`.`id` + 1 = `i2`.`id`) + ) +WHERE `i2`.`id` IS NULL + AND `i1`.`isFloramondo` <> 0 diff --git a/db/routines/vn/views/labelInfo.sql b/db/routines/vn/views/labelInfo.sql new file mode 100644 index 000000000..ccc6fc6ac --- /dev/null +++ b/db/routines/vn/views/labelInfo.sql @@ -0,0 +1,35 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`labelInfo` +AS SELECT `i`.`id` AS `itemId`, + `i`.`name` AS `itemName`, + `b`.`stickers` AS `stickers`, + `b`.`printedStickers` AS `life`, + `i`.`inkFk` AS `colorCode`, + `i`.`stems` AS `stems`, + `i`.`category` AS `category`, + `i`.`subName` AS `productor`, + `b`.`packing` AS `packing`, + `clb`.`warehouse_id` AS `warehouse_id`, + `i`.`size` AS `size`, + `b`.`isPickedOff` AS `isPickedOff`, + `e`.`evaNotes` AS `notes`, + `w`.`name` AS `wh_in`, + `e`.`id` AS `entryId`, + `b`.`id` AS `buyId` +FROM ( + ( + ( + ( + ( + `vn`.`buy` `b` + JOIN `vn`.`item` `i` ON(`i`.`id` = `b`.`itemFk`) + ) + JOIN `cache`.`last_buy` `clb` ON(`clb`.`item_id` = `i`.`id`) + ) + JOIN `vn`.`entry` `e` ON(`e`.`id` = `b`.`entryFk`) + ) + LEFT JOIN `vn`.`travel` `tr` ON(`tr`.`id` = `e`.`travelFk`) + ) + JOIN `vn`.`warehouse` `w` ON(`w`.`id` = `tr`.`warehouseInFk`) + ) diff --git a/db/routines/vn/views/lastHourProduction.sql b/db/routines/vn/views/lastHourProduction.sql new file mode 100644 index 000000000..90bc0cd76 --- /dev/null +++ b/db/routines/vn/views/lastHourProduction.sql @@ -0,0 +1,25 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`lastHourProduction` +AS SELECT `t`.`warehouseFk` AS `warehouseFk`, + cast( + sum( + IFNULL( + `p`.`volume`, + `p`.`width` * `p`.`height` * `p`.`depth` + ) / 1000000 + ) AS decimal(5, 1) + ) AS `m3` +FROM ( + ( + ( + `vn`.`warehouse` `w` + JOIN `vn`.`ticket` `t` ON(`t`.`warehouseFk` = `w`.`id`) + ) + LEFT JOIN `vn`.`expedition` `e` ON(`t`.`id` = `e`.`ticketFk`) + ) + LEFT JOIN `vn`.`packaging` `p` ON(`p`.`id` = `e`.`packagingFk`) + ) +WHERE `e`.`created` BETWEEN `util`.`VN_NOW`() - INTERVAL 1 HOUR + AND `util`.`VN_NOW`() +GROUP BY `t`.`warehouseFk` diff --git a/db/routines/vn/views/lastPurchases.sql b/db/routines/vn/views/lastPurchases.sql new file mode 100644 index 000000000..04a9f8c05 --- /dev/null +++ b/db/routines/vn/views/lastPurchases.sql @@ -0,0 +1,35 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`lastPurchases` +AS SELECT `tr`.`landed` AS `landed`, + `w`.`id` AS `warehouseFk`, + `w`.`name` AS `warehouse`, + `i`.`longName` AS `longName`, + `i`.`subName` AS `subName`, + `e`.`id` AS `entryFk`, + `b`.`stickers` AS `stickers`, + `b`.`packing` AS `packing`, + `e`.`invoiceNumber` AS `ref`, + `b`.`itemFk` AS `itemFk`, + `ek`.`pro` AS `pro`, + `ek`.`ref` AS `ektRef`, + `ek`.`agj` AS `agj` +FROM ( + ( + ( + ( + ( + `vn`.`buy` `b` + JOIN `vn`.`entry` `e` ON(`e`.`id` = `b`.`entryFk`) + ) + JOIN `vn`.`item` `i` ON(`i`.`id` = `b`.`itemFk`) + ) + JOIN `vn`.`travel` `tr` ON(`tr`.`id` = `e`.`travelFk`) + ) + JOIN `vn`.`warehouse` `w` ON(`w`.`id` = `tr`.`warehouseInFk`) + ) + LEFT JOIN `edi`.`ekt` `ek` ON(`ek`.`id` = `b`.`ektFk`) + ) +WHERE `tr`.`landed` BETWEEN `util`.`yesterday`() AND `util`.`tomorrow`() + AND `e`.`isRaid` = 0 + AND `b`.`stickers` > 0 diff --git a/db/routines/vn/views/lastTopClaims.sql b/db/routines/vn/views/lastTopClaims.sql new file mode 100644 index 000000000..0bc36e3c2 --- /dev/null +++ b/db/routines/vn/views/lastTopClaims.sql @@ -0,0 +1,38 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`lastTopClaims` +AS SELECT `s`.`itemFk` AS `itemFk`, + `i`.`longName` AS `itemName`, + `it`.`name` AS `itemTypeName`, + COUNT(0) AS `claimsNumber`, + round( + sum( + `cb`.`quantity` * `s`.`price` * (1 - (`c`.`responsibility` - 1) / 4) * (100 - `s`.`discount`) / 100 + ), + 2 + ) AS `claimedAmount`, + round( + sum( + `cb`.`quantity` * `s`.`price` * (100 - `s`.`discount`) / 100 + ), + 2 + ) AS `totalAmount` +FROM ( + ( + ( + ( + `vn`.`claim` `c` + JOIN `vn`.`claimBeginning` `cb` ON(`cb`.`claimFk` = `c`.`id`) + ) + JOIN `vn`.`sale` `s` ON(`s`.`id` = `cb`.`saleFk`) + ) + JOIN `vn`.`item` `i` ON(`i`.`id` = `s`.`itemFk`) + ) + JOIN `vn`.`itemType` `it` ON(`it`.`id` = `i`.`typeFk`) + ) +WHERE `c`.`created` >= `util`.`VN_CURDATE`() + INTERVAL -1 week +GROUP BY `s`.`itemFk` +HAVING `claimedAmount` > 100 + AND `claimsNumber` > 2 + OR `claimsNumber` > 4 +ORDER BY COUNT(0) DESC diff --git a/db/routines/vn/views/mistake.sql b/db/routines/vn/views/mistake.sql new file mode 100644 index 000000000..0ed4dccf2 --- /dev/null +++ b/db/routines/vn/views/mistake.sql @@ -0,0 +1,27 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`mistake` +AS SELECT `wr`.`code` AS `revisador`, + `s`.`concept` AS `concept`, + `w`.`code` AS `sacador`, + `w`.`firstName` AS `firstName`, + `w`.`lastName` AS `lastName`, + `mt`.`description` AS `description`, + cast(`iss`.`created` AS date) AS `created`, + `w`.`id` AS `workerFk` +FROM ( + ( + ( + ( + ( + `vn`.`saleMistake` `sm` + JOIN `vn`.`mistakeType` `mt` ON(`mt`.`id` = `sm`.`typeFk`) + ) + JOIN `vn`.`worker` `wr` ON(`wr`.`id` = `sm`.`userFk`) + ) + JOIN `vn`.`sale` `s` ON(`s`.`id` = `sm`.`saleFk`) + ) + JOIN `vn`.`itemShelvingSale` `iss` ON(`iss`.`saleFk` = `sm`.`saleFk`) + ) + JOIN `vn`.`worker` `w` ON(`w`.`id` = `iss`.`userFk`) + ) diff --git a/db/routines/vn/views/mistakeRatio.sql b/db/routines/vn/views/mistakeRatio.sql new file mode 100644 index 000000000..4b7fd5a1f --- /dev/null +++ b/db/routines/vn/views/mistakeRatio.sql @@ -0,0 +1,24 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`mistakeRatio` +AS SELECT `wr`.`code` AS `revisador`, + `w`.`code` AS `sacador`, + `w`.`firstName` AS `firstName`, + `w`.`lastName` AS `lastName`, + `mt`.`description` AS `description`, + cast(`iss`.`created` AS date) AS `created`, + `w`.`id` AS `workerFk`, + `sm`.`saleFk` AS `saleFk` +FROM ( + ( + ( + ( + `vn`.`itemShelvingSale` `iss` + JOIN `vn`.`worker` `w` ON(`w`.`id` = `iss`.`userFk`) + ) + LEFT JOIN `vn`.`saleMistake` `sm` ON(`iss`.`saleFk` = `sm`.`saleFk`) + ) + LEFT JOIN `vn`.`mistakeType` `mt` ON(`mt`.`id` = `sm`.`typeFk`) + ) + LEFT JOIN `vn`.`worker` `wr` ON(`wr`.`id` = `sm`.`userFk`) + ) diff --git a/db/routines/vn/views/newBornSales.sql b/db/routines/vn/views/newBornSales.sql new file mode 100644 index 000000000..d34eff4ef --- /dev/null +++ b/db/routines/vn/views/newBornSales.sql @@ -0,0 +1,26 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`newBornSales` +AS SELECT `v`.`importe` AS `amount`, + `v`.`Id_Cliente` AS `clientFk`, + `c`.`salesPersonFk` AS `userFk`, + `v`.`fecha` AS `dated`, + `cn`.`firstShipped` AS `firstShipped` +FROM ( + ( + ( + ( + `bs`.`clientNewBorn` `cn` + JOIN `bs`.`ventas` `v` ON( + `cn`.`firstShipped` + INTERVAL 1 year > `v`.`fecha` + AND `v`.`Id_Cliente` = `cn`.`clientFk` + ) + ) + JOIN `vn`.`client` `c` ON(`c`.`id` = `v`.`Id_Cliente`) + ) + JOIN `account`.`user` `u` ON(`u`.`id` = `c`.`salesPersonFk`) + ) + JOIN `account`.`role` `r` ON(`r`.`id` = `u`.`role`) + ) +WHERE `r`.`name` = 'salesPerson' + AND `u`.`name` NOT IN ('ismaelalcolea', 'ruben') diff --git a/db/routines/vn/views/operatorWorkerCode.sql b/db/routines/vn/views/operatorWorkerCode.sql new file mode 100644 index 000000000..340d833a7 --- /dev/null +++ b/db/routines/vn/views/operatorWorkerCode.sql @@ -0,0 +1,22 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`operatorWorkerCode` +AS SELECT `o`.`workerFk` AS `workerFk`, + concat(`w`.`firstName`, ' ', `w`.`lastName`) AS `fullName`, + `w`.`code` AS `code`, + `o`.`numberOfWagons` AS `numberOfWagons` +FROM ( + ( + `vn`.`worker` `w` + JOIN `vn`.`operator` `o` ON(`o`.`workerFk` = `w`.`id`) + ) + JOIN `vn`.`sector` `s` ON(`o`.`sectorFk` = `s`.`id`) + ) +WHERE `o`.`sectorFk` IS NOT NULL + AND `s`.`code` IN ( + 'H2', + 'H2', + 'PEQUES_H', + 'ALTILLO COMP', + 'ALTILLO ARTI' + ) diff --git a/db/routines/vn/views/originL10n.sql b/db/routines/vn/views/originL10n.sql new file mode 100644 index 000000000..2ff368e14 --- /dev/null +++ b/db/routines/vn/views/originL10n.sql @@ -0,0 +1,12 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`originL10n` +AS SELECT `o`.`id` AS `id`, + IFNULL(`i`.`name`, `o`.`name`) AS `name` +FROM ( + `vn`.`origin` `o` + LEFT JOIN `vn`.`originI18n` `i` ON( + `i`.`originFk` = `o`.`id` + AND `i`.`lang` = `util`.`lang`() + ) + ) diff --git a/db/routines/vn/views/packageEquivalentItem.sql b/db/routines/vn/views/packageEquivalentItem.sql new file mode 100644 index 000000000..ba2897c14 --- /dev/null +++ b/db/routines/vn/views/packageEquivalentItem.sql @@ -0,0 +1,12 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`packageEquivalentItem` +AS SELECT `p`.`itemFk` AS `itemFk`, + `p2`.`itemFk` AS `equivalentFk` +FROM ( + ( + `vn`.`packageEquivalent` `pe` + JOIN `vn`.`packaging` `p` ON(`p`.`id` = `pe`.`packagingFk`) + ) + JOIN `vn`.`packaging` `p2` ON(`p2`.`id` = `pe`.`equivalentFk`) + ) diff --git a/db/routines/vn/views/paymentExchangeInsurance.sql b/db/routines/vn/views/paymentExchangeInsurance.sql new file mode 100644 index 000000000..7128144ea --- /dev/null +++ b/db/routines/vn/views/paymentExchangeInsurance.sql @@ -0,0 +1,16 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`paymentExchangeInsurance` +AS SELECT `p`.`pago_sdc_id` AS `id`, + `p`.`importe` AS `amount`, + `p`.`fecha` AS `created`, + `p`.`vencimiento` AS `dueDay`, + `p`.`entity_id` AS `entityFk`, + `p`.`ref` AS `ref`, + `p`.`rate` AS `rate`, + `p`.`empresa_id` AS `companyFk`, + `p`.`financialProductTypefk` AS `financialProductTypefk`, + `p`.`upperBarrier` AS `upperBarrier`, + `p`.`lowerBarrier` AS `lowerBarrier`, + `p`.`strike` AS `strike` +FROM `vn2008`.`pago_sdc` `p` diff --git a/db/routines/vn/views/payrollCenter.sql b/db/routines/vn/views/payrollCenter.sql new file mode 100644 index 000000000..fc6635483 --- /dev/null +++ b/db/routines/vn/views/payrollCenter.sql @@ -0,0 +1,12 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`payrollCenter` +AS SELECT `b`.`cod_centro` AS `codCenter`, + `b`.`Centro` AS `name`, + `b`.`nss_cotizacion` AS `nss`, + `b`.`domicilio` AS `street`, + `b`.`poblacion` AS `city`, + `b`.`cp` AS `postcode`, + `b`.`empresa_id` AS `companyFk`, + `b`.`codempresa` AS `companyCode` +FROM `vn2008`.`payroll_centros` `b` diff --git a/db/routines/vn/views/personMedia.sql b/db/routines/vn/views/personMedia.sql new file mode 100644 index 000000000..d17410ef1 --- /dev/null +++ b/db/routines/vn/views/personMedia.sql @@ -0,0 +1,10 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`personMedia` +AS SELECT `c`.`id` AS `workerFk`, + IFNULL(`c`.`mobile`, `c`.`phone`) AS `mediaValue` +FROM ( + `vn`.`client` `c` + JOIN `vn`.`worker` `w` ON(`w`.`id` = `c`.`id`) + ) +HAVING `mediaValue` IS NOT NULL diff --git a/db/routines/vn/views/phoneBook.sql b/db/routines/vn/views/phoneBook.sql new file mode 100644 index 000000000..5fcafe99c --- /dev/null +++ b/db/routines/vn/views/phoneBook.sql @@ -0,0 +1,22 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`phoneBook` +AS SELECT 'C' AS `Tipo`, + `vn`.`client`.`id` AS `Id`, + `vn`.`client`.`name` AS `Cliente`, + `vn`.`client`.`phone` AS `Telefono` +FROM `vn`.`client` +WHERE `vn`.`client`.`phone` IS NOT NULL +UNION +SELECT 'C' AS `Tipo`, + `vn`.`client`.`id` AS `Id`, + `vn`.`client`.`name` AS `Cliente`, + `vn`.`client`.`mobile` AS `Movil` +FROM `vn`.`client` +WHERE `vn`.`client`.`mobile` IS NOT NULL +UNION +SELECT 'C' AS `Tipo`, + `vn`.`clientContact`.`clientFk` AS `clientFk`, + `vn`.`clientContact`.`name` AS `name`, + `vn`.`clientContact`.`phone` AS `phone` +FROM `vn`.`clientContact` diff --git a/db/routines/vn/views/productionVolume.sql b/db/routines/vn/views/productionVolume.sql new file mode 100644 index 000000000..fd83b96bc --- /dev/null +++ b/db/routines/vn/views/productionVolume.sql @@ -0,0 +1,23 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`productionVolume` +AS SELECT HOUR(`e`.`created`) AS `hora`, + MINUTE(`e`.`created`) AS `minuto`, + IFNULL( + `p`.`volume`, + IFNULL(`p`.`width` * `p`.`height` * `p`.`depth`, 94500) + ) AS `cm3`, + `t`.`warehouseFk` AS `warehouseFk`, + `e`.`created` AS `created` +FROM ( + ( + ( + `vn`.`expedition` `e` + LEFT JOIN `vn`.`packaging` `p` ON(`p`.`id` = `e`.`packagingFk`) + ) + JOIN `vn`.`ticket` `t` ON(`t`.`id` = `e`.`ticketFk`) + ) + JOIN `vn`.`client` `c` ON(`c`.`id` = `t`.`clientFk`) + ) +WHERE `e`.`created` BETWEEN `util`.`VN_CURDATE`() AND `util`.`dayend`(`util`.`VN_CURDATE`()) + AND `c`.`isRelevant` <> 0 diff --git a/db/routines/vn/views/productionVolume_LastHour.sql b/db/routines/vn/views/productionVolume_LastHour.sql new file mode 100644 index 000000000..561a23f9b --- /dev/null +++ b/db/routines/vn/views/productionVolume_LastHour.sql @@ -0,0 +1,11 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`productionVolume_LastHour` +AS SELECT cast( + sum(`productionVolume`.`cm3` / 1000000) AS decimal(10, 0) + ) AS `m3`, + `productionVolume`.`warehouseFk` AS `warehouseFk` +FROM `vn`.`productionVolume` +WHERE `productionVolume`.`created` > `util`.`VN_NOW`() + INTERVAL -1 HOUR + AND `productionVolume`.`warehouseFk` IN (1, 44, 60) +GROUP BY `productionVolume`.`warehouseFk` diff --git a/db/routines/vn/views/promissoryNote.sql b/db/routines/vn/views/promissoryNote.sql new file mode 100644 index 000000000..a9f047285 --- /dev/null +++ b/db/routines/vn/views/promissoryNote.sql @@ -0,0 +1,7 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`promissoryNote` +AS SELECT `p`.`Id_Pagare` AS `id`, + `p`.`Concepto` AS `Concept`, + `p`.`pago_id` AS `paymentFk` +FROM `vn2008`.`Pagares` `p` diff --git a/db/routines/vn/views/role.sql b/db/routines/vn/views/role.sql new file mode 100644 index 000000000..310951570 --- /dev/null +++ b/db/routines/vn/views/role.sql @@ -0,0 +1,8 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`role` +AS SELECT `account`.`role`.`id` AS `id`, + `account`.`role`.`name` AS `name`, + `account`.`role`.`description` AS `description`, + `account`.`role`.`hasLogin` AS `hasLogin` +FROM `account`.`role` diff --git a/db/routines/vn/views/routesControl.sql b/db/routines/vn/views/routesControl.sql new file mode 100644 index 000000000..380d9d9ce --- /dev/null +++ b/db/routines/vn/views/routesControl.sql @@ -0,0 +1,27 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`routesControl` +AS SELECT `t`.`routeFk` AS `routeFk`, + COUNT(`e`.`id`) AS `expeditions`, + COUNT(`es`.`id`) AS `scanned`, + COUNT(DISTINCT `es`.`palletFk`) AS `pallets`, + max(`es`.`scanned`) AS `lastScanned`, + max(`et`.`description`) AS `description`, + max(`et`.`eta`) AS `eta` +FROM ( + ( + ( + ( + `vn`.`ticket` `t` + JOIN `vn`.`expedition` `e` ON(`t`.`id` = `e`.`ticketFk`) + ) + LEFT JOIN `vn`.`expeditionScan` `es` ON(`es`.`expeditionFk` = `e`.`id`) + ) + LEFT JOIN `vn`.`expeditionPallet` `ep` ON(`ep`.`id` = `es`.`palletFk`) + ) + LEFT JOIN `vn`.`expeditionTruck` `et` ON(`et`.`id` = `ep`.`truckFk`) + ) +WHERE `t`.`shipped` >= `util`.`VN_CURDATE`() + AND `t`.`routeFk` <> 0 +GROUP BY `t`.`routeFk` +ORDER BY max(`et`.`eta`) diff --git a/db/routines/vn/views/saleCost.sql b/db/routines/vn/views/saleCost.sql new file mode 100644 index 000000000..27265aa93 --- /dev/null +++ b/db/routines/vn/views/saleCost.sql @@ -0,0 +1,22 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`saleCost` +AS SELECT `s`.`itemFk` AS `itemFk`, + `s`.`ticketFk` AS `ticketFk`, + `s`.`concept` AS `concept`, + `s`.`quantity` AS `quantity`, + `s`.`discount` AS `discount`, + `s`.`price` AS `price`, + `c`.`name` AS `component`, + `sc`.`value` AS `coste` +FROM ( + ( + ( + `vn`.`sale` `s` + JOIN `vn`.`saleComponent` `sc` ON(`sc`.`saleFk` = `s`.`id`) + ) + JOIN `vn`.`component` `c` ON(`c`.`id` = `sc`.`componentFk`) + ) + JOIN `vn`.`componentType` `ct` ON(`ct`.`id` = `c`.`typeFk`) + ) +WHERE `ct`.`type` = 'coste' diff --git a/db/routines/vn/views/saleLabel.sql b/db/routines/vn/views/saleLabel.sql new file mode 100644 index 000000000..4feae9294 --- /dev/null +++ b/db/routines/vn/views/saleLabel.sql @@ -0,0 +1,8 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`saleLabel` +AS SELECT `ml`.`Id_movimiento` AS `saleFk`, + `ml`.`label` AS `label`, + `ml`.`stem` AS `stem`, + `ml`.`created` AS `created` +FROM `vn2008`.`movement_label` `ml` diff --git a/db/routines/vn/views/saleMistakeList.sql b/db/routines/vn/views/saleMistakeList.sql new file mode 100644 index 000000000..d362e0d97 --- /dev/null +++ b/db/routines/vn/views/saleMistakeList.sql @@ -0,0 +1,29 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`saleMistakeList` +AS SELECT `st`.`saleFk` AS `saleFk`, + `st`.`workerFk` AS `workerFk`, + concat(`w2`.`firstName`, ' ', `w2`.`lastName`) AS `sacador`, + `st`.`created` AS `created`, + concat(`w`.`firstName`, ' ', `w`.`lastName`) AS `revisador`, + `mt`.`description` AS `description`, + `sm`.`created` AS `controlled` +FROM ( + ( + ( + ( + ( + `vn`.`saleTracking` `st` + JOIN `vn`.`worker` `w2` ON(`w2`.`id` = `st`.`workerFk`) + ) + JOIN `vn`.`state` `s` ON( + `s`.`id` = `st`.`stateFk` + AND `s`.`code` IN ('PREVIOUS_PREPARATION', 'PREPARED', 'OK') + ) + ) + LEFT JOIN `vn`.`saleMistake` `sm` ON(`st`.`saleFk` = `sm`.`saleFk`) + ) + LEFT JOIN `vn`.`mistakeType` `mt` ON(`mt`.`id` = `sm`.`typeFk`) + ) + LEFT JOIN `vn`.`worker` `w` ON(`w`.`id` = `sm`.`userFk`) + ) diff --git a/db/routines/vn/views/saleMistake_list__2.sql b/db/routines/vn/views/saleMistake_list__2.sql new file mode 100644 index 000000000..1f40a89d9 --- /dev/null +++ b/db/routines/vn/views/saleMistake_list__2.sql @@ -0,0 +1,29 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`saleMistake_list__2` +AS SELECT `st`.`saleFk` AS `saleFk`, + `st`.`workerFk` AS `workerFk`, + concat(`w2`.`firstName`, ' ', `w2`.`lastName`) AS `sacador`, + `st`.`created` AS `created`, + concat(`w`.`firstName`, ' ', `w`.`lastName`) AS `revisador`, + `mt`.`description` AS `description`, + `sm`.`created` AS `controlled` +FROM ( + ( + ( + ( + ( + `vn`.`saleTracking` `st` + JOIN `vn`.`worker` `w2` ON(`w2`.`id` = `st`.`workerFk`) + ) + JOIN `vn`.`state` `s` ON( + `s`.`id` = `st`.`stateFk` + AND `s`.`code` IN ('PREVIOUS_PREPARATION', 'PREPARED', 'OK') + ) + ) + LEFT JOIN `vn`.`saleMistake` `sm` ON(`st`.`saleFk` = `sm`.`saleFk`) + ) + LEFT JOIN `vn`.`mistakeType` `mt` ON(`mt`.`id` = `sm`.`typeFk`) + ) + LEFT JOIN `vn`.`worker` `w` ON(`w`.`id` = `sm`.`userFk`) + ) diff --git a/db/routines/vn/views/saleSaleTracking.sql b/db/routines/vn/views/saleSaleTracking.sql new file mode 100644 index 000000000..9ada798cf --- /dev/null +++ b/db/routines/vn/views/saleSaleTracking.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`saleSaleTracking` +AS SELECT DISTINCT `st`.`saleFk` AS `saleFk` +FROM `vn`.`saleTracking` `st` +WHERE `st`.`created` >= `util`.`VN_CURDATE`() + INTERVAL -1 DAY diff --git a/db/routines/vn/views/saleValue.sql b/db/routines/vn/views/saleValue.sql new file mode 100644 index 000000000..2dee4695e --- /dev/null +++ b/db/routines/vn/views/saleValue.sql @@ -0,0 +1,50 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`saleValue` +AS SELECT `wh`.`name` AS `warehouse`, + `c`.`name` AS `client`, + `c`.`typeFk` AS `typeFk`, + `u`.`name` AS `buyer`, + `it`.`id` AS `itemTypeFk`, + `it`.`name` AS `family`, + `s`.`itemFk` AS `itemFk`, + `s`.`concept` AS `concept`, + `s`.`quantity` AS `quantity`, + `b`.`buyingValue` + `b`.`freightValue` + `b`.`comissionValue` + `b`.`packageValue` AS `cost`, +( + `b`.`buyingValue` + `b`.`freightValue` + `b`.`comissionValue` + `b`.`packageValue` + ) * `s`.`quantity` AS `value`, + `tm`.`year` AS `year`, + `tm`.`week` AS `week` +FROM ( + ( + ( + ( + ( + ( + ( + ( + ( + `vn`.`sale` `s` + JOIN `vn`.`item` `i` ON(`i`.`id` = `s`.`itemFk`) + ) + JOIN `vn`.`itemType` `it` ON(`it`.`id` = `i`.`typeFk`) + ) + JOIN `account`.`user` `u` ON(`u`.`id` = `it`.`workerFk`) + ) + JOIN `vn`.`ticket` `t` ON(`t`.`id` = `s`.`ticketFk`) + ) + JOIN `vn`.`client` `c` ON(`c`.`id` = `t`.`clientFk`) + ) + JOIN `vn`.`warehouse` `wh` ON(`wh`.`id` = `t`.`warehouseFk`) + ) + JOIN `vn`.`time` `tm` ON(`tm`.`dated` = cast(`t`.`shipped` AS date)) + ) + JOIN `cache`.`last_buy` `lb` ON( + `lb`.`item_id` = `i`.`id` + AND `lb`.`warehouse_id` = `wh`.`id` + ) + ) + JOIN `vn`.`buy` `b` ON(`b`.`id` = `lb`.`buy_id`) + ) +WHERE `wh`.`isManaged` <> 0 diff --git a/db/routines/vn/views/saleVolume.sql b/db/routines/vn/views/saleVolume.sql new file mode 100644 index 000000000..aec739678 --- /dev/null +++ b/db/routines/vn/views/saleVolume.sql @@ -0,0 +1,45 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`saleVolume` +AS SELECT `s`.`ticketFk` AS `ticketFk`, + `s`.`id` AS `saleFk`, + round(`ic`.`cm3delivery` * `s`.`quantity` / 1000, 0) AS `litros`, + `t`.`routeFk` AS `routeFk`, + `t`.`shipped` AS `shipped`, + `t`.`landed` AS `landed`, + `s`.`quantity` * `ic`.`cm3delivery` / 1000000 AS `volume`, + `s`.`quantity` * `ic`.`grams` / 1000 AS `physicalWeight`, + `s`.`quantity` * `ic`.`cm3delivery` * greatest( + `ic`.`grams` / `ic`.`cm3delivery`, + `vc`.`aerealVolumetricDensity` + ) / 1000000 AS `weight`, + `s`.`quantity` * `ic`.`cm3delivery` / 1000000 AS `physicalVolume`, + `s`.`quantity` * `ic`.`cm3delivery` * IFNULL( + `t`.`zonePrice` - IFNULL(`t`.`zoneBonus`, 0), + `z`.`price` - `z`.`bonus` + ) / (`vc`.`standardFlowerBox` * 1000) * `z`.`inflation` AS `freight`, + `t`.`zoneFk` AS `zoneFk`, + `t`.`clientFk` AS `clientFk`, + `s`.`isPicked` AS `isPicked`, + `s`.`quantity` * `s`.`price` * (100 - `s`.`discount`) / 100 AS `eurosValue`, + `i`.`itemPackingTypeFk` AS `itemPackingTypeFk` +FROM ( + ( + ( + ( + ( + `vn`.`sale` `s` + JOIN `vn`.`item` `i` ON(`i`.`id` = `s`.`itemFk`) + ) + JOIN `vn`.`ticket` `t` ON(`t`.`id` = `s`.`ticketFk`) + ) + JOIN `vn`.`zone` `z` ON(`z`.`id` = `t`.`zoneFk`) + ) + JOIN `vn`.`volumeConfig` `vc` + ) + JOIN `vn`.`itemCost` `ic` ON( + `ic`.`itemFk` = `s`.`itemFk` + AND `ic`.`warehouseFk` = `t`.`warehouseFk` + ) + ) +WHERE `s`.`quantity` > 0 diff --git a/db/routines/vn/views/saleVolume_Today_VNH.sql b/db/routines/vn/views/saleVolume_Today_VNH.sql new file mode 100644 index 000000000..29b921bcb --- /dev/null +++ b/db/routines/vn/views/saleVolume_Today_VNH.sql @@ -0,0 +1,27 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`saleVolume_Today_VNH` +AS SELECT `t`.`nickname` AS `Cliente`, + `p`.`name` AS `Provincia`, + `c`.`country` AS `Pais`, + cast(sum(`sv`.`volume`) AS decimal(5, 1)) AS `volume` +FROM ( + ( + ( + ( + ( + `vn`.`saleVolume` `sv` + JOIN `vn`.`ticket` `t` ON(`t`.`id` = `sv`.`ticketFk`) + ) + JOIN `vn`.`address` `a` ON(`a`.`id` = `t`.`addressFk`) + ) + JOIN `vn`.`province` `p` ON(`p`.`id` = `a`.`provinceFk`) + ) + JOIN `vn`.`country` `c` ON(`c`.`id` = `p`.`countryFk`) + ) + JOIN `vn`.`warehouse` `w` ON(`w`.`id` = `t`.`warehouseFk`) + ) +WHERE `w`.`name` = 'VNH' + AND `t`.`shipped` BETWEEN `util`.`VN_CURDATE`() AND `util`.`dayend`(`util`.`VN_CURDATE`()) +GROUP BY `t`.`nickname`, + `p`.`name` diff --git a/db/routines/vn/views/sale_freightComponent.sql b/db/routines/vn/views/sale_freightComponent.sql new file mode 100644 index 000000000..7a329e0ee --- /dev/null +++ b/db/routines/vn/views/sale_freightComponent.sql @@ -0,0 +1,21 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`sale_freightComponent` +AS SELECT `t`.`id` AS `ticketFk`, + `sc`.`value` * `s`.`quantity` AS `amount`, + `t`.`shipped` AS `shipped` +FROM ( + ( + ( + ( + `vn`.`ticket` `t` STRAIGHT_JOIN `vn`.`sale` `s` ON(`t`.`id` = `s`.`ticketFk`) + ) + JOIN `vn`.`saleComponent` `sc` ON(`sc`.`saleFk` = `s`.`id`) + ) + JOIN `vn`.`component` `c` ON(`c`.`id` = `sc`.`componentFk`) + ) + JOIN `vn`.`componentType` `ct` ON( + `ct`.`id` = `c`.`typeFk` + AND `ct`.`type` = 'agencia' + ) + ) diff --git a/db/routines/vn/views/salesPersonSince.sql b/db/routines/vn/views/salesPersonSince.sql new file mode 100644 index 000000000..4234ecac4 --- /dev/null +++ b/db/routines/vn/views/salesPersonSince.sql @@ -0,0 +1,16 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`salesPersonSince` +AS SELECT `b`.`workerFk` AS `workerFk`, + min(`b`.`started`) AS `started` +FROM ( + ( + `vn`.`business` `b` + JOIN `vn`.`worker` `w` ON(`w`.`id` = `b`.`workerFk`) + ) + LEFT JOIN `vn`.`professionalCategory` `pc` ON( + `pc`.`id` = `b`.`workerBusinessProfessionalCategoryFk` + ) + ) +WHERE `pc`.`description` = 'Aux ventas' +GROUP BY `b`.`workerFk` diff --git a/db/routines/vn/views/salesPreparedLastHour.sql b/db/routines/vn/views/salesPreparedLastHour.sql new file mode 100644 index 000000000..caa7866cb --- /dev/null +++ b/db/routines/vn/views/salesPreparedLastHour.sql @@ -0,0 +1,46 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`salesPreparedLastHour` +AS SELECT `t`.`warehouseFk` AS `warehouseFk`, + `st`.`saleFk` AS `saleFk`, + `st`.`isChecked` AS `isChecked`, + `st`.`originalQuantity` AS `originalQuantity`, + `st`.`created` AS `created`, + `e`.`code` AS `code`, + `w`.`firstName` AS `firstname`, + `w`.`lastName` AS `lastName`, + `w`.`code` AS `workerCode`, + `ic`.`cm3delivery` * `s`.`quantity` / 1000 AS `litros`, + `s`.`concept` AS `concept`, + `d`.`name` AS `departmentName` +FROM ( + ( + ( + ( + ( + ( + ( + ( + `vn`.`saleTracking` `st` + LEFT JOIN `vn`.`salesPreviousPreparated` `prevPrepSales` ON(`prevPrepSales`.`saleFk` = `st`.`saleFk`) + ) + JOIN `vn`.`sale` `s` ON(`s`.`id` = `st`.`saleFk`) + ) + JOIN `vn`.`ticket` `t` ON(`t`.`id` = `s`.`ticketFk`) + ) + JOIN `vn`.`itemCost` `ic` ON( + `ic`.`warehouseFk` = `t`.`warehouseFk` + AND `ic`.`itemFk` = `s`.`itemFk` + ) + ) + JOIN `vn`.`worker` `w` ON(`w`.`id` = `st`.`workerFk`) + ) + JOIN `vn`.`state` `e` ON(`e`.`id` = `st`.`stateFk`) + ) + JOIN `vn`.`workerDepartment` `wd` ON(`wd`.`workerFk` = `st`.`workerFk`) + ) + JOIN `vn`.`department` `d` ON(`d`.`id` = `wd`.`departmentFk`) + ) +WHERE `st`.`created` > `util`.`VN_NOW`() + INTERVAL -1 HOUR + AND `prevPrepSales`.`saleFk` IS NULL + AND `d`.`name` NOT LIKE 'EQUIPO%' diff --git a/db/routines/vn/views/salesPreviousPreparated.sql b/db/routines/vn/views/salesPreviousPreparated.sql new file mode 100644 index 000000000..40ae29eda --- /dev/null +++ b/db/routines/vn/views/salesPreviousPreparated.sql @@ -0,0 +1,10 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`salesPreviousPreparated` +AS SELECT `st`.`saleFk` AS `saleFk` +FROM ( + `vn`.`saleTracking` `st` + JOIN `vn`.`state` `e` ON(`e`.`id` = `st`.`stateFk`) + ) +WHERE `st`.`created` > `util`.`VN_CURDATE`() + AND `e`.`code` LIKE 'PREVIOUS_PREPARATION' diff --git a/db/routines/vn/views/supplierPackaging.sql b/db/routines/vn/views/supplierPackaging.sql new file mode 100644 index 000000000..45a9d46d3 --- /dev/null +++ b/db/routines/vn/views/supplierPackaging.sql @@ -0,0 +1,33 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`supplierPackaging` +AS SELECT `e`.`supplierFk` AS `supplierFk`, + `b`.`itemFk` AS `itemFk`, + `i`.`longName` AS `longName`, + `s`.`name` AS `supplier`, + `b`.`entryFk` AS `entryFk`, + `tr`.`landed` AS `landed`, + - least(`b`.`quantity`, 0) AS `out`, + greatest(`b`.`quantity`, 0) AS `in`, + `w`.`name` AS `warehouse`, + `b`.`buyingValue` AS `buyingValue` +FROM ( + ( + ( + ( + ( + ( + `vn`.`buy` `b` + JOIN `vn`.`item` `i` ON(`i`.`id` = `b`.`itemFk`) + ) + JOIN `vn`.`packaging` `p` ON(`p`.`itemFk` = `i`.`id`) + ) + JOIN `vn`.`entry` `e` ON(`e`.`id` = `b`.`entryFk`) + ) + JOIN `vn`.`supplier` `s` ON(`s`.`id` = `e`.`supplierFk`) + ) + JOIN `vn`.`travel` `tr` ON(`tr`.`id` = `e`.`travelFk`) + ) + JOIN `vn`.`warehouse` `w` ON(`w`.`id` = `tr`.`warehouseInFk`) + ) +WHERE `p`.`isPackageReturnable` <> 0 diff --git a/db/routines/vn/views/tagL10n.sql b/db/routines/vn/views/tagL10n.sql new file mode 100644 index 000000000..982122b13 --- /dev/null +++ b/db/routines/vn/views/tagL10n.sql @@ -0,0 +1,12 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`tagL10n` +AS SELECT `t`.`id` AS `id`, + IFNULL(`i`.`name`, `t`.`name`) AS `name` +FROM ( + `vn`.`tag` `t` + LEFT JOIN `vn`.`tagI18n` `i` ON( + `i`.`tagFk` = `t`.`id` + AND `i`.`lang` = `util`.`LANG`() + ) + ) diff --git a/db/routines/vn/views/ticketDownBuffer.sql b/db/routines/vn/views/ticketDownBuffer.sql new file mode 100644 index 000000000..4d157f20c --- /dev/null +++ b/db/routines/vn/views/ticketDownBuffer.sql @@ -0,0 +1,22 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`ticketDownBuffer` +AS SELECT `td`.`ticketFk` AS `ticketFk`, + `td`.`created` AS `created`, + `td`.`selected` AS `selected`, + concat(`w`.`firstName`, ' ', `w`.`lastName`) AS `sacador`, + `pk`.`code` AS `parking` +FROM ( + ( + ( + ( + `vn`.`ticketDown` `td` + JOIN `vn`.`ticketParking` `tp` ON(`tp`.`ticketFk` = `td`.`ticketFk`) + ) + JOIN `vn`.`parking` `pk` ON(`pk`.`id` = `tp`.`parkingFk`) + ) + JOIN `vn`.`ticketStateToday` `tst` ON(`tst`.`ticketFk` = `td`.`ticketFk`) + ) + JOIN `vn`.`worker` `w` ON(`w`.`id` = `tst`.`userFk`) + ) +WHERE `td`.`selected` = 2 diff --git a/db/routines/vn/views/ticketLastUpdated.sql b/db/routines/vn/views/ticketLastUpdated.sql new file mode 100644 index 000000000..96b6eaa17 --- /dev/null +++ b/db/routines/vn/views/ticketLastUpdated.sql @@ -0,0 +1,7 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`ticketLastUpdated` +AS SELECT `ticketLastUpdatedList`.`ticketFk` AS `ticketFk`, + max(`ticketLastUpdatedList`.`created`) AS `lastUpdated` +FROM `vn`.`ticketLastUpdatedList` +GROUP BY `ticketLastUpdatedList`.`ticketFk` diff --git a/db/routines/vn/views/ticketLastUpdatedList.sql b/db/routines/vn/views/ticketLastUpdatedList.sql new file mode 100644 index 000000000..bfc769e47 --- /dev/null +++ b/db/routines/vn/views/ticketLastUpdatedList.sql @@ -0,0 +1,23 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`ticketLastUpdatedList` +AS SELECT `s`.`ticketFk` AS `ticketFk`, + `st`.`created` AS `created` +FROM ( + `vn`.`saleTracking` `st` + JOIN `vn`.`sale` `s` ON(`s`.`id` = `st`.`saleFk`) + ) +WHERE `st`.`created` > `util`.`VN_CURDATE`() +UNION ALL +SELECT `tt`.`ticketFk` AS `Id_Ticket`, + `tt`.`created` AS `odbc_date` +FROM `vn`.`ticketTracking` `tt` +WHERE `tt`.`created` > `util`.`VN_CURDATE`() +UNION ALL +SELECT `s`.`ticketFk` AS `ticketFk`, + `iss`.`created` AS `created` +FROM ( + `vn`.`itemShelvingSale` `iss` + JOIN `vn`.`sale` `s` ON(`s`.`id` = `iss`.`saleFk`) + ) +WHERE `iss`.`created` > `util`.`VN_CURDATE`() diff --git a/db/routines/vn/views/ticketMRW.sql b/db/routines/vn/views/ticketMRW.sql new file mode 100644 index 000000000..d612c8742 --- /dev/null +++ b/db/routines/vn/views/ticketMRW.sql @@ -0,0 +1,47 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`ticketMRW` +AS SELECT `Tickets`.`Id_Agencia` AS `id_Agencia`, + `Tickets`.`empresa_id` AS `empresa_id`, + `Consignatarios`.`consignatario` AS `Consignatario`, + `Consignatarios`.`domicilio` AS `DOMICILIO`, + `Consignatarios`.`poblacion` AS `POBLACION`, + `Consignatarios`.`codPostal` AS `CODPOSTAL`, + `Consignatarios`.`telefono` AS `telefono`, + IFNULL( + IFNULL( + IFNULL( + IFNULL(`Consignatarios`.`movil`, `Clientes`.`movil`), + `Consignatarios`.`telefono` + ), + `Clientes`.`telefono` + ), + 0 + ) AS `movil`, + `Clientes`.`if` AS `IF`, + `Tickets`.`Id_Ticket` AS `Id_Ticket`, + `Tickets`.`warehouse_id` AS `warehouse_id`, + `Consignatarios`.`id_consigna` AS `Id_Consigna`, + `Paises`.`Codigo` AS `CodigoPais`, + `Tickets`.`Fecha` AS `Fecha`, + `province`.`province_id` AS `province_id`, + `Tickets`.`landing` AS `landing` +FROM ( + ( + ( + ( + `vn2008`.`Clientes` + JOIN `vn2008`.`Consignatarios` ON( + `Clientes`.`id_cliente` = `Consignatarios`.`Id_cliente` + ) + ) + JOIN `vn2008`.`Tickets` ON( + `Consignatarios`.`id_consigna` = `Tickets`.`Id_Consigna` + ) + ) + JOIN `vn2008`.`province` ON( + `Consignatarios`.`province_id` = `province`.`province_id` + ) + ) + JOIN `vn2008`.`Paises` ON(`province`.`Paises_Id` = `Paises`.`Id`) + ) diff --git a/db/routines/vn/views/ticketNotInvoiced.sql b/db/routines/vn/views/ticketNotInvoiced.sql new file mode 100644 index 000000000..c35b414ce --- /dev/null +++ b/db/routines/vn/views/ticketNotInvoiced.sql @@ -0,0 +1,26 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`ticketNotInvoiced` +AS SELECT `t`.`companyFk` AS `companyFk`, + `cm`.`code` AS `companyCode`, + `t`.`clientFk` AS `clientFk`, + `c`.`name` AS `clientName`, + `t`.`shipped` AS `shipped`, + cast( + sum( + `s`.`quantity` * `s`.`price` * (100 - `s`.`discount`) / 100 + ) AS decimal(10, 2) + ) AS `value` +FROM ( + ( + ( + `vn`.`ticket` `t` + JOIN `vn`.`sale` `s` ON(`s`.`ticketFk` = `t`.`id`) + ) + JOIN `vn`.`client` `c` ON(`c`.`id` = `t`.`clientFk`) + ) + JOIN `vn`.`company` `cm` ON(`cm`.`id` = `t`.`companyFk`) + ) +WHERE `t`.`refFk` IS NULL + AND `t`.`shipped` > '2017-01-01' +GROUP BY `t`.`id` diff --git a/db/routines/vn/views/ticketPackingList.sql b/db/routines/vn/views/ticketPackingList.sql new file mode 100644 index 000000000..bafe3c00c --- /dev/null +++ b/db/routines/vn/views/ticketPackingList.sql @@ -0,0 +1,38 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`ticketPackingList` +AS SELECT `t`.`nickname` AS `nickname`, + `t`.`id` AS `ticketFk`, + `am`.`name` AS `agencyMode`, + `am`.`flag` AS `flag`, + `p`.`name` AS `province`, + `s`.`itemFk` AS `itemFk`, + `s`.`concept` AS `concept`, + `s`.`quantity` AS `quantity`, + `sv`.`litros` AS `litros`, + `to`.`description` AS `observaciones` +FROM ( + ( + ( + ( + ( + ( + ( + `vn`.`ticket` `t` + JOIN `vn`.`address` `a` ON(`a`.`id` = `t`.`addressFk`) + ) + JOIN `vn`.`province` `p` ON(`p`.`id` = `a`.`provinceFk`) + ) + JOIN `vn`.`agencyMode` `am` ON(`am`.`id` = `t`.`agencyModeFk`) + ) + LEFT JOIN `vn`.`sale` `s` ON(`s`.`ticketFk` = `t`.`id`) + ) + LEFT JOIN `vn`.`saleVolume` `sv` ON(`sv`.`saleFk` = `s`.`id`) + ) + JOIN `vn`.`observationType` `ot` ON(`ot`.`code` = 'packager') + ) + LEFT JOIN `vn`.`ticketObservation` `to` ON( + `to`.`ticketFk` = `t`.`id` + AND `ot`.`id` = `to`.`observationTypeFk` + ) + ) diff --git a/db/routines/vn/views/ticketPreviousPreparingList.sql b/db/routines/vn/views/ticketPreviousPreparingList.sql new file mode 100644 index 000000000..9c84b8af3 --- /dev/null +++ b/db/routines/vn/views/ticketPreviousPreparingList.sql @@ -0,0 +1,36 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`ticketPreviousPreparingList` +AS SELECT `s`.`ticketFk` AS `ticketFk`, + `w`.`code` AS `code`, + COUNT(`s`.`id`) AS `saleLines`, + sum(`s`.`isPicked` <> 0) AS `alreadyMadeSaleLines`, + sum(`s`.`isPicked` <> 0) / COUNT(`s`.`id`) AS `madeRate`, + `sg`.`created` AS `created`, + `p`.`code` AS `parking`, + `iss`.`sectorFk` AS `sectorFk`, + `al`.`code` AS `alertCode` +FROM ( + ( + ( + ( + ( + ( + ( + `vn`.`saleGroup` `sg` + JOIN `vn`.`saleGroupDetail` `sgd` ON(`sgd`.`saleGroupFk` = `sg`.`id`) + ) + JOIN `vn`.`sale` `s` ON(`s`.`id` = `sgd`.`saleFk`) + ) + JOIN `vn`.`ticketState` `tls` ON(`tls`.`ticketFk` = `s`.`ticketFk`) + ) + JOIN `vn`.`alertLevel` `al` ON(`al`.`id` = `tls`.`alertLevel`) + ) + JOIN `vn`.`worker` `w` ON(`w`.`id` = `sg`.`userFk`) + ) + LEFT JOIN `vn`.`parking` `p` ON(`p`.`id` = `sg`.`parkingFk`) + ) + JOIN `vn`.`itemShelvingStock` `iss` ON(`iss`.`itemFk` = `s`.`itemFk`) + ) +WHERE `sg`.`created` >= `util`.`VN_CURDATE`() + INTERVAL 0.1 DAY +GROUP BY `sg`.`id` diff --git a/db/routines/vn/views/ticketState.sql b/db/routines/vn/views/ticketState.sql new file mode 100644 index 000000000..118a58b34 --- /dev/null +++ b/db/routines/vn/views/ticketState.sql @@ -0,0 +1,20 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`ticketState` +AS SELECT `tt`.`created` AS `updated`, + `tt`.`stateFk` AS `stateFk`, + `tt`.`userFk` AS `userFk`, + `tls`.`ticketFk` AS `ticketFk`, + `s`.`id` AS `state`, + `s`.`order` AS `productionOrder`, + `s`.`alertLevel` AS `alertLevel`, + `s`.`code` AS `code`, + `s`.`isPreviousPreparable` AS `isPreviousPreparable`, + `s`.`isPicked` AS `isPicked` +FROM ( + ( + `vn`.`ticketLastState` `tls` + JOIN `vn`.`ticketTracking` `tt` ON(`tt`.`id` = `tls`.`ticketTrackingFk`) + ) + JOIN `vn`.`state` `s` ON(`s`.`id` = `tt`.`stateFk`) + ) diff --git a/db/routines/vn/views/ticketStateToday.sql b/db/routines/vn/views/ticketStateToday.sql new file mode 100644 index 000000000..1f10aceb1 --- /dev/null +++ b/db/routines/vn/views/ticketStateToday.sql @@ -0,0 +1,16 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`ticketStateToday` +AS SELECT `ts`.`ticketFk` AS `ticketFk`, + `ts`.`state` AS `state`, + `ts`.`productionOrder` AS `productionOrder`, + `ts`.`alertLevel` AS `alertLevel`, + `ts`.`userFk` AS `userFk`, + `ts`.`code` AS `code`, + `ts`.`updated` AS `updated`, + `ts`.`isPicked` AS `isPicked` +FROM ( + `vn`.`ticketState` `ts` + JOIN `vn`.`ticket` `t` ON(`t`.`id` = `ts`.`ticketFk`) + ) +WHERE `t`.`shipped` BETWEEN `util`.`VN_CURDATE`() AND `MIDNIGHT`(`util`.`VN_CURDATE`()) diff --git a/db/routines/vn/views/ticketToPrepare.sql b/db/routines/vn/views/ticketToPrepare.sql new file mode 100644 index 000000000..98302b60d --- /dev/null +++ b/db/routines/vn/views/ticketToPrepare.sql @@ -0,0 +1,58 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`ticketToPrepare` +AS SELECT `m`.`Id_Ticket` AS `Id_Ticket`, + `mk`.`Id_Movimiento` AS `Id_Movimiento`, + `mk`.`Id_Movimiento_mark` AS `Id_Movimiento_mark`, + `mk`.`Id_Trabajador` AS `Id_Trabjador`, + `m`.`Id_Article` AS `Id_Article`, + `m`.`Concepte` AS `Concepte`, + `art`.`subName` AS `subName`, + `mk`.`original_quantity` - IFNULL(`is`.`quantity`, 0) AS `Cantidad`, + `mk`.`original_quantity` AS `original_quantity`, + IF( + HOUR(`t`.`shipped`), + HOUR(`t`.`shipped`), + HOUR(`z`.`hour`) + ) AS `Hora`, + HOUR(`t`.`shipped`) AS `Departure`, + MINUTE(`t`.`shipped`) AS `Minuto`, + `am`.`agencyFk` AS `agency_id`, + `t`.`warehouseFk` AS `warehouse_id`, + `a`.`provinceFk` AS `province_id`, + `is`.`quantity` AS `picked`, + `t`.`zoneFk` AS `zoneFk`, + `p`.`sectorFk` AS `sectorFk` +FROM ( + ( + ( + ( + ( + ( + ( + ( + ( + ( + `vn2008`.`Movimientos_mark` `mk` + JOIN `vn2008`.`Movimientos` `m` ON(`m`.`Id_Movimiento` = `mk`.`Id_Movimiento`) + ) + JOIN `vn`.`ticket` `t` ON(`m`.`Id_Ticket` = `t`.`id`) + ) + JOIN `vn`.`agencyMode` `am` ON(`am`.`id` = `t`.`agencyModeFk`) + ) + JOIN `vn`.`address` `a` ON(`a`.`id` = `t`.`addressFk`) + ) + LEFT JOIN `vn`.`itemShelvingSale` `is` ON(`is`.`saleFk` = `mk`.`Id_Movimiento`) + ) + LEFT JOIN `vn`.`itemShelving` `ish` ON(`ish`.`id` = `is`.`itemShelvingFk`) + ) + LEFT JOIN `vn`.`shelving` `sh` ON(`sh`.`code` = `ish`.`shelvingFk`) + ) + LEFT JOIN `vn`.`parking` `p` ON(`p`.`id` = `sh`.`parkingFk`) + ) + LEFT JOIN `vn2008`.`Articles` `art` ON(`art`.`Id_Article` = `m`.`Id_Article`) + ) + LEFT JOIN `vn`.`zone` `z` ON(`z`.`id` = `t`.`zoneFk`) + ) +WHERE `mk`.`stateFk` = 26 + AND `mk`.`valor` <> 1 diff --git a/db/routines/vn/views/ticketeToPreparePrepared.sql b/db/routines/vn/views/ticketeToPreparePrepared.sql new file mode 100644 index 000000000..76e840816 --- /dev/null +++ b/db/routines/vn/views/ticketeToPreparePrepared.sql @@ -0,0 +1,47 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`ticketeToPreparePrepared` +AS SELECT `m`.`Id_Ticket` AS `Id_Ticket`, + `mk`.`Id_Movimiento` AS `Id_Movimiento`, + `mk`.`Id_Movimiento_mark` AS `Id_Movimiento_mark`, + `mk`.`Id_Trabajador` AS `Id_Trabjador`, + `m`.`Id_Article` AS `Id_Article`, + `m`.`Concepte` AS `Concepte`, + `art`.`subName` AS `subName`, + `mk`.`original_quantity` - IFNULL(`is`.`quantity`, 0) AS `Cantidad`, + `mk`.`original_quantity` AS `original_quantity`, + HOUR(`t`.`shipped`) AS `Hora`, + HOUR(`t`.`shipped`) AS `Departure`, + MINUTE(`t`.`shipped`) AS `Minuto`, + `am`.`agencyFk` AS `agency_id`, + `t`.`warehouseFk` AS `warehouse_id`, + `a`.`provinceFk` AS `province_id`, + `is`.`quantity` AS `picked`, + `t`.`CodigoTrabajador` AS `trabajador`, + `is`.`sectorFk` AS `sectorFk` +FROM ( + ( + ( + ( + ( + ( + ( + ( + `vn2008`.`Movimientos_mark` `mk` + JOIN `vn`.`state` `st` ON(`st`.`id` = `mk`.`stateFk`) + ) + JOIN `vn2008`.`Movimientos` `m` ON(`m`.`Id_Movimiento` = `mk`.`Id_Movimiento`) + ) + JOIN `vn`.`ticket` `t` ON(`m`.`Id_Ticket` = `t`.`id`) + ) + JOIN `vn`.`agencyMode` `am` ON(`am`.`id` = `t`.`agencyModeFk`) + ) + JOIN `vn`.`address` `a` ON(`a`.`id` = `t`.`addressFk`) + ) + LEFT JOIN `vn`.`itemShelvingSaleSum` `is` ON(`is`.`saleFk` = `mk`.`Id_Movimiento`) + ) + JOIN `vn2008`.`Articles` `art` ON(`art`.`Id_Article` = `m`.`Id_Article`) + ) + LEFT JOIN `vn2008`.`Trabajadores` `t` ON(`t`.`Id_Trabajador` = `mk`.`Id_Trabajador`) + ) +WHERE `st`.`code` LIKE 'PREVIOUS_PREPARATION' diff --git a/db/routines/vn/views/tr2.sql b/db/routines/vn/views/tr2.sql new file mode 100644 index 000000000..5abc2bfa8 --- /dev/null +++ b/db/routines/vn/views/tr2.sql @@ -0,0 +1,19 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`tr2` +AS SELECT `vn`.`travel`.`id` AS `id`, + `vn`.`travel`.`shipped` AS `shipped`, + `vn`.`travel`.`shipmentHour` AS `shipmentHour`, + `vn`.`travel`.`landed` AS `landed`, + `vn`.`travel`.`landingHour` AS `landingHour`, + `vn`.`travel`.`warehouseInFk` AS `warehouseInFk`, + `vn`.`travel`.`warehouseOutFk` AS `warehouseOutFk`, + `vn`.`travel`.`agencyModeFk` AS `agencyFk`, + `vn`.`travel`.`ref` AS `ref`, + `vn`.`travel`.`isDelivered` AS `isDelivered`, + `vn`.`travel`.`isReceived` AS `isReceived`, + `vn`.`travel`.`m3` AS `m3`, + `vn`.`travel`.`kg` AS `kg`, + `vn`.`travel`.`cargoSupplierFk` AS `cargoSupplierFk`, + `vn`.`travel`.`totalEntries` AS `totalEntries` +FROM `vn`.`travel` diff --git a/db/routines/vn/views/traceabilityBuy.sql b/db/routines/vn/views/traceabilityBuy.sql new file mode 100644 index 000000000..0257c2f5d --- /dev/null +++ b/db/routines/vn/views/traceabilityBuy.sql @@ -0,0 +1,23 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`traceabilityBuy` +AS SELECT `b`.`id` AS `buyFk`, + `b`.`quantity` AS `quantity`, + `tr`.`landed` AS `landed`, + `w`.`name` AS `warehouseName`, + `b`.`entryFk` AS `entryFk`, + `s`.`name` AS `supplierName`, + IFNULL(`b`.`itemOriginalFk`, `b`.`itemFk`) AS `itemFk` +FROM ( + ( + ( + ( + `vn`.`buy` `b` + JOIN `vn`.`entry` `e` ON(`e`.`id` = `b`.`entryFk`) + ) + JOIN `vn`.`travel` `tr` ON(`tr`.`id` = `e`.`travelFk`) + ) + JOIN `vn`.`supplier` `s` ON(`s`.`id` = `e`.`supplierFk`) + ) + JOIN `vn`.`warehouse` `w` ON(`w`.`id` = `tr`.`warehouseInFk`) + ) diff --git a/db/routines/vn/views/traceabilitySale.sql b/db/routines/vn/views/traceabilitySale.sql new file mode 100644 index 000000000..9caf11d5e --- /dev/null +++ b/db/routines/vn/views/traceabilitySale.sql @@ -0,0 +1,19 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`traceabilitySale` +AS SELECT `s`.`ticketFk` AS `ticketFk`, + `sb`.`buyFk` AS `buyFk`, + `t`.`shipped` AS `shipped`, + `t`.`nickname` AS `nickname`, + `s`.`quantity` AS `quantity`, + concat(`w`.`firstName`, ' ', `w`.`lastName`) AS `worker` +FROM ( + ( + ( + `vn`.`saleBuy` `sb` + JOIN `vn`.`sale` `s` ON(`s`.`id` = `sb`.`saleFk`) + ) + JOIN `vn`.`ticket` `t` ON(`t`.`id` = `s`.`ticketFk`) + ) + JOIN `vn`.`worker` `w` ON(`w`.`id` = `sb`.`workerFk`) + ) diff --git a/db/routines/vn/views/workerBusinessDated.sql b/db/routines/vn/views/workerBusinessDated.sql new file mode 100644 index 000000000..83d6eb48c --- /dev/null +++ b/db/routines/vn/views/workerBusinessDated.sql @@ -0,0 +1,13 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`workerBusinessDated` +AS SELECT `t`.`dated` AS `dated`, + `b`.`id` AS `businessFk`, + `b`.`workerFk` AS `workerFk` +FROM ( + `vn`.`time` `t` + LEFT JOIN `vn`.`business` `b` ON( + `t`.`dated` BETWEEN `b`.`started` AND IFNULL(`b`.`ended`, `util`.`VN_CURDATE`()) + ) + ) +WHERE `t`.`dated` > `util`.`VN_CURDATE`() + INTERVAL -2 year diff --git a/db/routines/vn/views/workerDepartment.sql b/db/routines/vn/views/workerDepartment.sql new file mode 100644 index 000000000..4be3122da --- /dev/null +++ b/db/routines/vn/views/workerDepartment.sql @@ -0,0 +1,9 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`workerDepartment` +AS SELECT `b`.`workerFk` AS `workerFk`, + `b`.`departmentFk` AS `departmentFk` +FROM ( + `vn`.`business` `b` + JOIN `vn`.`worker` `w` ON(`w`.`businessFk` = `b`.`id`) + ) diff --git a/db/routines/vn/views/workerLabour.sql b/db/routines/vn/views/workerLabour.sql new file mode 100644 index 000000000..2f4067c2d --- /dev/null +++ b/db/routines/vn/views/workerLabour.sql @@ -0,0 +1,12 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`workerLabour` +AS SELECT `b`.`id` AS `businessFk`, + `b`.`workerFk` AS `workerFk`, + `b`.`workcenterFk` AS `workCenterFk`, + `b`.`started` AS `started`, + `b`.`ended` AS `ended`, + `b`.`departmentFk` AS `departmentFk`, + `b`.`payedHolidays` AS `payedHolidays` +FROM `vn`.`business` `b` +ORDER BY `b`.`started` DESC diff --git a/db/routines/vn/views/workerMedia.sql b/db/routines/vn/views/workerMedia.sql new file mode 100644 index 000000000..72ee04299 --- /dev/null +++ b/db/routines/vn/views/workerMedia.sql @@ -0,0 +1,7 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`workerMedia` +AS SELECT `w`.`id` AS `workerFk`, + `w`.`phone` AS `mediaValue` +FROM `vn`.`worker` `w` +WHERE `w`.`phone` IS NOT NULL diff --git a/db/routines/vn/views/workerSpeedExpedition.sql b/db/routines/vn/views/workerSpeedExpedition.sql new file mode 100644 index 000000000..db13cf16a --- /dev/null +++ b/db/routines/vn/views/workerSpeedExpedition.sql @@ -0,0 +1,25 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`workerSpeedExpedition` +AS SELECT `sv`.`ticketFk` AS `ticketFk`, + sum(`sv`.`litros`) AS `litros`, + sum( + IF( + `sub`.`started` > `util`.`VN_NOW`() + INTERVAL -1 HOUR, + `sv`.`litros`, + 0 + ) + ) AS `literLastHour`, + cast( + 60 * sum(`sv`.`litros`) / time_to_sec( + timediff(max(`sub`.`finished`), min(`sub`.`started`)) + ) AS decimal(10, 1) + ) AS `litersByMinute`, + `sub`.`code` AS `workerCode`, + `sub`.`cajas` AS `cajas`, + `sub`.`warehouseFk` AS `warehouseFk` +FROM ( + `vn`.`saleVolume` `sv` + JOIN `vn`.`expeditionTimeExpended` `sub` ON(`sub`.`ticketFk` = `sv`.`ticketFk`) + ) +GROUP BY `sub`.`code` diff --git a/db/routines/vn/views/workerSpeedSaleTracking.sql b/db/routines/vn/views/workerSpeedSaleTracking.sql new file mode 100644 index 000000000..21f07ea8a --- /dev/null +++ b/db/routines/vn/views/workerSpeedSaleTracking.sql @@ -0,0 +1,29 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`workerSpeedSaleTracking` +AS SELECT `salesPreparedLastHour`.`warehouseFk` AS `warehouseFk`, + `salesPreparedLastHour`.`code` AS `state`, + `salesPreparedLastHour`.`workerCode` AS `workerCode`, + sum(`salesPreparedLastHour`.`litros`) AS `sumaLitros`, + min(`salesPreparedLastHour`.`created`) AS `started`, + max(`salesPreparedLastHour`.`created`) AS `finished`, + sum( + IF( + `salesPreparedLastHour`.`created` >= `util`.`VN_NOW`() + INTERVAL -1 HOUR, + `salesPreparedLastHour`.`litros`, + 0 + ) + ) AS `sumaLitrosLastHour`, + cast( + 60 * sum(`salesPreparedLastHour`.`litros`) / time_to_sec( + timediff( + max(`salesPreparedLastHour`.`created`), + min(`salesPreparedLastHour`.`created`) + ) + ) AS decimal(10, 1) + ) AS `litersByMinute`, + `salesPreparedLastHour`.`departmentName` AS `departmentName` +FROM `vn`.`salesPreparedLastHour` +GROUP BY `salesPreparedLastHour`.`warehouseFk`, + `salesPreparedLastHour`.`code`, + `salesPreparedLastHour`.`workerCode` diff --git a/db/routines/vn/views/workerTeamCollegues.sql b/db/routines/vn/views/workerTeamCollegues.sql new file mode 100644 index 000000000..dbe245a16 --- /dev/null +++ b/db/routines/vn/views/workerTeamCollegues.sql @@ -0,0 +1,9 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`workerTeamCollegues` +AS SELECT DISTINCT `w`.`workerFk` AS `workerFk`, + `t`.`workerFk` AS `collegueFk` +FROM ( + `vn`.`workerTeam` `w` + JOIN `vn`.`workerTeam` `t` ON(`w`.`team` = `t`.`team`) + ) diff --git a/db/routines/vn/views/workerTimeControlUserInfo.sql b/db/routines/vn/views/workerTimeControlUserInfo.sql new file mode 100644 index 000000000..eea8ffd7c --- /dev/null +++ b/db/routines/vn/views/workerTimeControlUserInfo.sql @@ -0,0 +1,20 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`workerTimeControlUserInfo` +AS SELECT `u`.`id` AS `userFk`, + `w`.`firstName` AS `name`, + `w`.`lastName` AS `surname`, + `u`.`name` AS `user`, + `u`.`password` AS `password`, + `wd`.`departmentFk` AS `departmentFk`, + left(`c`.`fi`, 8) AS `dni` +FROM ( + ( + ( + `account`.`user` `u` + JOIN `vn`.`worker` `w` ON(`w`.`id` = `u`.`id`) + ) + JOIN `vn`.`client` `c` ON(`c`.`id` = `u`.`id`) + ) + LEFT JOIN `vn`.`workerDepartment` `wd` ON(`wd`.`workerFk` = `w`.`id`) + ) diff --git a/db/routines/vn/views/workerTimeJourneyNG.sql b/db/routines/vn/views/workerTimeJourneyNG.sql new file mode 100644 index 000000000..b45b855b7 --- /dev/null +++ b/db/routines/vn/views/workerTimeJourneyNG.sql @@ -0,0 +1,13 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`workerTimeJourneyNG` +AS SELECT `wtc`.`userFk` AS `userFk`, + cast(`wtc`.`timed` AS date) AS `dated`, + IF(`wtc`.`order` MOD 2, -1, 1) * (HOUR(`wtc`.`timed`) + MINUTE(`wtc`.`timed`) / 60) AS `Journey`, + dayname(`wtc`.`timed`) AS `dayName`, + `w`.`lastName` AS `name`, + `w`.`firstName` AS `firstname` +FROM ( + `vn`.`workerTimeControl` `wtc` + JOIN `vn`.`worker` `w` ON(`w`.`id` = `wtc`.`userFk`) + ) diff --git a/db/routines/vn/views/workerWithoutTractor.sql b/db/routines/vn/views/workerWithoutTractor.sql new file mode 100644 index 000000000..e0c0978a5 --- /dev/null +++ b/db/routines/vn/views/workerWithoutTractor.sql @@ -0,0 +1,20 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`workerWithoutTractor` +AS SELECT `c`.`workerFk` AS `workerFk`, + `cl`.`name` AS `Trabajador`, + COUNT(DISTINCT `c`.`id`) AS `Colecciones`, + max(`c`.`created`) AS `created` +FROM ( + ( + `vn`.`collection` `c` + JOIN `vn`.`client` `cl` ON(`cl`.`id` = `c`.`workerFk`) + ) + LEFT JOIN `vn`.`machineWorker` `mw` ON( + `mw`.`workerFk` = `c`.`workerFk` + AND `mw`.`inTimed` > `util`.`VN_CURDATE`() + ) + ) +WHERE `c`.`created` > `util`.`VN_CURDATE`() + AND `mw`.`workerFk` IS NULL +GROUP BY `c`.`workerFk` diff --git a/db/routines/vn/views/zoneEstimatedDelivery.sql b/db/routines/vn/views/zoneEstimatedDelivery.sql new file mode 100644 index 000000000..90c7381d8 --- /dev/null +++ b/db/routines/vn/views/zoneEstimatedDelivery.sql @@ -0,0 +1,45 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn`.`zoneEstimatedDelivery` +AS SELECT `t`.`zoneFk` AS `zoneFk`, + `zc`.`hour` AS `zoneClosureHour`, + `z`.`hour` AS `zoneHour`, + `sv`.`volume` AS `volume`, + `al`.`hasToRecalcPrice` AS `hasToRecalcPrice`, + `lhp`.`m3` AS `m3`, + `dl`.`minSpeed` AS `minSpeed` +FROM ( + ( + ( + ( + ( + ( + ( + ( + ( + `vn`.`ticket` `t` + JOIN `vn`.`ticketStateToday` `tst` ON(`tst`.`ticketFk` = `t`.`id`) + ) + JOIN `vn`.`state` `s` ON(`s`.`id` = `tst`.`state`) + ) + JOIN `vn`.`saleVolume` `sv` ON(`sv`.`ticketFk` = `t`.`id`) + ) + LEFT JOIN `vn`.`lastHourProduction` `lhp` ON(`lhp`.`warehouseFk` = `t`.`warehouseFk`) + ) + JOIN `vn`.`warehouse` `w` ON(`w`.`id` = `t`.`warehouseFk`) + ) + ) STRAIGHT_JOIN `vn`.`zone` `z` ON(`z`.`id` = `t`.`zoneFk`) + ) + LEFT JOIN `vn`.`zoneClosure` `zc` ON( + `zc`.`zoneFk` = `t`.`zoneFk` + AND `zc`.`dated` = `util`.`VN_CURDATE`() + ) + ) + LEFT JOIN `cache`.`departure_limit` `dl` ON( + `dl`.`warehouse_id` = `t`.`warehouseFk` + AND `dl`.`fecha` = `util`.`VN_CURDATE`() + ) + ) + JOIN `vn`.`alertLevel` `al` ON(`al`.`id` = `s`.`alertLevel`) +WHERE `w`.`hasProduction` <> 0 + AND cast(`t`.`shipped` AS date) = `util`.`VN_CURDATE`() \ No newline at end of file diff --git a/db/routines/vn2008/events/raidUpdate.sql b/db/routines/vn2008/events/raidUpdate.sql new file mode 100644 index 000000000..aacfd6dcd --- /dev/null +++ b/db/routines/vn2008/events/raidUpdate.sql @@ -0,0 +1,8 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `vn2008`.`raidUpdate` + ON SCHEDULE EVERY 1 DAY + STARTS '2017-12-29 00:05:00.000' + ON COMPLETION PRESERVE + ENABLE +DO CALL raidUpdate$$ +DELIMITER ; diff --git a/db/routines/vn2008/procedures/account_conciliacion_add.sql b/db/routines/vn2008/procedures/account_conciliacion_add.sql new file mode 100644 index 000000000..94ef0b14b --- /dev/null +++ b/db/routines/vn2008/procedures/account_conciliacion_add.sql @@ -0,0 +1,33 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`account_conciliacion_add`() +BEGIN + UPDATE account_conciliacion ac + JOIN + ( + SELECT idaccount_conciliacion, @c:= if(@id = id_calculated, @c + 1, 1) contador, + @id:= id_calculated as id_calculated, concat(id_calculated,'(',@c,')') as new_id + FROM account_conciliacion + JOIN + ( + select id_calculated, count(*) rep, @c:= 0, @id:= concat('-',id_calculated) + from account_conciliacion + group by id_calculated + having rep > 1 + ) sub using(id_calculated) + ) sub2 using(idaccount_conciliacion) + SET ac.id_calculated = sub2.new_id; + + INSERT INTO Cajas(Cajafecha, Partida, Serie, Concepto, Entrada, + Salida, Id_Banco,empresa_id, warehouse_id, + Proveedores_account_id, id_calculated, InForeignValue, OutForeignValue, Id_Trabajador) + SELECT Fechaoperacion, TRUE, 'MB', ac.Concepto, IF(DebeHaber = 2 AND currencyFk = 1, importe,null), + IF(DebeHaber = 1 AND currencyFk = 1, importe, null), a.id, sa.supplierFk, 1, + ac.Id_Proveedores_account, ac.id_calculated, IF(DebeHaber = 2 AND NOT currencyFk = 1, importe, null), + IF(DebeHaber = 1 AND NOT currencyFk = 1, importe, null), account.myUser_getId() + FROM account_conciliacion ac + JOIN vn.supplierAccount sa on sa.id = ac.Id_Proveedores_account + JOIN vn.accounting a ON a.id = sa.accountingFk + LEFT JOIN Cajas c on c.id_calculated = ac.id_calculated + WHERE c.Id_Caja IS NULL; +END$$ +DELIMITER ; diff --git a/db/routines/vn2008/procedures/agencia_volume.sql b/db/routines/vn2008/procedures/agencia_volume.sql new file mode 100644 index 000000000..ea631793d --- /dev/null +++ b/db/routines/vn2008/procedures/agencia_volume.sql @@ -0,0 +1,44 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`agencia_volume`() +BEGIN + DECLARE vStarted DATETIME DEFAULT TIMESTAMP(util.VN_CURDATE()); + DECLARE vEnded DATETIME DEFAULT TIMESTAMP(util.VN_CURDATE(), '23:59:59'); + + DROP TEMPORARY TABLE IF EXISTS tmp.ticket_PackagingEstimated; + CREATE TEMPORARY TABLE tmp.ticket_PackagingEstimated + ( + ticketFk INT PRIMARY KEY + ,boxes INT DEFAULT 0 + ); + + INSERT INTO tmp.ticket_PackagingEstimated(ticketFk, boxes) + SELECT sv.ticketFk, CEIL(1000 * sum(sv.volume) / vc.standardFlowerBox) + FROM vn.ticket t + JOIN vn.saleVolume sv ON sv.ticketFk = t.id + JOIN vn.volumeConfig vc + WHERE t.shipped BETWEEN vStarted AND vEnded + AND IFNULL(t.packages,0) = 0 + GROUP BY t.id; + SELECT * FROM + ( + SELECT ag.id agency_id, + CONCAT(RPAD(c.country, 16,' _') ,' ',ag.name) Agencia, + count(*) expediciones, + sum(t.packages) Bultos, + sum(tpe.boxes) Faltan + FROM vn.ticket t + JOIN vn.warehouse w ON w.id = t.warehouseFk + JOIN vn.country c ON w.countryFk = c.id + JOIN vn.address a ON a.id = t.addressFk + JOIN vn.agencyMode am ON am.id = t.agencyModeFk + JOIN vn.agency ag ON ag.id = am.agencyFk + JOIN tmp.ticket_PackagingEstimated tpe ON tpe.ticketFk = t.id + WHERE t.shipped BETWEEN vStarted AND vEnded + AND ag.isOwn = FALSE + GROUP BY ag.id + ) sub + ORDER BY Agencia; + + DROP TEMPORARY TABLE tmp.ticket_PackagingEstimated; +END$$ +DELIMITER ; diff --git a/db/routines/vn2008/procedures/article.sql b/db/routines/vn2008/procedures/article.sql new file mode 100644 index 000000000..3c2664c0f --- /dev/null +++ b/db/routines/vn2008/procedures/article.sql @@ -0,0 +1,15 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`article`() +BEGIN +/** + * Crea la tabla temporal: article_inventory + */ + DROP TEMPORARY TABLE IF EXISTS article_inventory; + CREATE TEMPORARY TABLE article_inventory + ( + `article_id` INT(11) NOT NULL PRIMARY KEY, + `future` DATETIME + ) + ENGINE = MEMORY; +END$$ +DELIMITER ; diff --git a/db/routines/vn2008/procedures/article_multiple_buy.sql b/db/routines/vn2008/procedures/article_multiple_buy.sql new file mode 100644 index 000000000..5b0d402c5 --- /dev/null +++ b/db/routines/vn2008/procedures/article_multiple_buy.sql @@ -0,0 +1,6 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`article_multiple_buy`(v_date DATETIME, wh INT) +BEGIN + CALL vn.item_multipleBuy(v_date, wh); +END$$ +DELIMITER ; diff --git a/db/routines/vn2008/procedures/article_multiple_buy_date.sql b/db/routines/vn2008/procedures/article_multiple_buy_date.sql new file mode 100644 index 000000000..7b197cb01 --- /dev/null +++ b/db/routines/vn2008/procedures/article_multiple_buy_date.sql @@ -0,0 +1,9 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`article_multiple_buy_date`( + IN vDated DATETIME, + IN vWarehouseFk TINYINT(3) +) +BEGIN + CALL vn.item_multipleBuyByDate(vDated, vWarehouseFk); +END$$ +DELIMITER ; diff --git a/db/routines/vn2008/procedures/availableTraslate.sql b/db/routines/vn2008/procedures/availableTraslate.sql new file mode 100644 index 000000000..a3d2c8bea --- /dev/null +++ b/db/routines/vn2008/procedures/availableTraslate.sql @@ -0,0 +1,126 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`availableTraslate`( + vWarehouseLanding INT, + vDated DATE, + vWarehouseShipment INT) +proc: BEGIN + DECLARE vDatedFrom DATE; + DECLARE vDatedTo DATETIME; + DECLARE vDatedReserve DATETIME; + DECLARE vDatedInventory DATE; + + IF vDated < util.VN_CURDATE() THEN + LEAVE proc; + END IF; + + CALL vn.item_getStock (vWarehouseLanding, vDated, NULL); + + -- 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 SUBTIME(util.VN_NOW(), reserveTime) INTO vDatedReserve + FROM hedera.orderConfig; + + -- Calcula el ultimo dia de vida para cada producto + DROP TEMPORARY TABLE IF EXISTS itemRange; + CREATE TEMPORARY TABLE itemRange + (PRIMARY KEY (itemFk)) + ENGINE = MEMORY + SELECT c.itemFk, MAX(t.landed) dated + FROM vn.buy c + JOIN vn.entry e ON c.entryFk = e.id + JOIN vn.travel t ON t.id = e.travelFk + JOIN vn.warehouse w ON w.id = t.warehouseInFk + WHERE t.landed BETWEEN vDatedInventory AND vDatedFrom + AND t.warehouseInFk = vWarehouseLanding + AND NOT e.isExcludedFromAvailable + AND NOT e.isRaid + GROUP BY c.itemFk; + + -- Tabla con el ultimo dia de last_buy para cada producto que hace un replace de la anterior + CALL vn.buyUltimate(vWarehouseShipment, util.VN_CURDATE()); + + INSERT INTO itemRange + SELECT t.itemFk, tr.landed + FROM tmp.buyUltimate t + JOIN vn.buy b ON b.id = t.buyFk + JOIN vn.entry e ON e.id = b.entryFk + JOIN vn.travel tr ON tr.id = e.travelFk + LEFT JOIN itemRange i ON t.itemFk = i.itemFk + WHERE t.warehouseFk = vWarehouseShipment + AND NOT e.isRaid + ON DUPLICATE KEY UPDATE itemRange.dated = GREATEST(itemRange.dated, tr.landed); + + DROP TEMPORARY TABLE IF EXISTS itemRangeLive; + CREATE TEMPORARY TABLE itemRangeLive + (PRIMARY KEY (itemFk)) + ENGINE = MEMORY + SELECT ir.itemFk, TIMESTAMP(TIMESTAMPADD(DAY, it.life, ir.dated), '23:59:59') dated + FROM itemRange ir + JOIN vn.item i ON i.id = ir.itemFk + JOIN vn.itemType it ON it.id = i.typeFk + HAVING dated >= vDatedFrom OR dated IS NULL; + + -- Calcula el ATP + DROP TEMPORARY TABLE IF EXISTS tmp.itemCalc; + CREATE TEMPORARY TABLE tmp.itemCalc + (INDEX (itemFk,warehouseFk)) + ENGINE = MEMORY + SELECT i.itemFk, vWarehouseLanding warehouseFk, i.shipped dated, i.quantity + FROM vn.itemTicketOut i + JOIN itemRangeLive ir ON ir.itemFK = i.itemFk + WHERE i.shipped >= vDatedFrom + AND (ir.dated IS NULL OR i.shipped <= ir.dated) + AND i.warehouseFk = vWarehouseLanding + UNION ALL + SELECT b.itemFk, vWarehouseLanding, t.landed, b.quantity + FROM vn.buy b + JOIN vn.entry e ON b.entryFk = e.id + JOIN vn.travel t ON t.id = e.travelFk + JOIN itemRangeLive ir ON ir.itemFk = b.itemFk + WHERE NOT e.isExcludedFromAvailable + AND b.quantity <> 0 + AND NOT e.isRaid + AND t.warehouseInFk = vWarehouseLanding + AND t.landed >= vDatedFrom + AND (ir.dated IS NULL OR t.landed <= ir.dated) + UNION ALL + SELECT i.itemFk, vWarehouseLanding, i.shipped, i.quantity + FROM vn.itemEntryOut i + JOIN itemRangeLive ir ON ir.itemFk = i.itemFk + WHERE i.shipped >= vDatedFrom + AND (ir.dated IS NULL OR i.shipped <= ir.dated) + AND i.warehouseOutFk = vWarehouseLanding + UNION ALL + SELECT r.item_id, vWarehouseLanding, r.shipment, -r.amount + FROM hedera.order_row r + JOIN hedera.`order` o ON o.id = r.order_id + JOIN itemRangeLive ir ON ir.itemFk = r.item_id + WHERE r.shipment >= vDatedFrom + AND (ir.dated IS NULL OR r.shipment <= ir.dated) + AND r.warehouse_id = vWarehouseLanding + AND r.created >= vDatedReserve + AND NOT o.confirmed; + + CALL vn.item_getAtp(vDated); + + DROP TEMPORARY TABLE IF EXISTS availableTraslate; + CREATE TEMPORARY TABLE availableTraslate + (PRIMARY KEY (item_id)) + ENGINE = MEMORY + SELECT t.item_id, SUM(stock) available + FROM ( + SELECT ti.itemFk item_id, stock + FROM tmp.itemList ti + JOIN itemRange ir ON ir.itemFk = ti.itemFk + UNION ALL + SELECT itemFk, quantity + FROM tmp.itemAtp + ) t + GROUP BY t.item_id + HAVING available <> 0; + + DROP TEMPORARY TABLE tmp.itemList, itemRange, itemRangeLive; +END$$ +DELIMITER ; diff --git a/db/routines/vn2008/procedures/balance_create.sql b/db/routines/vn2008/procedures/balance_create.sql new file mode 100644 index 000000000..2acd26834 --- /dev/null +++ b/db/routines/vn2008/procedures/balance_create.sql @@ -0,0 +1,207 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`balance_create`( + IN vStartingMonth INT, + IN vEndingMonth INT, + IN vCompany INT, + IN vIsConsolidated BOOLEAN, + IN vInterGroupSalesIncluded BOOLEAN) +BEGIN + DECLARE intGAP INT DEFAULT 7; + DECLARE vYears INT DEFAULT 2; + DECLARE vYear TEXT; + DECLARE vOneYearAgo TEXT; + DECLARE vTwoYearsAgo TEXT; + DECLARE vQuery TEXT; + DECLARE vConsolidatedGroup INT; + DECLARE vStartingDate DATE DEFAULT '2020-01-01'; + DECLARE vCurYear INT DEFAULT YEAR(util.VN_CURDATE()); + DECLARE vStartingYear INT DEFAULT vCurYear - 2; + DECLARE vTable TEXT; + + SET vTable = util.quoteIdentifier('balance_nest_tree'); + SET vYear = util.quoteIdentifier(vCurYear); + SET vOneYearAgo = util.quoteIdentifier(vCurYear-1); + SET vTwoYearsAgo = util.quoteIdentifier(vCurYear-2); + + -- Solicitamos la tabla tmp.nest, como base para el balance + DROP TEMPORARY TABLE IF EXISTS tmp.nest; + + EXECUTE IMMEDIATE CONCAT( + 'CREATE TEMPORARY TABLE tmp.nest + SELECT node.id + ,CONCAT( REPEAT(REPEAT(" ",?), COUNT(parent.id) - 1), node.name) AS name + ,node.lft + ,node.rgt + ,COUNT(parent.id) - 1 as depth + ,cast((node.rgt - node.lft - 1) / 2 as DECIMAL) as sons + FROM ', vTable, ' AS node, + ', vTable, ' AS parent + WHERE node.lft BETWEEN parent.lft AND parent.rgt + GROUP BY node.id + ORDER BY node.lft') + USING intGAP; + + DROP TEMPORARY TABLE IF EXISTS tmp.balance; + CREATE TEMPORARY TABLE tmp.balance + SELECT * FROM tmp.nest; + + DROP TEMPORARY TABLE IF EXISTS tmp.empresas_receptoras; + DROP TEMPORARY TABLE IF EXISTS tmp.empresas_emisoras; + + SELECT empresa_grupo INTO vConsolidatedGroup + FROM empresa + WHERE id = vCompany; + + CREATE TEMPORARY TABLE tmp.empresas_receptoras + SELECT id as empresa_id + FROM vn2008.empresa + WHERE id = vCompany + OR empresa_grupo = IF(vIsConsolidated, vConsolidatedGroup, NULL); + + CREATE TEMPORARY TABLE tmp.empresas_emisoras + SELECT Id_Proveedor as empresa_id FROM vn2008.Proveedores p; + + IF vInterGroupSalesIncluded = FALSE THEN + + DELETE ee.* + FROM tmp.empresas_emisoras ee + JOIN vn2008.empresa e on e.id = ee.empresa_id + WHERE e.empresa_grupo = vConsolidatedGroup; + + END IF; + + -- Se calculan las facturas que intervienen, para luego poder servir el desglose desde aqui + DROP TEMPORARY TABLE IF EXISTS tmp.balance_desglose; + CREATE TEMPORARY TABLE tmp.balance_desglose + SELECT er.empresa_id receptora_id, + ee.empresa_id emisora_id, + year(IFNULL(r.bookEntried,IFNULL(r.dateBooking, r.Fecha))) `year`, + month(IFNULL(r.bookEntried,IFNULL(r.dateBooking, r.Fecha))) `month`, + gastos_id Id_Gasto, + SUM(bi) importe + FROM recibida r + JOIN recibida_iva ri on ri.recibida_id = r.id + JOIN tmp.empresas_receptoras er on er.empresa_id = r.empresa_id + JOIN tmp.empresas_emisoras ee ON ee.empresa_id = r.proveedor_id + WHERE IFNULL(r.bookEntried,IFNULL(r.dateBooking, r.Fecha)) >= vStartingDate + AND r.contabilizada + GROUP BY Id_Gasto, year, month, emisora_id, receptora_id; + + INSERT INTO tmp.balance_desglose( + receptora_id, + emisora_id, + year, + month, + Id_Gasto, + importe) + SELECT gr.empresa_id, + gr.empresa_id, + year, + month, + Id_Gasto, + SUM(importe) + FROM gastos_resumen gr + JOIN tmp.empresas_receptoras er on gr.empresa_id = er.empresa_id + WHERE year >= vStartingYear + AND month BETWEEN vStartingMonth AND vEndingMonth + GROUP BY Id_Gasto, year, month, gr.empresa_id; + + DELETE FROM tmp.balance_desglose + WHERE month < vStartingMonth + OR month > vEndingMonth; + + -- Ahora el balance + EXECUTE IMMEDIATE CONCAT( + 'ALTER TABLE tmp.balance + ADD COLUMN ', vTwoYearsAgo ,' INT(10) NULL , + ADD COLUMN ', vOneYearAgo ,' INT(10) NULL , + ADD COLUMN ', vYear,' INT(10) NULL , + ADD COLUMN Id_Gasto VARCHAR(10) NULL, + ADD COLUMN Gasto VARCHAR(45) NULL'); + + -- Añadimos los gastos, para facilitar el formulario + UPDATE tmp.balance b + JOIN vn2008.balance_nest_tree bnt on bnt.id = b.id + JOIN (SELECT id Id_Gasto, name Gasto + FROM vn.expense + GROUP BY id) g ON g.Id_Gasto = bnt.Id_Gasto COLLATE utf8_general_ci + SET b.Id_Gasto = g.Id_Gasto COLLATE utf8_general_ci + , b.Gasto = g.Gasto COLLATE utf8_general_ci ; + + -- Rellenamos los valores de primer nivel, los que corresponden a los gastos simples + WHILE vYears >= 0 DO + SET vQuery = CONCAT( + 'UPDATE tmp.balance b + JOIN + (SELECT Id_Gasto, SUM(Importe) as Importe + FROM tmp.balance_desglose + WHERE year = ? + GROUP BY Id_Gasto + ) sub on sub.Id_Gasto = b.Id_Gasto COLLATE utf8_general_ci + SET ', util.quoteIdentifier(vCurYear - vYears), ' = - Importe'); + + EXECUTE IMMEDIATE vQuery + USING vCurYear - vYears; + + SET vYears = vYears - 1; + END WHILE; + + -- Añadimos las ventas + EXECUTE IMMEDIATE CONCAT( + 'UPDATE tmp.balance b + JOIN ( + SELECT SUM(IF(year = ?, venta, 0)) y2, + SUM(IF(year = ?, venta, 0)) y1, + SUM(IF(year = ?, venta, 0)) y0, + c.Gasto + FROM bs.ventas_contables c + JOIN tmp.empresas_receptoras er on er.empresa_id = c.empresa_id + WHERE month BETWEEN ? AND ? + GROUP BY c.Gasto + ) sub ON sub.Gasto = b.Id_Gasto COLLATE utf8_general_ci + SET b.', vTwoYearsAgo, '= IFNULL(b.', vTwoYearsAgo, ', 0) + sub.y2, + b.', vOneYearAgo, '= IFNULL(b.', vOneYearAgo, ', 0) + sub.y1, + b.', vYear, '= IFNULL(b.', vYear, ', 0) + sub.y0') + USING vCurYear-2, + vCurYear-1, + vCurYear, + vStartingMonth, + vEndingMonth; + + -- Ventas intra grupo + IF NOT vInterGroupSalesIncluded THEN + + SELECT lft, rgt INTO @grupoLft, @grupoRgt + FROM tmp.balance b + WHERE TRIM(b.`name`) = 'Grupo'; + + DELETE + FROM tmp.balance + WHERE lft BETWEEN @grupoLft AND @grupoRgt; + + END IF; + + -- Rellenamos el valor de los padres con la suma de los hijos + DROP TEMPORARY TABLE IF EXISTS tmp.balance_aux; + CREATE TEMPORARY TABLE tmp.balance_aux + SELECT * FROM tmp.balance; + + EXECUTE IMMEDIATE + CONCAT('UPDATE tmp.balance b + JOIN ( + SELECT b1.id, + b1.name, + SUM(b2.', vYear,') thisYear, + SUM(b2.', vOneYearAgo,') oneYearAgo, + SUM(b2.', vTwoYearsAgo,') twoYearsAgo + FROM tmp.nest b1 + JOIN tmp.balance_aux b2 on b2.lft BETWEEN b1.lft and b1.rgt + GROUP BY b1.id)sub ON sub.id = b.id + SET b.', vYear, ' = thisYear, + b.', vOneYearAgo, ' = oneYearAgo, + b.', vTwoYearsAgo, ' = twoYearsAgo'); + + SELECT *, CONCAT('',ifnull(Id_Gasto,'')) newgasto + FROM tmp.balance; +END$$ +DELIMITER ; diff --git a/db/routines/vn2008/procedures/buy_tarifas.sql b/db/routines/vn2008/procedures/buy_tarifas.sql new file mode 100644 index 000000000..c6e8dff90 --- /dev/null +++ b/db/routines/vn2008/procedures/buy_tarifas.sql @@ -0,0 +1,6 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`buy_tarifas`(vBuyFk INT) +BEGIN + CALL vn.buy_recalcPricesByBuy(vBuyFk); +END$$ +DELIMITER ; diff --git a/db/routines/vn2008/procedures/buy_tarifas_entry.sql b/db/routines/vn2008/procedures/buy_tarifas_entry.sql new file mode 100644 index 000000000..3fc0739e0 --- /dev/null +++ b/db/routines/vn2008/procedures/buy_tarifas_entry.sql @@ -0,0 +1,11 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`buy_tarifas_entry`(IN vEntryFk INT(11)) +BEGIN +/** + * Recalcula los precios de una entrada + * + * @param vEntryFk + */ + CALL vn.buy_recalcPricesByEntry(vEntryFk); +END$$ +DELIMITER ; diff --git a/db/routines/vn2008/procedures/raidUpdate.sql b/db/routines/vn2008/procedures/raidUpdate.sql new file mode 100644 index 000000000..9746f3cf9 --- /dev/null +++ b/db/routines/vn2008/procedures/raidUpdate.sql @@ -0,0 +1,28 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`raidUpdate`() +BEGIN + + UPDATE Entradas e + JOIN Entradas_Auto ea USING (Id_Entrada) + JOIN travel t ON t.id = e.travel_id + JOIN ( + SELECT * + FROM ( + SELECT id, landing, warehouse_id, warehouse_id_out + FROM travel + JOIN ( + SELECT warehouse_id, warehouse_id_out + FROM Entradas_Auto ea + JOIN Entradas e USING(Id_Entrada) + JOIN travel t ON t.id = e.travel_id + GROUP BY warehouse_id, warehouse_id_out + ) t USING (warehouse_id, warehouse_id_out) + WHERE shipment > util.VN_CURDATE() AND delivered = FALSE + ORDER BY landing + LIMIT 10000000000000000000 + ) t + GROUP BY warehouse_id, warehouse_id_out + ) t USING (warehouse_id, warehouse_id_out) + SET e.travel_id = t.id; +END$$ +DELIMITER ; diff --git a/db/routines/vn2008/procedures/rateView.sql b/db/routines/vn2008/procedures/rateView.sql new file mode 100644 index 000000000..91e317be6 --- /dev/null +++ b/db/routines/vn2008/procedures/rateView.sql @@ -0,0 +1,37 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`rateView`() +BEGIN + + SELECT + t.year as año, + t.month as mes, + pagos.dolares, + pagos.cambioPractico, + CAST(sum(divisa) / sum(bi) as DECIMAL(5,4)) as cambioTeorico, + pagos.cambioOficial + FROM recibida r + JOIN time t ON t.date = r.fecha + JOIN recibida_iva ri ON r.id = ri.recibida_id + JOIN + ( + SELECT + t.year as Año, + t.month as Mes, + cast(sum(divisa) as DECIMAL(10,2)) as dolares, + cast(sum(divisa) / sum(importe) as DECIMAL(5,4)) as cambioPractico, + cast(rr.rate * 0.998 as DECIMAL(5,4)) as cambioOficial + FROM pago p + JOIN time t ON t.date = p.fecha + JOIN reference_rate rr ON rr.date = p.fecha AND moneda_id = 2 + WHERE divisa + AND fecha >= '2015-01-11' + GROUP BY t.year, t.month + ) pagos ON t.year = pagos.Año AND t.month = pagos.Mes + WHERE moneda_id = 2 + AND fecha >= '2015-01-01' + AND divisa + AND bi + GROUP BY t.year, t.month; + +END$$ +DELIMITER ; diff --git a/db/routines/vn2008/procedures/recobro_credito.sql b/db/routines/vn2008/procedures/recobro_credito.sql new file mode 100644 index 000000000..3657f2b9b --- /dev/null +++ b/db/routines/vn2008/procedures/recobro_credito.sql @@ -0,0 +1,45 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`recobro_credito`() +BEGIN + DECLARE EXIT HANDLER FOR SQLSTATE '45000' + BEGIN + ROLLBACK; + RESIGNAL; + END; + + START TRANSACTION; + UPDATE vn.`client` c + JOIN vn.payMethod pm ON pm.id = c.payMethodFk + SET credit = 0 + WHERE pm.`code` = 'card'; + + DROP TEMPORARY TABLE IF EXISTS clientes_credit; + CREATE TEMPORARY TABLE clientes_credit + SELECT Id_Cliente, if (Credito > Recobro ,Credito - Recobro,0) AS newCredit + FROM ( + SELECT r.Id_Cliente, r.amount AS Recobro, + timestampadd(DAY, period, UltimaFecha) AS Deadline, sub2.amount AS Credito + FROM vn2008.recovery r + JOIN ( + SELECT Id_Cliente, amount , odbc_date AS UltimaFecha + FROM ( + SELECT * FROM credit + ORDER BY odbc_date DESC + LIMIT 10000000000000000000 + ) sub + GROUP BY Id_Cliente + ) sub2 USING(Id_Cliente) + WHERE dend IS NULL or dend >= util.VN_CURDATE() + GROUP BY Id_Cliente + HAVING Deadline <= util.VN_CURDATE() + ) sub3 + WHERE Credito > 0; + + UPDATE Clientes + JOIN clientes_credit USING(Id_Cliente) + SET Clientes.Credito = newCredit; + + DROP TEMPORARY TABLE clientes_credit; + COMMIT; +END$$ +DELIMITER ; diff --git a/db/routines/vn2008/procedures/risk_vs_client_list.sql b/db/routines/vn2008/procedures/risk_vs_client_list.sql new file mode 100644 index 000000000..92f94eb9f --- /dev/null +++ b/db/routines/vn2008/procedures/risk_vs_client_list.sql @@ -0,0 +1,84 @@ +DELIMITER $$ +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`risk_vs_client_list`(maxRiskDate DATE) +BEGIN +/** + * Calcula el riesgo para los clientes activos de la tabla temporal tmp.client_list + * + * @deprecated usar vn.client_getDebt + * @param maxRiskDate Fecha maxima de los registros + * @return table tmp.risk + */ + DECLARE startingDate DATETIME DEFAULT TIMESTAMPADD(DAY, - DAYOFMONTH(util.VN_CURDATE()) - 60, util.VN_CURDATE()); + DECLARE endingDate DATETIME; + DECLARE MAX_RISK_ALLOWED INT DEFAULT 200; + + SET maxRiskDate = IFNULL(maxRiskDate, util.VN_CURDATE()); + SET endingDate = TIMESTAMP(maxRiskDate, '23:59:59'); + + DROP TEMPORARY TABLE IF EXISTS tmp.client_list_2; + CREATE TEMPORARY TABLE tmp.client_list_2 + (PRIMARY KEY (Id_Cliente)) + ENGINE = MEMORY + SELECT * + FROM tmp.client_list; + + DROP TEMPORARY TABLE IF EXISTS tmp.client_list_3; + CREATE TEMPORARY TABLE tmp.client_list_3 + (PRIMARY KEY (Id_Cliente)) + ENGINE = MEMORY + SELECT * + FROM tmp.client_list; + + DROP TEMPORARY TABLE IF EXISTS tmp.tickets_sin_facturar; + CREATE TEMPORARY TABLE tmp.tickets_sin_facturar + (PRIMARY KEY (Id_Cliente)) + ENGINE = MEMORY + SELECT t.Id_Cliente, floor(IF(cl.isVies, 1, 1.1) * sum(Cantidad * Preu * (100 - Descuento) / 100)) as total + FROM Movimientos m + JOIN Tickets t on m.Id_Ticket = t.Id_Ticket + JOIN tmp.client_list c on c.Id_Cliente = t.Id_Cliente + JOIN vn.client cl ON cl.id = t.Id_Cliente + WHERE Factura IS NULL + AND Fecha BETWEEN startingDate AND endingDate + GROUP BY t.Id_Cliente; + + DROP TEMPORARY TABLE IF EXISTS tmp.risk; + CREATE TEMPORARY TABLE tmp.risk + (PRIMARY KEY (Id_Cliente)) + ENGINE = MEMORY + SELECT Id_Cliente, SUM(amount) risk, sum(saldo) saldo + FROM Clientes c + JOIN ( + SELECT clientFk, SUM(amount) amount,SUM(amount) saldo + FROM vn.clientRisk + JOIN tmp.client_list on Id_Cliente = clientFk + GROUP BY clientFk + UNION ALL + SELECT Id_Cliente, SUM(Entregado),SUM(Entregado) + FROM Recibos + JOIN tmp.client_list_2 using(Id_Cliente) + WHERE Fechacobro > endingDate + GROUP BY Id_Cliente + UNION ALL + SELECT Id_Cliente, total,0 + FROM tmp.tickets_sin_facturar + UNION ALL + SELECT t.clientFk, CAST(-SUM(t.amount) / 100 AS DECIMAL(10,2)), CAST(-SUM(t.amount) / 100 AS DECIMAL(10,2)) + FROM hedera.tpvTransaction t + JOIN tmp.client_list_3 on Id_Cliente = t.clientFk + WHERE t.receiptFk IS NULL + AND t.status = 'ok' + GROUP BY t.clientFk + ) t ON c.Id_Cliente = t.clientFk + WHERE c.activo != FALSE + GROUP BY c.Id_Cliente; + + DELETE r.* + FROM tmp.risk r + JOIN vn2008.Clientes c on c.Id_Cliente = r.Id_Cliente + JOIN vn2008.pay_met pm on pm.id = c.pay_met_id + WHERE IFNULL(r.saldo,0) < 10 + AND r.risk <= MAX_RISK_ALLOWED + AND pm.`name` = 'TARJETA'; +END$$ +DELIMITER ; diff --git a/db/routines/vn2008/views/Agencias.sql b/db/routines/vn2008/views/Agencias.sql new file mode 100644 index 000000000..d70ec73f4 --- /dev/null +++ b/db/routines/vn2008/views/Agencias.sql @@ -0,0 +1,18 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Agencias` +AS SELECT `am`.`id` AS `Id_Agencia`, + `am`.`name` AS `Agencia`, + `am`.`description` AS `description`, + `am`.`deliveryMethodFk` AS `Vista`, + `am`.`m3` AS `m3`, + `am`.`web` AS `web`, + `am`.`agencyFk` AS `agency_id`, + `am`.`inflation` AS `inflacion`, + `am`.`isVolumetric` AS `is_volumetric`, + `am`.`reportMail` AS `send_mail`, + `am`.`isActive` AS `tpv`, + `am`.`code` AS `code`, + `am`.`showAgencyName` AS `show_AgencyName`, + `am`.`isRiskFree` AS `isRiskFree` +FROM `vn`.`agencyMode` `am` diff --git a/db/routines/vn2008/views/Articles.sql b/db/routines/vn2008/views/Articles.sql new file mode 100644 index 000000000..385bf310b --- /dev/null +++ b/db/routines/vn2008/views/Articles.sql @@ -0,0 +1,52 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Articles` +AS SELECT `i`.`id` AS `Id_Article`, + `i`.`name` AS `Article`, + `i`.`typeFk` AS `tipo_id`, + `i`.`size` AS `Medida`, + `i`.`inkFk` AS `Color`, + `i`.`category` AS `Categoria`, + `i`.`stems` AS `Tallos`, + `i`.`originFk` AS `id_origen`, + `i`.`description` AS `description`, + `i`.`producerFk` AS `producer_id`, + `i`.`intrastatFk` AS `Codintrastat`, + `i`.`box` AS `caja`, + `i`.`expenseFk` AS `expenseFk`, + `i`.`comment` AS `comments`, + `i`.`relevancy` AS `relevancy`, + `i`.`image` AS `Foto`, + `i`.`generic` AS `generic`, + `i`.`density` AS `density`, + `i`.`minPrice` AS `PVP`, + `i`.`hasMinPrice` AS `Min`, + `i`.`isActive` AS `isActive`, + `i`.`longName` AS `longName`, + `i`.`subName` AS `subName`, + `i`.`tag5` AS `tag5`, + `i`.`value5` AS `value5`, + `i`.`tag6` AS `tag6`, + `i`.`value6` AS `value6`, + `i`.`tag7` AS `tag7`, + `i`.`value7` AS `value7`, + `i`.`tag8` AS `tag8`, + `i`.`value8` AS `value8`, + `i`.`tag9` AS `tag9`, + `i`.`value9` AS `value9`, + `i`.`tag10` AS `tag10`, + `i`.`value10` AS `value10`, + `i`.`minimum` AS `minimum`, + `i`.`upToDown` AS `upToDown`, + `i`.`hasKgPrice` AS `hasKgPrice`, + `i`.`equivalent` AS `Equivalente`, + `i`.`isToPrint` AS `Imprimir`, + `i`.`family` AS `Familia__`, + `i`.`doPhoto` AS `do_photo`, + `i`.`created` AS `odbc_date`, + `i`.`isFloramondo` AS `isFloramondo`, + `i`.`supplyResponseFk` AS `supplyResponseFk`, + `i`.`stemMultiplier` AS `stemMultiplier`, + `i`.`itemPackingTypeFk` AS `itemPackingTypeFk`, + `i`.`packingOut` AS `packingOut` +FROM `vn`.`item` `i` diff --git a/db/routines/vn2008/views/Bancos.sql b/db/routines/vn2008/views/Bancos.sql new file mode 100644 index 000000000..6e850f365 --- /dev/null +++ b/db/routines/vn2008/views/Bancos.sql @@ -0,0 +1,11 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Bancos` +AS SELECT `a`.`id` AS `Id_Banco`, + `a`.`bank` AS `Banco`, + `a`.`account` AS `Cuenta`, + `a`.`accountingTypeFk` AS `cash`, + `a`.`entityFk` AS `entity_id`, + `a`.`isActive` AS `activo`, + `a`.`currencyFk` AS `currencyFk` +FROM `vn`.`accounting` `a` diff --git a/db/routines/vn2008/views/Bancos_poliza.sql b/db/routines/vn2008/views/Bancos_poliza.sql new file mode 100644 index 000000000..4cd443545 --- /dev/null +++ b/db/routines/vn2008/views/Bancos_poliza.sql @@ -0,0 +1,24 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Bancos_poliza` +AS SELECT `bp`.`id` AS `poliza_id`, + `bp`.`ref` AS `referencia`, + `bp`.`amount` AS `importe`, + `bp`.`committedFee` AS `com_dispuesto`, + `bp`.`nonCommittedFee` AS `com_no_dispuesto`, + `bp`.`annualFee` AS `com_anual`, + `bp`.`started` AS `apertura`, + `bp`.`ended` AS `cierre`, + `bp`.`accountingFk` AS `Id_Banco`, + `bp`.`companyFk` AS `empresa_id`, + `bp`.`supplierFk` AS `supplierFk`, + `bp`.`description` AS `description`, + `bp`.`hasGuarantee` AS `hasGuarantee`, + `bp`.`dmsFk` AS `dmsFk`, + `bp`.`notaryFk` AS `notaryFk`, + `bp`.`currencyFk` AS `currencyFk`, + `bp`.`amortizationTypeFk` AS `amortizationTypeFk`, + `bp`.`periodicityTypeFk` AS `periodicityTypeFk`, + `bp`.`insuranceExpired` AS `insuranceExpired` +FROM `vn`.`bankPolicy` `bp` +ORDER BY `bp`.`id` DESC diff --git a/db/routines/vn2008/views/Cajas.sql b/db/routines/vn2008/views/Cajas.sql new file mode 100644 index 000000000..54b9ee189 --- /dev/null +++ b/db/routines/vn2008/views/Cajas.sql @@ -0,0 +1,24 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Cajas` +AS SELECT `t`.`id` AS `Id_Caja`, + `t`.`dated` AS `Cajafecha`, + `t`.`serie` AS `Serie`, + `t`.`concept` AS `Concepto`, + `t`.`in` AS `Entrada`, + `t`.`out` AS `Salida`, + `t`.`bankFk` AS `Id_Banco`, + `t`.`companyFk` AS `empresa_id`, + `t`.`isAccountable` AS `Partida`, + `t`.`InForeignValue` AS `InForeignValue`, + `t`.`OutForeignValue` AS `OutForeignValue`, + `t`.`workerFk` AS `Id_Trabajador`, + `t`.`calculatedCode` AS `id_calculated`, + `t`.`number` AS `Numero`, + `t`.`isLinked` AS `linked`, + `t`.`created` AS `odbc_date`, + `t`.`isOk` AS `ok`, + `t`.`warehouseFk` AS `warehouse_id`, + `t`.`isConciliate` AS `conciliado`, + `t`.`supplierAccountFk` AS `Proveedores_account_Id` +FROM `vn`.`till` `t` diff --git a/db/routines/vn2008/views/Clientes.sql b/db/routines/vn2008/views/Clientes.sql new file mode 100644 index 000000000..a696cb6e0 --- /dev/null +++ b/db/routines/vn2008/views/Clientes.sql @@ -0,0 +1,48 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Clientes` +AS SELECT `c`.`id` AS `id_cliente`, + `c`.`name` AS `cliente`, + `c`.`fi` AS `if`, + `c`.`socialName` AS `razonSocial`, + `c`.`contact` AS `contacto`, + `c`.`street` AS `domicilio`, + `c`.`city` AS `poblacion`, + `c`.`postcode` AS `codPostal`, + `c`.`phone` AS `telefono`, + `c`.`mobile` AS `movil`, + `c`.`isRelevant` AS `real`, + `c`.`email` AS `e-mail`, + `c`.`iban` AS `iban`, + `c`.`dueDay` AS `vencimiento`, + `c`.`accountingAccount` AS `Cuenta`, + `c`.`isEqualizated` AS `RE`, + `c`.`provinceFk` AS `province_id`, + `c`.`hasToInvoice` AS `invoice`, + `c`.`credit` AS `credito`, + `c`.`countryFk` AS `Id_Pais`, + `c`.`isActive` AS `activo`, + `c`.`gestdocFk` AS `gestdoc_id`, + `c`.`quality` AS `calidad`, + `c`.`payMethodFk` AS `pay_met_id`, + `c`.`created` AS `created`, + `c`.`isToBeMailed` AS `mail`, + `c`.`contactChannelFk` AS `chanel_id`, + `c`.`hasSepaVnl` AS `sepaVnl`, + `c`.`hasCoreVnl` AS `coreVnl`, + `c`.`hasCoreVnh` AS `coreVnh`, + `c`.`hasLcr` AS `hasLcr`, + `c`.`defaultAddressFk` AS `default_address`, + `c`.`riskCalculated` AS `risk_calculated`, + `c`.`hasToInvoiceByAddress` AS `invoiceByAddress`, + `c`.`isTaxDataChecked` AS `contabilizado`, + `c`.`isFreezed` AS `congelado`, + `c`.`creditInsurance` AS `creditInsurance`, + `c`.`isCreatedAsServed` AS `isCreatedAsServed`, + `c`.`hasInvoiceSimplified` AS `hasInvoiceSimplified`, + `c`.`salesPersonFk` AS `Id_Trabajador`, + `c`.`isVies` AS `vies`, + `c`.`eypbc` AS `EYPBC`, + `c`.`bankEntityFk` AS `bankEntityFk`, + `c`.`typeFk` AS `typeFk` +FROM `vn`.`client` `c` diff --git a/db/routines/vn2008/views/Comparativa.sql b/db/routines/vn2008/views/Comparativa.sql new file mode 100644 index 000000000..875a5c370 --- /dev/null +++ b/db/routines/vn2008/views/Comparativa.sql @@ -0,0 +1,10 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Comparativa` +AS SELECT `c`.`timePeriod` AS `Periodo`, + `c`.`itemFk` AS `Id_Article`, + `c`.`warehouseFk` AS `warehouse_id`, + `c`.`quantity` AS `Cantidad`, + `c`.`price` AS `price`, + `c`.`countryFk` AS `countryFk` +FROM `vn`.`comparative` `c` diff --git a/db/routines/vn2008/views/Compres.sql b/db/routines/vn2008/views/Compres.sql new file mode 100644 index 000000000..557136192 --- /dev/null +++ b/db/routines/vn2008/views/Compres.sql @@ -0,0 +1,33 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Compres` +AS SELECT `c`.`id` AS `Id_Compra`, + `c`.`entryFk` AS `Id_Entrada`, + `c`.`itemFk` AS `Id_Article`, + `c`.`buyingValue` AS `Costefijo`, + `c`.`quantity` AS `Cantidad`, + `c`.`packagingFk` AS `Id_Cubo`, + `c`.`stickers` AS `Etiquetas`, + `c`.`freightValue` AS `Portefijo`, + `c`.`packageValue` AS `Embalajefijo`, + `c`.`comissionValue` AS `Comisionfija`, + `c`.`packing` AS `Packing`, + `c`.`grouping` AS `grouping`, + `c`.`groupingMode` AS `caja`, + `c`.`location` AS `Nicho`, + `c`.`price1` AS `Tarifa1`, + `c`.`price2` AS `Tarifa2`, + `c`.`price3` AS `Tarifa3`, + `c`.`minPrice` AS `PVP`, + `c`.`printedStickers` AS `Vida`, + `c`.`isChecked` AS `punteo`, + `c`.`ektFk` AS `buy_edi_id`, + `c`.`created` AS `odbc_date`, + `c`.`isIgnored` AS `Novincular`, + `c`.`isPickedOff` AS `isPickedOff`, + `c`.`workerFk` AS `Id_Trabajador`, + `c`.`weight` AS `weight`, + `c`.`dispatched` AS `dispatched`, + `c`.`containerFk` AS `container_id`, + `c`.`itemOriginalFk` AS `itemOriginalFk` +FROM `vn`.`buy` `c` diff --git a/db/routines/vn2008/views/Compres_mark.sql b/db/routines/vn2008/views/Compres_mark.sql new file mode 100644 index 000000000..7138c4e4c --- /dev/null +++ b/db/routines/vn2008/views/Compres_mark.sql @@ -0,0 +1,8 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Compres_mark` +AS SELECT `bm`.`id` AS `Id_Compra`, + `bm`.`comment` AS `comment`, + `bm`.`mark` AS `mark`, + `bm`.`odbcDate` AS `odbc_date` +FROM `vn`.`buyMark` `bm` diff --git a/db/routines/vn2008/views/Consignatarios.sql b/db/routines/vn2008/views/Consignatarios.sql new file mode 100644 index 000000000..13a426f4d --- /dev/null +++ b/db/routines/vn2008/views/Consignatarios.sql @@ -0,0 +1,19 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Consignatarios` +AS SELECT `a`.`id` AS `id_consigna`, + `a`.`clientFk` AS `Id_cliente`, + `a`.`street` AS `domicilio`, + `a`.`city` AS `poblacion`, + `a`.`postalCode` AS `codPostal`, + `a`.`provinceFk` AS `province_id`, + `a`.`phone` AS `telefono`, + `a`.`mobile` AS `movil`, + `a`.`nickname` AS `consignatario`, + `a`.`isDefaultAddress` AS `predeterminada`, + `a`.`longitude` AS `longitude`, + `a`.`latitude` AS `latitude`, + `a`.`agencyModeFk` AS `Id_Agencia`, + `a`.`isEqualizated` AS `isEqualizated`, + `a`.`isActive` AS `active` +FROM `vn`.`address` `a` diff --git a/db/routines/vn2008/views/Cubos.sql b/db/routines/vn2008/views/Cubos.sql new file mode 100644 index 000000000..4ece9c435 --- /dev/null +++ b/db/routines/vn2008/views/Cubos.sql @@ -0,0 +1,21 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Cubos` +AS SELECT `p`.`id` AS `Id_Cubo`, + `p`.`volume` AS `Volumen`, + `p`.`width` AS `X`, + `p`.`depth` AS `Y`, + `p`.`height` AS `Z`, + `p`.`isPackageReturnable` AS `Retornable`, + `p`.`created` AS `odbc_date`, + `p`.`itemFk` AS `item_id`, + `p`.`price` AS `pvp`, + `p`.`cubicPackage` AS `bultoCubico`, + `p`.`value` AS `Valor`, + `p`.`packagingReturnFk` AS `idCubos_Retorno`, + `p`.`lower` AS `Bajan`, + `p`.`upload` AS `Suben`, + `p`.`base` AS `Base`, + `p`.`isBox` AS `box`, + `p`.`returnCost` AS `costeRetorno` +FROM `vn`.`packaging` `p` diff --git a/db/routines/vn2008/views/Cubos_Retorno.sql b/db/routines/vn2008/views/Cubos_Retorno.sql new file mode 100644 index 000000000..bc56f275b --- /dev/null +++ b/db/routines/vn2008/views/Cubos_Retorno.sql @@ -0,0 +1,8 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Cubos_Retorno` +AS SELECT `rb`.`id` AS `idCubos_Retorno`, + `rb`.`freightContainerType` AS `Soporte`, + `rb`.`freightPackagingEmpty` AS `Vacio`, + `rb`.`freightPackagingFull` AS `Lleno` +FROM `vn`.`returnBuckets` `rb` diff --git a/db/routines/vn2008/views/Entradas.sql b/db/routines/vn2008/views/Entradas.sql new file mode 100644 index 000000000..63fbaa728 --- /dev/null +++ b/db/routines/vn2008/views/Entradas.sql @@ -0,0 +1,29 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Entradas` +AS SELECT `e`.`id` AS `Id_Entrada`, + `e`.`supplierFk` AS `Id_Proveedor`, + `e`.`invoiceNumber` AS `Referencia`, + `e`.`reference` AS `reference`, + `e`.`isExcludedFromAvailable` AS `Inventario`, + `e`.`isConfirmed` AS `Confirmada`, + `e`.`isOrdered` AS `Pedida`, + `e`.`isRaid` AS `Redada`, + `e`.`commission` AS `comision`, + `e`.`created` AS `odbc_date`, + `e`.`evaNotes` AS `Notas_Eva`, + `e`.`travelFk` AS `travel_id`, + `e`.`currencyFk` AS `Id_Moneda`, + `e`.`companyFk` AS `empresa_id`, + `e`.`gestDocFk` AS `gestdoc_id`, + `e`.`invoiceInFk` AS `recibida_id`, + `e`.`dated` AS `Fecha`, + `e`.`isBooked` AS `Anotadoencaja`, + `e`.`loadPriority` AS `loadPriority`, + `e`.`sub` AS `sub`, + `e`.`kop` AS `kop`, + `e`.`pro` AS `pro`, + `e`.`invoiceAmount` AS `invoiceAmount`, + `e`.`buyerFk` AS `buyerFk`, + `e`.`typeFk` AS `typeFk` +FROM `vn`.`entry` `e` diff --git a/db/routines/vn2008/views/Entradas_Auto.sql b/db/routines/vn2008/views/Entradas_Auto.sql new file mode 100644 index 000000000..5d1266965 --- /dev/null +++ b/db/routines/vn2008/views/Entradas_Auto.sql @@ -0,0 +1,5 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Entradas_Auto` +AS SELECT `ev`.`entryFk` AS `Id_Entrada` +FROM `vn`.`entryVirtual` `ev` diff --git a/db/routines/vn2008/views/Entradas_orden.sql b/db/routines/vn2008/views/Entradas_orden.sql new file mode 100644 index 000000000..66f46a929 --- /dev/null +++ b/db/routines/vn2008/views/Entradas_orden.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Entradas_orden` +AS SELECT `eo`.`entryFk` AS `Id_Entrada`, + `eo`.`order` AS `orden` +FROM `vn`.`entryOrder` `eo` diff --git a/db/routines/vn2008/views/Impresoras.sql b/db/routines/vn2008/views/Impresoras.sql new file mode 100644 index 000000000..c4782ab72 --- /dev/null +++ b/db/routines/vn2008/views/Impresoras.sql @@ -0,0 +1,9 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Impresoras` +AS SELECT `vn`.`printer`.`id` AS `Id_impresora`, + `vn`.`printer`.`path` AS `Ruta`, + `vn`.`printer`.`name` AS `Impresora`, + `vn`.`printer`.`reference` AS `referencia`, + `vn`.`printer`.`isLabeler` AS `isLabeler` +FROM `vn`.`printer` diff --git a/db/routines/vn2008/views/Monedas.sql b/db/routines/vn2008/views/Monedas.sql new file mode 100644 index 000000000..3693885be --- /dev/null +++ b/db/routines/vn2008/views/Monedas.sql @@ -0,0 +1,8 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Monedas` +AS SELECT `c`.`id` AS `Id_Moneda`, + `c`.`code` AS `Moneda`, + `c`.`name` AS `Descripcion`, + `c`.`ratio` AS `Cambio` +FROM `vn`.`currency` `c` diff --git a/db/routines/vn2008/views/Movimientos.sql b/db/routines/vn2008/views/Movimientos.sql new file mode 100644 index 000000000..da41c51bb --- /dev/null +++ b/db/routines/vn2008/views/Movimientos.sql @@ -0,0 +1,18 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Movimientos` +AS SELECT `m`.`id` AS `Id_Movimiento`, + `m`.`itemFk` AS `Id_Article`, + `m`.`ticketFk` AS `Id_Ticket`, + `m`.`concept` AS `Concepte`, + `m`.`quantity` AS `Cantidad`, + `m`.`price` AS `Preu`, + `m`.`discount` AS `Descuento`, + `m`.`reserved` AS `Reservado`, + `m`.`isPicked` AS `OK`, + `m`.`created` AS `odbc_date`, + `m`.`priceFixed` AS `CostFixat`, + `m`.`isPriceFixed` AS `PrecioFijado`, + `m`.`originalQuantity` AS `quantity`, + `m`.`isAdded` AS `isAdded` +FROM `vn`.`sale` `m` diff --git a/db/routines/vn2008/views/Movimientos_componentes.sql b/db/routines/vn2008/views/Movimientos_componentes.sql new file mode 100644 index 000000000..440fbfb6a --- /dev/null +++ b/db/routines/vn2008/views/Movimientos_componentes.sql @@ -0,0 +1,9 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Movimientos_componentes` +AS SELECT `sc`.`saleFk` AS `Id_Movimiento`, + `sc`.`componentFk` AS `Id_Componente`, + `sc`.`value` AS `Valor`, + `sc`.`created` AS `created`, + `sc`.`isGreuge` AS `greuge` +FROM `vn`.`saleComponent` `sc` diff --git a/db/routines/vn2008/views/Movimientos_mark.sql b/db/routines/vn2008/views/Movimientos_mark.sql new file mode 100644 index 000000000..10ef2fc08 --- /dev/null +++ b/db/routines/vn2008/views/Movimientos_mark.sql @@ -0,0 +1,11 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Movimientos_mark` +AS SELECT `mm`.`saleFk` AS `Id_Movimiento`, + `mm`.`isChecked` AS `valor`, + `mm`.`created` AS `odbc_date`, + `mm`.`originalQuantity` AS `original_quantity`, + `mm`.`workerFk` AS `Id_Trabajador`, + `mm`.`id` AS `Id_Movimiento_mark`, + `mm`.`stateFk` AS `stateFk` +FROM `vn`.`saleTracking` `mm` diff --git a/db/routines/vn2008/views/Ordenes.sql b/db/routines/vn2008/views/Ordenes.sql new file mode 100644 index 000000000..46d9fd89b --- /dev/null +++ b/db/routines/vn2008/views/Ordenes.sql @@ -0,0 +1,23 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Ordenes` +AS SELECT `tr`.`id` AS `Id_ORDEN`, + `tr`.`description` AS `ORDEN`, + `tr`.`requesterFk` AS `requesterFk`, + `tr`.`attenderFk` AS `attenderFk`, + `tr`.`quantity` AS `CANTIDAD`, + `tr`.`itemFk` AS `Id_ARTICLE`, + `tr`.`price` AS `PRECIOMAX`, + `tr`.`isOk` AS `isOk`, + `tr`.`saleFk` AS `Id_Movimiento`, + `tr`.`ticketFk` AS `ticketFk`, + `tr`.`response` AS `COMENTARIO`, + `tr`.`created` AS `odbc_date`, + `tr`.`ordered` AS `datORDEN`, + `tr`.`shipped` AS `datTICKET`, + `tr`.`salesPersonCode` AS `CodVENDEDOR`, + `tr`.`buyerCode` AS `CodCOMPRADOR`, + `tr`.`clientFk` AS `Id_CLIENTE`, + `tr`.`total` AS `TOTAL`, + `tr`.`buyed` AS `datCOMPRA` +FROM `vn`.`ticketRequest` `tr` diff --git a/db/routines/vn2008/views/Origen.sql b/db/routines/vn2008/views/Origen.sql new file mode 100644 index 000000000..5bb1d9b7f --- /dev/null +++ b/db/routines/vn2008/views/Origen.sql @@ -0,0 +1,9 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Origen` +AS SELECT `o`.`id` AS `id`, + `o`.`code` AS `Abreviatura`, + `o`.`name` AS `Origen`, + `o`.`countryFk` AS `Id_Paises`, + `o`.`warehouseFk` AS `warehouse_id` +FROM `vn`.`origin` `o` diff --git a/db/routines/vn2008/views/Paises.sql b/db/routines/vn2008/views/Paises.sql new file mode 100644 index 000000000..ea7172dff --- /dev/null +++ b/db/routines/vn2008/views/Paises.sql @@ -0,0 +1,13 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Paises` +AS SELECT `c`.`id` AS `Id`, + `c`.`country` AS `Pais`, + `c`.`CEE` AS `CEE`, + `c`.`isUeeMember` AS `isUeeMember`, + `c`.`code` AS `Codigo`, + `c`.`currencyFk` AS `Id_Moneda`, + `c`.`geoFk` AS `geoFk`, + `c`.`ibanLength` AS `ibanLength`, + `c`.`hasDailyInvoice` AS `hasDailyInvoice` +FROM `vn`.`country` `c` diff --git a/db/routines/vn2008/views/PreciosEspeciales.sql b/db/routines/vn2008/views/PreciosEspeciales.sql new file mode 100644 index 000000000..cea9f87fd --- /dev/null +++ b/db/routines/vn2008/views/PreciosEspeciales.sql @@ -0,0 +1,8 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`PreciosEspeciales` +AS SELECT `sp`.`id` AS `Id_PrecioEspecial`, + `sp`.`clientFk` AS `Id_Cliente`, + `sp`.`itemFk` AS `Id_Article`, + `sp`.`value` AS `PrecioEspecial` +FROM `vn`.`specialPrice` `sp` diff --git a/db/routines/vn2008/views/Proveedores.sql b/db/routines/vn2008/views/Proveedores.sql new file mode 100644 index 000000000..0b7ee89f8 --- /dev/null +++ b/db/routines/vn2008/views/Proveedores.sql @@ -0,0 +1,35 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Proveedores` +AS SELECT `s`.`id` AS `Id_Proveedor`, + `s`.`name` AS `Proveedor`, + `s`.`account` AS `cuenta`, + `s`.`countryFk` AS `pais_id`, + `s`.`nif` AS `NIF`, + `s`.`isFarmer` AS `Agricola`, + `s`.`phone` AS `Telefono`, + `s`.`retAccount` AS `cuentaret`, + `s`.`commission` AS `ComisionProveedor`, + `s`.`created` AS `odbc_time`, + `s`.`postcodeFk` AS `postcode_id`, + `s`.`isActive` AS `active`, + `s`.`street` AS `Domicilio`, + `s`.`city` AS `Localidad`, + `s`.`provinceFk` AS `province_id`, + `s`.`postCode` AS `codpos`, + `s`.`payMethodFk` AS `pay_met_id`, + `s`.`payDemFk` AS `pay_dem_id`, + `s`.`nickname` AS `Alias`, + `s`.`isOfficial` AS `oficial`, + `s`.`workerFk` AS `workerFk`, + `s`.`payDay` AS `pay_day`, + `s`.`isSerious` AS `serious`, + `s`.`note` AS `notas`, + `s`.`taxTypeSageFk` AS `taxTypeSageFk`, + `s`.`withholdingSageFk` AS `withholdingSageFk`, + `s`.`isTrucker` AS `isTrucker`, + `s`.`transactionTypeSageFk` AS `transactionTypeSageFk`, + `s`.`supplierActivityFk` AS `supplierActivityFk`, + `s`.`healthRegister` AS `healthRegister`, + `s`.`isPayMethodChecked` AS `isPayMethodChecked` +FROM `vn`.`supplier` `s` diff --git a/db/routines/vn2008/views/Proveedores_gestdoc.sql b/db/routines/vn2008/views/Proveedores_gestdoc.sql new file mode 100644 index 000000000..c25623b8b --- /dev/null +++ b/db/routines/vn2008/views/Proveedores_gestdoc.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Proveedores_gestdoc` +AS SELECT `sd`.`supplierFk` AS `Id_Proveedor`, + `sd`.`dmsFk` AS `gestdoc_id` +FROM `vn`.`supplierDms` `sd` diff --git a/db/routines/vn2008/views/Recibos.sql b/db/routines/vn2008/views/Recibos.sql new file mode 100644 index 000000000..93ec7bc6f --- /dev/null +++ b/db/routines/vn2008/views/Recibos.sql @@ -0,0 +1,14 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Recibos` +AS SELECT `r`.`Id` AS `Id`, + `r`.`invoiceFk` AS `Id_Factura`, + `r`.`amountPaid` AS `Entregado`, + `r`.`payed` AS `Fechacobro`, + `r`.`workerFk` AS `Id_Trabajador`, + `r`.`bankFk` AS `Id_Banco`, + `r`.`clientFk` AS `Id_Cliente`, + `r`.`created` AS `odbc_date`, + `r`.`companyFk` AS `empresa_id`, + `r`.`isConciliate` AS `conciliado` +FROM `vn`.`receipt` `r` diff --git a/db/routines/vn2008/views/Remesas.sql b/db/routines/vn2008/views/Remesas.sql new file mode 100644 index 000000000..9e8c18ada --- /dev/null +++ b/db/routines/vn2008/views/Remesas.sql @@ -0,0 +1,8 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Remesas` +AS SELECT `r`.`id` AS `Id_Remesa`, + `r`.`dated` AS `Fecha Remesa`, + `r`.`accountingFk` AS `Banco`, + `r`.`companyFk` AS `empresa_id` +FROM `vn`.`remittance` `r` diff --git a/db/routines/vn2008/views/Rutas.sql b/db/routines/vn2008/views/Rutas.sql new file mode 100644 index 000000000..78b3bb471 --- /dev/null +++ b/db/routines/vn2008/views/Rutas.sql @@ -0,0 +1,19 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Rutas` +AS SELECT `r`.`id` AS `Id_Ruta`, + `r`.`workerFk` AS `Id_Trabajador`, + `r`.`created` AS `Fecha`, + `r`.`vehicleFk` AS `Id_Vehiculo`, + `r`.`agencyModeFk` AS `Id_Agencia`, + `r`.`time` AS `Hora`, + `r`.`isOk` AS `ok`, + `r`.`kmStart` AS `km_start`, + `r`.`kmEnd` AS `km_end`, + `r`.`started` AS `date_start`, + `r`.`finished` AS `date_end`, + `r`.`gestdocFk` AS `gestdoc_id`, + `r`.`cost` AS `cost`, + `r`.`m3` AS `m3`, + `r`.`description` AS `description` +FROM `vn`.`route` `r` diff --git a/db/routines/vn2008/views/Saldos_Prevision.sql b/db/routines/vn2008/views/Saldos_Prevision.sql new file mode 100644 index 000000000..f4749d30f --- /dev/null +++ b/db/routines/vn2008/views/Saldos_Prevision.sql @@ -0,0 +1,10 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Saldos_Prevision` +AS SELECT `fb`.`id` AS `Saldos_Prevision_id`, + `fb`.`description` AS `Descripcion`, + `fb`.`amount` AS `Importe`, + `fb`.`dated` AS `Fecha`, + `fb`.`accountingFk` AS `Id_Banco`, + `fb`.`companyFk` AS `empresa_id` +FROM `vn`.`forecastedBalance` `fb` \ No newline at end of file diff --git a/db/routines/vn2008/views/Split.sql b/db/routines/vn2008/views/Split.sql new file mode 100644 index 000000000..eec90a5f8 --- /dev/null +++ b/db/routines/vn2008/views/Split.sql @@ -0,0 +1,9 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Splits` +AS SELECT `s`.`id` AS `Id_Split`, + `s`.`ticketFk` AS `Id_Ticket`, + `s`.`entryFk` AS `Id_Entrada`, + `s`.`dated` AS `Fecha`, + `s`.`note` AS `Notas` +FROM `vn`.`split` `s` \ No newline at end of file diff --git a/db/routines/vn2008/views/Split_lines.sql b/db/routines/vn2008/views/Split_lines.sql new file mode 100644 index 000000000..0b7897be7 --- /dev/null +++ b/db/routines/vn2008/views/Split_lines.sql @@ -0,0 +1,8 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Split_lines` +AS SELECT `sl`.`id` AS `Id_Split_lines`, + `sl`.`splitFk` AS `Id_Split`, + `sl`.`itemFk` AS `Id_Article`, + `sl`.`buyFk` AS `Id_Compra` +FROM `vn`.`splitLine` `sl` \ No newline at end of file diff --git a/db/routines/vn2008/views/Tickets.sql b/db/routines/vn2008/views/Tickets.sql new file mode 100644 index 000000000..c24b87b72 --- /dev/null +++ b/db/routines/vn2008/views/Tickets.sql @@ -0,0 +1,33 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Tickets` +AS SELECT `t`.`id` AS `Id_Ticket`, + `t`.`clientFk` AS `Id_Cliente`, + `t`.`warehouseFk` AS `warehouse_id`, + `t`.`shipped` AS `Fecha`, + `t`.`landed` AS `landing`, + `t`.`nickname` AS `Alias`, + `t`.`refFk` AS `Factura`, + `t`.`addressFk` AS `Id_Consigna`, + `t`.`location` AS `Localizacion`, + `t`.`solution` AS `Solucion`, + `t`.`routeFk` AS `Id_Ruta`, + `t`.`companyFk` AS `empresa_id`, + `t`.`agencyModeFk` AS `Id_Agencia`, + `t`.`priority` AS `Prioridad`, + `t`.`packages` AS `Bultos`, + `t`.`isDeleted` AS `isDeleted`, + `t`.`created` AS `odbc_date`, + `t`.`workerFk` AS `Id_Trabajador`, + `t`.`observations` AS `Observaciones`, + `t`.`isSigned` AS `Firmado`, + `t`.`isLabeled` AS `Etiquetasemitidas`, + `t`.`isPrinted` AS `PedidoImpreso`, + `t`.`hour` AS `Hora`, + `t`.`isBlocked` AS `blocked`, + `t`.`hasPriority` AS `priority`, + `t`.`isBoxed` AS `boxed`, + `t`.`zoneFk` AS `zoneFk`, + `t`.`totalWithVat` AS `totalWithVat`, + `t`.`totalWithoutVat` AS `totalWithoutVat` +FROM `vn`.`ticket` `t` diff --git a/db/routines/vn2008/views/Tickets_state.sql b/db/routines/vn2008/views/Tickets_state.sql new file mode 100644 index 000000000..be59a750f --- /dev/null +++ b/db/routines/vn2008/views/Tickets_state.sql @@ -0,0 +1,7 @@ +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` diff --git a/db/routines/vn2008/views/Tickets_turno.sql b/db/routines/vn2008/views/Tickets_turno.sql new file mode 100644 index 000000000..28bc2d55f --- /dev/null +++ b/db/routines/vn2008/views/Tickets_turno.sql @@ -0,0 +1,6 @@ +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` diff --git a/db/routines/vn2008/views/Tintas.sql b/db/routines/vn2008/views/Tintas.sql new file mode 100644 index 000000000..2299aa759 --- /dev/null +++ b/db/routines/vn2008/views/Tintas.sql @@ -0,0 +1,11 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Tintas` +AS SELECT `i`.`id` AS `Id_Tinta`, + `i`.`name` AS `name`, + `i`.`picture` AS `Tinta`, + `i`.`showOrder` AS `Orden`, + `i`.`ball` AS `ball`, + `i`.`isCargex` AS `cargex`, + `i`.`hex` AS `colorHex` +FROM `vn`.`ink` `i` diff --git a/db/routines/vn2008/views/Tipos.sql b/db/routines/vn2008/views/Tipos.sql new file mode 100644 index 000000000..4cde954f1 --- /dev/null +++ b/db/routines/vn2008/views/Tipos.sql @@ -0,0 +1,22 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Tipos` +AS SELECT `it`.`id` AS `tipo_id`, + `it`.`code` AS `Id_Tipo`, + `it`.`name` AS `Tipo`, + `it`.`order` AS `Orden`, + `it`.`categoryFk` AS `reino_id`, + `it`.`workerFk` AS `Id_Trabajador`, + `it`.`life` AS `life`, + `it`.`isPackaging` AS `isPackaging`, + `it`.`density` AS `density`, + `it`.`isInventory` AS `inventory`, + `it`.`created` AS `odbc_date`, + `it`.`making` AS `confeccion`, + `it`.`temperatureFk` AS `Temperatura`, + `it`.`promo` AS `promo`, + `it`.`maneuver` AS `maneuver`, + `it`.`target` AS `target`, + `it`.`topMargin` AS `top_margin`, + `it`.`profit` AS `profit` +FROM `vn`.`itemType` `it` diff --git a/db/routines/vn2008/views/Trabajadores.sql b/db/routines/vn2008/views/Trabajadores.sql new file mode 100644 index 000000000..72b53e54e --- /dev/null +++ b/db/routines/vn2008/views/Trabajadores.sql @@ -0,0 +1,16 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Trabajadores` +AS SELECT `w`.`id` AS `Id_Trabajador`, + `w`.`firstName` AS `Nombre`, + `w`.`id` AS `user_id`, + `w`.`phone` AS `phone`, + `w`.`bossFk` AS `boss`, + NULL AS `Foto`, + `w`.`fiDueDate` AS `DniExpiration`, + `w`.`code` AS `CodigoTrabajador`, + `w`.`lastName` AS `Apellidos`, + `w`.`hasMachineryAuthorized` AS `hasMachineryAuthorized`, + `w`.`sub` AS `sub`, + `w`.`maritalStatus` AS `marital_status` +FROM `vn`.`worker` `w` diff --git a/db/routines/vn2008/views/V_edi_item_track.sql b/db/routines/vn2008/views/V_edi_item_track.sql new file mode 100644 index 000000000..64cfdc1c5 --- /dev/null +++ b/db/routines/vn2008/views/V_edi_item_track.sql @@ -0,0 +1,19 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`V_edi_item_track` +AS SELECT `edi`.`item_track`.`item_id` AS `item_id`, + `edi`.`item_track`.`s1` AS `s1`, + `edi`.`item_track`.`s2` AS `s2`, + `edi`.`item_track`.`s3` AS `s3`, + `edi`.`item_track`.`s4` AS `s4`, + `edi`.`item_track`.`s5` AS `s5`, + `edi`.`item_track`.`s6` AS `s6`, + `edi`.`item_track`.`kop` AS `kop`, + `edi`.`item_track`.`pac` AS `pac`, + `edi`.`item_track`.`cat` AS `cat`, + `edi`.`item_track`.`ori` AS `ori`, + `edi`.`item_track`.`pro` AS `pro`, + `edi`.`item_track`.`sub` AS `sub`, + `edi`.`item_track`.`package` AS `package`, + `edi`.`item_track`.`item` AS `item` +FROM `edi`.`item_track` diff --git a/db/routines/vn2008/views/Vehiculos_consumo.sql b/db/routines/vn2008/views/Vehiculos_consumo.sql new file mode 100644 index 000000000..422a77499 --- /dev/null +++ b/db/routines/vn2008/views/Vehiculos_consumo.sql @@ -0,0 +1,20 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Vehiculos_consumo` +AS SELECT `vc`.`id` AS `Vehiculos_consumo_id`, + `vc`.`vehicleFk` AS `Id_Vehiculo`, + `vc`.`dated` AS `fecha`, + `vc`.`km` AS `km`, + `vc`.`liters` AS `litros`, + `vc`.`price` AS `precio`, + `vc`.`adblue` AS `adblue`, + `vc`.`tolls` AS `peajes`, + `vc`.`discount` AS `descuento`, + `vc`.`silla` AS `silla`, + `vc`.`created` AS `odbc_date`, + `vc`.`others` AS `otros`, + `vc`.`fuelTypeFk` AS `fuelTypeFk`, + `vc`.`supplierFk` AS `proveedoresFk`, + `vc`.`liters100km` AS `liters100km`, + `vc`.`gasoline` AS `gasoline` +FROM `vn`.`vehicleConsumption` `vc` \ No newline at end of file diff --git a/db/routines/vn2008/views/account_conciliacion.sql b/db/routines/vn2008/views/account_conciliacion.sql new file mode 100644 index 000000000..66db78eee --- /dev/null +++ b/db/routines/vn2008/views/account_conciliacion.sql @@ -0,0 +1,13 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`account_conciliacion` +AS SELECT `ar`.`id` AS `idaccount_conciliacion`, + `ar`.`supplierAccountFk` AS `Id_Proveedores_account`, + `ar`.`operationDated` AS `Fechaoperacion`, + `ar`.`valueDated` AS `FechaValor`, + `ar`.`amount` AS `importe`, + `ar`.`concept` AS `Concepto`, + `ar`.`debitCredit` AS `DebeHaber`, + `ar`.`calculatedCode` AS `id_calculated`, + `ar`.`created` AS `odbc_date` +FROM `vn`.`accountReconciliation` `ar` diff --git a/db/routines/vn2008/views/account_detail.sql b/db/routines/vn2008/views/account_detail.sql new file mode 100644 index 000000000..74d35ae41 --- /dev/null +++ b/db/routines/vn2008/views/account_detail.sql @@ -0,0 +1,8 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`account_detail` +AS SELECT `ac`.`id` AS `account_detail_id`, + `ac`.`value` AS `value`, + `ac`.`accountDetailTypeFk` AS `account_detail_type_id`, + `ac`.`supplierAccountFk` AS `Id_Proveedores_account` +FROM `vn`.`accountDetail` `ac` diff --git a/db/routines/vn2008/views/account_detail_type.sql b/db/routines/vn2008/views/account_detail_type.sql new file mode 100644 index 000000000..6def86a9a --- /dev/null +++ b/db/routines/vn2008/views/account_detail_type.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`account_detail_type` +AS SELECT `adt`.`id` AS `account_detail_type_id`, + `adt`.`description` AS `description` +FROM `vn`.`accountDetailType` `adt` diff --git a/db/routines/vn2008/views/agency.sql b/db/routines/vn2008/views/agency.sql new file mode 100644 index 000000000..637bb0910 --- /dev/null +++ b/db/routines/vn2008/views/agency.sql @@ -0,0 +1,9 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`agency` +AS SELECT `a`.`id` AS `agency_id`, + `a`.`name` AS `name`, + `a`.`warehouseFk` AS `warehouse_id`, + `a`.`isOwn` AS `propios`, + `a`.`workCenterFk` AS `workCenterFk` +FROM `vn`.`agency` `a` diff --git a/db/routines/vn2008/views/airline.sql b/db/routines/vn2008/views/airline.sql new file mode 100644 index 000000000..786206b1c --- /dev/null +++ b/db/routines/vn2008/views/airline.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`airline` +AS SELECT `a`.`id` AS `airline_id`, + `a`.`name` AS `name` +FROM `vn`.`airline` `a` diff --git a/db/routines/vn2008/views/airport.sql b/db/routines/vn2008/views/airport.sql new file mode 100644 index 000000000..0e8ab39d2 --- /dev/null +++ b/db/routines/vn2008/views/airport.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`airport` +AS SELECT `a`.`id` AS `airport_id`, + `a`.`name` AS `name` +FROM `vn`.`airport` `a` diff --git a/db/routines/vn2008/views/albaran.sql b/db/routines/vn2008/views/albaran.sql new file mode 100644 index 000000000..51a7c77e9 --- /dev/null +++ b/db/routines/vn2008/views/albaran.sql @@ -0,0 +1,19 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`albaran` +AS SELECT `dn`.`id` AS `albaran_id`, + `dn`.`ref` AS `ref`, + `dn`.`note` AS `note`, + `dn`.`shipped` AS `fecha`, + `dn`.`landed` AS `fecha_entrega`, + `dn`.`amount` AS `valor`, + `dn`.`supplierFk` AS `Id_Proveedor`, + `dn`.`companyFk` AS `empresa_id`, + `dn`.`warehouseFk` AS `warehouse_id`, + `dn`.`stateFk` AS `albaran_state_id`, + `dn`.`workerFk` AS `Id_Trabajador`, + `dn`.`supervisorFk` AS `Id_Responsable`, + `dn`.`departmentFk` AS `department_id`, + `dn`.`invoiceInFk` AS `recibida_id`, + `dn`.`farmingFk` AS `farmingFk` +FROM `vn`.`deliveryNote` `dn` diff --git a/db/routines/vn2008/views/albaran_gestdoc.sql b/db/routines/vn2008/views/albaran_gestdoc.sql new file mode 100644 index 000000000..ffde86937 --- /dev/null +++ b/db/routines/vn2008/views/albaran_gestdoc.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`albaran_gestdoc` +AS SELECT `dnd`.`dmsFk` AS `gestdoc_id`, + `dnd`.`deliveryNoteFk` AS `albaran_id` +FROM `vn`.`deliveryNoteDms` `dnd` diff --git a/db/routines/vn2008/views/albaran_state.sql b/db/routines/vn2008/views/albaran_state.sql new file mode 100644 index 000000000..a15938f45 --- /dev/null +++ b/db/routines/vn2008/views/albaran_state.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`albaran_state` +AS SELECT `dn`.`id` AS `albaran_state_id`, + `dn`.`state` AS `state` +FROM `vn`.`deliveryNoteState` `dn` diff --git a/db/routines/vn2008/views/awb.sql b/db/routines/vn2008/views/awb.sql new file mode 100644 index 000000000..010596288 --- /dev/null +++ b/db/routines/vn2008/views/awb.sql @@ -0,0 +1,33 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`awb` +AS SELECT `a`.`id` AS `id`, + `a`.`code` AS `codigo`, + `a`.`package` AS `bultos`, + `a`.`weight` AS `peso`, + `a`.`created` AS `MYSQL_TIME`, + `a`.`transitoryFk` AS `transitario_id`, + `a`.`taxFk` AS `iva_id`, + `a`.`duakk` AS `duakk`, + `a`.`docFk` AS `gestdoc_id`, + `a`.`amount` AS `importe`, + `a`.`freightFk` AS `carguera_id`, + `a`.`m3` AS `m3`, + `a`.`stems` AS `stems`, + `a`.`flightFk` AS `flight_id`, + `a`.`volumeWeight` AS `volume_weight`, + `a`.`hb` AS `hb`, + `a`.`rate` AS `rate`, + `a`.`booked` AS `booked`, + `a`.`issued` AS `issued`, + `a`.`operated` AS `operated`, + `a`.`bookEntried` AS `bookEntried`, + `a`.`invoiceInFk` AS `invoiceInFk`, + `a`.`isChecked` AS `isChecked`, + `a`.`isTransitoryChecked` AS `isTransitoryChecked`, + `a`.`year` AS `year`, + `a`.`invoiceInPaletizedFk` AS `invoiceInPaletizedFk`, + `a`.`observation` AS `observation`, + `a`.`hasFreightPrepaid` AS `hasFreightPrepaid`, + `a`.`propertyNumber` AS `propertyNumber` +FROM `vn`.`awb` `a` diff --git a/db/routines/vn2008/views/awb_component.sql b/db/routines/vn2008/views/awb_component.sql new file mode 100644 index 000000000..8053c4a59 --- /dev/null +++ b/db/routines/vn2008/views/awb_component.sql @@ -0,0 +1,14 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`awb_component` +AS SELECT `ac`.`id` AS `id`, + `ac`.`awbFk` AS `awb_id`, + `ac`.`supplierFk` AS `Id_Proveedor`, + `ac`.`typeFk` AS `awb_component_type_id`, + `ac`.`awbRoleFk` AS `awb_role_id`, + `ac`.`awbUnitFk` AS `awb_unit_id`, + `ac`.`value` AS `value`, + `ac`.`currencyFk` AS `Id_Moneda`, + `ac`.`invoiceInFk` AS `recibida_id` +FROM + `vn`.`awbComponent` `ac`; \ No newline at end of file diff --git a/db/routines/vn2008/views/awb_component_template.sql b/db/routines/vn2008/views/awb_component_template.sql new file mode 100644 index 000000000..bc8fd1cd8 --- /dev/null +++ b/db/routines/vn2008/views/awb_component_template.sql @@ -0,0 +1,19 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`awb_component_template` +AS SELECT`act`.`id` AS `awb_component_template_id`, + `act`.`freightFk` AS `carguera_id`, + `act`.`airportIn` AS `airport_in`, + `act`.`airportOut` AS `airport_out`, + `act`.`airlineFk` AS `airline_id`, + `act`.`typeFk` AS `awb_component_type_id`, + `act`.`dated` AS `Fecha`, + `act`.`awbRoleFk` AS `awb_role_id`, + `act`.`awbUnit` AS `awb_unit_id`, + `act`.`value` AS `value`, + `act`.`maxValue` AS `max_value`, + `act`.`minValue` AS `min_value`, + `act`.`currencyFk` AS `Id_Moneda`, + `act`.`days` AS `days` +FROM + `vn`.`awbComponentTemplate` `act`; diff --git a/db/routines/vn2008/views/awb_component_type.sql b/db/routines/vn2008/views/awb_component_type.sql new file mode 100644 index 000000000..45921e11c --- /dev/null +++ b/db/routines/vn2008/views/awb_component_type.sql @@ -0,0 +1,7 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`awb_component_type` +AS SELECT `act`.`id` AS `awb_component_type_id`, + `act`.`description` AS `description`, + `act`.`hasStems` AS `hasStems` +FROM `vn`.`awbComponentType` `act` diff --git a/db/routines/vn2008/views/awb_gestdoc.sql b/db/routines/vn2008/views/awb_gestdoc.sql new file mode 100644 index 000000000..6b5c58d56 --- /dev/null +++ b/db/routines/vn2008/views/awb_gestdoc.sql @@ -0,0 +1,7 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`awb_gestdoc` +AS SELECT `ad`.`id` AS `awb_gestdoc_id`, + `ad`.`awbFk` AS `awb_id`, + `ad`.`dmsFk` AS `gestdoc_id` +FROM `vn`.`awbDms` `ad` diff --git a/db/routines/vn2008/views/awb_recibida.sql b/db/routines/vn2008/views/awb_recibida.sql new file mode 100644 index 000000000..c7586214d --- /dev/null +++ b/db/routines/vn2008/views/awb_recibida.sql @@ -0,0 +1,7 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`awb_recibida` +AS SELECT `aii`.`awbFk` AS `awb_id`, + `aii`.`invoiceInFk` AS `recibida_id`, + `aii`.`sad` AS `dua` +FROM `vn`.`awbInvoiceIn` `aii`; diff --git a/db/routines/vn2008/views/awb_role.sql b/db/routines/vn2008/views/awb_role.sql new file mode 100644 index 000000000..5ef004244 --- /dev/null +++ b/db/routines/vn2008/views/awb_role.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`awb_role` +AS SELECT `ar`.`id` AS `awb_role_id`, + `ar`.`name` AS `name` +FROM `vn`.`awbRole` `ar` diff --git a/db/routines/vn2008/views/awb_unit.sql b/db/routines/vn2008/views/awb_unit.sql new file mode 100644 index 000000000..7d1193105 --- /dev/null +++ b/db/routines/vn2008/views/awb_unit.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`awb_unit` +AS SELECT `au`.`id` AS `awb_unit_id`, + `au`.`operation` AS `operation` +FROM `vn`.`awbUnit` `au` diff --git a/db/routines/vn2008/views/balance_nest_tree.sql b/db/routines/vn2008/views/balance_nest_tree.sql new file mode 100644 index 000000000..66d048d7f --- /dev/null +++ b/db/routines/vn2008/views/balance_nest_tree.sql @@ -0,0 +1,10 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`balance_nest_tree` +AS SELECT `bnt`.`lft` AS `lft`, + `bnt`.`rgt` AS `rgt`, + `bnt`.`name` AS `name`, + `bnt`.`id` AS `id`, + `bnt`.`expenseFk` AS `Id_Gasto`, + `bnt`.`isSelected` AS `isSelected` +FROM `vn`.`balanceNestTree` `bnt` diff --git a/db/routines/vn2008/views/barcodes.sql b/db/routines/vn2008/views/barcodes.sql new file mode 100644 index 000000000..f366e15fa --- /dev/null +++ b/db/routines/vn2008/views/barcodes.sql @@ -0,0 +1,7 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`barcodes` +AS SELECT `b`.`id` AS `id`, + `b`.`itemFk` AS `Id_Article`, + `b`.`code` AS `code` +FROM `vn`.`itemBarcode` `b` diff --git a/db/routines/vn2008/views/buySource.sql b/db/routines/vn2008/views/buySource.sql new file mode 100644 index 000000000..33226a1dc --- /dev/null +++ b/db/routines/vn2008/views/buySource.sql @@ -0,0 +1,77 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`buySource` +AS SELECT `b`.`entryFk` AS `Id_Entrada`, + `b`.`isPickedOff` AS `isPickedOff`, + NULL AS `tarifa0`, + `e`.`kop` AS `kop`, + `b`.`id` AS `Id_Compra`, + `i`.`typeFk` AS `tipo_id`, + `b`.`itemFk` AS `Id_Article`, + `i`.`size` AS `Medida`, + `i`.`stems` AS `Tallos`, + `b`.`stickers` AS `Etiquetas`, + `b`.`packagingFk` AS `Id_Cubo`, + `b`.`buyingValue` AS `Costefijo`, + `b`.`packing` AS `Packing`, + `b`.`grouping` AS `Grouping`, + `b`.`quantity` AS `Cantidad`, + `b`.`price2` AS `Tarifa2`, + `b`.`price3` AS `Tarifa3`, + `b`.`isChecked` AS `Punteo`, + `b`.`groupingMode` AS `Caja`, + `i`.`isToPrint` AS `Imprimir`, + `i`.`name` AS `Article`, + `vn`.`ink`.`picture` AS `Tinta`, + `i`.`originFk` AS `id_origen`, + `i`.`minPrice` AS `PVP`, + NULL AS `Id_Accion`, + `s`.`company_name` AS `pro`, + `i`.`hasMinPrice` AS `Min`, + `b`.`isIgnored` AS `Novincular`, + `b`.`freightValue` AS `Portefijo`, + round(`b`.`buyingValue` * `b`.`quantity`, 2) AS `Importe`, + `b`.`printedStickers` AS `Vida`, + `i`.`comment` AS `reference`, + `b`.`workerFk` AS `Id_Trabajador`, + `e`.`s1` AS `S1`, + `e`.`s2` AS `S2`, + `e`.`s3` AS `S3`, + `e`.`s4` AS `S4`, + `e`.`s5` AS `S5`, + `e`.`s6` AS `S6`, + 0 AS `price_fixed`, + `i`.`producerFk` AS `producer_id`, + `i`.`subName` AS `tag1`, + `i`.`value5` AS `tag2`, + `i`.`value6` AS `tag3`, + `i`.`value7` AS `tag4`, + `i`.`value8` AS `tag5`, + `i`.`value9` AS `tag6`, + `i`.`value10` AS `tag7`, + `s`.`company_name` AS `company_name`, + `b`.`weight` AS `weightPacking`, + `i`.`packingOut` AS `packingOut`, + `b`.`itemOriginalFk` AS `itemOriginalFk`, + `io`.`longName` AS `itemOriginalName`, + `it`.`gramsMax` AS `gramsMax`, + `i`.`minQuantity` AS `minQuantity` +FROM ( + ( + ( + ( + ( + ( + `vn`.`item` `i` + JOIN `vn`.`itemType` `it` ON(`it`.`id` = `i`.`typeFk`) + ) + LEFT JOIN `vn`.`ink` ON(`vn`.`ink`.`id` = `i`.`inkFk`) + ) + LEFT JOIN `vn`.`buy` `b` ON(`b`.`itemFk` = `i`.`id`) + ) + LEFT JOIN `vn`.`item` `io` ON(`io`.`id` = `b`.`itemOriginalFk`) + ) + LEFT JOIN `edi`.`ekt` `e` ON(`e`.`id` = `b`.`ektFk`) + ) + LEFT JOIN `edi`.`supplier` `s` ON(`e`.`pro` = `s`.`supplier_id`) + ) diff --git a/db/routines/vn2008/views/buy_edi.sql b/db/routines/vn2008/views/buy_edi.sql new file mode 100644 index 000000000..0d194c89e --- /dev/null +++ b/db/routines/vn2008/views/buy_edi.sql @@ -0,0 +1,41 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`buy_edi` +AS SELECT `t`.`id` AS `id`, + `t`.`barcode` AS `barcode`, + `t`.`entryYear` AS `entry_year`, + `t`.`deliveryNumber` AS `delivery_number`, + `t`.`fec` AS `fec`, + `t`.`hor` AS `hor`, + `t`.`now` AS `now`, + `t`.`ptj` AS `ptj`, + `t`.`ref` AS `ref`, + `t`.`item` AS `item`, + `t`.`pac` AS `pac`, + `t`.`qty` AS `qty`, + `t`.`ori` AS `ori`, + `t`.`cat` AS `cat`, + `t`.`agj` AS `agj`, + `t`.`kop` AS `kop`, + `t`.`ptd` AS `ptd`, + `t`.`sub` AS `sub`, + `t`.`pro` AS `pro`, + `t`.`pri` AS `pri`, + `t`.`package` AS `package`, + `t`.`auction` AS `auction`, + `t`.`klo` AS `klo`, + `t`.`k1` AS `k01`, + `t`.`k2` AS `k02`, + `t`.`k3` AS `k03`, + `t`.`k4` AS `k04`, + `t`.`s1` AS `s1`, + `t`.`s2` AS `s2`, + `t`.`s3` AS `s3`, + `t`.`s4` AS `s4`, + `t`.`s5` AS `s5`, + `t`.`s6` AS `s6`, + `t`.`ok` AS `ok`, + `t`.`trolleyFk` AS `trolley_id`, + `t`.`putOrderFk` AS `putOrderFk`, + `t`.`scanned` AS `scanned` +FROM `edi`.`ekt` `t` diff --git a/db/routines/vn2008/views/buy_edi_k012.sql b/db/routines/vn2008/views/buy_edi_k012.sql new file mode 100644 index 000000000..8ef89e5c9 --- /dev/null +++ b/db/routines/vn2008/views/buy_edi_k012.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`buy_edi_k012` +AS SELECT `eek`.`id` AS `buy_edi_k012_id`, + `eek`.`description` AS `description` +FROM `edi`.`ektK1` `eek` diff --git a/db/routines/vn2008/views/buy_edi_k03.sql b/db/routines/vn2008/views/buy_edi_k03.sql new file mode 100644 index 000000000..04ca10ef5 --- /dev/null +++ b/db/routines/vn2008/views/buy_edi_k03.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`buy_edi_k03` +AS SELECT `eek`.`id` AS `buy_edi_k03_id`, + `eek`.`description` AS `description` +FROM `edi`.`ektK3` `eek` diff --git a/db/routines/vn2008/views/buy_edi_k04.sql b/db/routines/vn2008/views/buy_edi_k04.sql new file mode 100644 index 000000000..3c32e3b88 --- /dev/null +++ b/db/routines/vn2008/views/buy_edi_k04.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`buy_edi_k04` +AS SELECT `eek`.`id` AS `buy_edi_k04_id`, + `eek`.`description` AS `description` +FROM `edi`.`ektK4` `eek` diff --git a/db/routines/vn2008/views/cdr.sql b/db/routines/vn2008/views/cdr.sql new file mode 100644 index 000000000..9d0d2f172 --- /dev/null +++ b/db/routines/vn2008/views/cdr.sql @@ -0,0 +1,20 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`cdr` +AS SELECT `c`.`call_date` AS `calldate`, + `c`.`clid` AS `clid`, + `c`.`src` AS `src`, + `c`.`dst` AS `dst`, + `c`.`dcontext` AS `dcontext`, + `c`.`channel` AS `channel`, + `c`.`dst_channel` AS `dstchannel`, + `c`.`last_app` AS `lastapp`, + `c`.`last_data` AS `lastdata`, + `c`.`duration` AS `duration`, + `c`.`billsec` AS `billsec`, + `c`.`disposition` AS `disposition`, + `c`.`ama_flags` AS `amaflags`, + `c`.`account_code` AS `accountcode`, + `c`.`unique_id` AS `uniqueid`, + `c`.`user_field` AS `userfield` +FROM `pbx`.`cdr` `c` diff --git a/db/routines/vn2008/views/chanel.sql b/db/routines/vn2008/views/chanel.sql new file mode 100644 index 000000000..9d2ed0d9c --- /dev/null +++ b/db/routines/vn2008/views/chanel.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`chanel` +AS SELECT `c`.`id` AS `chanel_id`, + `c`.`name` AS `name` +FROM `vn`.`contactChannel` `c` diff --git a/db/routines/vn2008/views/cl_act.sql b/db/routines/vn2008/views/cl_act.sql new file mode 100644 index 000000000..a62ac3efe --- /dev/null +++ b/db/routines/vn2008/views/cl_act.sql @@ -0,0 +1,10 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`cl_act` +AS SELECT `c`.`id` AS `id`, + `c`.`saleFk` AS `Id_Movimiento`, + `c`.`claimFk` AS `cl_main_id`, + `c`.`workerFk` AS `Id_Trabajador`, + `c`.`claimDestinationFk` AS `cl_sol_id`, + `c`.`isGreuge` AS `greuge` +FROM `vn`.`claimEnd` `c` diff --git a/db/routines/vn2008/views/cl_cau.sql b/db/routines/vn2008/views/cl_cau.sql new file mode 100644 index 000000000..a835a94c9 --- /dev/null +++ b/db/routines/vn2008/views/cl_cau.sql @@ -0,0 +1,12 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`cl_cau` +AS SELECT `c`.`id` AS `id`, + `c`.`claimFk` AS `cl_main_id`, + `c`.`claimResponsibleFk` AS `cl_res_id`, + `c`.`workerFk` AS `Id_Trabajador`, + `c`.`claimReasonFk` AS `cl_mot_id`, + `c`.`claimResultFk` AS `cl_con_id`, + `c`.`claimRedeliveryFk` AS `cl_dev`, + `c`.`claimDestinationFk` AS `cl_sol` +FROM `vn`.`claimDevelopment` `c` diff --git a/db/routines/vn2008/views/cl_con.sql b/db/routines/vn2008/views/cl_con.sql new file mode 100644 index 000000000..b4f596d56 --- /dev/null +++ b/db/routines/vn2008/views/cl_con.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`cl_con` +AS SELECT `c`.`id` AS `id`, + `c`.`description` AS `consecuencia` +FROM `vn`.`claimResult` `c` diff --git a/db/routines/vn2008/views/cl_det.sql b/db/routines/vn2008/views/cl_det.sql new file mode 100644 index 000000000..cef5c821d --- /dev/null +++ b/db/routines/vn2008/views/cl_det.sql @@ -0,0 +1,8 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`cl_det` +AS SELECT `c`.`id` AS `id`, + `c`.`claimFk` AS `cl_main_id`, + `c`.`saleFk` AS `Id_Movimiento`, + `c`.`quantity` AS `numero` +FROM `vn`.`claimBeginning` `c` diff --git a/db/routines/vn2008/views/cl_main.sql b/db/routines/vn2008/views/cl_main.sql new file mode 100644 index 000000000..ef0c2cb8a --- /dev/null +++ b/db/routines/vn2008/views/cl_main.sql @@ -0,0 +1,14 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`cl_main` +AS SELECT `c`.`id` AS `id`, + `c`.`ticketCreated` AS `Fecha`, + `c`.`claimStateFk` AS `cl_est_id`, + `c`.`observation` AS `notas`, + `c`.`clientFk` AS `Id_Cliente`, + `c`.`workerFk` AS `Id_Trabajador`, + `c`.`responsibility` AS `sensib`, + `c`.`isChargedToMana` AS `mana`, + `c`.`ticketFk` AS `ticketFk`, + `c`.`created` AS `odbc_date` +FROM `vn`.`claim` `c` diff --git a/db/routines/vn2008/views/cl_mot.sql b/db/routines/vn2008/views/cl_mot.sql new file mode 100644 index 000000000..60fb27041 --- /dev/null +++ b/db/routines/vn2008/views/cl_mot.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`cl_mot` +AS SELECT `c`.`id` AS `id`, + `c`.`description` AS `motivo` +FROM `vn`.`claimReason` `c` diff --git a/db/routines/vn2008/views/cl_res.sql b/db/routines/vn2008/views/cl_res.sql new file mode 100644 index 000000000..e82ee73b0 --- /dev/null +++ b/db/routines/vn2008/views/cl_res.sql @@ -0,0 +1,7 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`cl_res` +AS SELECT `c`.`id` AS `id`, + `c`.`description` AS `responsable`, + `c`.`responsability` AS `sensibility` +FROM `vn`.`claimResponsible` `c` diff --git a/db/routines/vn2008/views/cl_sol.sql b/db/routines/vn2008/views/cl_sol.sql new file mode 100644 index 000000000..23f2b8594 --- /dev/null +++ b/db/routines/vn2008/views/cl_sol.sql @@ -0,0 +1,7 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`cl_sol` +AS SELECT `c`.`id` AS `id`, + `c`.`description` AS `solucion`, + `c`.`addressFk` AS `addressFk` +FROM `vn`.`claimDestination` `c` diff --git a/db/routines/vn2008/views/config_host.sql b/db/routines/vn2008/views/config_host.sql new file mode 100644 index 000000000..2d4d6fa4c --- /dev/null +++ b/db/routines/vn2008/views/config_host.sql @@ -0,0 +1,11 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`config_host` +AS SELECT `vn`.`host`.`code` AS `config_host_id`, + `vn`.`host`.`warehouseFk` AS `warehouse`, + `vn`.`host`.`companyFk` AS `empresaId`, + `vn`.`host`.`bankFk` AS `caja`, + `vn`.`host`.`printerFk` AS `Id_Impresora`, + `vn`.`host`.`routeDaysBefore` AS `route_days_before`, + `vn`.`host`.`routeDaysAfter` AS `route_days_after` +FROM `vn`.`host` diff --git a/db/routines/vn2008/views/consignatarios_observation.sql b/db/routines/vn2008/views/consignatarios_observation.sql new file mode 100644 index 000000000..1f4c2eeb2 --- /dev/null +++ b/db/routines/vn2008/views/consignatarios_observation.sql @@ -0,0 +1,8 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`consignatarios_observation` +AS SELECT `co`.`id` AS `consignatarios_observation_id`, + `co`.`addressFk` AS `Id_Consigna`, + `co`.`observationTypeFk` AS `observation_type_id`, + `co`.`description` AS `text` +FROM `vn`.`addressObservation` `co` diff --git a/db/routines/vn2008/views/credit.sql b/db/routines/vn2008/views/credit.sql new file mode 100644 index 000000000..0de60b967 --- /dev/null +++ b/db/routines/vn2008/views/credit.sql @@ -0,0 +1,11 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`credit` +AS SELECT + `c`.`id` AS `id`, + `c`.`clientFk` AS `Id_Cliente`, + `c`.`workerFk` AS `Id_Trabajador`, + `c`.`amount` AS `amount`, + `c`.`created` AS `odbc_date` +FROM + `vn`.`clientCredit` `c` diff --git a/db/routines/vn2008/views/definitivo.sql b/db/routines/vn2008/views/definitivo.sql new file mode 100644 index 000000000..1bc554161 --- /dev/null +++ b/db/routines/vn2008/views/definitivo.sql @@ -0,0 +1,9 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`definitivo` +AS SELECT `d`.`id` AS `definitivo_id`, + `d`.`companyFk` AS `empresa_id`, + `d`.`started` AS `desde`, + `d`.`ended` AS `hasta`, + `d`.`created` AS `fecha` +FROM `vn`.`dmsStorageBox` `d` diff --git a/db/routines/vn2008/views/edi_article.sql b/db/routines/vn2008/views/edi_article.sql new file mode 100644 index 000000000..34bb64149 --- /dev/null +++ b/db/routines/vn2008/views/edi_article.sql @@ -0,0 +1,12 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`edi_article` +AS SELECT `edi`.`item`.`id` AS `id`, + `edi`.`item`.`product_name` AS `product_name`, + `edi`.`item`.`name` AS `name`, + `edi`.`item`.`plant_id` AS `plant_id`, + `edi`.`item`.`group_id` AS `group_id`, + `edi`.`item`.`entry_date` AS `entry_date`, + `edi`.`item`.`expiry_date` AS `expiry_date`, + `edi`.`item`.`change_date_time` AS `change_date_time` +FROM `edi`.`item` diff --git a/db/routines/vn2008/views/edi_bucket.sql b/db/routines/vn2008/views/edi_bucket.sql new file mode 100644 index 000000000..1af487a6c --- /dev/null +++ b/db/routines/vn2008/views/edi_bucket.sql @@ -0,0 +1,15 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`edi_bucket` +AS SELECT cast( + `edi`.`bucket`.`bucket_id` AS char CHARSET utf8mb3 + ) COLLATE utf8mb3_general_ci AS `bucket_id`, + `edi`.`bucket`.`bucket_type_id` AS `bucket_type_id`, + `edi`.`bucket`.`description` AS `description`, + `edi`.`bucket`.`x_size` AS `x_size`, + `edi`.`bucket`.`y_size` AS `y_size`, + `edi`.`bucket`.`z_size` AS `z_size`, + `edi`.`bucket`.`entry_date` AS `entry_date`, + `edi`.`bucket`.`expiry_date` AS `expiry_date`, + `edi`.`bucket`.`change_date_time` AS `change_date_time` +FROM `edi`.`bucket` diff --git a/db/routines/vn2008/views/edi_bucket_type.sql b/db/routines/vn2008/views/edi_bucket_type.sql new file mode 100644 index 000000000..8e3af2080 --- /dev/null +++ b/db/routines/vn2008/views/edi_bucket_type.sql @@ -0,0 +1,9 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`edi_bucket_type` +AS SELECT `edi`.`bucket_type`.`bucket_type_id` AS `bucket_type_id`, + `edi`.`bucket_type`.`description` AS `description`, + `edi`.`bucket_type`.`entry_date` AS `entry_date`, + `edi`.`bucket_type`.`expiry_date` AS `expiry_date`, + `edi`.`bucket_type`.`change_date_time` AS `change_date_time` +FROM `edi`.`bucket_type` diff --git a/db/routines/vn2008/views/edi_specie.sql b/db/routines/vn2008/views/edi_specie.sql new file mode 100644 index 000000000..33e38482e --- /dev/null +++ b/db/routines/vn2008/views/edi_specie.sql @@ -0,0 +1,10 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`edi_specie` +AS SELECT `edi`.`specie`.`specie_id` AS `specie_id`, + `edi`.`specie`.`genus_id` AS `genus_id`, + `edi`.`specie`.`latin_species_name` AS `latin_species_name`, + `edi`.`specie`.`entry_date` AS `entry_date`, + `edi`.`specie`.`expiry_date` AS `expiry_date`, + `edi`.`specie`.`change_date_time` AS `change_date_time` +FROM `edi`.`specie` diff --git a/db/routines/vn2008/views/edi_supplier.sql b/db/routines/vn2008/views/edi_supplier.sql new file mode 100644 index 000000000..51f96b83d --- /dev/null +++ b/db/routines/vn2008/views/edi_supplier.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`edi_supplier` +AS SELECT `edi`.`supplier`.`supplier_id` AS `supplier_id`, + `edi`.`supplier`.`company_name` AS `company_name` +FROM `edi`.`supplier` diff --git a/db/routines/vn2008/views/empresa.sql b/db/routines/vn2008/views/empresa.sql new file mode 100644 index 000000000..8c80a06e8 --- /dev/null +++ b/db/routines/vn2008/views/empresa.sql @@ -0,0 +1,23 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`empresa` +AS SELECT `c`.`id` AS `id`, + `c`.`code` AS `abbreviation`, + `c`.`supplierAccountFk` AS `Id_Proveedores_account`, + `c`.`workerManagerFk` AS `gerente_id`, + `c`.`phytosanitary` AS `phytosanitary`, + `c`.`companyCode` AS `CodigoEmpresa`, + `c`.`companyGroupFk` AS `empresa_grupo`, + `c`.`isDefaulter` AS `morosidad`, + `c`.`expired` AS `baja`, + `c`.`register` AS `registro`, + `c`.`registered` AS `alta`, + `c`.`logo` AS `logo`, + `c`.`isOfficial` AS `oficial`, + `c`.`hasCyc` AS `cyc`, + `c`.`rgb` AS `rgb`, + `c`.`email` AS `mail`, + `c`.`stamp` AS `cuno`, + `c`.`created` AS `ODBC_DATE`, + `c`.`clientFk` AS `Id_Cliente` +FROM `vn`.`company` `c` diff --git a/db/routines/vn2008/views/empresa_grupo.sql b/db/routines/vn2008/views/empresa_grupo.sql new file mode 100644 index 000000000..35ba27279 --- /dev/null +++ b/db/routines/vn2008/views/empresa_grupo.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`empresa_grupo` +AS SELECT `vn`.`companyGroup`.`id` AS `empresa_grupo_id`, + `vn`.`companyGroup`.`code` AS `grupo` +FROM `vn`.`companyGroup` diff --git a/db/routines/vn2008/views/entrySource.sql b/db/routines/vn2008/views/entrySource.sql new file mode 100644 index 000000000..3a8df41bf --- /dev/null +++ b/db/routines/vn2008/views/entrySource.sql @@ -0,0 +1,55 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`entrySource` +AS SELECT `e`.`gestDocFk` AS `gestdoc_id`, + `e`.`id` AS `Id_Entrada`, + `e`.`invoiceNumber` AS `invoiceNumber`, + `e`.`reference` AS `reference`, + `e`.`isExcludedFromAvailable` AS `Inventario`, + `e`.`isConfirmed` AS `Confirmada`, + `e`.`isOrdered` AS `Pedida`, + `e`.`isRaid` AS `Redada`, + `e`.`evaNotes` AS `notas`, + `e`.`supplierFk` AS `Id_Proveedor`, + `tr`.`shipped` AS `shipment`, + `tr`.`landed` AS `landing`, + `w2`.`name` AS `wh_in`, + `w1`.`name` AS `wh_out`, + `am`.`name` AS `Agencia`, + `e`.`commission` AS `comision`, + `tr`.`warehouseInFk` AS `warehouse_id`, + `w1`.`id` AS `warehouse_id_out`, + `e`.`isBooked` AS `anotadoencaja`, + `e`.`invoiceInFk` AS `invoiceInFk`, + `e`.`companyFk` AS `empresa_id`, + `e`.`currencyFk` AS `Id_Moneda`, + `tr`.`id` AS `TravelFk`, + `e`.`sub` AS `sub`, + `e`.`kop` AS `kop`, + `e`.`pro` AS `pro`, + `e`.`invoiceAmount` AS `invoiceAmount`, + `w`.`code` AS `buyerCode`, + `e`.`typeFk` AS `typeFk`, + `w3`.`code` AS `observationWorkerCode` +FROM ( + ( + ( + ( + ( + ( + ( + `vn`.`entry` `e` + LEFT JOIN `vn`.`travel` `tr` ON(`e`.`travelFk` = `tr`.`id`) + ) + LEFT JOIN `vn`.`agencyMode` `am` ON(`am`.`id` = `tr`.`agencyModeFk`) + ) + LEFT JOIN `vn`.`warehouse` `w1` ON(`tr`.`warehouseOutFk` = `w1`.`id`) + ) + LEFT JOIN `vn`.`warehouse` `w2` ON(`tr`.`warehouseInFk` = `w2`.`id`) + ) + LEFT JOIN `vn`.`supplier` `s` ON(`e`.`supplierFk` = `s`.`id`) + ) + LEFT JOIN `vn`.`worker` `w` ON(`w`.`id` = `e`.`buyerFk`) + ) + LEFT JOIN `vn`.`worker` `w3` ON(`w3`.`id` = `e`.`observationEditorFk`) + ) diff --git a/db/routines/vn2008/views/financialProductType.sql b/db/routines/vn2008/views/financialProductType.sql new file mode 100644 index 000000000..89a063856 --- /dev/null +++ b/db/routines/vn2008/views/financialProductType.sql @@ -0,0 +1,4 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER +VIEW `vn2008`.`financialProductType`AS + SELECT * FROM vn.financialProductType; \ No newline at end of file diff --git a/db/routines/vn2008/views/flight.sql b/db/routines/vn2008/views/flight.sql new file mode 100644 index 000000000..2df5362f7 --- /dev/null +++ b/db/routines/vn2008/views/flight.sql @@ -0,0 +1,13 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`flight` +AS SELECT + `f`.`id` AS `flight_id`, + `f`.`duration` AS `duration`, + `f`.`flightPath` AS `route`, + `f`.`days` AS `days`, + `f`.`airlineFk` AS `airline_id`, + `f`.`airportArrivalFk` AS `airport_out`, + `f`.`airportDepartureFk` AS `airport_in` +FROM + `vn`.`flight` `f`; \ No newline at end of file diff --git a/db/routines/vn2008/views/gastos_resumen.sql b/db/routines/vn2008/views/gastos_resumen.sql new file mode 100644 index 000000000..02231bcbf --- /dev/null +++ b/db/routines/vn2008/views/gastos_resumen.sql @@ -0,0 +1,11 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`gastos_resumen` +AS SELECT + `es`.`expenseFk` AS `Id_Gasto`, + `es`.`year` AS `year`, + `es`.`month` AS `month`, + `es`.`amount` AS `importe`, + `es`.`companyFk` AS `empresa_id` +FROM + `vn`.`expenseManual` `es`; \ No newline at end of file diff --git a/db/routines/vn2008/views/integra2.sql b/db/routines/vn2008/views/integra2.sql new file mode 100644 index 000000000..05840d6bb --- /dev/null +++ b/db/routines/vn2008/views/integra2.sql @@ -0,0 +1,9 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`integra2` +AS SELECT + `i2`.`postCode` AS `postal_code`, + `i2`.`frequency` AS `frequency`, + `i2`.`warehouseFk` AS `warehouse_id` +FROM + `vn`.`integra2` `i2`; \ No newline at end of file diff --git a/db/routines/vn2008/views/integra2_province.sql b/db/routines/vn2008/views/integra2_province.sql new file mode 100644 index 000000000..bc099adb3 --- /dev/null +++ b/db/routines/vn2008/views/integra2_province.sql @@ -0,0 +1,8 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`integra2_province` +AS SELECT + `ip`.`provinceFk` AS `province_id`, + `ip`.`franchise` AS `franquicia` +FROM + `vn`.`integra2Province` `ip`; \ No newline at end of file diff --git a/db/routines/vn2008/views/mail.sql b/db/routines/vn2008/views/mail.sql new file mode 100644 index 000000000..3074dfa95 --- /dev/null +++ b/db/routines/vn2008/views/mail.sql @@ -0,0 +1,16 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`mail` +AS SELECT `m`.`id` AS `id`, + `m`.`senderFk` AS `senderFk`, + `m`.`recipientFk` AS `recipientFk`, + `m`.`receiver` AS `to`, + `m`.`replyTo` AS `reply_to`, + `m`.`subject` AS `subject`, + `m`.`body` AS `text`, + `m`.`plainTextBody` AS `plainTextBody`, + `m`.`attachment` AS `path`, + `m`.`creationDate` AS `DATE_ODBC`, + `m`.`sent` AS `sent`, + `m`.`status` AS `error` +FROM `vn`.`mail` `m` diff --git a/db/routines/vn2008/views/mandato.sql b/db/routines/vn2008/views/mandato.sql new file mode 100644 index 000000000..dde43b48d --- /dev/null +++ b/db/routines/vn2008/views/mandato.sql @@ -0,0 +1,11 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`mandato` +AS SELECT `m`.`id` AS `id`, + `m`.`clientFk` AS `Id_Cliente`, + `m`.`companyFk` AS `empresa_id`, + `m`.`code` AS `Id_mandato`, + `m`.`created` AS `FAlta`, + `m`.`finished` AS `Fbaja`, + `m`.`mandateTypeFk` AS `idmandato_tipo` +FROM `vn`.`mandate` `m` diff --git a/db/routines/vn2008/views/mandato_tipo.sql b/db/routines/vn2008/views/mandato_tipo.sql new file mode 100644 index 000000000..a1b5b0a9f --- /dev/null +++ b/db/routines/vn2008/views/mandato_tipo.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`mandato_tipo` +AS SELECT `m`.`id` AS `idmandato_tipo`, + `m`.`name` AS `Nombre` +FROM `vn`.`mandateType` `m` diff --git a/db/routines/vn2008/views/pago.sql b/db/routines/vn2008/views/pago.sql new file mode 100644 index 000000000..546496070 --- /dev/null +++ b/db/routines/vn2008/views/pago.sql @@ -0,0 +1,18 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`pago` +AS SELECT `p`.`id` AS `id`, + `p`.`received` AS `fecha`, + `p`.`dueDated` AS `dueDated`, + `p`.`supplierFk` AS `id_proveedor`, + `p`.`amount` AS `importe`, + `p`.`currencyFk` AS `id_moneda`, + `p`.`divisa` AS `divisa`, + `p`.`bankFk` AS `id_banco`, + `p`.`payMethodFk` AS `pay_met_id`, + `p`.`companyFk` AS `empresa_id`, + `p`.`isConciliated` AS `conciliado`, + `p`.`bankingFees` AS `g_bancarios`, + `p`.`concept` AS `concepte`, + `p`.`created` AS `odbc_date` +FROM `vn`.`payment` `p` diff --git a/db/routines/vn2008/views/pago_sdc.sql b/db/routines/vn2008/views/pago_sdc.sql new file mode 100644 index 000000000..29480e376 --- /dev/null +++ b/db/routines/vn2008/views/pago_sdc.sql @@ -0,0 +1,16 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`pago_sdc` +AS SELECT `ei`.`id` AS `pago_sdc_id`, + `ei`.`amount` AS `importe`, + `ei`.`dated` AS `fecha`, + `ei`.`dueDated` AS `vencimiento`, + `ei`.`entityFk` AS `entity_id`, + `ei`.`ref` AS `ref`, + `ei`.`rate` AS `rate`, + `ei`.`companyFk` AS `empresa_id`, + `ei`.`financialProductTypefk` AS `financialProductTypefk`, + `ei`.`upperBarrier` AS `upperBarrier`, + `ei`.`lowerBarrier` AS `lowerBarrier`, + `ei`.`strike` AS `strike` +FROM `vn`.`exchangeInsurance` `ei` \ No newline at end of file diff --git a/db/routines/vn2008/views/pay_dem.sql b/db/routines/vn2008/views/pay_dem.sql new file mode 100644 index 000000000..1ef00d645 --- /dev/null +++ b/db/routines/vn2008/views/pay_dem.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`pay_dem` +AS SELECT `pd`.`id` AS `id`, + `pd`.`payDem` AS `pay_dem` +FROM `vn`.`payDem` `pd` diff --git a/db/routines/vn2008/views/pay_dem_det.sql b/db/routines/vn2008/views/pay_dem_det.sql new file mode 100644 index 000000000..822897ed8 --- /dev/null +++ b/db/routines/vn2008/views/pay_dem_det.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`pay_dem_det` +AS SELECT `pdd`.`id` AS `id`, + `pdd`.`detail` AS `detalle` +FROM `vn`.`payDemDetail` `pdd` diff --git a/db/routines/vn2008/views/pay_met.sql b/db/routines/vn2008/views/pay_met.sql new file mode 100644 index 000000000..63e2b30e0 --- /dev/null +++ b/db/routines/vn2008/views/pay_met.sql @@ -0,0 +1,10 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`pay_met` +AS SELECT `pm`.`id` AS `id`, + `pm`.`name` AS `name`, + `pm`.`graceDays` AS `graceDays`, + `pm`.`outstandingDebt` AS `deudaviva`, + `pm`.`solution` AS `solucion`, + `pm`.`isNotified` AS `isNotified` +FROM `vn`.`payMethod` `pm` diff --git a/db/routines/vn2008/views/payroll_categorias.sql b/db/routines/vn2008/views/payroll_categorias.sql new file mode 100644 index 000000000..b71e69019 --- /dev/null +++ b/db/routines/vn2008/views/payroll_categorias.sql @@ -0,0 +1,7 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`payroll_categorias` +AS SELECT `pc`.`id` AS `codcategoria`, + `pc`.`rate` AS `Tarifa`, + `pc`.`description` AS `descripcion` +FROM `vn`.`payrollCategories` `pc` diff --git a/db/routines/vn2008/views/plantpassport.sql b/db/routines/vn2008/views/plantpassport.sql new file mode 100644 index 000000000..b1be6a80b --- /dev/null +++ b/db/routines/vn2008/views/plantpassport.sql @@ -0,0 +1,8 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`plantpassport` +AS SELECT `pp`.`producerFk` AS `producer_id`, + `pp`.`plantpassportAuthorityFk` AS `plantpassport_authority_id`, + `pp`.`number` AS `number`, + `pp`.`isRequested` AS `isRequested` +FROM `vn`.`plantpassport` `pp` diff --git a/db/routines/vn2008/views/plantpassport_authority.sql b/db/routines/vn2008/views/plantpassport_authority.sql new file mode 100644 index 000000000..4548bbede --- /dev/null +++ b/db/routines/vn2008/views/plantpassport_authority.sql @@ -0,0 +1,7 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`plantpassport_authority` +AS SELECT `ppa`.`id` AS `plantpassport_authority_id`, + `ppa`.`denomination` AS `denomination`, + `ppa`.`countryFk` AS `Paises_Id` +FROM `vn`.`plantpassportAuthority` `ppa` diff --git a/db/routines/vn2008/views/price_fixed.sql b/db/routines/vn2008/views/price_fixed.sql new file mode 100644 index 000000000..ce8170e7c --- /dev/null +++ b/db/routines/vn2008/views/price_fixed.sql @@ -0,0 +1,18 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`price_fixed` +AS SELECT `pf`.`itemFk` AS `item_id`, + `pf`.`rate0` AS `rate_0`, + `pf`.`rate1` AS `rate_1`, + `pf`.`rate2` AS `rate_2`, + `pf`.`rate3` AS `rate_3`, + `pf`.`started` AS `date_start`, + `pf`.`ended` AS `date_end`, + `pf`.`bonus` AS `bonus`, + `pf`.`warehouseFk` AS `warehouse_id`, + `pf`.`created` AS `odbc_date`, + `pf`.`id` AS `price_fixed_id`, + `pf`.`grouping` AS `grouping`, + `pf`.`packing` AS `Packing`, + `pf`.`box` AS `caja` +FROM `vn`.`priceFixed` `pf` diff --git a/db/routines/vn2008/views/producer.sql b/db/routines/vn2008/views/producer.sql new file mode 100644 index 000000000..babfb887e --- /dev/null +++ b/db/routines/vn2008/views/producer.sql @@ -0,0 +1,7 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`producer` +AS SELECT `p`.`id` AS `producer_id`, + `p`.`name` AS `name`, + `p`.`isVisible` AS `visible` +FROM `vn`.`producer` `p` diff --git a/db/routines/vn2008/views/promissoryNote.sql b/db/routines/vn2008/views/promissoryNote.sql new file mode 100644 index 000000000..0db0fa86f --- /dev/null +++ b/db/routines/vn2008/views/promissoryNote.sql @@ -0,0 +1,8 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Pagares` +AS SELECT `p`.`id` AS `Id_Pagare`, + `p`.`issued` AS `Fechaemision`, + `p`.`Concept` AS `Concepto`, + `p`.`paymentFk` AS `pago_id` +FROM `vn`.`promissoryNote` `p` \ No newline at end of file diff --git a/db/routines/vn2008/views/proveedores_clientes.sql b/db/routines/vn2008/views/proveedores_clientes.sql new file mode 100644 index 000000000..e08f4a3a7 --- /dev/null +++ b/db/routines/vn2008/views/proveedores_clientes.sql @@ -0,0 +1,11 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`proveedores_clientes` +AS SELECT `Proveedores`.`Id_Proveedor` AS `Id_Proveedor`, + `Proveedores`.`Proveedor` AS `Proveedor`, + `Clientes`.`id_cliente` AS `Id_Cliente`, + `Clientes`.`cliente` AS `Cliente` +FROM ( + `vn2008`.`Proveedores` + JOIN `vn2008`.`Clientes` ON(`Proveedores`.`NIF` = `Clientes`.`if`) + ) diff --git a/db/routines/vn2008/views/province.sql b/db/routines/vn2008/views/province.sql new file mode 100644 index 000000000..1477ec803 --- /dev/null +++ b/db/routines/vn2008/views/province.sql @@ -0,0 +1,10 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`province` +AS SELECT `p`.`id` AS `province_id`, + `p`.`name` AS `name`, + `p`.`countryFk` AS `Paises_Id`, + `p`.`warehouseFk` AS `warehouse_id`, + `p`.`zoneFk` AS `zone`, + `p`.`geoFk` AS `geoFk` +FROM `vn`.`province` `p` diff --git a/db/routines/vn2008/views/recibida.sql b/db/routines/vn2008/views/recibida.sql new file mode 100644 index 000000000..76b86505e --- /dev/null +++ b/db/routines/vn2008/views/recibida.sql @@ -0,0 +1,26 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`recibida` +AS SELECT `r`.`id` AS `id`, + `r`.`serialNumber` AS `num_recibida`, + `r`.`serial` AS `serie`, + `r`.`supplierFk` AS `proveedor_id`, + `r`.`issued` AS `fecha`, + `r`.`supplierRef` AS `sref`, + `r`.`isBooked` AS `contabilizada`, + `r`.`currencyFk` AS `moneda_id`, + `r`.`created` AS `MYSQL_TIME`, + `r`.`companyFk` AS `empresa_id`, + `r`.`docFk` AS `gestdoc_id`, + `r`.`booked` AS `dateBooking`, + `r`.`operated` AS `dateOperation`, + `r`.`siiTypeInvoiceInFk` AS `siiTypeInvoiceInFk`, + `r`.`cplusRectificationTypeFk` AS `cplusRectificationTypeFk`, + `r`.`cplusSubjectOpFk` AS `cplusSubjectOpFk`, + `r`.`cplusTaxBreakFk` AS `cplusTaxBreakFk`, + `r`.`siiTrascendencyInvoiceInFk` AS `siiTrascendencyInvoiceInFk`, + `r`.`bookEntried` AS `bookEntried`, + `r`.`isVatDeductible` AS `isVatDeductible`, + `r`.`withholdingSageFk` AS `withholdingSageFk`, + `r`.`expenseFkDeductible` AS `expenseFkDeductible` +FROM `vn`.`invoiceIn` `r` diff --git a/db/routines/vn2008/views/recibida_intrastat.sql b/db/routines/vn2008/views/recibida_intrastat.sql new file mode 100644 index 000000000..402781931 --- /dev/null +++ b/db/routines/vn2008/views/recibida_intrastat.sql @@ -0,0 +1,7 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`recibida_intrastat` +AS SELECT `i`.`invoiceInFk` AS `recibida_id`, + `i`.`intrastatFk` AS `Codintrastat`, + `i`.`amount` AS `importe` +FROM `vn`.`invoiceInIntrastat` `i` diff --git a/db/routines/vn2008/views/recibida_iva.sql b/db/routines/vn2008/views/recibida_iva.sql new file mode 100644 index 000000000..7d948a6ff --- /dev/null +++ b/db/routines/vn2008/views/recibida_iva.sql @@ -0,0 +1,13 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`recibida_iva` +AS SELECT `i`.`id` AS `id`, + `i`.`invoiceInFk` AS `recibida_id`, + `i`.`taxCodeFk` AS `iva_id`, + `i`.`taxableBase` AS `bi`, + `i`.`expenseFk` AS `gastos_id`, + `i`.`foreignValue` AS `divisa`, + `i`.`taxTypeSageFk` AS `taxTypeSageFk`, + `i`.`transactionTypeSageFk` AS `transactionTypeSageFk`, + `i`.`created` AS `MYSQL_TIME` +FROM `vn`.`invoiceInTax` `i` diff --git a/db/routines/vn2008/views/recibida_vencimiento.sql b/db/routines/vn2008/views/recibida_vencimiento.sql new file mode 100644 index 000000000..813ae40d7 --- /dev/null +++ b/db/routines/vn2008/views/recibida_vencimiento.sql @@ -0,0 +1,11 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`recibida_vencimiento` +AS SELECT `r`.`id` AS `id`, + `r`.`invoiceInFk` AS `recibida_id`, + `r`.`dueDated` AS `fecha`, + `r`.`bankFk` AS `banco_id`, + `r`.`amount` AS `cantidad`, + `r`.`foreignValue` AS `divisa`, + `r`.`created` AS `stamp` +FROM `vn`.`invoiceInDueDay` `r` diff --git a/db/routines/vn2008/views/recovery.sql b/db/routines/vn2008/views/recovery.sql new file mode 100644 index 000000000..5bbff3124 --- /dev/null +++ b/db/routines/vn2008/views/recovery.sql @@ -0,0 +1,10 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`recovery` +AS SELECT `r`.`id` AS `recovery_id`, + `r`.`clientFk` AS `Id_Cliente`, + `r`.`started` AS `dstart`, + `r`.`finished` AS `dend`, + `r`.`amount` AS `amount`, + `r`.`period` AS `period` +FROM `vn`.`recovery` `r` diff --git a/db/routines/vn2008/views/reference_rate.sql b/db/routines/vn2008/views/reference_rate.sql new file mode 100644 index 000000000..eb0f1c25e --- /dev/null +++ b/db/routines/vn2008/views/reference_rate.sql @@ -0,0 +1,7 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`reference_rate` +AS SELECT `rr`.`currencyFk` AS `moneda_id`, + `rr`.`dated` AS `date`, + `rr`.`value` AS `rate` +FROM `vn`.`referenceRate` `rr` diff --git a/db/routines/vn2008/views/reinos.sql b/db/routines/vn2008/views/reinos.sql new file mode 100644 index 000000000..4d98d1f09 --- /dev/null +++ b/db/routines/vn2008/views/reinos.sql @@ -0,0 +1,12 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`reinos` +AS SELECT `r`.`id` AS `id`, + `r`.`name` AS `reino`, + `r`.`display` AS `display`, + `r`.`color` AS `color`, + `r`.`icon` AS `icon`, + `r`.`merchandise` AS `mercancia`, + `r`.`order` AS `orden`, + `r`.`shortLife` AS `efimero` +FROM `vn`.`itemCategory` `r` diff --git a/db/routines/vn2008/views/state.sql b/db/routines/vn2008/views/state.sql new file mode 100644 index 000000000..63f6589af --- /dev/null +++ b/db/routines/vn2008/views/state.sql @@ -0,0 +1,13 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`state` +AS SELECT `s`.`id` AS `id`, + `s`.`name` AS `name`, + `s`.`order` AS `order`, + `s`.`alertLevel` AS `alert_level`, + `s`.`code` AS `code`, + `s`.`sectorProdPriority` AS `sectorProdPriority`, + `s`.`nextStateFk` AS `nextStateFk`, + `s`.`isPreviousPreparable` AS `isPreviousPreparable`, + `s`.`isPicked` AS `isPicked` +FROM `vn`.`state` `s` diff --git a/db/routines/vn2008/views/tag.sql b/db/routines/vn2008/views/tag.sql new file mode 100644 index 000000000..25b3ab82e --- /dev/null +++ b/db/routines/vn2008/views/tag.sql @@ -0,0 +1,10 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`tag` +AS SELECT `t`.`id` AS `id`, + `t`.`name` AS `name`, + `t`.`isFree` AS `isFree`, + `t`.`isQuantitatif` AS `isQuantitatif`, + `t`.`sourceTable` AS `sourceTable`, + `t`.`unit` AS `unit` +FROM `vn`.`tag` `t` diff --git a/db/routines/vn2008/views/tarifa_componentes.sql b/db/routines/vn2008/views/tarifa_componentes.sql new file mode 100644 index 000000000..bec53abd9 --- /dev/null +++ b/db/routines/vn2008/views/tarifa_componentes.sql @@ -0,0 +1,10 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`tarifa_componentes` +AS SELECT `tarifa_componentes`.`Id_Componente` AS `Id_Componente`, + `tarifa_componentes`.`Componente` AS `Componente`, + `tarifa_componentes`.`tarifa_componentes_series_id` AS `tarifa_componentes_series_id`, + `tarifa_componentes`.`tarifa_class` AS `tarifa_class`, + `tarifa_componentes`.`tax` AS `tax`, + `tarifa_componentes`.`is_renewable` AS `is_renewable` +FROM `bi`.`tarifa_componentes` diff --git a/db/routines/vn2008/views/tarifa_componentes_series.sql b/db/routines/vn2008/views/tarifa_componentes_series.sql new file mode 100644 index 000000000..a1d188709 --- /dev/null +++ b/db/routines/vn2008/views/tarifa_componentes_series.sql @@ -0,0 +1,7 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`tarifa_componentes_series` +AS SELECT `tarifa_componentes_series`.`tarifa_componentes_series_id` AS `tarifa_componentes_series_id`, + `tarifa_componentes_series`.`Serie` AS `Serie`, + `tarifa_componentes_series`.`base` AS `base` +FROM `bi`.`tarifa_componentes_series` diff --git a/db/routines/vn2008/views/tblContadores.sql b/db/routines/vn2008/views/tblContadores.sql new file mode 100644 index 000000000..129d3ce8b --- /dev/null +++ b/db/routines/vn2008/views/tblContadores.sql @@ -0,0 +1,39 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`tblContadores` +AS SELECT `c`.`id` AS `id`, + `c`.`ochoa` AS `ochoa`, + `c`.`invoiceOutFk` AS `nfactura`, + `c`.`inventoried` AS `FechaInventario`, + `c`.`itemLog` AS `HistoricoArticulo`, + `c`.`weekGoal` AS `week_goal`, + `c`.`photosPath` AS `Rutafotos`, + `c`.`cashBoxNumber` AS `numCaja`, + `c`.`redCode` AS `CodigoRojo`, + `c`.`TabletTime` AS `Tablet_Hora`, + `c`.`t0` AS `t0`, + `c`.`t1` AS `t1`, + `c`.`t2` AS `t2`, + `c`.`t3` AS `t3`, + `c`.`cc` AS `cc`, + `c`.`palet` AS `palet`, + `c`.`campaign` AS `campaign`, + `c`.`campaignLife` AS `campaign_life`, + `c`.`truckDays` AS `truck_days`, + `c`.`transportCharges` AS `tasa_transporte`, + `c`.`escanerPath` AS `escaner_path`, + `c`.`printedTurn` AS `turnoimpreso`, + `c`.`truckLength` AS `truck_length`, + `c`.`fuelConsumption` AS `fuel_consumption`, + `c`.`petrol` AS `petrol`, + `c`.`maintenance` AS `maintenance`, + `c`.`hourPrice` AS `hour_price`, + `c`.`meterPrice` AS `meter_price`, + `c`.`kmPrice` AS `km_price`, + `c`.`routeOption` AS `route_option`, + `c`.`dbproduccion` AS `dbproduccion`, + `c`.`mdbServer` AS `mdbServer`, + `c`.`fakeEmail` AS `fakeEmail`, + `c`.`defaultersMaxAmount` AS `defaultersMaxAmount`, + `c`.`ASIEN` AS `ASIEN` +FROM `vn`.`config` `c` diff --git a/db/routines/vn2008/views/thermograph.sql b/db/routines/vn2008/views/thermograph.sql new file mode 100644 index 000000000..f51b83d24 --- /dev/null +++ b/db/routines/vn2008/views/thermograph.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`thermograph` +AS SELECT `t`.`id` AS `thermograph_id`, + `t`.`model` AS `model` +FROM `vn`.`thermograph` `t` diff --git a/db/routines/vn2008/views/ticket_observation.sql b/db/routines/vn2008/views/ticket_observation.sql new file mode 100644 index 000000000..deb85e4b6 --- /dev/null +++ b/db/routines/vn2008/views/ticket_observation.sql @@ -0,0 +1,8 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`ticket_observation` +AS SELECT `to`.`id` AS `ticket_observation_id`, + `to`.`ticketFk` AS `Id_Ticket`, + `to`.`observationTypeFk` AS `observation_type_id`, + `to`.`description` AS `text` +FROM `vn`.`ticketObservation` `to` diff --git a/db/routines/vn2008/views/tickets_gestdoc.sql b/db/routines/vn2008/views/tickets_gestdoc.sql new file mode 100644 index 000000000..a8682db57 --- /dev/null +++ b/db/routines/vn2008/views/tickets_gestdoc.sql @@ -0,0 +1,6 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`tickets_gestdoc` +AS SELECT `td`.`ticketFk` AS `Id_Ticket`, + `td`.`dmsFk` AS `gestdoc_id` +FROM `vn`.`ticketDms` `td` diff --git a/db/routines/vn2008/views/time.sql b/db/routines/vn2008/views/time.sql new file mode 100644 index 000000000..f3bbc8607 --- /dev/null +++ b/db/routines/vn2008/views/time.sql @@ -0,0 +1,11 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`time` +AS SELECT `t`.`dated` AS `date`, + `t`.`period` AS `period`, + `t`.`month` AS `month`, + `t`.`year` AS `year`, + `t`.`day` AS `day`, + `t`.`week` AS `week`, + `t`.`yearMonth` AS `yearMonth` +FROM `vn`.`time` `t` diff --git a/db/routines/vn2008/views/travel.sql b/db/routines/vn2008/views/travel.sql new file mode 100644 index 000000000..b55dbf9b6 --- /dev/null +++ b/db/routines/vn2008/views/travel.sql @@ -0,0 +1,21 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`travel` +AS SELECT `t`.`id` AS `id`, + `t`.`shipped` AS `shipment`, + `t`.`shipmentHour` AS `shipment_hour`, + `t`.`landed` AS `landing`, + `t`.`landingHour` AS `landing_hour`, + `t`.`warehouseInFk` AS `warehouse_id`, + `t`.`warehouseOutFk` AS `warehouse_id_out`, + `t`.`agencyModeFk` AS `agency_id`, + `t`.`ref` AS `ref`, + `t`.`isDelivered` AS `delivered`, + `t`.`isReceived` AS `received`, + `t`.`m3` AS `m3`, + `t`.`kg` AS `kg`, + `t`.`cargoSupplierFk` AS `cargoSupplierFk`, + `t`.`totalEntries` AS `totalEntries`, + `t`.`appointment` AS `appointment`, + `t`.`awbFk` AS `awbFk` +FROM `vn`.`travel` `t` diff --git a/db/routines/vn2008/views/v_Articles_botanical.sql b/db/routines/vn2008/views/v_Articles_botanical.sql new file mode 100644 index 000000000..8640bb638 --- /dev/null +++ b/db/routines/vn2008/views/v_Articles_botanical.sql @@ -0,0 +1,15 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`v_Articles_botanical` +AS SELECT `ib`.`itemFk` AS `itemFk`, + concat(`g`.`name`, ' ', IFNULL(`s`.`name`, '')) AS `ediBotanic` +FROM ( + ( + ( + `vn`.`itemBotanical` `ib` + LEFT JOIN `vn`.`genus` `g` ON(`g`.`id` = `ib`.`genusFk`) + ) + LEFT JOIN `vn`.`specie` `s` ON(`s`.`id` = `ib`.`specieFk`) + ) + LEFT JOIN `vn`.`ediSpecie` `es` ON(`es`.`id` = `ib`.`specieFk`) + ) diff --git a/db/routines/vn2008/views/v_compres.sql b/db/routines/vn2008/views/v_compres.sql new file mode 100644 index 000000000..8bd6a4a64 --- /dev/null +++ b/db/routines/vn2008/views/v_compres.sql @@ -0,0 +1,90 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`v_compres` +AS SELECT `TP`.`Id_Tipo` AS `Familia`, + `RN`.`id` AS `reino_id`, + `C`.`Id_Compra` AS `Id_Compra`, + `C`.`Id_Entrada` AS `Id_Entrada`, + `C`.`Id_Article` AS `Id_Article`, + `C`.`Cantidad` AS `Cantidad`, + `C`.`Costefijo` AS `Costefijo`, + `C`.`Portefijo` AS `Portefijo`, + `C`.`Novincular` AS `Novincular`, + `C`.`Etiquetas` AS `Etiquetas`, + `C`.`Packing` AS `Packing`, + `C`.`grouping` AS `grouping`, + `C`.`Comisionfija` AS `Comisionfija`, + `C`.`Embalajefijo` AS `Embalajefijo`, + `C`.`Id_Cubo` AS `Id_Cubo`, + `C`.`Tarifa1` AS `Tarifa1`, + `C`.`Tarifa2` AS `Tarifa2`, + `C`.`Tarifa3` AS `Tarifa3`, + `C`.`PVP` AS `PVP`, + `C`.`Vida` AS `Vida`, + `C`.`Id_Trabajador` AS `Id_Trabajador`, + `C`.`punteo` AS `punteo`, + `C`.`odbc_date` AS `odbc_date`, + `E`.`Inventario` AS `Inventario`, + `E`.`Id_Proveedor` AS `Id_Proveedor`, + `E`.`Fecha` AS `Fecha`, + `E`.`Confirmada` AS `Confirmada`, + `E`.`Redada` AS `Redada`, + `E`.`empresa_id` AS `empresa_id`, + `E`.`travel_id` AS `travel_id`, + `E`.`Pedida` AS `Pedida`, + `E`.`recibida_id` AS `recibida_id`, + `TR`.`id` AS `id`, + `TR`.`shipment` AS `shipment`, + `TR`.`landing` AS `landing`, + `TR`.`warehouse_id` AS `warehouse_id`, + `TR`.`warehouse_id_out` AS `warehouse_id_out`, + `TR`.`agency_id` AS `agency_id`, + `TR`.`ref` AS `ref`, + `TR`.`delivered` AS `delivered`, + `TR`.`received` AS `received`, + `A`.`Article` AS `Article`, + `A`.`Medida` AS `Medida`, + `A`.`Tallos` AS `Tallos`, + `C`.`caja` AS `caja`, + `A`.`Categoria` AS `Categoria`, + `A`.`id_origen` AS `id_origen`, + `TP`.`Id_Tipo` AS `Tipo`, + `A`.`tipo_id` AS `tipo_id`, + `A`.`Color` AS `Color`, + `A`.`Min` AS `Min`, + `C`.`Costefijo` + `C`.`Embalajefijo` + `C`.`Comisionfija` + `C`.`Portefijo` AS `Coste`, + `W_OUT`.`isFeedStock` AS `fuente`, + IF( + `cb`.`Volumen` > 0, + `cb`.`Volumen`, + `cb`.`X` * `cb`.`Y` * IF(`cb`.`Z` = 0, `A`.`Medida` + 10, `cb`.`Z`) + ) * `C`.`Etiquetas` AS `cm3`, + `A`.`producer_id` AS `producer_id` +FROM ( + ( + ( + ( + ( + ( + ( + ( + `vn2008`.`Compres` `C` + JOIN `vn2008`.`Entradas` `E` ON(`C`.`Id_Entrada` = `E`.`Id_Entrada`) + ) + JOIN `vn2008`.`travel` `TR` ON(`TR`.`id` = `E`.`travel_id`) + ) + JOIN `vn`.`warehouse` `W_IN` ON(`W_IN`.`id` = `TR`.`warehouse_id`) + ) + JOIN `vn`.`warehouse` `W_OUT` ON(`W_OUT`.`id` = `TR`.`warehouse_id_out`) + ) + JOIN `vn2008`.`Articles` `A` ON(`C`.`Id_Article` = `A`.`Id_Article`) + ) + JOIN `vn2008`.`Tipos` `TP` ON(`A`.`tipo_id` = `TP`.`tipo_id`) + ) + JOIN `vn2008`.`reinos` `RN` ON(`RN`.`id` = `TP`.`reino_id`) + ) + JOIN `vn2008`.`Cubos` `cb` ON(`cb`.`Id_Cubo` = `C`.`Id_Cubo`) + ) +WHERE `W_IN`.`isFeedStock` = 0 + AND `E`.`Inventario` = 0 + AND `E`.`Redada` = 0 diff --git a/db/routines/vn2008/views/v_empresa.sql b/db/routines/vn2008/views/v_empresa.sql new file mode 100644 index 000000000..5a6d6e0f5 --- /dev/null +++ b/db/routines/vn2008/views/v_empresa.sql @@ -0,0 +1,25 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`v_empresa` +AS SELECT `e`.`logo` AS `logo`, + `e`.`id` AS `id`, + `e`.`registro` AS `registro`, + `e`.`gerente_id` AS `gerente_id`, + `e`.`alta` AS `alta`, + `t`.`Nombre` AS `Nombre`, + `t`.`Apellidos` AS `Apellidos`, + `p`.`Proveedor` AS `Proveedor`, + `p`.`Domicilio` AS `Domicilio`, + `p`.`codpos` AS `CP`, + `p`.`Localidad` AS `Localidad`, + `p`.`NIF` AS `NIF`, + `p`.`Telefono` AS `Telefono`, + `p`.`Alias` AS `Alias`, + `e`.`abbreviation` AS `abbreviation` +FROM ( + ( + `vn2008`.`empresa` `e` + JOIN `vn2008`.`Trabajadores` `t` ON(`t`.`Id_Trabajador` = `e`.`gerente_id`) + ) + JOIN `vn2008`.`Proveedores` `p` ON(`p`.`Id_Proveedor` = `e`.`id`) + ) diff --git a/db/routines/vn2008/views/versiones.sql b/db/routines/vn2008/views/versiones.sql new file mode 100644 index 000000000..3d27f4f92 --- /dev/null +++ b/db/routines/vn2008/views/versiones.sql @@ -0,0 +1,8 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`versiones` +AS SELECT `m`.`app` AS `programa`, + `m`.`version` AS `version`, + 0 AS `critical` +FROM `vn`.`mdbVersion` `m` +WHERE `m`.`branchFk` = 'master' \ No newline at end of file diff --git a/db/routines/vn2008/views/warehouse_pickup.sql b/db/routines/vn2008/views/warehouse_pickup.sql new file mode 100644 index 000000000..c3a7268a1 --- /dev/null +++ b/db/routines/vn2008/views/warehouse_pickup.sql @@ -0,0 +1,9 @@ + +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`warehouse_pickup` +AS SELECT + `wp`.`warehouseFk` AS `warehouse_id`, + `wp`.`agencyModeFk` AS `agency_id` +FROM + `vn`.`warehousePickup` `wp`; \ No newline at end of file diff --git a/db/tests.js b/db/tests.js deleted file mode 100644 index 74ea9a80b..000000000 --- a/db/tests.js +++ /dev/null @@ -1,39 +0,0 @@ -process.on('warning', warning => { - console.log(warning.name); - console.log(warning.message); - console.log(warning.stack); -}); - -let verbose = false; - -if (process.argv[2] === '--v') - verbose = true; - -let app = require(`vn-loopback/server/server`); -app.boot(); -loopbackApp = 'vn-loopback/server/server'; - -let Jasmine = require('jasmine'); -let jasmine = new Jasmine(); -let SpecReporter = require('jasmine-spec-reporter').SpecReporter; - -let serviceSpecs = [ - './tests/**/*[sS]pec.js' -]; - -jasmine.loadConfig({ - spec_dir: 'db', - spec_files: serviceSpecs, - helpers: [] -}); - -jasmine.addReporter(new SpecReporter({ - spec: { - // displayStacktrace: 'summary', - displaySuccessful: verbose, - displayFailedSpec: true, - displaySpecDuration: true - } -})); - -jasmine.execute(); diff --git a/db/tests/cache/last_buy_refresh.spec.js b/db/tests/cache/last_buy_refresh.spec.js deleted file mode 100644 index 71a9c3872..000000000 --- a/db/tests/cache/last_buy_refresh.spec.js +++ /dev/null @@ -1,42 +0,0 @@ -const app = require(`${loopbackApp}`); -const ParameterizedSQL = require('loopback-connector').ParameterizedSQL; - -describe('last_buy_refresh()', () => { - it(`should store some data on cache.last_buy`, async() => { - const stmts = []; - - stmts.push('START TRANSACTION'); - - const lastBuyTableIndex = stmts.push(`SELECT * FROM cache.last_buy ORDER BY item_id ASC`) - 1; - - stmts.push('ROLLBACK'); - - const sql = ParameterizedSQL.join(stmts, ';'); - const result = await app.models.Ticket.rawStmt(sql); - - const lastBuyTable = result[lastBuyTableIndex]; - - expect(lastBuyTable.length).toEqual(12); - - expect(lastBuyTable[0].item_id).toEqual(1); - expect(lastBuyTable[1].item_id).toEqual(1); - expect(lastBuyTable[2].item_id).toEqual(1); - expect(lastBuyTable[3].item_id).toEqual(2); - expect(lastBuyTable[4].item_id).toEqual(2); - expect(lastBuyTable[5].item_id).toEqual(3); - - expect(lastBuyTable[0].warehouse_id).toEqual(1); - expect(lastBuyTable[1].warehouse_id).toEqual(3); - expect(lastBuyTable[2].warehouse_id).toEqual(5); - expect(lastBuyTable[3].warehouse_id).toEqual(1); - expect(lastBuyTable[4].warehouse_id).toEqual(5); - expect(lastBuyTable[5].warehouse_id).toEqual(1); - - expect(lastBuyTable[1].buy_id).toEqual(10); - expect(lastBuyTable[0].buy_id).toEqual(3); - expect(lastBuyTable[2].buy_id).toEqual(13); - expect(lastBuyTable[3].buy_id).toEqual(4); - expect(lastBuyTable[4].buy_id).toEqual(14); - expect(lastBuyTable[5].buy_id).toEqual(5); - }); -}); diff --git a/db/tests/vn/buyUltimate.spec.js b/db/tests/vn/buyUltimate.spec.js deleted file mode 100644 index 4c98945c1..000000000 --- a/db/tests/vn/buyUltimate.spec.js +++ /dev/null @@ -1,55 +0,0 @@ -const app = require('vn-loopback/server/server'); -const ParameterizedSQL = require('loopback-connector').ParameterizedSQL; - -describe('buyUltimate()', () => { - const today = Date.vnNew(); - it(`should create buyUltimate temporal table and update it's values`, async() => { - let stmts = []; - let stmt; - - stmts.push('START TRANSACTION'); - - let params = { - warehouseFk: 1, - date: today - }; - - stmt = new ParameterizedSQL('CALL vn.buyUltimate(?, ?)', [ - params.warehouseFk, - params.date - ]); - stmts.push(stmt); - - let buyUltimateTableIndex = stmts.push(`SELECT * FROM tmp.buyUltimate ORDER BY itemFk ASC`) - 1; - - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - let result = await app.models.Ticket.rawStmt(sql); - - let buyUltimateTable = result[buyUltimateTableIndex]; - - expect(buyUltimateTable.length).toEqual(6); - - expect(buyUltimateTable[0].itemFk).toEqual(1); - expect(buyUltimateTable[1].itemFk).toEqual(2); - expect(buyUltimateTable[2].itemFk).toEqual(3); - expect(buyUltimateTable[3].itemFk).toEqual(4); - expect(buyUltimateTable[4].itemFk).toEqual(8); - expect(buyUltimateTable[5].itemFk).toEqual(9); - - expect(buyUltimateTable[0].warehouseFk).toEqual(1); - expect(buyUltimateTable[1].warehouseFk).toEqual(1); - expect(buyUltimateTable[2].warehouseFk).toEqual(1); - expect(buyUltimateTable[3].warehouseFk).toEqual(1); - expect(buyUltimateTable[4].warehouseFk).toEqual(1); - expect(buyUltimateTable[5].warehouseFk).toEqual(1); - - expect(buyUltimateTable[1].buyFk).toEqual(4); - expect(buyUltimateTable[0].buyFk).toEqual(3); - expect(buyUltimateTable[2].buyFk).toEqual(5); - expect(buyUltimateTable[3].buyFk).toEqual(9); - expect(buyUltimateTable[4].buyFk).toEqual(6); - expect(buyUltimateTable[5].buyFk).toEqual(7); - }); -}); diff --git a/db/tests/vn/buyUltimateFromInterval.spec.js b/db/tests/vn/buyUltimateFromInterval.spec.js deleted file mode 100644 index 7a4a79d47..000000000 --- a/db/tests/vn/buyUltimateFromInterval.spec.js +++ /dev/null @@ -1,132 +0,0 @@ -const app = require('vn-loopback/server/server'); -const ParameterizedSQL = require('loopback-connector').ParameterizedSQL; - -describe('buyUltimateFromInterval()', () => { - let today; - let future; - beforeAll(() => { - let now = Date.vnNew(); - now.setHours(0, 0, 0, 0); - today = now; - - let futureDate = new Date(now); - let futureMonth = now.getMonth() + 1; - futureDate.setMonth(futureMonth); - future = futureDate; - }); - - it(`should create a temporal table with it's data`, async() => { - let stmts = []; - let stmt; - - stmts.push('START TRANSACTION'); - - let params = { - warehouseFk: 1, - started: today, - ended: today - }; - - stmt = new ParameterizedSQL('CALL vn.buyUltimateFromInterval(?, ?, ?)', [ - params.warehouseFk, - params.started, - params.ended - ]); - stmts.push(stmt); - - let buyUltimateFromIntervalTableIndex = stmts.push(`SELECT * FROM tmp.buyUltimateFromInterval`) - 1; - - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - let result = await app.models.Ticket.rawStmt(sql); - - let buyUltimateFromIntervalTable = result[buyUltimateFromIntervalTableIndex]; - - expect(buyUltimateFromIntervalTable.length).toEqual(2); - - expect(buyUltimateFromIntervalTable[0].itemFk).toEqual(1); - expect(buyUltimateFromIntervalTable[1].itemFk).toEqual(3); - - expect(buyUltimateFromIntervalTable[0].warehouseFk).toEqual(1); - expect(buyUltimateFromIntervalTable[1].warehouseFk).toEqual(1); - - expect(buyUltimateFromIntervalTable[0].buyFk).toEqual(3); - expect(buyUltimateFromIntervalTable[1].buyFk).toEqual(5); - - expect(buyUltimateFromIntervalTable[0].landed).toEqual(today); - expect(buyUltimateFromIntervalTable[1].landed).toEqual(today); - }); - - it(`should create a temporal table with it's data in which started value is assigned to ended`, async() => { - let params = { - warehouseFk: 1, - started: today, - ended: null - }; - - let query = ` - START TRANSACTION; - CALL vn.buyUltimateFromInterval(?, ?, ?); - SELECT * FROM tmp.buyUltimateFromInterval; - ROLLBACK;`; - - let result = await app.models.Ticket.rawSql(query, [ - params.warehouseFk, - params.started, - params.ended - ]); - - let buyUltimateFromIntervalTable = result[2]; - - expect(buyUltimateFromIntervalTable.length).toEqual(2); - - expect(buyUltimateFromIntervalTable[0].itemFk).toEqual(1); - expect(buyUltimateFromIntervalTable[1].itemFk).toEqual(3); - - expect(buyUltimateFromIntervalTable[0].warehouseFk).toEqual(1); - expect(buyUltimateFromIntervalTable[1].warehouseFk).toEqual(1); - - expect(buyUltimateFromIntervalTable[0].buyFk).toEqual(3); - expect(buyUltimateFromIntervalTable[1].buyFk).toEqual(5); - - expect(buyUltimateFromIntervalTable[0].landed).toEqual(today); - expect(buyUltimateFromIntervalTable[1].landed).toEqual(today); - }); - - it(`should create a temporal table with it's data in which ended value is a date in the future`, async() => { - let params = { - warehouseFk: 1, - started: today, - ended: future - }; - - let query = ` - START TRANSACTION; - CALL vn.buyUltimateFromInterval(?, ?, ?); - SELECT * FROM tmp.buyUltimateFromInterval; - ROLLBACK;`; - - let result = await app.models.Ticket.rawSql(query, [ - params.warehouseFk, - params.started, - params.ended - ]); - - let buyUltimateFromIntervalTable = result[2]; - - expect(buyUltimateFromIntervalTable.length).toEqual(2); - - expect(buyUltimateFromIntervalTable[0].itemFk).toEqual(1); - expect(buyUltimateFromIntervalTable[1].itemFk).toEqual(3); - - expect(buyUltimateFromIntervalTable[0].warehouseFk).toEqual(1); - expect(buyUltimateFromIntervalTable[1].warehouseFk).toEqual(1); - - expect(buyUltimateFromIntervalTable[0].buyFk).toEqual(3); - expect(buyUltimateFromIntervalTable[1].buyFk).toEqual(5); - - expect(buyUltimateFromIntervalTable[0].landed).toEqual(today); - expect(buyUltimateFromIntervalTable[1].landed).toEqual(today); - }); -}); diff --git a/db/tests/vn/item_getBalance.spec.js b/db/tests/vn/item_getBalance.spec.js deleted file mode 100644 index 74e1e6659..000000000 --- a/db/tests/vn/item_getBalance.spec.js +++ /dev/null @@ -1,31 +0,0 @@ -const app = require('vn-loopback/server/server'); -const ParameterizedSQL = require('loopback-connector').ParameterizedSQL; - -describe('item_getBalance()', () => { - it(`should return the item balance ordered by alert level`, async() => { - let stmts = []; - - let params = { - itemFk: 1, - warehouseFk: 1 - }; - - const conn = await app.models.Item.dataSource.connector; - - stmts.push(new ParameterizedSQL('CALL vn.item_getBalance(?, ?, NULL)', [ - params.warehouseFk, - params.itemFk - ])); - - let sql = ParameterizedSQL.join(stmts, ';'); - let result = await conn.executeStmt(sql); - let itemBalance = result[0]; - - expect(itemBalance[0].alertLevel).toBeGreaterThanOrEqual(itemBalance[1].alertLevel); - expect(itemBalance[1].alertLevel).toBeGreaterThanOrEqual(itemBalance[2].alertLevel); - expect(itemBalance[2].alertLevel).toBeGreaterThanOrEqual(itemBalance[3].alertLevel); - expect(itemBalance[3].alertLevel).toBeGreaterThanOrEqual(itemBalance[4].alertLevel); - expect(itemBalance[4].alertLevel).toBeGreaterThanOrEqual(itemBalance[5].alertLevel); - expect(itemBalance[5].alertLevel).toBeGreaterThanOrEqual(itemBalance[6].alertLevel); - }); -}); diff --git a/db/tests/vn/ticketCalculateClon.spec.js b/db/tests/vn/ticketCalculateClon.spec.js deleted file mode 100644 index 9116d805f..000000000 --- a/db/tests/vn/ticketCalculateClon.spec.js +++ /dev/null @@ -1,107 +0,0 @@ -const app = require('vn-loopback/server/server'); -const ParameterizedSQL = require('loopback-connector').ParameterizedSQL; - -describe('ticket ticketCalculateClon()', () => { - const today = Date.vnNew(); - it('should add the ticket to the order containing the original ticket', async() => { - let stmts = []; - let stmt; - - stmts.push('START TRANSACTION'); - - let params = { - clientFk: 1101, - shipped: today, - warehouseFk: 1, - companyFk: 442, - addressFk: 121, - agencyType: 23, - routeFk: 1, - landed: today, - userId: 21, - originalTicketId: 11 - }; - - stmt = new ParameterizedSQL('CALL vn.ticket_add(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, @result)', [ - params.clientFk, - params.shipped, - params.warehouseFk, - params.companyFk, - params.addressFk, - params.agencyType, - params.routeFk, - params.landed, - params.userId, - true - ]); - stmts.push(stmt); - - stmt = new ParameterizedSQL('CALL vn.ticketCalculateClon(@result, ?)', [params.originalTicketId]); - stmts.push(stmt); - - let orderIndex = stmts.push(`SELECT * FROM vn.orderTicket WHERE ticketFk = @result`) - 1; - - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - let result = await app.models.Ticket.rawStmt(sql); - - let expectedOrder = 11; - let newestTicketIdInFixtures = 21; - - expect(result[orderIndex][0].orderFk).toEqual(expectedOrder); - expect(result[orderIndex][0].ticketFk).toBeGreaterThan(newestTicketIdInFixtures); - }); - - it('should add the ticket to the order containing the original ticket and generate landed value if it was null', async() => { - let stmts = []; - let stmt; - - stmts.push('START TRANSACTION'); - - let params = { - clientFk: 1101, - shipped: today, - warehouseFk: 1, - companyFk: 442, - addressFk: 121, - agencyType: 23, - routeFk: 1, - landed: null, - userId: 21, - originalTicketId: 11 - }; - - stmt = new ParameterizedSQL('CALL vn.ticket_add(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, @result)', [ - params.clientFk, - params.shipped, - params.warehouseFk, - params.companyFk, - params.addressFk, - params.agencyType, - params.routeFk, - params.landed, - params.userId, - true - ]); - stmts.push(stmt); - - stmt = new ParameterizedSQL('CALL vn.ticketCalculateClon(@result, ?)', [params.originalTicketId]); - stmts.push(stmt); - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - - let error; - - try { - await app.models.Ticket.rawStmt(sql); - } catch (e) { - error = e; - } - - expect(error).toBeDefined(); - expect(error.statusCode).toBe(500); - expect(error.code).toBe('ER_SIGNAL_EXCEPTION'); - }); -}); diff --git a/db/tests/vn/ticketComponentUpdateSale.spec.js b/db/tests/vn/ticketComponentUpdateSale.spec.js deleted file mode 100644 index 9e252200b..000000000 --- a/db/tests/vn/ticketComponentUpdateSale.spec.js +++ /dev/null @@ -1,294 +0,0 @@ -const app = require('vn-loopback/server/server'); -const ParameterizedSQL = require('loopback-connector').ParameterizedSQL; - -describe('ticketComponentUpdateSale()', () => { - it(`should update the sale price when option ONE using the base components and reclaculate only the ones with isRenewable TRUE`, async() => { - let stmts = []; - let stmt; - - let params = { - warehouseFk: 1, - ticketFk: 13 - }; - - stmts.push('START TRANSACTION'); - - stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.sale'); - - // createSaleTempTable code comes from vn.ticketComponentUpdate procedure - let createSaleTempTable = ` - CREATE TEMPORARY TABLE tmp.sale - (PRIMARY KEY (saleFk)) - ENGINE = MEMORY - SELECT id AS saleFk, ? warehouseFk - FROM sale s WHERE s.ticketFk = ? - `; - - stmt = new ParameterizedSQL(createSaleTempTable, [ - params.warehouseFk, - params.ticketFk - ]); - stmts.push(stmt); - - stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponent'); - - // createTicketComponentTable code comes partially from vn.ticketComponenetCalculate procedure - let createTicketComponentTable = ` - CREATE TEMPORARY TABLE tmp.ticketComponent ( - warehouseFk INT UNSIGNED NOT NULL, - itemFk INT NOT NULL, - componentFk INT UNSIGNED NOT NULL, - cost DECIMAL(10,4) NOT NULL, - INDEX itemWarehouse USING BTREE (itemFk ASC, warehouseFk ASC), - UNIQUE INDEX itemWarehouseComponent (itemFk ASC, warehouseFk ASC, componentFk ASC)) - `; - - stmts.push(createTicketComponentTable); - - let insertTicketComponentTable = ` - INSERT INTO tmp.ticketComponent (warehouseFk, itemFk, componentFk, cost) - VALUES - (1 , 4 , 15 , 999.00), - (1 , 4 , 17 , 2.00), - (1 , 4 , 22 , 999.00), - (1 , 4 , 28 , 1.00), - (1 , 4 , 29 , 2.00), - (1 , 4 , 32 , 999.00), - (1 , 4 , 39 , 1.00) - `; - - stmts.push(insertTicketComponentTable); - - let updateComponentTwentyNine = ` - UPDATE vn.saleComponent - SET value = '5' - WHERE saleFk = 26 AND componentFk = 29 - `; - - stmts.push(updateComponentTwentyNine); - - let updateComponentTwentyEight = ` - UPDATE vn.saleComponent - SET value = '5' - WHERE saleFk = 26 AND componentFk = 28 - `; - - stmts.push(updateComponentTwentyEight); - - let priceFixtedToZero = ` - UPDATE vn.sale - SET priceFixed = 0 - WHERE id = 26 - `; - - stmts.push(priceFixtedToZero); - - let firstSalePriceIndexBefore = stmts.push('SELECT price FROM vn.sale WHERE id = 26') - 1; - - stmts.push('CALL vn.ticketComponentUpdateSale(1)'); - - let firstSalePriceIndexAfter = stmts.push('SELECT price FROM vn.sale WHERE id = 26') - 1; - - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - let result = await app.models.Ticket.rawStmt(sql); - - expect(result[firstSalePriceIndexBefore][0].price).toEqual(1.72); - expect(result[firstSalePriceIndexAfter][0].price).toEqual(1005); - }); - - it(`should keep the sale price when option TWO using the base components and save the difference in a new component`, async() => { - let stmts = []; - let stmt; - - let params = { - warehouseFk: 1, - ticketFk: 13 - }; - - stmts.push('START TRANSACTION'); - - stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.sale'); - - // createSaleTempTable code comes from vn.ticketComponentUpdate procedure - let createSaleTempTable = ` - CREATE TEMPORARY TABLE tmp.sale - (PRIMARY KEY (saleFk)) - ENGINE = MEMORY - SELECT id AS saleFk, ? warehouseFk - FROM sale s WHERE s.ticketFk = ? - `; - - stmt = new ParameterizedSQL(createSaleTempTable, [ - params.warehouseFk, - params.ticketFk - ]); - stmts.push(stmt); - - stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponent'); - - // createTicketComponentTable code comes partially from vn.ticketComponenetCalculate procedure - let createTicketComponentTable = ` - CREATE TEMPORARY TABLE tmp.ticketComponent ( - warehouseFk INT UNSIGNED NOT NULL, - itemFk INT NOT NULL, - componentFk INT UNSIGNED NOT NULL, - cost DECIMAL(10,4) NOT NULL, - INDEX itemWarehouse USING BTREE (itemFk ASC, warehouseFk ASC), - UNIQUE INDEX itemWarehouseComponent (itemFk ASC, warehouseFk ASC, componentFk ASC)) - `; - - stmts.push(createTicketComponentTable); - - let insertTicketComponentTable = ` - INSERT INTO tmp.ticketComponent (warehouseFk, itemFk, componentFk, cost) - VALUES - (1 , 4 , 15 , 999.00), - (1 , 4 , 17 , 2.00), - (1 , 4 , 22 , 999.00), - (1 , 4 , 28 , 1.00), - (1 , 4 , 29 , 2.00), - (1 , 4 , 32 , 999.00), - (1 , 4 , 39 , 1.00) - `; - - stmts.push(insertTicketComponentTable); - - let updateComponentTwentyNine = ` - UPDATE vn.saleComponent - SET value = '5' - WHERE saleFk = 26 AND componentFk = 29 - `; - - stmts.push(updateComponentTwentyNine); - - let updateComponentTwentyEight = ` - UPDATE vn.saleComponent - SET value = '5' - WHERE saleFk = 26 AND componentFk = 28 - `; - - stmts.push(updateComponentTwentyEight); - - let priceFixtedToZero = ` - UPDATE vn.sale - SET priceFixed = 0 - WHERE id = 26 - `; - - stmts.push(priceFixtedToZero); - - let firstSalePriceIndexBefore = stmts.push('SELECT price FROM vn.sale WHERE id = 26') - 1; - - stmts.push('CALL vn.ticketComponentUpdateSale(2)'); - - let addedComponentIndex = stmts.push('SELECT * FROM vn.saleComponent WHERE saleFk = 26 AND componentFk = 17') - 1; - let firstSalePriceIndexAfter = stmts.push('SELECT price FROM vn.sale WHERE id = 26') - 1; - - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - let result = await app.models.Ticket.rawStmt(sql); - - expect(result[addedComponentIndex][0].value).toEqual(-1003.28); - expect(result[firstSalePriceIndexBefore][0].price).toEqual(result[firstSalePriceIndexAfter][0].price); - }); - - it(`should not change the sale price when option SEVEN, instead it stores 80% and 20% of the price in two components and any price difference in a third one`, async() => { - let stmts = []; - let stmt; - - let params = { - warehouseFk: 1, - ticketFk: 1 - }; - - stmts.push('START TRANSACTION'); - - stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.sale'); - - // createSaleTempTable code comes from vn.ticketComponentUpdate procedure - let createSaleTempTable = ` - CREATE TEMPORARY TABLE tmp.sale - (PRIMARY KEY (saleFk)) - ENGINE = MEMORY - SELECT id AS saleFk, ? warehouseFk - FROM sale s WHERE s.ticketFk = ? - `; - - stmt = new ParameterizedSQL(createSaleTempTable, [ - params.warehouseFk, - params.ticketFk - ]); - stmts.push(stmt); - - stmts.push('DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponent'); - - // createTicketComponentTable code comes partially from vn.ticketComponenetCalculate procedure - let createTicketComponentTable = ` - CREATE TEMPORARY TABLE tmp.ticketComponent ( - warehouseFk INT UNSIGNED NOT NULL, - itemFk INT NOT NULL, - componentFk INT UNSIGNED NOT NULL, - cost DECIMAL(10,4) NOT NULL, - INDEX itemWarehouse USING BTREE (itemFk ASC, warehouseFk ASC), - UNIQUE INDEX itemWarehouseComponent (itemFk ASC, warehouseFk ASC, componentFk ASC)) - `; - - stmts.push(createTicketComponentTable); - - let insertTicketComponentTable = ` - INSERT INTO tmp.ticketComponent (warehouseFk, itemFk, componentFk, cost) - VALUES - (1 , 2 , 29 , 999.00), - (1 , 2 , 28 , 2.00), - (1 , 4 , 29 , 999.00), - (1 , 4 , 28 , 1.00) - `; - - stmts.push(insertTicketComponentTable); - - let updateComponentTwentyEight = ` - UPDATE vn.saleComponent - SET value = '5' - WHERE saleFk = 1 AND componentFk = 28 - `; - - stmts.push(updateComponentTwentyEight); - - let updateComponentTwentyNine = ` - UPDATE vn.saleComponent - SET value = '5' - WHERE saleFk = 1 AND componentFk = 29 - `; - - stmts.push(updateComponentTwentyNine); - - let priceFixtedToZero = ` - UPDATE vn.sale - SET priceFixed = 0 - WHERE id = 1 - `; - - stmts.push(priceFixtedToZero); - - let firstSalePriceIndexBefore = stmts.push('SELECT price FROM vn.sale WHERE id = 1') - 1; - - stmts.push('CALL vn.ticketComponentUpdateSale(7)'); - - let componentTwentyEightIndex = stmts.push('SELECT * FROM vn.saleComponent WHERE saleFk = 1 AND componentFk = 28') - 1; - let componentTwentyNineIndex = stmts.push('SELECT * FROM vn.saleComponent WHERE saleFk = 1 AND componentFk = 29') - 1; - let firstSalePriceIndexAfter = stmts.push('SELECT price FROM vn.sale WHERE id = 1') - 1; - - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - let result = await app.models.Ticket.rawStmt(sql); - - expect(result[componentTwentyEightIndex][0].value).toEqual(79.517); - expect(result[componentTwentyNineIndex][0].value).toEqual(19.879); - expect(result[firstSalePriceIndexBefore][0].price).toEqual(result[firstSalePriceIndexAfter][0].price); - }); -}); - diff --git a/db/tests/vn/ticketCreateWithUser.spec.js b/db/tests/vn/ticketCreateWithUser.spec.js deleted file mode 100644 index 5dd84d397..000000000 --- a/db/tests/vn/ticketCreateWithUser.spec.js +++ /dev/null @@ -1,203 +0,0 @@ -const app = require('vn-loopback/server/server'); -const ParameterizedSQL = require('loopback-connector').ParameterizedSQL; - -describe('ticket ticket_add()', () => { - const today = Date.vnNew(); - it('should confirm the procedure creates the expected ticket', async() => { - let stmts = []; - let stmt; - - stmts.push('START TRANSACTION'); - - let params = { - clientFk: 1101, - shipped: today, - warehouseFk: 1, - companyFk: 442, - addressFk: 121, - agencyModeFk: 1, - routeFk: null, - landed: today, - userId: 18 - }; - - stmt = new ParameterizedSQL(`CALL vn.ticket_add(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, @newTicketId)`, [ - params.clientFk, - params.shipped, - params.warehouseFk, - params.companyFk, - params.addressFk, - params.agencyModeFk, - params.routeFk, - params.landed, - params.userId, - true - ]); - stmts.push(stmt); - - let ticketResultIndex = stmts.push(`SELECT * FROM vn.ticket WHERE id = @newTicketId`) - 1; - - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - let result = await app.models.Ticket.rawStmt(sql); - - let ticketResult = result[ticketResultIndex][0]; - - expect(ticketResult.id).toBeGreaterThan(21); - expect(ticketResult.clientFk).toEqual(params.clientFk); - expect(ticketResult.warehouseFk).toEqual(params.warehouseFk); - expect(ticketResult.companyFk).toEqual(params.companyFk); - expect(ticketResult.addressFk).toEqual(params.addressFk); - expect(ticketResult.agencyModeFk).toEqual(params.agencyModeFk); - expect(ticketResult.routeFk).toEqual(params.routeFk); - }); - - it('should confirm the procedure creates the expected observations in the ticket', async() => { - let stmts = []; - let stmt; - - stmts.push('START TRANSACTION'); - - let params = { - clientFk: 1101, - shipped: today, - warehouseFk: 1, - companyFk: 442, - addressFk: 121, - agencyModeFk: 1, - routeFk: null, - landed: today, - userId: 18 - }; - - stmt = new ParameterizedSQL('CALL vn.ticket_add(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, @newTicketId)', [ - params.clientFk, - params.shipped, - params.warehouseFk, - params.companyFk, - params.addressFk, - params.agencyModeFk, - params.routeFk, - params.landed, - params.userId, - true - ]); - stmts.push(stmt); - - let ticketObsevationsIndex = stmts.push(`SELECT * FROM vn.ticketObservation WHERE ticketFk = @newTicketId`) - 1; - - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - let result = await app.models.Ticket.rawStmt(sql); - - let firstTicketObservation = result[ticketObsevationsIndex][0]; - let secondTicketObservation = result[ticketObsevationsIndex][1]; - let thirdTicketObservation = result[ticketObsevationsIndex][2]; - - expect(firstTicketObservation.observationTypeFk).toEqual(1); - expect(firstTicketObservation.description).toEqual('under the floor'); - expect(secondTicketObservation.observationTypeFk).toEqual(2); - expect(secondTicketObservation.description).toEqual('wears leather and goes out at night'); - expect(thirdTicketObservation.observationTypeFk).toEqual(3); - expect(thirdTicketObservation.description).toEqual('care with the dog'); - }); - - it('should confirm the procedure sets address if it received it null', async() => { - let stmts = []; - let stmt; - - stmts.push('START TRANSACTION'); - - let params = { - clientFk: 1101, - shipped: today, - warehouseFk: 1, - companyFk: 442, - addressFk: 0, - agencyModeFk: 1, - routeFk: null, - landed: today, - userId: 18 - }; - - stmt = new ParameterizedSQL(`CALL vn.ticket_add(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, @newTicketId)`, [ - params.clientFk, - params.shipped, - params.warehouseFk, - params.companyFk, - params.addressFk, - params.agencyModeFk, - params.routeFk, - params.landed, - params.userId, - true - ]); - - stmts.push(stmt); - - let ticketAddressIndex = stmts.push(`SELECT addressFk FROM vn.ticket WHERE id = @newTicketId`) - 1; - - stmt = new ParameterizedSQL(`SELECT id FROM vn.address WHERE clientFk = ? AND isDefaultAddress = 1`, [ - params.clientFk, - ]); - let clientDefaultAddressIndex = stmts.push(stmt) - 1; - stmts.push('ROLLBACK'); - let sql = ParameterizedSQL.join(stmts, ';'); - let result = await app.models.Ticket.rawStmt(sql); - let ticketAddress = result[ticketAddressIndex][0]; - let clientDefaultAddress = result[clientDefaultAddressIndex][0]; - - expect(ticketAddress.addressFk).toEqual(clientDefaultAddress.id); - }); - - it('should confirm the procedure creates the state as delivered if the client has isCreatedAsServed TRUE', async() => { - let stmts = []; - let stmt; - - stmts.push('START TRANSACTION'); - - let params = { - clientFk: 1101, - shipped: today, - warehouseFk: 1, - companyFk: 442, - addressFk: 121, - agencyModeFk: 1, - routeFk: null, - landed: today, - userId: 18 - }; - - stmt = new ParameterizedSQL(`UPDATE vn.client SET isCreatedAsServed = 1 WHERE id = ?`, [ - params.clientFk, - ]); - stmts.push(stmt); - - stmt = new ParameterizedSQL(`CALL vn.ticket_add(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, @newTicketId)`, [ - params.clientFk, - params.shipped, - params.warehouseFk, - params.companyFk, - params.addressFk, - params.agencyModeFk, - params.routeFk, - params.landed, - params.userId, - true - ]); - stmts.push(stmt); - stmts.push(`select @newTicketId`); - let ticketStateCodeIndex = stmts.push(`SELECT code FROM vn.ticketState WHERE ticketFk = @newTicketId`) - 1; - - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - let result = await app.models.Ticket.rawStmt(sql); - - let ticketStateCode = result[ticketStateCodeIndex][0].code; - - expect(ticketStateCode).toEqual('FREE'); - }); -}); diff --git a/db/tests/vn/ticket_componentMakeUpdate.spec.js b/db/tests/vn/ticket_componentMakeUpdate.spec.js deleted file mode 100644 index a059f1060..000000000 --- a/db/tests/vn/ticket_componentMakeUpdate.spec.js +++ /dev/null @@ -1,123 +0,0 @@ -const app = require('vn-loopback/server/server'); -const ParameterizedSQL = require('loopback-connector').ParameterizedSQL; - -// 2277 solucionar problema al testear procedimiento con start transaction / rollback -xdescribe('ticket_componentMakeUpdate()', () => { - it('should recalculate the ticket components without make modifications', async() => { - let stmts = []; - let stmt; - - let params = { - ticketId: 11, - clientId: 1102, - agencyModeId: 2, - addressId: 122, - zoneId: 3, - warehouseId: 1, - companyId: 442, - isDeleted: 0, - hasToBeUnrouted: 0, - componentOption: 1 - }; - - stmts.push('START TRANSACTION'); - - stmt = new ParameterizedSQL('SELECT * FROM vn.ticket WHERE id = ?', [ - params.ticketId - ]); - stmts.push(stmt); - - let originalTicketIndex = stmts.push(stmt) - 1; - - stmt = new ParameterizedSQL('CALL vn.ticket_componentMakeUpdate(?, ?, ?, ?, ?, ?, ?, DATE_ADD(CURDATE(), INTERVAL +1 DAY), DATE_ADD(CURDATE(), INTERVAL +1 DAY), ?, ?, ?)', [ - params.ticketId, - params.clientId, - params.agencyModeId, - params.addressId, - params.zoneId, - params.warehouseId, - params.companyId, - params.isDeleted, - params.hasToBeUnrouted, - params.componentOption - ]); - stmts.push(stmt); - - stmt = new ParameterizedSQL('SELECT * FROM vn.ticket WHERE id = ?', [ - params.ticketId - ]); - stmts.push(stmt); - - let updatedTicketIndex = stmts.push(stmt) - 1; - - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - let result = await app.models.Ticket.rawStmt(sql); - - let originalTicketData = result[originalTicketIndex]; - let updatedTicketData = result[updatedTicketIndex]; - - expect(originalTicketData[0].isDeleted).toEqual(updatedTicketData[0].isDeleted); - expect(originalTicketData[0].routeFk).toEqual(updatedTicketData[0].routeFk); - }); - - it('should delete and unroute a ticket and recalculate the components', async() => { - let stmts = []; - let stmt; - - let params = { - ticketId: 11, - clientId: 1102, - agencyModeId: 2, - addressId: 122, - zoneId: 3, - warehouseId: 1, - companyId: 442, - isDeleted: 1, - hasToBeUnrouted: 1, - componentOption: 1 - }; - - stmts.push('START TRANSACTION'); - - stmt = new ParameterizedSQL('SELECT * FROM vn.ticket WHERE id = ?', [ - params.ticketId - ]); - stmts.push(stmt); - - let originalTicketIndex = stmts.push(stmt) - 1; - - stmt = new ParameterizedSQL('CALL vn.ticket_componentMakeUpdate(?, ?, ?, ?, ?, ?, ?, DATE_ADD(CURDATE(), INTERVAL +1 DAY), DATE_ADD(CURDATE(), INTERVAL +1 DAY), ?, ?, ?)', [ - params.ticketId, - params.clientId, - params.agencyModeId, - params.addressId, - params.zoneId, - params.warehouseId, - params.companyId, - params.isDeleted, - params.hasToBeUnrouted, - params.componentOption - ]); - stmts.push(stmt); - - stmt = new ParameterizedSQL('SELECT * FROM vn.ticket WHERE id = ?', [ - params.ticketId - ]); - stmts.push(stmt); - - let updatedTicketIndex = stmts.push(stmt) - 1; - - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - let result = await app.models.Ticket.rawStmt(sql); - - let originalTicketData = result[originalTicketIndex]; - let updatedTicketData = result[updatedTicketIndex]; - - expect(originalTicketData[0].isDeleted).not.toEqual(updatedTicketData[0].isDeleted); - expect(originalTicketData[0].routeFk).not.toEqual(updatedTicketData[0].routeFk); - }); -}); diff --git a/db/tests/vn/ticket_recalcComponents.spec.js b/db/tests/vn/ticket_recalcComponents.spec.js deleted file mode 100644 index 1256528e6..000000000 --- a/db/tests/vn/ticket_recalcComponents.spec.js +++ /dev/null @@ -1,62 +0,0 @@ -const app = require('vn-loopback/server/server'); -const ParameterizedSQL = require('loopback-connector').ParameterizedSQL; - -describe('ticket_recalcComponents()', () => { - it('should recalculate the components in a ticket and check it', async() => { - let stmts = []; - let stmt; - const ticketId = 11; - - stmts.push('START TRANSACTION'); - - let sales = await app.models.Sale.find({where: {ticketFk: ticketId}}); - - stmt = new ParameterizedSQL('UPDATE vn.sale SET price=100 WHERE id IN(?,?)', [ - sales[0].id, - sales[1].id - ]); - stmts.push(stmt); - - stmt = new ParameterizedSQL('SELECT * FROM vn.sale WHERE ticketFk = ?', [ - ticketId - ]); - stmts.push(stmt); - - let modifiedSales = stmts.push(stmt) - 1; - - stmt = new ParameterizedSQL('CALL vn.ticket_recalcComponents(?, NULL)', [ - ticketId, - ]); - stmts.push(stmt); - - stmt = new ParameterizedSQL('SELECT * FROM vn.sale WHERE ticketFk = ?', [ - ticketId - ]); - stmts.push(stmt); - - let expectedSales = stmts.push(stmt) - 1; - - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - let result = await app.models.Ticket.rawStmt(sql); - - // original data - const firstPrice = sales[0].price; - const secondPrice = sales[1].price; - - // alteratons for test purposes - const modifiedFirstPrice = result[modifiedSales][0].price; - const modifiedSecondPrice = result[modifiedSales][1].price; - - // expected data after recalc - const expectedSalesFirstPrice = result[expectedSales][0].price; - const expectedSalesSecondPrice = result[expectedSales][1].price; - - expect(firstPrice).not.toEqual(modifiedFirstPrice); - expect(secondPrice).not.toEqual(modifiedSecondPrice); - - expect(firstPrice).toEqual(expectedSalesFirstPrice); - expect(secondPrice).toEqual(expectedSalesSecondPrice); - }); -}); diff --git a/db/tests/vn/timeBusiness_calculateByUser.spec.js b/db/tests/vn/timeBusiness_calculateByUser.spec.js deleted file mode 100644 index 5fe51d8f8..000000000 --- a/db/tests/vn/timeBusiness_calculateByUser.spec.js +++ /dev/null @@ -1,40 +0,0 @@ -const app = require('vn-loopback/server/server'); -const ParameterizedSQL = require('loopback-connector').ParameterizedSQL; - -describe('timeBusiness_calculateByUser()', () => { - it('should return the expected hours for today', async() => { - let start = Date.vnNew(); - start.setHours(0, 0, 0, 0); - let end = Date.vnNew(); - end.setHours(0, 0, 0, 0); - - let stmts = []; - let stmt; - - stmts.push('START TRANSACTION'); - - let params = { - workerID: 1106, - start: start, - end: end - }; - - stmt = new ParameterizedSQL('CALL vn.timeBusiness_calculateByUser(?, ?, ?)', [ - params.workerID, - params.start, - params.end - ]); - stmts.push(stmt); - - let tableIndex = stmts.push('SELECT * FROM tmp.timeBusinessCalculate') - 1; - - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - let result = await app.models.Ticket.rawStmt(sql); - - let [timeBusinessCalculateTable] = result[tableIndex]; - - expect(timeBusinessCalculateTable.timeBusinessSeconds).toEqual(28800); - }); -}); diff --git a/db/tests/vn/timeControl_calculateByUser.spec.js b/db/tests/vn/timeControl_calculateByUser.spec.js deleted file mode 100644 index 0b385d2c9..000000000 --- a/db/tests/vn/timeControl_calculateByUser.spec.js +++ /dev/null @@ -1,91 +0,0 @@ -const app = require('vn-loopback/server/server'); -const ParameterizedSQL = require('loopback-connector').ParameterizedSQL; - -describe('timeControl_calculateByUser()', () => { - it(`should return today's worked hours`, async() => { - let start = Date.vnNew(); - start.setHours(0, 0, 0, 0); - start.setDate(start.getDate() - 1); - - let end = Date.vnNew(); - end.setHours(0, 0, 0, 0); - end.setDate(end.getDate() + 1); - - let stmts = []; - let stmt; - - let params = { - workerID: 1106, - start: start, - end: end - }; - - stmt = new ParameterizedSQL('CALL vn.timeControl_calculateByUser(?, ?, ?)', [ - params.workerID, - params.start, - params.end - ]); - stmts.push(stmt); - - let tableIndex = stmts.push('SELECT * FROM tmp.timeControlCalculate') - 1; - - let sql = ParameterizedSQL.join(stmts, ';'); - let result = await app.models.Ticket.rawStmt(sql); - - let [timeControlCalculateTable] = result[tableIndex]; - - expect(timeControlCalculateTable.timeWorkSeconds).toEqual(28200); - }); - // #2261 - xit(`should return the worked hours between last sunday and monday`, async() => { - let lastSunday = Date.vnNew(); - let daysSinceSunday = lastSunday.getDay(); - if (daysSinceSunday === 0) // this means today is sunday but you need the previous sunday :) - daysSinceSunday = 7; - lastSunday.setHours(23, 0, 0, 0); - lastSunday.setDate(lastSunday.getDate() - daysSinceSunday); - - let monday = Date.vnNew(); - let daysSinceMonday = daysSinceSunday - 1; // aiming for monday (today could be monday) - monday.setHours(7, 0, 0, 0); - monday.setDate(monday.getDate() - daysSinceMonday); - - let stmts = []; - let stmt; - - stmts.push('START TRANSACTION'); - - const workerID = 1108; - - stmt = new ParameterizedSQL(` - INSERT INTO vn.workerTimeControl(userFk, timed, manual, direction) - VALUES - (?, ?, 1, 'in'), - (?, ?, 1, 'out') - `, [ - workerID, - lastSunday, - workerID, - monday - ]); - stmts.push(stmt); - - stmt = new ParameterizedSQL('CALL vn.timeControl_calculateByUser(?, ?, ?)', [ - workerID, - lastSunday, - monday - ]); - stmts.push(stmt); - - let tableIndex = stmts.push('SELECT * FROM tmp.timeControlCalculate') - 1; - - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - let result = await app.models.Ticket.rawStmt(sql); - - let [timeControlCalculateTable] = result[tableIndex]; - - expect(timeControlCalculateTable.timeWorkSeconds).toEqual(30000); - }); -}); diff --git a/db/tests/vn/workerTimeControlCheck.spec.js b/db/tests/vn/workerTimeControlCheck.spec.js deleted file mode 100644 index 0ca1429d4..000000000 --- a/db/tests/vn/workerTimeControlCheck.spec.js +++ /dev/null @@ -1,580 +0,0 @@ -const app = require('vn-loopback/server/server'); -const ParameterizedSQL = require('loopback-connector').ParameterizedSQL; - -// #2261 xdescribe dbtest workerTimeControl_check() -xdescribe('worker workerTimeControl_check()', () => { - it(`should throw an error if the worker can't sign on that tablet`, async() => { - let stmts = []; - let stmt; - const workerId = 1110; - const tabletId = 2; - let err; - stmts.push('START TRANSACTION'); - try { - stmt = new ParameterizedSQL('CALL vn.workerTimeControl_check(?, ?, NULL)', [ - workerId, - tabletId - ]); - stmts.push(stmt); - - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - await app.models.Worker.rawStmt(sql); - } catch (e) { - err = e; - } - - expect(err.sqlMessage).toEqual('No perteneces a este departamento.'); - }); - - it('should check that the worker can sign on that tablet', async() => { - let stmts = []; - let stmt; - const workerId = 1110; - const tabletId = 1; - let err; - stmts.push('START TRANSACTION'); - try { - stmt = new ParameterizedSQL('CALL vn.workerTimeControl_check(?, ?, NULL)', [ - workerId, - tabletId - ]); - stmts.push(stmt); - - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - await app.models.Worker.rawStmt(sql); - } catch (e) { - err = e; - } - - expect(err).not.toBeDefined(); - }); - - it('should throw an error if the worker with a special category has not finished the 9h break', async() => { - const workerId = 1110; - const tabletId = 1; - let stmts = []; - let stmt; - let sql; - let error; - - stmts.push('START TRANSACTION'); - stmt = new ParameterizedSQL(`INSERT INTO vn.workerTimeControl(userFk,timed,manual,direction) - VALUES - (?,TIMESTAMPADD(HOUR,-17,NOW()),0,"in"), - (?,TIMESTAMPADD(SECOND,-32399,NOW()),0,"out")`, [ - workerId, - workerId - ]); - stmts.push(stmt); - - stmt = new ParameterizedSQL('CALL vn.workerTimeControl_check(?, ?, NULL)', [ - workerId, - tabletId - ]); - stmts.push(stmt); - stmts.push('ROLLBACK'); - sql = ParameterizedSQL.join(stmts, ';'); - - try { - await app.models.Worker.rawStmt(sql); - } catch (e) { - await app.models.Worker.rawSql('ROLLBACK'); - error = e; - } - - expect(error.sqlMessage).toEqual('Descansos 9 h'); - }); - - it('should check f the worker with a special category has finished the 9h break', async() => { - const workerId = 1110; - const tabletId = 1; - let stmts = []; - let stmt; - let err; - stmts.push('START TRANSACTION'); - stmt = new ParameterizedSQL(`INSERT INTO vn.workerTimeControl(userFk,timed,manual,direction) - VALUES - (?,TIMESTAMPADD(HOUR,-17,NOW()),0,"in"), - (?,TIMESTAMPADD(SECOND,-32401,NOW()),0,"out")`, [ - workerId, - workerId - ]); - stmts.push(stmt); - - stmt = new ParameterizedSQL('CALL vn.workerTimeControl_check(?, ?, NULL)', [ - workerId, - tabletId - ]); - stmts.push(stmt); - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - - try { - await app.models.Worker.rawStmt(sql); - } catch (e) { - await app.models.Worker.rawSql('ROLLBACK'); - err = e; - } - - expect(err).not.toBeDefined(); - }); - - it('should throw an error if the worker has not finished the 12h break', async() => { - const workerId = 1109; - const tabletId = 1; - let stmts = []; - let stmt; - let sql; - let error; - - stmts.push('START TRANSACTION'); - stmt = new ParameterizedSQL(`INSERT INTO vn.workerTimeControl(userFk,timed,manual,direction) - VALUES - (?,TIMESTAMPADD(HOUR,-20,NOW()),0,"in"), - (?,TIMESTAMPADD(SECOND,-43199,NOW()),0,"out")`, [ - workerId, - workerId - ]); - stmts.push(stmt); - - stmt = new ParameterizedSQL('CALL vn.workerTimeControl_check(?, ?, NULL)', [ - workerId, - tabletId - ]); - stmts.push(stmt); - stmts.push('ROLLBACK'); - sql = ParameterizedSQL.join(stmts, ';'); - - try { - await app.models.Worker.rawStmt(sql); - } catch (e) { - await app.models.Worker.rawSql('ROLLBACK'); - error = e; - } - - expect(error.sqlMessage).toEqual('Descansos 12 h'); - }); - - it('should throw an error if the worker has finished the 12h break', async() => { - const workerId = 1109; - const tabletId = 1; - let stmts = []; - let stmt; - let err; - stmts.push('START TRANSACTION'); - stmt = new ParameterizedSQL(`INSERT INTO vn.workerTimeControl(userFk,timed,manual,direction) - VALUES - (?,TIMESTAMPADD(HOUR,-20,NOW()),0,"in"), - (?,TIMESTAMPADD(SECOND,-43201,NOW()),0,"out")`, [ - workerId, - workerId - ]); - stmts.push(stmt); - - stmt = new ParameterizedSQL('CALL vn.workerTimeControl_check(?, ?, NULL)', [ - workerId, - tabletId - ]); - stmts.push(stmt); - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - - try { - await app.models.Worker.rawStmt(sql); - } catch (e) { - await app.models.Worker.rawSql('ROLLBACK'); - err = e; - } - - expect(err).not.toBeDefined(); - }); - - it('should throw an error if the worker has odd entry records', async() => { - const workerId = 1109; - const tabletId = 1; - let stmts = []; - let stmt; - let err; - stmts.push('START TRANSACTION'); - stmt = new ParameterizedSQL(`INSERT INTO vn.workerTimeControl(userFk,timed,manual,direction) - VALUES - (?,TIMESTAMPADD(HOUR,-24,NOW()),0,"in")`, [ - workerId - ]); - stmts.push(stmt); - - stmt = new ParameterizedSQL('CALL vn.workerTimeControl_check(?, ?, NULL)', [ - workerId, - tabletId - ]); - stmts.push(stmt); - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - - try { - await app.models.Worker.rawStmt(sql); - } catch (e) { - await app.models.Worker.rawSql('ROLLBACK'); - err = e; - } - - expect(err.sqlMessage).toEqual('Dias con fichadas impares'); - }); - - it('should throw an error if the worker try to sign on a holiday day', async() => { - const workerId = 1109; - const tabletId = 1; - let stmts = []; - let stmt; - let err; - - stmts.push('START TRANSACTION'); - - stmt = new ParameterizedSQL(`INSERT INTO vn.workerTimeControl(userFk,timed,manual,direction) - VALUES - (?,TIMESTAMPADD(HOUR,-24,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-20,NOW()),0,"out")`, [ - workerId, - workerId - ]); - stmts.push(stmt); - - stmt = new ParameterizedSQL('CALL vn.workerTimeControl_check(?, ?, NULL)', [ - workerId, - tabletId - ]); - stmts.push(stmt); - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - - try { - await app.models.Worker.rawStmt(sql); - } catch (e) { - await app.models.Worker.rawSql('ROLLBACK'); - err = e; - } - - expect(err.sqlMessage).toEqual('Holidays'); - }); - - it('should throw an error if the worker try to sign with your contract ended', async() => { - const workerId = 1109; - const tabletId = 1; - let stmts = []; - let stmt; - let err; - - stmts.push('START TRANSACTION'); - - stmt = new ParameterizedSQL(`UPDATE vn.business SET ended = DATE_ADD(CURDATE(), INTERVAL -1 DAY) WHERE id = ?`, [ - workerId - ]); - stmts.push(stmt); - - stmt = new ParameterizedSQL(`INSERT INTO vn.workerTimeControl(userFk,timed,manual,direction) - VALUES - (?,TIMESTAMPADD(HOUR,-24,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-20,NOW()),0,"out")`, [ - workerId, - workerId - ]); - stmts.push(stmt); - - stmt = new ParameterizedSQL('CALL vn.workerTimeControl_check(?, ?, NULL)', [ - workerId, - tabletId - ]); - stmts.push(stmt); - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - - try { - await app.models.Worker.rawStmt(sql); - } catch (e) { - await app.models.Worker.rawSql('ROLLBACK'); - err = e; - } - - expect(err.sqlMessage).toEqual('No hay un contrato en vigor'); - }); - - it('should throw an error if the worker has not finished the 36h weekly break', async() => { - const workerId = 1109; - const tabletId = 1; - let stmts = []; - let stmt; - - stmts.push('SET @warn := NULL'); - - stmts.push('START TRANSACTION'); - - stmt = new ParameterizedSQL(`INSERT INTO vn.workerTimeControl(userFk,timed,manual,direction) - VALUES - (?,TIMESTAMPADD(HOUR,-24,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-16,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-48,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-40,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-72,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-64,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-96,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-88,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-120,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-112,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-144,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-136,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-168,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-160,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-192,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-184,NOW()),0,"out")`, [ - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId - ]); - stmts.push(stmt); - - stmt = new ParameterizedSQL('CALL vn.workerTimeControl_check(?, ?, NULL)', [ - workerId, - tabletId - ]); - stmts.push(stmt); - - let warningMessageIndex = stmts.push('SELECT @warn AS warning') - 1; - stmts.push('ROLLBACK'); - let sql = ParameterizedSQL.join(stmts, ';'); - let result = await app.models.Worker.rawStmt(sql); - - expect(result[warningMessageIndex][0].warning).toEqual('Descansos 36 h'); - }); - - it('should check if the worker has finished the 36h weekly break', async() => { - const workerId = 1109; - const tabletId = 1; - let stmts = []; - let stmt; - - stmts.push('SET @warn := NULL'); - - stmts.push('START TRANSACTION'); - - stmt = new ParameterizedSQL(`INSERT INTO vn.workerTimeControl(userFk,timed,manual,direction) - VALUES - (?,TIMESTAMPADD(HOUR,-24,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-16,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-48,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-40,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-72,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-64,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-96,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-88,NOW()),0,"out")`, [ - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId - ]); - stmts.push(stmt); - - stmt = new ParameterizedSQL('CALL vn.workerTimeControl_check(?, ?, NULL)', [ - workerId, - tabletId - ]); - stmts.push(stmt); - stmts.push('ROLLBACK'); - - let warningMessageIndex = stmts.push('SELECT @warn AS warning') - 1; - - let sql = ParameterizedSQL.join(stmts, ';'); - let result = await app.models.Worker.rawStmt(sql); - - expect(result[warningMessageIndex][0].warning).toBe(null); - }); - - it('should throw an error if the worker has not finished the 72h biweekly break', async() => { - const workerId = 1109; - const tabletId = 1; - let stmts = []; - let stmt; - let err; - stmts.push('START TRANSACTION'); - - stmt = new ParameterizedSQL(`INSERT INTO vn.workerTimeControl(userFk,timed,manual,direction) - VALUES - (?,TIMESTAMPADD(HOUR,-24,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-16,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-48,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-40,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-72,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-64,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-96,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-88,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-120,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-112,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-144,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-136,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-168,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-160,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-192,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-184,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-216,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-208,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-240,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-232,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-264,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-256,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-289,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-280,NOW()),0,"out")`, [ - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId - ]); - stmts.push(stmt); - - stmt = new ParameterizedSQL('CALL vn.workerTimeControl_check(?, ?, NULL)', [ - workerId, - tabletId - ]); - stmts.push(stmt); - stmts.push('ROLLBACK'); - - stmts.push('SELECT @warn AS warning') - 1; - - let sql = ParameterizedSQL.join(stmts, ';'); - - try { - await app.models.Worker.rawStmt(sql); - } catch (e) { - await app.models.Worker.rawSql('ROLLBACK'); - err = e; - } - - expect(err.sqlMessage).toEqual('Descansos 72 h'); - }); - - it('should check if the worker has finished the 72h biweekly break', async() => { - const workerId = 1109; - const tabletId = 1; - let stmts = []; - let stmt; - let err; - stmts.push('START TRANSACTION'); - - stmt = new ParameterizedSQL(`INSERT INTO vn.workerTimeControl(userFk,timed,manual,direction) - VALUES - (?,TIMESTAMPADD(HOUR,-24,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-16,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-48,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-40,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-72,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-64,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-96,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-88,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-120,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-112,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-144,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-136,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-168,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-160,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-192,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-184,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-216,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-208,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-240,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-232,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-264,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-256,NOW()),0,"out"), - (?,TIMESTAMPADD(HOUR,-288,NOW()),0,"in"), - (?,TIMESTAMPADD(HOUR,-280,NOW()),0,"out")`, [ - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId, - workerId - ]); - stmts.push(stmt); - - stmt = new ParameterizedSQL('CALL vn.workerTimeControl_check(?, ?, NULL)', [ - workerId, - tabletId - ]); - stmts.push(stmt); - stmts.push('ROLLBACK'); - - stmts.push('SELECT @warn AS warning') - 1; - - let sql = ParameterizedSQL.join(stmts, ';'); - - try { - await app.models.Worker.rawStmt(sql); - } catch (e) { - await app.models.Worker.rawSql('ROLLBACK'); - err = e; - } - - expect(err).not.toBeDefined(); - }); -}); diff --git a/db/tests/vn/zone_getEvents.spec.js b/db/tests/vn/zone_getEvents.spec.js deleted file mode 100644 index fe49b60be..000000000 --- a/db/tests/vn/zone_getEvents.spec.js +++ /dev/null @@ -1,31 +0,0 @@ -const app = require('vn-loopback/server/server'); -const ParameterizedSQL = require('loopback-connector').ParameterizedSQL; - -describe('zone zone_getEvents()', () => { - it(`should return data for a agencyMode with deliveryMethod pickup`, async() => { - let stmts = []; - let stmt; - - stmts.push('START TRANSACTION'); - - let params = { - zoneGeoFk: 1, - agencyModeFk: 1}; - - stmt = new ParameterizedSQL('CALL zone_getEvents(?, ?)', [ - params.zoneGeoFk, - params.agencyModeFk, - - ]); - stmts.push(stmt); - - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - let result = await app.models.Ticket.rawStmt(sql); - - let zonesEvents = result[1]; - - expect(zonesEvents.length).toBeGreaterThan(0); - }); -}); diff --git a/db/tests/vn/zone_getFromGeo.spec.js b/db/tests/vn/zone_getFromGeo.spec.js deleted file mode 100644 index 74b6e00cc..000000000 --- a/db/tests/vn/zone_getFromGeo.spec.js +++ /dev/null @@ -1,28 +0,0 @@ -const app = require('vn-loopback/server/server'); -const ParameterizedSQL = require('loopback-connector').ParameterizedSQL; - -describe('zone zone_getFromGeo()', () => { - it(`should check that there are some results in table zone`, async() => { - let stmts = []; - let stmt; - - stmts.push('START TRANSACTION'); - let geoFk = 16; - - stmt = new ParameterizedSQL('CALL zone_getFromGeo(?)', [ - geoFk, - ]); - stmts.push(stmt); - - let tableIndex = stmts.push('SELECT count(*) countZone FROM tmp.zone WHERE id IN (1, 2, 3, 4, 5, 6, 7, 8)') - 1; - - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - let result = await app.models.Ticket.rawStmt(sql); - - let [zoneTable] = result[tableIndex]; - - expect(zoneTable.countZone).toBe(8); - }); -}); diff --git a/db/tests/vn/zone_getLanded.spec.js b/db/tests/vn/zone_getLanded.spec.js deleted file mode 100644 index 888d7c132..000000000 --- a/db/tests/vn/zone_getLanded.spec.js +++ /dev/null @@ -1,75 +0,0 @@ -const app = require('vn-loopback/server/server'); -const ParameterizedSQL = require('loopback-connector').ParameterizedSQL; - -describe('zone zone_getLanded()', () => { - it(`should return data for a shipped in the past`, async() => { - let stmts = []; - let stmt; - stmts.push('START TRANSACTION'); - const date = Date.vnNew(); - date.setHours(0, 0, 0, 0); - - let params = { - addressFk: 121, - agencyModeFk: 7, - warehouseFk: 1, - showExpiredZones: true}; - - stmt = new ParameterizedSQL('CALL zone_getLanded(DATE_ADD(?, INTERVAL -1 DAY), ?, ?, ?, ?)', [ - date, - params.addressFk, - params.agencyModeFk, - params.warehouseFk, - params.showExpiredZones - - ]); - stmts.push(stmt); - - let tableIndex = stmts.push('SELECT count(*) countZone FROM tmp.zoneGetLanded') - 1; - - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - let result = await app.models.Ticket.rawStmt(sql); - - let [zoneTable] = result[tableIndex]; - - expect(zoneTable.countZone).toBe(1); - }); - - it(`should return data for a shipped tomorrow`, async() => { - let stmts = []; - let stmt; - const date = Date.vnNew(); - date.setHours(0, 0, 0, 0); - - stmts.push('START TRANSACTION'); - - let params = { - addressFk: 121, - agencyModeFk: 7, - warehouseFk: 1, - showExpiredZones: false}; - - stmt = new ParameterizedSQL('CALL zone_getLanded(DATE_ADD(?, INTERVAL +2 DAY), ?, ?, ?, ?)', [ - date, - params.addressFk, - params.agencyModeFk, - params.warehouseFk, - params.showExpiredZones - - ]); - stmts.push(stmt); - - let tableIndex = stmts.push('SELECT count(*) countZone FROM tmp.zoneGetLanded') - 1; - - stmts.push('ROLLBACK'); - - let sql = ParameterizedSQL.join(stmts, ';'); - let result = await app.models.Ticket.rawStmt(sql); - - let [zoneTable] = result[tableIndex]; - - expect(zoneTable.countZone).toBe(1); - }); -}); diff --git a/db/versions/.archive/10107-pinkPaniculata/00-firstScript.sql b/db/versions/.archive/10107-pinkPaniculata/00-firstScript.sql new file mode 100644 index 000000000..a5e4dd843 --- /dev/null +++ b/db/versions/.archive/10107-pinkPaniculata/00-firstScript.sql @@ -0,0 +1,3 @@ +-- Place your SQL code here +ALTER TABLE vn.productionConfig ADD defaultZone INT DEFAULT 697 NOT NULL; +ALTER TABLE vn.productionConfig ADD defautlAgencyMode INT DEFAULT 1328 NOT NULL COMMENT 'SENDING'; diff --git a/db/versions/.archive/10112-wheatAnthurium/00-firstScript.sql b/db/versions/.archive/10112-wheatAnthurium/00-firstScript.sql new file mode 100644 index 000000000..bc4b383b9 --- /dev/null +++ b/db/versions/.archive/10112-wheatAnthurium/00-firstScript.sql @@ -0,0 +1 @@ +ALTER TABLE `vn2008`.`Tickets_dits` RENAME TO `vn2008`.`Tickets_dits__` ; diff --git a/db/versions/.archive/10113-blueMonstera/00-firstScript.sql b/db/versions/.archive/10113-blueMonstera/00-firstScript.sql new file mode 100644 index 000000000..c437d076b --- /dev/null +++ b/db/versions/.archive/10113-blueMonstera/00-firstScript.sql @@ -0,0 +1,3 @@ +ALTER TABLE vn.specialPrice DROP FOREIGN KEY `{01A99AF1-3D3F-4B15-AC0C-C7A834F319A3}`; +ALTER TABLE vn.specialPrice DROP FOREIGN KEY `{EE4ADEF6-0AC6-401F-B7C4-D797972FC065}`; + \ No newline at end of file diff --git a/db/versions/.archive/10114-maroonOrchid/00-updateConfig.sql b/db/versions/.archive/10114-maroonOrchid/00-updateConfig.sql new file mode 100644 index 000000000..919c6269a --- /dev/null +++ b/db/versions/.archive/10114-maroonOrchid/00-updateConfig.sql @@ -0,0 +1 @@ +ALTER TABLE srt.config ADD isBalanced BOOL DEFAULT 1 NOT NULL; \ No newline at end of file diff --git a/db/versions/.archive/10116-pinkOak/00-firstScript.sql b/db/versions/.archive/10116-pinkOak/00-firstScript.sql new file mode 100644 index 000000000..682f9772b --- /dev/null +++ b/db/versions/.archive/10116-pinkOak/00-firstScript.sql @@ -0,0 +1,3 @@ +ALTER TABLE vn.propertyNotes DROP FOREIGN KEY propertyNotes_FK; +ALTER TABLE vn.propertyNotes MODIFY COLUMN propertyFk int(11) NOT NULL; +ALTER TABLE vn.propertyNotes ADD CONSTRAINT propertyNotes_FK FOREIGN KEY (propertyFk) REFERENCES vn.property(id); diff --git a/db/versions/.archive/10118-blueFern/00-firstScript.sql b/db/versions/.archive/10118-blueFern/00-firstScript.sql new file mode 100644 index 000000000..12de63f4b --- /dev/null +++ b/db/versions/.archive/10118-blueFern/00-firstScript.sql @@ -0,0 +1 @@ +ALTER TABLE vn.cmrConfig ADD landingDays TINYINT DEFAULT 1 NOT NULL; \ No newline at end of file diff --git a/db/versions/.archive/10119-navyGerbera/00-AfegirFKPart1.sql b/db/versions/.archive/10119-navyGerbera/00-AfegirFKPart1.sql new file mode 100644 index 000000000..bfff1133b --- /dev/null +++ b/db/versions/.archive/10119-navyGerbera/00-AfegirFKPart1.sql @@ -0,0 +1,18 @@ +/*ALTER TABLE bi.rutasBoard ADD CONSTRAINT rutasBoard_FK FOREIGN KEY (warehouse_id) REFERENCES vn.warehouse(id); +ALTER TABLE bi.tarifa_warehouse MODIFY COLUMN warehouse_id smallint(6) UNSIGNED NOT NULL; +ALTER TABLE bi.tarifa_warehouse ADD CONSTRAINT tarifa_warehouse_FK FOREIGN KEY (warehouse_id) REFERENCES vn.warehouse(id); +ALTER TABLE bi.XDiario_ALL MODIFY COLUMN empresa_id SMALLINT (5) UNSIGNED NOT NULL; +ALTER TABLE bi.XDiario_ALL ADD CONSTRAINT XDiario_ALL_FK FOREIGN KEY (empresa_id) REFERENCES vn.company(id); +ALTER TABLE bs.defaulter ADD CONSTRAINT defaulter_FK FOREIGN KEY (clientFk) REFERENCES vn.client(id); +ALTER TABLE bs.inspeccionSS_2021 ADD CONSTRAINT inspeccionSS_2021_FK FOREIGN KEY (business_id) REFERENCES postgresql.business(business_id); +DELETE FROM bs.m3 WHERE id=589880; +DELETE FROM bs.m3 WHERE id=639521; +DELETE FROM bs.m3 WHERE id=639984; +ALTER TABLE bs.m3 ADD CONSTRAINT m3_FK FOREIGN KEY (provinceFk) REFERENCES vn.province(id); +ALTER TABLE bs.m3 ADD CONSTRAINT m3Warehouse_FK FOREIGN KEY (warehouseFk) REFERENCES vn.warehouse(id) ON UPDATE CASCADE; +ALTER TABLE bs.ventas_contables MODIFY COLUMN empresa_id smallint(5) unsigned NOT NULL; +ALTER TABLE bs.ventas_contables ADD CONSTRAINT ventas_contables_FK FOREIGN KEY (empresa_id) REFERENCES vn.company(id); +DELETE FROM bs.ventas_contables WHERE tipo_id = 97; -- BORRE PER QUE ESTE TIPO JA NO EXISTEIX +ALTER TABLE cache.cache_calc ADD CONSTRAINT cache_calc_FK FOREIGN KEY (cache_id) REFERENCES cache.cache(id) ON DELETE CASCADE ON UPDATE CASCADE; +ALTER TABLE cache.last_buy MODIFY COLUMN item_id int(11) NOT NULL; +comente per que ja s'ha executat esta part*/ \ No newline at end of file diff --git a/db/versions/.archive/10119-navyGerbera/01-AfegirFkPart2.sql b/db/versions/.archive/10119-navyGerbera/01-AfegirFkPart2.sql new file mode 100644 index 000000000..c129b2c76 --- /dev/null +++ b/db/versions/.archive/10119-navyGerbera/01-AfegirFkPart2.sql @@ -0,0 +1,17 @@ +/* +ALTER TABLE cache.last_buy ADD CONSTRAINT last_buy_FK_1 FOREIGN KEY (warehouse_id) REFERENCES vn.warehouse(id) ON DELETE CASCADE ON UPDATE CASCADE; +ALTER TABLE cache.last_buy MODIFY COLUMN buy_id int(11) NULL; +-- Aplicado hasta aquí +ALTER TABLE cache.last_buy ADD CONSTRAINT last_buy_FK_2 FOREIGN KEY (buy_id) REFERENCES vn.buy(id) ON DELETE CASCADE ON UPDATE CASCADE; +ALTER TABLE cache.prod_graphic_source MODIFY COLUMN warehouse_id smallint(6) unsigned NOT NULL; +ALTER TABLE cache.prod_graphic_source ADD CONSTRAINT prod_graphic_source_FK FOREIGN KEY (warehouse_id) REFERENCES vn.warehouse(id) ON DELETE CASCADE ON UPDATE CASCADE; +DELETE FROM dipole.expedition_PrintOut WHERE expeditionFk NOT IN (SELECT id FROM vn.expedition); +ALTER TABLE dipole.expedition_PrintOut ADD CONSTRAINT expedition_PrintOut_FK_1 FOREIGN KEY (expeditionFk) REFERENCES vn.expedition(id); +ALTER TABLE dipole.expedition_PrintOut ADD CONSTRAINT expedition_PrintOut_FK_2 FOREIGN KEY (addressFk) REFERENCES vn.address(id); +ALTER TABLE dipole.expedition_PrintOut ADD CONSTRAINT expedition_PrintOut_FK_3 FOREIGN KEY (clientFk) REFERENCES vn.client(id); +ALTER TABLE dipole.expedition_PrintOut MODIFY COLUMN routeFk int(11) DEFAULT 0 NOT NULL COMMENT '3 ultimos caracteres de la ruta'; +ALTER TABLE dipole.expedition_PrintOut ADD CONSTRAINT expedition_PrintOut_FK_4 FOREIGN KEY (ticketFk) REFERENCES vn.ticket(id); +ALTER TABLE dipole.expedition_Read ADD CONSTRAINT expedition_Read_FK_1 FOREIGN KEY (expeditionFk) REFERENCES vn.expedition(id); +ALTER TABLE edi.bucket ADD CONSTRAINT bucket_FK FOREIGN KEY (bucket_type_id) REFERENCES edi.bucket_type(bucket_type_id) ON UPDATE CASCADE; +ALTER TABLE edi.clientFHAdminNumber ADD CONSTRAINT clientFHAdminNumber_FK_1 FOREIGN KEY (clientFk) REFERENCES vn.client(id) ON UPDATE CASCADE; +*/ \ No newline at end of file diff --git a/db/versions/.archive/10125-grayRose/00-firstScript.sql b/db/versions/.archive/10125-grayRose/00-firstScript.sql new file mode 100644 index 000000000..e37209b83 --- /dev/null +++ b/db/versions/.archive/10125-grayRose/00-firstScript.sql @@ -0,0 +1,45 @@ +ALTER TABLE hedera.restPriv MODIFY COLUMN `role` int(10) unsigned NULL; + +UPDATE hedera.restPriv + SET `role`=104 + WHERE id=5; +UPDATE hedera.restPriv + SET `role`=5 + WHERE id=7; +DELETE FROM hedera.restPriv + WHERE id=2; +DELETE FROM hedera.restPriv + WHERE id=6; +DELETE FROM hedera.restPriv + WHERE id=8; +INSERT INTO hedera.restPriv (methodPath) + VALUES ('core/captcha'); +INSERT INTO hedera.restPriv (methodPath) + VALUES ('core/log'); +INSERT INTO hedera.restPriv (methodPath) + VALUES ('core/login'); +INSERT INTO hedera.restPriv (methodPath) + VALUES ('core/logout'); +INSERT INTO hedera.restPriv (methodPath) + VALUES ('core/query'); +INSERT INTO hedera.restPriv (methodPath) + VALUES ('core/recover-password'); +INSERT INTO hedera.restPriv (methodPath) + VALUES ('core/restore-password'); +INSERT INTO hedera.restPriv (methodPath,`role`) + VALUES ('dms/invoice',2); +INSERT INTO hedera.restPriv (methodPath) + VALUES ('image/thumb'); +INSERT INTO hedera.restPriv (methodPath) + VALUES ('misc/concact'); +INSERT INTO hedera.restPriv (methodPath) + VALUES ('misc/production'); +INSERT INTO hedera.restPriv (methodPath) + VALUES ('tpv/confirm-post'); +INSERT INTO hedera.restPriv (methodPath) + VALUES ('tpv/confirm-soap'); +INSERT INTO hedera.restPriv (methodPath,`role`) + VALUES ('client/supplant',18); + +UPDATE vn.`itemCategory` SET `display` = '0' WHERE `itemCategory`.`id` = 9; +DELETE FROM hedera.`menu` WHERE `menu`.`id` = 16 diff --git a/db/versions/.archive/10127-purpleMedeola/00-firstScript.sql b/db/versions/.archive/10127-purpleMedeola/00-firstScript.sql new file mode 100644 index 000000000..e64ccf9cb --- /dev/null +++ b/db/versions/.archive/10127-purpleMedeola/00-firstScript.sql @@ -0,0 +1,28 @@ +CREATE OR REPLACE DEFINER=`root`@`localhost` + SQL SECURITY DEFINER + VIEW `vn2008`.`Trabajadores` +AS SELECT `w`.`id` AS `Id_Trabajador`, + `w`.`firstName` AS `Nombre`, + `w`.`userFk` AS `user_id`, + `w`.`phone` AS `phone`, + `w`.`bossFk` AS `boss`, + NULL AS `Foto`, + `w`.`fiDueDate` AS `DniExpiration`, + `w`.`code` AS `CodigoTrabajador`, + `w`.`lastName` AS `Apellidos`, + `w`.`hasMachineryAuthorized` AS `hasMachineryAuthorized`, + `w`.`password__` AS `Password__`, + `w`.`email__` AS `email__`, + `w`.`extension__` AS `extension__`, + `w`.`sub` AS `sub`, + `w`.`user__` AS `user__`, + `w`.`typeBussines__` AS `Contrato_Tipo__`, + `w`.`laborCategory__` AS `Categoria_Laboral__`, + `w`.`started__` AS `Fecha_Inicio__`, + `w`.`ended__` AS `Fecha_Fin__`, + `w`.`notes__` AS `Notas__`, + `w`.`address__` AS `address__`, + `w`.`birthed__` AS `date_birth__`, + `w`.`maritalStatus` AS `marital_status`, + `w`.`clientFk__` AS `Id_Cliente_Interno__` +FROM `vn`.`worker` `w` diff --git a/db/versions/.archive/10128-tealGerbera/00-firstScript.sql b/db/versions/.archive/10128-tealGerbera/00-firstScript.sql new file mode 100644 index 000000000..3904fcdcf --- /dev/null +++ b/db/versions/.archive/10128-tealGerbera/00-firstScript.sql @@ -0,0 +1 @@ +ALTER TABLE srt.config ADD testMode BOOL DEFAULT 0 NOT NULL; diff --git a/db/versions/.archive/10129-maroonChrysanthemum/00-firstScript.sql b/db/versions/.archive/10129-maroonChrysanthemum/00-firstScript.sql new file mode 100644 index 000000000..d10ca22fa --- /dev/null +++ b/db/versions/.archive/10129-maroonChrysanthemum/00-firstScript.sql @@ -0,0 +1,4 @@ +ALTER TABLE vn.itemShelving CHANGE deep deep__ int(11) unsigned DEFAULT 1 NOT NULL; +ALTER TABLE vn.itemShelving CHANGE quantity quantity__ int(11) DEFAULT 0 NOT NULL; +ALTER TABLE vn.itemShelving CHANGE `level` level__ varchar(45) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT '1' NOT NULL; +ALTER TABLE vn.itemShelving CHANGE available available__ int(11) DEFAULT 0 NOT NULL; \ No newline at end of file diff --git a/db/versions/.archive/10132-blackChrysanthemum/00-firstScript.sql b/db/versions/.archive/10132-blackChrysanthemum/00-firstScript.sql new file mode 100644 index 000000000..3d9ce2922 --- /dev/null +++ b/db/versions/.archive/10132-blackChrysanthemum/00-firstScript.sql @@ -0,0 +1,3 @@ +ALTER TABLE vn.item CHANGE compression compression__ decimal(5,2) +DEFAULT 1.00 NOT NULL +COMMENT 'Relacion de compresividad entre el volumen de las entradas en Silla y el empaquetado en los envios a clientes.'; diff --git a/db/versions/.archive/10133-crimsonLaurel/00-firstScript.sql b/db/versions/.archive/10133-crimsonLaurel/00-firstScript.sql new file mode 100644 index 000000000..caaad1e40 --- /dev/null +++ b/db/versions/.archive/10133-crimsonLaurel/00-firstScript.sql @@ -0,0 +1 @@ +ALTER TABLE `vn`.`item` CHANGE compression__ compression decimal(5,2) DEFAULT 1.00 NOT NULL COMMENT 'Relacion de compresividad entre el volumen de las entradas en Silla y el empaquetado en los envios a clientes.'; diff --git a/db/versions/.archive/10134-limeAnthurium/00-firstScript.sql b/db/versions/.archive/10134-limeAnthurium/00-firstScript.sql new file mode 100644 index 000000000..f32521d8f --- /dev/null +++ b/db/versions/.archive/10134-limeAnthurium/00-firstScript.sql @@ -0,0 +1,35 @@ +ALTER TABLE `vn`.`commissionConfig` ADD executionDay SMALLINT NULL; +ALTER TABLE `vn`.`commissionConfig` ADD salesPersonWithPlusNewClient INT NULL; +ALTER TABLE `vn`.`commissionConfig` ADD maxPlusNewClient INT NULL; +ALTER TABLE `vn`.`commissionConfig` ADD plusDifference INT NULL; +ALTER TABLE `vn`.`commissionConfig` ADD maxScoreNewClient INT NULL; +ALTER TABLE `vn`.`commissionConfig` ADD scoreDifference INT NULL; + +UPDATE `vn`.`commissionConfig` +SET plusDifference=5,executionDay=5,scoreDifference=1,maxScoreNewClient=100,maxPlusNewClient=100,salesPersonWithPlusNewClient=20 +WHERE rate=0.0080; + +UPDATE `vn`.`department` +SET workerFk=4661 +WHERE id=96; +UPDATE `vn`.`department` +SET workerFk=4667 +WHERE id=95; +UPDATE `vn`.`department` +SET workerFk=3810 +WHERE id=115; +UPDATE `vn`.`department` +SET workerFk=7102 +WHERE id=123; +UPDATE `vn`.`department` +SET workerFk=3797 +WHERE id=94; +UPDATE `vn`.`department` +SET workerFk=4250 +WHERE id=80; +UPDATE `vn`.`department` +SET workerFk=1118 +WHERE id=125; +UPDATE `vn`.`department` +SET workerFk=1203 +WHERE id=92; \ No newline at end of file diff --git a/db/versions/.archive/10135-brownMonstera/00-firstScript.sql b/db/versions/.archive/10135-brownMonstera/00-firstScript.sql new file mode 100644 index 000000000..cce5f0521 --- /dev/null +++ b/db/versions/.archive/10135-brownMonstera/00-firstScript.sql @@ -0,0 +1,12 @@ +Use `vn`; + +CREATE TABLE `vn`.`zoneExclusionGeo` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `zoneExclusionFk` int(11) NOT NULL, + `geoFk` int(11) NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `zoneExclusionGeo_UN` (`zoneExclusionFk`,`geoFk`), + KEY `zoneExclusionGeo2_FK_1` (`geoFk`), + CONSTRAINT `zoneExclusionGeo_FK` FOREIGN KEY (`geoFk`) REFERENCES `zoneGeo` (`id`) ON UPDATE CASCADE, + CONSTRAINT `zoneExclusionGeo_FK_1` FOREIGN KEY (`zoneExclusionFk`) REFERENCES `zoneExclusion` (`id`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8; diff --git a/db/versions/.archive/10136-turquoiseGerbera/00-workerTimeControl.sql b/db/versions/.archive/10136-turquoiseGerbera/00-workerTimeControl.sql new file mode 100644 index 000000000..f5b6e046a --- /dev/null +++ b/db/versions/.archive/10136-turquoiseGerbera/00-workerTimeControl.sql @@ -0,0 +1,9 @@ +USE vn; +ALTER TABLE `vn`.`workerTimeControl` +ADD INDEX `timed_idx` (`timed` ASC); + +ALTER TABLE `vn`.`workerTimeControlConfig` +ADD COLUMN `shortWeekDays` INT(11) NULL COMMENT 'Días a tener en cuenta para calcular el descanso corto' AFTER `dayMaxTime`, +ADD COLUMN `longWeekDays` INT(11) NULL COMMENT 'Días a tener en cuenta para calcular el descanso largo' AFTER `shortWeekDays`; + +UPDATE `vn`.`workerTimeControlConfig` SET `shortWeekDays` = '6', `longWeekDays` = '13' WHERE (`id` = '1'); diff --git a/db/versions/.archive/10138-limeBirch/00-firstScript.sql b/db/versions/.archive/10138-limeBirch/00-firstScript.sql new file mode 100644 index 000000000..40dee2261 --- /dev/null +++ b/db/versions/.archive/10138-limeBirch/00-firstScript.sql @@ -0,0 +1,14 @@ +TRUNCATE vn.beach; +ALTER TABLE vn.beach CHANGE name name varchar(45) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL AFTER id; +ALTER TABLE vn.beach DROP COLUMN x; +ALTER TABLE vn.beach DROP COLUMN y; +ALTER TABLE vn.beach DROP COLUMN isShowed; +ALTER TABLE vn.beach DROP COLUMN name; +ALTER TABLE vn.beach CHANGE id code varchar(45) NOT NULL; +ALTER TABLE vn.beach MODIFY COLUMN code varchar(45) NOT NULL; +ALTER TABLE vn.beach MODIFY COLUMN warehouseFk smallint(6) DEFAULT 60 NOT NULL; +ALTER TABLE vn.routesMonitor ADD CONSTRAINT routesMonitor_FK_2 FOREIGN KEY (beachFk) REFERENCES vn.beach(code) ON DELETE RESTRICT ON UPDATE CASCADE; +INSERT INTO vn.beach (code) VALUES ('p1'); +INSERT INTO vn.beach (code) VALUES ('p2'); +INSERT INTO vn.beach (code) VALUES ('p3'); +INSERT INTO vn.beach (code) VALUES ('p4'); diff --git a/db/versions/.archive/10139-grayAspidistra/00-firstScript.sql b/db/versions/.archive/10139-grayAspidistra/00-firstScript.sql new file mode 100644 index 000000000..1a0584851 --- /dev/null +++ b/db/versions/.archive/10139-grayAspidistra/00-firstScript.sql @@ -0,0 +1,63 @@ +USE vn; +ALTER TABLE `vn`.`labelReport` + RENAME TO `vn`.`report` ; + +UPDATE `vn`.`report` SET `name` = 'invoice' WHERE (`id` = '3'); +UPDATE `vn`.`report` SET `name` = 'cleanDMS' WHERE (`id` = '11'); +UPDATE `vn`.`report` SET `name` = 'invoicePdf' WHERE (`id` = '40'); + + +CREATE TABLE `printQueue` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `printerFk` tinyint(3) unsigned DEFAULT NULL, + `priorityFk` tinyint(3) unsigned DEFAULT NULL, + `reportFk` tinyint(3) unsigned DEFAULT NULL, + `statusCode` enum('queued','error','printing') COLLATE utf8_unicode_ci NOT NULL DEFAULT 'queued', + `started` datetime DEFAULT NULL, + `finished` datetime DEFAULT NULL, + `workerFk` int(11) DEFAULT NULL, + `error` text COLLATE utf8_unicode_ci, + `errorNumber` int(11) DEFAULT NULL, + `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + KEY `statusCode` (`statusCode`), + KEY `printerFk` (`printerFk`), + KEY `priorityFk` (`priorityFk`), + KEY `workerFk` (`workerFk`), + KEY `printQueue_report` (`reportFk`), + CONSTRAINT `printQueue_priorityFk` FOREIGN KEY (`priorityFk`) REFERENCES `queuePriority` (`id`) ON UPDATE CASCADE, + CONSTRAINT `printQueue_printerFk` FOREIGN KEY (`printerFk`) REFERENCES `printer` (`id`) ON UPDATE CASCADE, + CONSTRAINT `printQueue_report` FOREIGN KEY (`reportFk`) REFERENCES `report` (`id`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB AUTO_INCREMENT = 1 DEFAULT CHARSET = utf8 COLLATE = utf8_unicode_ci; + + + + +CREATE TABLE `printQueueArgs` ( + `printQueueFk` int(10) unsigned NOT NULL, + `name` varchar(255) COLLATE utf8_unicode_ci NOT NULL, + `value` varchar(255) COLLATE utf8_unicode_ci NOT NULL, + KEY `printQueueArgs_printQueueFk_idx` (`printQueueFk`), + CONSTRAINT `printQueueArgs_printQueueFk` FOREIGN KEY (`printQueueFk`) REFERENCES `printQueue` (`id`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Argumentos que se pasarán al informe para generarlos'; + + + +ALTER TABLE `vn`.`sector` + DROP FOREIGN KEY `sector_labelReport`; + +ALTER TABLE `vn`.`sector` + CHANGE COLUMN `labelReportFk` `reportFk` TINYINT(3) UNSIGNED NULL DEFAULT NULL ; + +ALTER TABLE `vn`.`sector` + ADD CONSTRAINT `sector_report` + FOREIGN KEY (`reportFk`) + REFERENCES `vn`.`report` (`id`); + +ALTER TABLE `vn`.`queuePriority` +ADD COLUMN `code` VARCHAR(6) NULL AFTER `priority`; + +UPDATE `vn`.`queuePriority` SET `code` = 'normal' WHERE (`id` = '2'); +UPDATE `vn`.`queuePriority` SET `code` = 'low' WHERE (`id` = '3'); +UPDATE `vn`.`queuePriority` SET `code` = 'high' WHERE (`id` = '1'); + diff --git a/db/versions/.archive/10139-grayAspidistra/01-secondScript.sql b/db/versions/.archive/10139-grayAspidistra/01-secondScript.sql new file mode 100644 index 000000000..57d90337a --- /dev/null +++ b/db/versions/.archive/10139-grayAspidistra/01-secondScript.sql @@ -0,0 +1,18 @@ +USE vn; + +CREATE TABLE `vn`.`printQueueConfig` ( + `networkDrive` VARCHAR(10) NOT NULL DEFAULT 'X:\\', + `dmsPath` VARCHAR(45) NOT NULL DEFAULT ' \\\\server\\dms'); + + +ALTER TABLE `vn`.`printQueue` + DROP FOREIGN KEY `printQueue_priorityFk`; + +ALTER TABLE `vn`.`printQueue` + CHANGE COLUMN `priorityFk` `priorityFk` TINYINT(3) UNSIGNED NOT NULL DEFAULT 3 COMMENT '1 - high, 2 - normal, 3 - low' ; + +ALTER TABLE `vn`.`printQueue` + ADD CONSTRAINT `printQueue_priorityFk` + FOREIGN KEY (`priorityFk`) + REFERENCES `vn`.`queuePriority` (`id`) + ON UPDATE CASCADE; \ No newline at end of file diff --git a/db/versions/.archive/10141-turquoiseCordyline/00-firstScript.sql b/db/versions/.archive/10141-turquoiseCordyline/00-firstScript.sql new file mode 100644 index 000000000..7c7d05b56 --- /dev/null +++ b/db/versions/.archive/10141-turquoiseCordyline/00-firstScript.sql @@ -0,0 +1 @@ +RENAME TABLE vn.itemPlacement TO vn.itemPlacement__; \ No newline at end of file diff --git a/db/versions/.archive/10142-silverMedeola/00-firstScript.sql b/db/versions/.archive/10142-silverMedeola/00-firstScript.sql new file mode 100644 index 000000000..0f960efe8 --- /dev/null +++ b/db/versions/.archive/10142-silverMedeola/00-firstScript.sql @@ -0,0 +1,11 @@ +UPDATE hedera.orderRow or2 + LEFT JOIN vn.sale s ON s.id = or2.saleFk + SET or2.saleFk = NULL + WHERE s.id IS NULL AND or2.saleFk IS NOT NULL; + +ALTER TABLE `hedera`.`orderRow` +ADD CONSTRAINT `orderRow_ibfk_4` + FOREIGN KEY (`saleFk`) + REFERENCES `vn`.`sale` (`id`) + ON DELETE SET NULL + ON UPDATE CASCADE; \ No newline at end of file diff --git a/db/versions/.archive/10143-whiteFern/00-firstScript.sql b/db/versions/.archive/10143-whiteFern/00-firstScript.sql new file mode 100644 index 000000000..18f7762c1 --- /dev/null +++ b/db/versions/.archive/10143-whiteFern/00-firstScript.sql @@ -0,0 +1 @@ +RENAME TABLE postgresql.periodos TO postgresql.periodos__; \ No newline at end of file diff --git a/db/versions/.archive/10144-silverAralia/00-AfegirFKPArt1.sql b/db/versions/.archive/10144-silverAralia/00-AfegirFKPArt1.sql new file mode 100644 index 000000000..c71c66699 --- /dev/null +++ b/db/versions/.archive/10144-silverAralia/00-AfegirFKPArt1.sql @@ -0,0 +1,62 @@ + +-- vn mail recipientFk +ALTER TABLE vn.mail MODIFY COLUMN recipientFk int(10) unsigned NULL; +ALTER TABLE vn.mail ADD CONSTRAINT mail_FK_1 FOREIGN KEY (recipientFk) REFERENCES account.user(id) ON UPDATE CASCADE; + +-- vn mail senderFk +ALTER TABLE vn.mail MODIFY COLUMN senderFk int(10) unsigned NULL; +ALTER TABLE vn.mail ADD CONSTRAINT mail_FK FOREIGN KEY (senderFk) REFERENCES account.user(id) ON UPDATE CASCADE; + +-- vn packaging packagingReturnFk +ALTER TABLE vn.packaging ADD CONSTRAINT packaging_FK_1 FOREIGN KEY (packagingReturnFk) REFERENCES vn2008.Cubos_Retorno(idCubos_Retorno) ON UPDATE CASCADE; + +-- vn printServerQueue2 +ALTER TABLE vn.printServerQueue2 ADD CONSTRAINT printServerQueue2_FK_1 FOREIGN KEY (printerFk) REFERENCES vn.printer(id); +ALTER TABLE vn.printServerQueue2 ADD CONSTRAINT printServerQueue2_FK_2 FOREIGN KEY (priorityFk) REFERENCES vn.queuePriority(id); + +-- vn recipe inkFk +ALTER TABLE vn.recipe ADD CONSTRAINT recipe_FK FOREIGN KEY (inkFk) REFERENCES vn.ink(id) ON UPDATE CASCADE; + +-- vn recipe_log recipe_ItemFk +ALTER TABLE vn.recipe_log ADD CONSTRAINT recipe_log_FK FOREIGN KEY (recipe_ItemFk) REFERENCES vn.item(id) ON UPDATE CASCADE; +-- vn recipe_log selected_ItemFk +ALTER TABLE vn.recipe_log ADD CONSTRAINT recipe_log_FK_1 FOREIGN KEY (selected_ItemFk) REFERENCES vn.item(id) ON UPDATE CASCADE; + +-- vn routesMonitor dockFk +ALTER TABLE vn.routesMonitor MODIFY COLUMN dockFk varchar(10) NULL; +ALTER TABLE vn.routesMonitor ADD CONSTRAINT routesMonitor_FK_1 FOREIGN KEY (dockFk) REFERENCES vn.dock(code) ON UPDATE CASCADE; + +-- vn saleTracking actionFk +ALTER TABLE vn.saleTracking MODIFY COLUMN actionFk int(11) NULL; +UPDATE vn.saleTracking SET actionFk = NULL WHERE actionFk = 0; +ALTER TABLE vn.saleTracking ADD CONSTRAINT saleTracking_FK_1 FOREIGN KEY (actionFk) REFERENCES vncontrol.accion(accion_id) ON UPDATE CASCADE; + +-- vn sector sonFk +ALTER TABLE vn.sector ADD CONSTRAINT sector_FK FOREIGN KEY (sonFk,warehouseFk) REFERENCES vn.sector(id,warehouseFk) ON UPDATE CASCADE; + +-- vn sms senderFk +ALTER TABLE vn.sms MODIFY COLUMN senderFk int(10) unsigned NOT NULL; +ALTER TABLE vn.sms ADD CONSTRAINT sms_FK FOREIGN KEY (senderFk) REFERENCES account.`user`(id) ON UPDATE CASCADE; + +-- vn state nextStateFk +ALTER TABLE vn.state MODIFY COLUMN nextStateFk tinyint(3) unsigned NOT NULL COMMENT 'Estado al que tiene que cambiar el ticket despues de preparacion previa'; +ALTER TABLE vn.state ADD CONSTRAINT state_FK FOREIGN KEY (nextStateFk) REFERENCES vn.state(id) ON UPDATE CASCADE; + +-- vn supplierAccount bankEntityFk +ALTER TABLE vn.supplierAccount MODIFY COLUMN bankEntityFk int(10) unsigned NULL; +ALTER TABLE vn.supplierAccount ADD CONSTRAINT supplierAccount_FK_1 FOREIGN KEY (bankEntityFk) REFERENCES vn.bankEntity(id) ON UPDATE CASCADE; + +-- suplier +ALTER TABLE vn.supplierAccount MODIFY COLUMN supplierFk int(11) NULL; +UPDATE vn.supplierAccount SET supplierFk = null WHERE supplierFk NOT IN (SELECT id FROM vn.supplier s); +ALTER TABLE vn.supplierAccount ADD CONSTRAINT supplierAccount_FK FOREIGN KEY (supplierFk) REFERENCES vn.supplier(id) ON UPDATE CASCADE; + +-- vn ticketCollection smartTagFk +ALTER TABLE vn.ticketCollection MODIFY COLUMN smartTagFk varchar(12) CHARACTER SET utf8 COLLATE utf8_general_ci NULL; +ALTER TABLE vn.ticketCollection ADD CONSTRAINT ticketCollection_FK FOREIGN KEY (smartTagFk) REFERENCES vn.smartTag(code) ON UPDATE CASCADE; + +-- vn workCenter payrollCenterFk +ALTER TABLE vn.workCenter MODIFY COLUMN payrollCenterFk int(11) NULL COMMENT 'Campo workcenter en A3'; + +-- vn warehouse pickUpAgencyModeFk +ALTER TABLE vn.warehouse ADD CONSTRAINT warehouse_FK_1 FOREIGN KEY (pickUpAgencyModeFk) REFERENCES vn.agencyMode(id) ON UPDATE CASCADE; diff --git a/db/versions/.archive/10144-silverAralia/00-AfegirFKPArt1.undo.sql b/db/versions/.archive/10144-silverAralia/00-AfegirFKPArt1.undo.sql new file mode 100644 index 000000000..cb6fb8d5d --- /dev/null +++ b/db/versions/.archive/10144-silverAralia/00-AfegirFKPArt1.undo.sql @@ -0,0 +1,34 @@ +ALTER TABLE vn.mail + DROP CONSTRAINT mail_FK_1; +ALTER TABLE vn.mail + DROP CONSTRAINT mail_FK; +ALTER TABLE vn.packaging + DROP CONSTRAINT packaging_FK_1; +ALTER TABLE vn.printServerQueue2 + DROP CONSTRAINT printServerQueue2_FK_1; +ALTER TABLE vn.printServerQueue2 + DROP CONSTRAINT printServerQueue2_FK_2; +ALTER TABLE vn.recipe + DROP CONSTRAINT recipe_FK; +ALTER TABLE vn.recipe_log + DROP CONSTRAINT recipe_log_FK; +ALTER TABLE vn.recipe_log + DROP CONSTRAINT recipe_log_FK_1; +ALTER TABLE vn.routesMonitor + DROP CONSTRAINT routesMonitor_FK_1; +ALTER TABLE vn.saleTracking + DROP CONSTRAINT saleTracking_FK_1; +ALTER TABLE vn.sector + DROP CONSTRAINT sector_FK; +ALTER TABLE vn.sms + DROP CONSTRAINT sms_FK; +ALTER TABLE vn.state + DROP CONSTRAINT state_FK; +ALTER TABLE vn.supplierAccount + DROP CONSTRAINT supplierAccount_FK_1; +ALTER TABLE vn.supplierAccount + DROP CONSTRAINT supplierAccount_FK; +ALTER TABLE vn.ticketCollection + DROP CONSTRAINT ticketCollection_FK; +ALTER TABLE vn.warehouse + DROP CONSTRAINT warehouse_FK_1; diff --git a/db/versions/.archive/10147-tealRuscus/00-firstScript.sql b/db/versions/.archive/10147-tealRuscus/00-firstScript.sql new file mode 100644 index 000000000..74a9047ee --- /dev/null +++ b/db/versions/.archive/10147-tealRuscus/00-firstScript.sql @@ -0,0 +1,2 @@ +-- Place your SQL code here +ALTER TABLE vn.person CHANGE readerId readerId__ int(11) DEFAULT NULL NULL; diff --git a/db/versions/.archive/10149-whiteMonstera/00-firstScript.sql b/db/versions/.archive/10149-whiteMonstera/00-firstScript.sql new file mode 100644 index 000000000..29108403a --- /dev/null +++ b/db/versions/.archive/10149-whiteMonstera/00-firstScript.sql @@ -0,0 +1,9 @@ +ALTER TABLE vn.config CHANGE bookFk bookFk__ int(11) DEFAULT 0 NULL; +ALTER TABLE vn.config CHANGE serialAFk serialAFk__ int(11) DEFAULT 0 NULL; +ALTER TABLE vn.config CHANGE serialEFk serialEFk__ int(11) DEFAULT 0 NULL; +ALTER TABLE vn.config CHANGE serialRFk serialRFk__ int(11) DEFAULT 0 NULL; +ALTER TABLE vn.config CHANGE serialCFk serialCFk__ int(11) DEFAULT 0 NULL; +ALTER TABLE vn.config CHANGE serialHFk serialHFk__ int(11) NOT NULL; +ALTER TABLE vn.config CHANGE serialPFk serialPFk__ int(11) DEFAULT 0 NULL; +ALTER TABLE vn.config CHANGE serialTFk serialTFk__ int(11) DEFAULT 0 NULL; +ALTER TABLE vn.config CHANGE serialMFk serialMFk__ int(11) DEFAULT 0 NULL; diff --git a/db/versions/.archive/10150-4062isLaid/00-firstScript.sql b/db/versions/.archive/10150-4062isLaid/00-firstScript.sql new file mode 100644 index 000000000..30f5a1e1f --- /dev/null +++ b/db/versions/.archive/10150-4062isLaid/00-firstScript.sql @@ -0,0 +1,4 @@ +-- Place your SQL code here +ALTER TABLE vn.item ADD isLaid BOOL DEFAULT FALSE NOT NULL COMMENT 'Indica si el producto se puede tumbar a efectos del transporte desde Holanda'; + +ALTER TABLE vn.itemType ADD isLaid BOOL DEFAULT FALSE NOT NULL COMMENT 'Indica si el producto se puede tumbar a efectos del transporte desde Holanda'; diff --git a/db/versions/.archive/10152-bluePalmetto/00-firstScript.sql b/db/versions/.archive/10152-bluePalmetto/00-firstScript.sql new file mode 100644 index 000000000..d3175a4cb --- /dev/null +++ b/db/versions/.archive/10152-bluePalmetto/00-firstScript.sql @@ -0,0 +1,19 @@ +-- Place your SQL code here +USE vn; + +DROP TABLE IF EXISTS workerAppTester; + +CREATE TABLE `workerAppTester` ( + `workerFk` int(10) unsigned NOT NULL, + PRIMARY KEY (`workerFk`), + KEY `workerAppTester_FK` (`workerFk`), + CONSTRAINT `workerAppTester_FK_1` FOREIGN KEY (`workerFk`) REFERENCES `worker` (`id`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='La tabla incluye usuarios testers que actualizarán a una versión diferente que el resto para testear los cambios nuevos en las app'; + +-- vn.mobileAppVersionControl definition + +ALTER TABLE vn.mobileAppVersionControl ADD urlProduction varchar(100) NULL; +ALTER TABLE vn.mobileAppVersionControl ADD urlBeta varchar(100) NULL; +ALTER TABLE vn.mobileAppVersionControl ADD versionBeta varchar(45) NULL; +ALTER TABLE vn.mobileAppVersionControl ADD isVersionBetaCritical tinyint(1) DEFAULT 0 NULL; +ALTER TABLE vn.mobileAppVersionControl CHANGE IsVersionCritical isVersionCritical tinyint(1) DEFAULT 0 NULL; \ No newline at end of file diff --git a/db/versions/.archive/10153-maroonAralia/00-firstScript.sql b/db/versions/.archive/10153-maroonAralia/00-firstScript.sql new file mode 100644 index 000000000..2a160b841 --- /dev/null +++ b/db/versions/.archive/10153-maroonAralia/00-firstScript.sql @@ -0,0 +1 @@ +ALTER TABLE `vn`.`sms` CHANGE destinationFk destinationFk__ int(11) DEFAULT NULL NULL; \ No newline at end of file diff --git a/db/versions/.archive/10154-blackSalal/00-compressionKk.sql b/db/versions/.archive/10154-blackSalal/00-compressionKk.sql new file mode 100644 index 000000000..5d9358515 --- /dev/null +++ b/db/versions/.archive/10154-blackSalal/00-compressionKk.sql @@ -0,0 +1,3 @@ +-- Place your SQL code here +ALTER TABLE vn.item CHANGE compression compression__ decimal(5,2) DEFAULT 1.00 NOT NULL + COMMENT 'Relacion de compresividad entre el volumen de las entradas en Silla y el empaquetado en los envios a clientes.'; diff --git a/db/versions/.archive/10157-goldenCyca/00-firstScript.sql b/db/versions/.archive/10157-goldenCyca/00-firstScript.sql new file mode 100644 index 000000000..d8fa592bd --- /dev/null +++ b/db/versions/.archive/10157-goldenCyca/00-firstScript.sql @@ -0,0 +1,3 @@ +ALTER TABLE postgresql.business_labour DROP FOREIGN KEY workcenter_labour; +ALTER TABLE postgresql.business_labour ADD CONSTRAINT business_labour_FK FOREIGN KEY (workcenter_id) REFERENCES vn.workCenter(id) ON DELETE RESTRICT ON UPDATE CASCADE; +RENAME TABLE postgresql.workcenter TO postgresql.workcenter__; \ No newline at end of file diff --git a/db/versions/.archive/10158-grayCordyline/00-firstScript.sql b/db/versions/.archive/10158-grayCordyline/00-firstScript.sql new file mode 100644 index 000000000..33e83a81f --- /dev/null +++ b/db/versions/.archive/10158-grayCordyline/00-firstScript.sql @@ -0,0 +1,31 @@ +CREATE TABLE bs.`salesByItemTypeDay` ( + `itemTypeFk` smallint(5) unsigned NOT NULL, + `itemCategoryFk` int(10) unsigned NOT NULL, + `dated` date NOT NULL, + `netSale` int(11) NOT NULL DEFAULT 0, + `stems` int(11) NOT NULL DEFAULT 0, + `references` int(11) NOT NULL DEFAULT 0, + `trash` int(11) NOT NULL DEFAULT 0, + `faults` int(11) NOT NULL DEFAULT 0, + `claimed` decimal(10,2) NOT NULL DEFAULT 0.00, + `accepted` decimal(10,2) NOT NULL DEFAULT 0.00, + `sale` decimal(10,2) NOT NULL DEFAULT 0.00, + `buy` decimal(10,2) NOT NULL DEFAULT 0.00, + `saleComponent` decimal(10,2) NOT NULL DEFAULT 0.00, + `costComponent` decimal(10,2) NOT NULL DEFAULT 0.00, + `marginComponent` decimal(10,2) NOT NULL DEFAULT 0.00, + PRIMARY KEY (`itemTypeFk`,`dated`), + KEY `itemTypeSalesByweek_itemCategoryFk_idx` (`itemCategoryFk`), + KEY `itemTypeSalesByweek_period_idx` (`dated`), + CONSTRAINT `itemTypeSalesByweek_itemCategoryFk` FOREIGN KEY (`itemCategoryFk`) REFERENCES `vn`.`itemCategory` (`id`) ON UPDATE CASCADE, + CONSTRAINT `itemTypeSalesByweek_itemTypeFk` FOREIGN KEY (`itemTypeFk`) REFERENCES `vn`.`itemType` (`id`) ON UPDATE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Ventas diarias agrupadas por reino y familia'; + +ALTER TABLE `vn`.`claimConfig` ADD maxResponsibility INT NULL; + +UPDATE `vn`.`claimConfig` + SET maxResponsibility=5 + WHERE id=1; + +INSERT INTO `bs`.`nightTask` (`order`,`schema`,`procedure`) + VALUES (1005,'bs','salesByItemTypeDay_addLauncher'); diff --git a/db/versions/.archive/10160-limePalmetto/00-firstScript.sql b/db/versions/.archive/10160-limePalmetto/00-firstScript.sql new file mode 100644 index 000000000..26ceaf40f --- /dev/null +++ b/db/versions/.archive/10160-limePalmetto/00-firstScript.sql @@ -0,0 +1,7 @@ +CREATE INDEX greuge_shipped_IDX USING BTREE ON `vn`.`greuge` (shipped); + +INSERT INTO `bs`.`nightTask` (`order`,`schema`,`procedure`) + VALUES (1006,'vn','greuge_add'); + +ALTER TABLE `vn`.`greugeConfig` ADD yearsToDelete INT NULL; +UPDATE `vn`.`greugeConfig` SET yearsToDelete=5 WHERE id=1; diff --git a/db/versions/.archive/10163-tealErica/00-firstScript.sql b/db/versions/.archive/10163-tealErica/00-firstScript.sql new file mode 100644 index 000000000..2a9042144 --- /dev/null +++ b/db/versions/.archive/10163-tealErica/00-firstScript.sql @@ -0,0 +1,2 @@ +-- Place your SQL code here +ALTER TABLE vn.expedition ADD hasNewRoute BIT DEFAULT 0 NOT NULL; diff --git a/db/versions/.archive/10164-pinkMastic/00-borrarSectorsDesus.sql b/db/versions/.archive/10164-pinkMastic/00-borrarSectorsDesus.sql new file mode 100644 index 000000000..7c64fc588 --- /dev/null +++ b/db/versions/.archive/10164-pinkMastic/00-borrarSectorsDesus.sql @@ -0,0 +1,2 @@ +DELETE FROM vn.parking WHERE sectorFk IN (2,42,43,46,47,54); +DELETE FROM vn.sector WHERE id IN (2,42,43,46,47,54); \ No newline at end of file diff --git a/db/versions/.archive/10165-yellowMastic/00-firstScript.sql b/db/versions/.archive/10165-yellowMastic/00-firstScript.sql new file mode 100644 index 000000000..54d1e9ae3 --- /dev/null +++ b/db/versions/.archive/10165-yellowMastic/00-firstScript.sql @@ -0,0 +1,5 @@ +ALTER TABLE `vn2008`.`Contactos` +RENAME TO `vn2008`.`Contactos__` ; + +ALTER TABLE `vn2008`.`Relaciones` +RENAME TO `vn2008`.`Relaciones__` ; \ No newline at end of file diff --git a/db/versions/.archive/10166-grayArborvitae/00-firstScript.sql b/db/versions/.archive/10166-grayArborvitae/00-firstScript.sql new file mode 100644 index 000000000..88544a1cd --- /dev/null +++ b/db/versions/.archive/10166-grayArborvitae/00-firstScript.sql @@ -0,0 +1,5 @@ + +USE vn; + +ALTER TABLE `vn`.`printQueueConfig` +ADD COLUMN `printQueueLimit` INT NOT NULL DEFAULT 30 COMMENT 'Número máximo de filas de la cola de impresión a mostrar al enviar correo a través del evento vn.printQueue_check' AFTER `dmsPath`; diff --git a/db/versions/.archive/10167-limeRoebelini/00-renameVnActiveContrat.sql b/db/versions/.archive/10167-limeRoebelini/00-renameVnActiveContrat.sql new file mode 100644 index 000000000..c74247c06 --- /dev/null +++ b/db/versions/.archive/10167-limeRoebelini/00-renameVnActiveContrat.sql @@ -0,0 +1 @@ +RENAME TABLE vn.activeContrat TO vn.activeContrat__; \ No newline at end of file diff --git a/db/versions/.archive/10167-limeRoebelini/01-renameVnActiveContrat.undo.sql b/db/versions/.archive/10167-limeRoebelini/01-renameVnActiveContrat.undo.sql new file mode 100644 index 000000000..9289cbc2f --- /dev/null +++ b/db/versions/.archive/10167-limeRoebelini/01-renameVnActiveContrat.undo.sql @@ -0,0 +1 @@ +RENAME TABLE vn.activeContrat__ TO vn.activeContrat; \ No newline at end of file diff --git a/db/versions/.archive/10168-orangeAnthurium/00-firstScript.sql b/db/versions/.archive/10168-orangeAnthurium/00-firstScript.sql new file mode 100644 index 000000000..bc461bfc0 --- /dev/null +++ b/db/versions/.archive/10168-orangeAnthurium/00-firstScript.sql @@ -0,0 +1,2 @@ +ALTER TABLE `vn`.`routeGate` +RENAME TO `vn`.`routeGate__` ; diff --git a/db/versions/.archive/10169-greenMonstera/00-createTableBankEntityConfig.sql b/db/versions/.archive/10169-greenMonstera/00-createTableBankEntityConfig.sql new file mode 100644 index 000000000..6d56edc36 --- /dev/null +++ b/db/versions/.archive/10169-greenMonstera/00-createTableBankEntityConfig.sql @@ -0,0 +1,10 @@ +CREATE TABLE vn.bankEntityConfig ( + id INT auto_increment NULL, + bicLength TINYINT DEFAULT 11 NULL COMMENT 'Tamaño del campo bic', + CONSTRAINT bankEntityConfig_PK PRIMARY KEY (id) +) +ENGINE=InnoDB +DEFAULT CHARSET=utf8mb3 +COLLATE=utf8mb3_unicode_ci; + +INSERT INTO vn.bankEntityConfig (id, bicLength) VALUES(1, 11); \ No newline at end of file diff --git a/db/versions/.archive/10169-greenMonstera/01-createTableBankEntityConfig.undo.sql b/db/versions/.archive/10169-greenMonstera/01-createTableBankEntityConfig.undo.sql new file mode 100644 index 000000000..76dacb203 --- /dev/null +++ b/db/versions/.archive/10169-greenMonstera/01-createTableBankEntityConfig.undo.sql @@ -0,0 +1 @@ +DROP TABLE vn.bankEntityConfig; \ No newline at end of file diff --git a/db/versions/.archive/10169-greenMonstera/02-addNotNullToBankEntityBic.sql b/db/versions/.archive/10169-greenMonstera/02-addNotNullToBankEntityBic.sql new file mode 100644 index 000000000..1f12efd8d --- /dev/null +++ b/db/versions/.archive/10169-greenMonstera/02-addNotNullToBankEntityBic.sql @@ -0,0 +1 @@ +ALTER TABLE vn.bankEntity MODIFY COLUMN bic varchar(11) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL; \ No newline at end of file diff --git a/db/versions/.archive/10171-crimsonCarnation/00-volumeConfig.sql b/db/versions/.archive/10171-crimsonCarnation/00-volumeConfig.sql new file mode 100644 index 000000000..df189acbc --- /dev/null +++ b/db/versions/.archive/10171-crimsonCarnation/00-volumeConfig.sql @@ -0,0 +1,2 @@ +ALTER TABLE vn.volumeConfig ADD aerealVolumetricDensity DECIMAL(10,1) DEFAULT 167 NULL +COMMENT 'factor de conversión para calcular el peso tasable aereo'; diff --git a/db/versions/.archive/10171-crimsonCarnation/01-itemWeight.sql b/db/versions/.archive/10171-crimsonCarnation/01-itemWeight.sql new file mode 100644 index 000000000..052c5259c --- /dev/null +++ b/db/versions/.archive/10171-crimsonCarnation/01-itemWeight.sql @@ -0,0 +1,27 @@ +ALTER TABLE vn.item ADD weightByPiece int unsigned NULL +COMMENT 'peso por defecto para un articulo por tallo/unidad'; +/* +-- actualizamos con los valores del itemCost, o de la ultima compra, o de la densidad * volumen +UPDATE vn.itemCost ic + JOIN cache.last_buy lb ON lb.item_id = ic.itemFk and lb.warehouse_id = ic.warehouseFk + JOIN vn.buy b ON b.id = lb.buy_id + JOIN vn.item i ON i.id = ic.itemFk + SET ic.grams = COALESCE( + (b.weight * 1000) / b.packing, + i.density * (cm3delivery / 1000000) * 1000); + +UPDATE vn.item i + JOIN vn.itemCost ic ON ic.itemFk = i.id and ic.warehouseFk = 60 + SET i.weightByPiece = ic.grams + WHERE i.weightByPiece IS NULL; + +UPDATE vn.item i + JOIN vn.itemCost ic ON ic.itemFk = i.id and ic.warehouseFk = 7 + SET i.weightByPiece = ic.grams + WHERE weightByPiece IS NULL; + +UPDATE vn.item i + JOIN vn.itemCost ic ON ic.itemFk = i.id + SET i.weightByPiece = ic.grams + WHERE i.weightByPiece IS NULL + AND ic.warehouseFk NOT IN (60,7);*/ \ No newline at end of file diff --git a/db/versions/.archive/10171-crimsonCarnation/02-agencymode.sql b/db/versions/.archive/10171-crimsonCarnation/02-agencymode.sql new file mode 100644 index 000000000..28413f789 --- /dev/null +++ b/db/versions/.archive/10171-crimsonCarnation/02-agencymode.sql @@ -0,0 +1 @@ +ALTER TABLE vn.agencyMode ADD hasWeightVolumetric INT DEFAULT 0 NOT NULL COMMENT 'Tiene en cuenta el peso volumetrico para los calculos'; diff --git a/db/versions/.archive/10172-brownMedeola/00-firstScript.sql b/db/versions/.archive/10172-brownMedeola/00-firstScript.sql new file mode 100644 index 000000000..b5ed114a2 --- /dev/null +++ b/db/versions/.archive/10172-brownMedeola/00-firstScript.sql @@ -0,0 +1,4 @@ +ALTER TABLE `vn`.`ticket` +CHANGE COLUMN `notes` `notes__` LONGTEXT COLLATE 'utf8mb3_unicode_ci' NULL DEFAULT NULL , +CHANGE COLUMN `invoiceOutFk` `invoiceOutFk__` INT(10) UNSIGNED NULL DEFAULT NULL COMMENT 'eliminar' , +CHANGE COLUMN `isBooked` `isBooked__` TINYINT(1) NOT NULL DEFAULT 0 ; diff --git a/db/versions/.archive/10174-silverOrchid/00-firstScript.sql b/db/versions/.archive/10174-silverOrchid/00-firstScript.sql new file mode 100644 index 000000000..23aa7bfca --- /dev/null +++ b/db/versions/.archive/10174-silverOrchid/00-firstScript.sql @@ -0,0 +1,25 @@ +USE vn; + +ALTER TABLE `vn`.`printer` +ADD COLUMN `sectorFk` INT(11) NULL DEFAULT NULL AFTER `isLabeler`, +ADD INDEX `printer_sectorFk_idx` (`id` ASC, `sectorFk` ASC) ; + +ALTER TABLE `vn`.`printer` +ADD CONSTRAINT `printer_sectorFk` + FOREIGN KEY (`sectorFk`) + REFERENCES `vn`.`sector` (`id`) + ON DELETE RESTRICT + ON UPDATE CASCADE; + + +DELETE FROM `vn`.`sector` WHERE (`id` = '61') and (`warehouseFk` = '60'); +UPDATE `vn`.`sector` SET `description` = 'Zona Palletizado', `code` = 'pallet1' WHERE (`id` = '60') and (`warehouseFk` = '60'); + +UPDATE `vn`.`printer` SET `sectorFk` = '60' WHERE (`id` = '68'); +UPDATE `vn`.`printer` SET `sectorFk` = '60' WHERE (`id` = '54'); +UPDATE `vn`.`printer` SET `sectorFk` = '60' WHERE (`id` = '58'); +UPDATE `vn`.`printer` SET `sectorFk` = '60' WHERE (`id` = '60'); +UPDATE `vn`.`printer` SET `sectorFk` = '40' WHERE (`id` = '89'); +UPDATE `vn`.`printer` SET `sectorFk` = '40' WHERE (`id` = '66'); +UPDATE `vn`.`printer` SET `sectorFk` = '41' WHERE (`id` = '88'); +UPDATE `vn`.`printer` SET `sectorFk` = '41' WHERE (`id` = '36'); diff --git a/db/versions/.archive/10175-bluePaniculata/00-firstScript.sql b/db/versions/.archive/10175-bluePaniculata/00-firstScript.sql new file mode 100644 index 000000000..c492182a1 --- /dev/null +++ b/db/versions/.archive/10175-bluePaniculata/00-firstScript.sql @@ -0,0 +1,40 @@ +CREATE TABLE `vn`.`mdbBranch` ( + `name` VARCHAR(255), + PRIMARY KEY(`name`) +); + +CREATE TABLE `vn`.`mdbVersion` ( + `app` VARCHAR(255) NOT NULL, + `branchFk` VARCHAR(255) NOT NULL, + `version` INT, + CONSTRAINT `mdbVersion_branchFk` FOREIGN KEY (`branchFk`) REFERENCES `vn`.`mdbBranch` (`name`) ON DELETE CASCADE ON UPDATE CASCADE +); + +INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) + VALUES('MdbVersion', '*', '*', 'ALLOW', 'ROLE', 'developer'); + +INSERT INTO `vn`.`mdbBranch` (`name`) + VALUES + ('test'), + ('master'); + +INSERT INTO `vn`.`mdbVersion` (`app`, `branchFk`, `version`) + SELECT programa, 'master', version + FROM vn2008.versiones; + +INSERT INTO `vn`.`mdbVersion` (`app`, `branchFk`, `version`) + SELECT programa, 'test', version + FROM vn2008.versiones; + +RENAME TABLE vn2008.versiones TO vn2008.versiones__; + +CREATE OR REPLACE +ALGORITHM = UNDEFINED VIEW `vn2008`.`versiones` AS +SELECT + `m`.`app` AS `programa`, + `m`.`version` AS `version`, + 0 AS `critical` +FROM + `vn`.`mdbVersion` `m` +WHERE + (`m`.`branchFk` = 'master'); diff --git a/db/versions/.archive/10177-pinkArborvitae/00-crearTablaSpecialLabels.sql b/db/versions/.archive/10177-pinkArborvitae/00-crearTablaSpecialLabels.sql new file mode 100644 index 000000000..ad0d326da --- /dev/null +++ b/db/versions/.archive/10177-pinkArborvitae/00-crearTablaSpecialLabels.sql @@ -0,0 +1,11 @@ +CREATE TABLE vn.specialLabels ( + id INT auto_increment NOT NULL, + description varchar(100) NOT NULL, + reportName varchar(100) NOT NULL, + isVisible BOOL DEFAULT 0 NOT NULL, + image BLOB NULL, + CONSTRAINT specialLabels_PK PRIMARY KEY (id) +) +ENGINE=InnoDB +DEFAULT CHARSET=utf8mb3 +COLLATE=utf8mb3_unicode_ci; \ No newline at end of file diff --git a/db/versions/.archive/10178-tealMoss/00-firstScript.sql b/db/versions/.archive/10178-tealMoss/00-firstScript.sql new file mode 100644 index 000000000..f96dc41be --- /dev/null +++ b/db/versions/.archive/10178-tealMoss/00-firstScript.sql @@ -0,0 +1,6 @@ +DROP VIEW vn.absenceType; +ALTER TABLE vn.calendar DROP FOREIGN KEY calendar_employee_state_id; +RENAME TABLE postgresql.calendar_state TO vn.absenceType; +ALTER TABLE vn.absenceType CHANGE calendar_state_id id int(11) auto_increment NOT NULL; +ALTER TABLE vn.absenceType CHANGE `type` name varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL; +ALTER TABLE vn.calendar ADD CONSTRAINT calendar_FK FOREIGN KEY (dayOffTypeFk) REFERENCES vn.absenceType(id) ON DELETE RESTRICT ON UPDATE CASCADE; \ No newline at end of file diff --git a/db/versions/.archive/10179-goldenMonstera/00-firstScript.sql b/db/versions/.archive/10179-goldenMonstera/00-firstScript.sql new file mode 100644 index 000000000..76089284c --- /dev/null +++ b/db/versions/.archive/10179-goldenMonstera/00-firstScript.sql @@ -0,0 +1,2 @@ +ALTER TABLE `vn`.`payment` +CHANGE COLUMN `exchangeInsuranceFk` `exchangeInsuranceFk__` INT(11) NULL DEFAULT NULL ; diff --git a/db/versions/.archive/10183-navyBamboo/00-firstScript.sql b/db/versions/.archive/10183-navyBamboo/00-firstScript.sql new file mode 100644 index 000000000..37c5d05e3 --- /dev/null +++ b/db/versions/.archive/10183-navyBamboo/00-firstScript.sql @@ -0,0 +1,6 @@ +ALTER TABLE vn.expedition CHANGE checked checked__ tinyint(4) DEFAULT 0 NOT NULL COMMENT 'Deprecado 01/06/2022'; +ALTER TABLE vn.expedition MODIFY COLUMN checked__ tinyint(4) DEFAULT 0 NOT NULL COMMENT 'Deprecado 01/06/2022'; +ALTER TABLE vn.expedition CHANGE isRefund isRefund__ bit(1) DEFAULT b'0' NULL COMMENT 'Deprecado 01/06/2022'; +ALTER TABLE vn.expedition MODIFY COLUMN isRefund__ bit(1) DEFAULT b'0' NULL COMMENT 'Deprecado 01/06/2022'; +ALTER TABLE vn.expedition CHANGE isPickUp isPickUp__ bit(1) DEFAULT b'0' NULL COMMENT 'Deprecado 01/06/2022'; +ALTER TABLE vn.expedition MODIFY COLUMN isPickUp__ bit(1) DEFAULT b'0' NULL COMMENT 'Deprecado 01/06/2022'; \ No newline at end of file diff --git a/db/versions/.archive/10184-azureLaurel/00-firstScript.sql b/db/versions/.archive/10184-azureLaurel/00-firstScript.sql new file mode 100644 index 000000000..94900d44d --- /dev/null +++ b/db/versions/.archive/10184-azureLaurel/00-firstScript.sql @@ -0,0 +1 @@ +ALTER TABLE vn.itemType ADD maxRefs INT UNSIGNED NULL COMMENT 'Indica el número máximo de referencias'; \ No newline at end of file diff --git a/db/versions/.archive/10185-greenGalax/00-firstScript.sql b/db/versions/.archive/10185-greenGalax/00-firstScript.sql new file mode 100644 index 000000000..03a46e785 --- /dev/null +++ b/db/versions/.archive/10185-greenGalax/00-firstScript.sql @@ -0,0 +1,3 @@ +-- Place your SQL code here + +ALTER TABLE vn.clientConfig ADD maxPriceIncreasingRatio DECIMAL(2,2) DEFAULT 0.25 NOT NULL COMMENT 'máximo recobro permitido'; diff --git a/db/versions/.archive/10186-silverGerbera/00-desactivar_trigger.sql b/db/versions/.archive/10186-silverGerbera/00-desactivar_trigger.sql new file mode 100644 index 000000000..d32e8299d --- /dev/null +++ b/db/versions/.archive/10186-silverGerbera/00-desactivar_trigger.sql @@ -0,0 +1,2 @@ +-- desactivem trigger per a canviar el camp +DROP TRIGGER IF EXISTS `vn`.`buy_afterUpdate`; \ No newline at end of file diff --git a/db/versions/.archive/10186-silverGerbera/01-alter_Table_buy.sql b/db/versions/.archive/10186-silverGerbera/01-alter_Table_buy.sql new file mode 100644 index 000000000..090fd4a4f --- /dev/null +++ b/db/versions/.archive/10186-silverGerbera/01-alter_Table_buy.sql @@ -0,0 +1,3 @@ +-- buy.sticker not null, por defecto valor cero +ALTER TABLE vn.buy MODIFY COLUMN stickers int(11) DEFAULT 0 NOT NULL; +ALTER TABLE vn.buy MODIFY COLUMN printedStickers int(11) DEFAULT 0 NOT NULL; \ No newline at end of file diff --git a/db/versions/.archive/10186-silverGerbera/02-alter_table_entryConfig.sql b/db/versions/.archive/10186-silverGerbera/02-alter_table_entryConfig.sql new file mode 100644 index 000000000..8a350d656 --- /dev/null +++ b/db/versions/.archive/10186-silverGerbera/02-alter_table_entryConfig.sql @@ -0,0 +1 @@ +ALTER TABLE `vn`.`entryConfig` ADD COLUMN `inventorySupplierFk` INT(11) NULL DEFAULT 4 AFTER `mailToNotify`; \ No newline at end of file diff --git a/db/versions/.archive/10186-silverGerbera/04-regularizar_Sticker_Inventario.sql b/db/versions/.archive/10186-silverGerbera/04-regularizar_Sticker_Inventario.sql new file mode 100644 index 000000000..3cfd57d3c --- /dev/null +++ b/db/versions/.archive/10186-silverGerbera/04-regularizar_Sticker_Inventario.sql @@ -0,0 +1,6 @@ +-- recorrer los inventarios y verificar que no tengan el campo sticker > 0 en caso contrario regularizar a zero +UPDATE vn.buy b +JOIN vn.entry e ON e.id = b.entryFk +JOIN vn.entryConfig ec ON ec.inventorySupplierFk = e.supplierFk +SET printedStickers = 0 +WHERE printedStickers <> 0; \ No newline at end of file diff --git a/db/versions/.archive/10186-silverGerbera/09-reactivar_trigger.sql b/db/versions/.archive/10186-silverGerbera/09-reactivar_trigger.sql new file mode 100644 index 000000000..9f37fa5af --- /dev/null +++ b/db/versions/.archive/10186-silverGerbera/09-reactivar_trigger.sql @@ -0,0 +1,94 @@ +-- reactivem trigger +DROP TRIGGER IF EXISTS `vn`.`buy_afterUpdate`; +DELIMITER $$ +CREATE DEFINER=`root`@`localhost` TRIGGER `vn`.`buy_afterUpdate` + AFTER UPDATE ON `buy` + FOR EACH ROW +trig: BEGIN + DECLARE vLanded DATE; + DECLARE vBuyerFk INT; + DECLARE vIsBuyerToBeEmailed BOOL; + DECLARE vItemName VARCHAR(50); + DECLARE vIsInventory BOOL; + DECLARE vEmail VARCHAR(255); + + IF !(NEW.id <=> OLD.id) + OR !(NEW.entryFk <=> OLD.entryFk) + OR !(NEW.itemFk <=> OLD.itemFk) + OR !(NEW.quantity <=> OLD.quantity) + OR !(NEW.created <=> OLD.created) THEN + CALL stock.log_add('buy', NEW.id, OLD.id); + END IF; + + IF @isModeInventory THEN + LEAVE trig; + END IF; + + CALL buy_afterUpsert(NEW.id); + + IF !(NEW.weight <=> OLD.weight) AND NEW.weight THEN + UPDATE item + SET density = NEW.weight / (item_getVolume(NEW.itemFk, NEW.packageFk) / 1000000) + WHERE id = NEW.itemFk; + END IF; + + SELECT w.isBuyerToBeEmailed, t.landed + INTO vIsBuyerToBeEmailed, vLanded + FROM entry e + JOIN travel t ON t.id = e.travelFk + JOIN warehouse w ON w.id = t.warehouseInFk + WHERE e.id = NEW.entryFk; + + SELECT it.workerFk, i.longName + INTO vBuyerFk, vItemName + FROM itemCategory k + JOIN itemType it ON it.categoryFk = k.id + JOIN item i ON i.typeFk = it.id + WHERE i.id = OLD.itemFk; + + IF vIsBuyerToBeEmailed AND + vBuyerFk != account.myUser_getId() AND + vLanded = util.CURDATE() THEN + IF !(NEW.itemFk <=> OLD.itemFk) OR + !(NEW.quantity <=> OLD.quantity) OR + !(NEW.packing <=> OLD.packing) OR + !(NEW.grouping <=> OLD.grouping) OR + !(NEW.packageFk <=> OLD.packageFk) OR + !(NEW.weight <=> OLD.weight) THEN + CALL vn.mail_insert( + CONCAT(account.user_getNameFromId(vBuyerFk),'@verdnatura.es'), + CONCAT(account.myUser_getName(),'@verdnatura.es'), + CONCAT('E ', NEW.entryFk ,' Se ha modificado item ', NEW.itemFk, ' ', vItemName), + 'Este email se ha generado automáticamente' + ); + END IF; + END IF; + + SELECT e.isInventory INTO vIsInventory + FROM entry e + WHERE e.id = NEW.entryFk; + + SELECT e.mailToNotify INTO vEmail + FROM entryConfig e + LIMIT 1; + + IF vIsInventory AND + (!(NEW.quantity <=> OLD.quantity) + OR !(NEW.price1<=>OLD.price1) + OR !(NEW.price2<=>OLD.price2) + OR !(NEW.price3<=>OLD.price3)) THEN + + CALL mail_insert( + vEmail, + NULL, + CONCAT('Se ha modificado la entrada ', NEW.entryFk ,' del Artículo ', NEW.itemFk, ' siendo inventario'), + CONCAT( + 'Antes: Cantidad: ', OLD.quantity, ' Precio1: ', OLD.price1, ' Precio2: ', OLD.price2, ' Precio3: ', OLD.price3, + '
', + 'Despues: Cantidad: ', NEW.quantity, ' Precio1: ', NEW.price1, ' Precio2: ', NEW.price2, ' Precio3: ', NEW.price3 + ) + ); + END IF; + +END$$ +DELIMITER ; \ No newline at end of file diff --git a/db/versions/.archive/10187-pinkAspidistra/00-firstScript.sql b/db/versions/.archive/10187-pinkAspidistra/00-firstScript.sql new file mode 100644 index 000000000..1fa97095e --- /dev/null +++ b/db/versions/.archive/10187-pinkAspidistra/00-firstScript.sql @@ -0,0 +1,4 @@ +-- Place your SQL code here +ALTER TABLE vn.agency CHANGE isVolumetric isVolumetric__ tinyint(4) DEFAULT 0 NOT NULL COMMENT 'Si el calculo del porte se hacer por volumen'; +ALTER TABLE vn.agency CHANGE bankFk bankFk__ int(11) DEFAULT 8 NOT NULL COMMENT 'para realizar los reembolsos'; +ALTER TABLE vn.agency CHANGE labelZone labelZone__ tinyint(4) DEFAULT 0 NOT NULL; diff --git a/db/versions/.archive/10188-limeMedeola/00-firstScript.sql b/db/versions/.archive/10188-limeMedeola/00-firstScript.sql new file mode 100644 index 000000000..f3a153748 --- /dev/null +++ b/db/versions/.archive/10188-limeMedeola/00-firstScript.sql @@ -0,0 +1,5 @@ +-- Place your SQL code here +ALTER TABLE vn.client CHANGE cc cc__ varchar(23) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL COMMENT 'obsoleta (comprobar)'; +ALTER TABLE vn.client CHANGE cyc cyc__ double NULL COMMENT 'obsoleta (comprobar)'; +ALTER TABLE vn.client CHANGE discount discount__ tinyint(3) unsigned DEFAULT 0 NOT NULL COMMENT 'obsoleta (comprobar)'; +ALTER TABLE vn.client CHANGE notes notes__ text CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL COMMENT 'obsoleta (comprobar)'; diff --git a/db/versions/.archive/10189-aquaDendro/00-firstScript.sql b/db/versions/.archive/10189-aquaDendro/00-firstScript.sql new file mode 100644 index 000000000..222cd9986 --- /dev/null +++ b/db/versions/.archive/10189-aquaDendro/00-firstScript.sql @@ -0,0 +1,2 @@ +ALTER TABLE `vn`.`itemType` CHANGE gramsMin gramsMin__ int(11) DEFAULT NULL NULL; +ALTER TABLE `vn`.`itemType` CHANGE f11 f11__ tinyint(4) DEFAULT 0 NOT NULL; \ No newline at end of file diff --git a/db/versions/.archive/10191-orangeRoebelini/00-firstScript.sql b/db/versions/.archive/10191-orangeRoebelini/00-firstScript.sql new file mode 100644 index 000000000..58674b9e5 --- /dev/null +++ b/db/versions/.archive/10191-orangeRoebelini/00-firstScript.sql @@ -0,0 +1,3 @@ +-- Place your SQL code here +ALTER TABLE vn.item DROP FOREIGN KEY item_ibfk_6; +ALTER TABLE vn.item CHANGE sectorFk sectorFk__ int(11) DEFAULT NULL NULL; \ No newline at end of file diff --git a/db/versions/.archive/10193-navyHydrangea/00-delete.sql b/db/versions/.archive/10193-navyHydrangea/00-delete.sql new file mode 100644 index 000000000..23d8ee4e7 --- /dev/null +++ b/db/versions/.archive/10193-navyHydrangea/00-delete.sql @@ -0,0 +1,46 @@ +use vn; +-- Auto-generated SQL script. Actual values for binary/complex data types may differ - what you see is the default string representation of values. +DELETE FROM vn.taxClassCode + WHERE taxClassFk=1 AND effectived='2014-01-01' AND taxCodeFk=108; +DELETE FROM vn.taxClassCode + WHERE taxClassFk=2 AND effectived='2014-01-01' AND taxCodeFk=108; +DELETE FROM vn.taxClassCode + WHERE taxClassFk=3 AND effectived='2014-01-01' AND taxCodeFk=108; +DELETE FROM vn.taxClassCode + WHERE taxClassFk=5 AND effectived='2014-01-01' AND taxCodeFk=108; +DELETE FROM vn.taxClassCode + WHERE taxClassFk=3 AND effectived='2016-01-01' AND taxCodeFk=109; +DELETE FROM vn.taxClassCode + WHERE taxClassFk=5 AND effectived='2016-01-01' AND taxCodeFk=109; +DELETE FROM vn.taxClassCode + WHERE taxClassFk=1 AND effectived='2019-01-01' AND taxCodeFk=122; +DELETE FROM vn.taxClassCode + WHERE taxClassFk=2 AND effectived='2019-01-01' AND taxCodeFk=122; +DELETE FROM vn.taxClassCode + WHERE taxClassFk=3 AND effectived='2019-01-01' AND taxCodeFk=122; +DELETE FROM vn.taxClassCode + WHERE taxClassFk=5 AND effectived='2019-01-01' AND taxCodeFk=122; +-- Auto-generated SQL script. Actual values for binary/complex data types may differ - what you see is the default string representation of values. +DELETE FROM vn.taxCode + WHERE id=108; +DELETE FROM vn.taxCode + WHERE id=109; +DELETE FROM vn.taxCode + WHERE id=110; +DELETE FROM vn.taxCode + WHERE id=122; +-- Auto-generated SQL script. Actual values for binary/complex data types may differ - what you see is the default string representation of values. +DELETE FROM vn.bookingPlanner + WHERE countryFk = 30; + +DELETE FROM vn.botanicExport where restriction = 'Importacion Prohibida'; + +DELETE FROM vn.itemTaxCountry WHERE countryFk = 30; +DELETE FROM vn.botanicExport WHERE countryFk = 30; +UPDATE vn.client SET countryFk = 1 WHERE countryFk = 30; +UPDATE vn.supplier SET countryFk = 1 WHERE countryFk = 30; +UPDATE province SET countryFk = 1 WHERE countryFk = 30; +UPDATE autonomy SET countryFk = 1 WHERE countryFk = 30; +DELETE FROM vn.taxCode WHERE taxTypeFk = 24; +DELETE FROM vn.taxClassCode WHERE taxCodeFk IN (108, 109,110,122); +DELETE FROM vn.country WHERE code = 'EX'; \ No newline at end of file diff --git a/db/versions/.archive/10193-navyHydrangea/01-botanicExport.sql b/db/versions/.archive/10193-navyHydrangea/01-botanicExport.sql new file mode 100644 index 000000000..f36f7fa9b --- /dev/null +++ b/db/versions/.archive/10193-navyHydrangea/01-botanicExport.sql @@ -0,0 +1 @@ +ALTER TABLE vn.botanicExport CHANGE countryFk countryFk__ mediumint(8) unsigned DEFAULT NULL NULL; diff --git a/db/versions/.archive/10193-navyHydrangea/02-item.sql b/db/versions/.archive/10193-navyHydrangea/02-item.sql new file mode 100644 index 000000000..8694e6d15 --- /dev/null +++ b/db/versions/.archive/10193-navyHydrangea/02-item.sql @@ -0,0 +1 @@ +ALTER TABLE vn.item MODIFY COLUMN comment varchar(150) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL COMMENT 'referencia del proveedor'; diff --git a/db/versions/.archive/10193-navyHydrangea/03-autonomy.sql b/db/versions/.archive/10193-navyHydrangea/03-autonomy.sql new file mode 100644 index 000000000..32771ef05 --- /dev/null +++ b/db/versions/.archive/10193-navyHydrangea/03-autonomy.sql @@ -0,0 +1,17 @@ +ALTER TABLE vn.autonomy ADD isUeeMember BOOL DEFAULT NULL NULL; +ALTER TABLE vn.autonomy ADD hasDailyInvoice tinyint(4) DEFAULT NULL; + +UPDATE vn.autonomy + SET isUeeMember = FALSE, + hasDailyInvoice = TRUE + WHERE name = 'Canarias'; + +UPDATE vn.autonomy + SET isUeeMember = FALSE, + hasDailyInvoice = TRUE + WHERE name = 'Ciudad de Ceuta'; + +UPDATE vn.autonomy + SET isUeeMember = FALSE, + hasDailyInvoice = TRUE + WHERE name = 'Ciudad de Melilla'; diff --git a/db/versions/.archive/10193-navyHydrangea/03-turn.sql b/db/versions/.archive/10193-navyHydrangea/03-turn.sql new file mode 100644 index 000000000..eb48cbdea --- /dev/null +++ b/db/versions/.archive/10193-navyHydrangea/03-turn.sql @@ -0,0 +1 @@ +RENAME TABLE vn2008.turn TO vn2008.turn__; diff --git a/db/versions/.archive/10193-navyHydrangea/04-country.sql b/db/versions/.archive/10193-navyHydrangea/04-country.sql new file mode 100644 index 000000000..fe57cf1b0 --- /dev/null +++ b/db/versions/.archive/10193-navyHydrangea/04-country.sql @@ -0,0 +1,2 @@ +ALTER TABLE vn.country CHANGE politicalCountryFk politicalCountryFk__ mediumint(8) unsigned NULL + COMMENT 'Pais Real(apaño por culpa del España Exento)'; \ No newline at end of file diff --git a/db/versions/.archive/10194-redRose/00-firstScript.sql b/db/versions/.archive/10194-redRose/00-firstScript.sql new file mode 100644 index 000000000..213423dbb --- /dev/null +++ b/db/versions/.archive/10194-redRose/00-firstScript.sql @@ -0,0 +1,3 @@ +-- Place your SQL code here +ALTER TABLE vn.sector CHANGE `path` path__ int(11) DEFAULT NULL NULL; +ALTER TABLE vn.sector CHANGE pickingPlacement pickingPlacement__ varchar(15) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL; diff --git a/db/versions/.archive/10195-redPhormium/00-firstScript.sql b/db/versions/.archive/10195-redPhormium/00-firstScript.sql new file mode 100644 index 000000000..532f8a4f8 --- /dev/null +++ b/db/versions/.archive/10195-redPhormium/00-firstScript.sql @@ -0,0 +1,24 @@ +CREATE TABLE `vn`.`itemCleanConfig` ( + `id` int(11) NOT NULL, + `step` int(11) NOT NULL COMMENT 'Indica los items que procesa en cada ciclo', + `quantity` int(11) NOT NULL COMMENT 'Indica el número de items que va a procesar', + `isStop` tinyint(1) DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +INSERT INTO vn.itemCleanConfig (id,step,quantity,isStop) + VALUES (1,500,100000,0); + +CREATE TABLE vn.itemCleanCount ( + id int(11) auto_increment NOT NULL, + itemFrom int(11) NULL COMMENT 'Indica el item por donde ha empezado', + itemDeleted int(11) NULL COMMENT 'Indica la cantidad de items que ha eliminado', + created TIMESTAMP DEFAULT current_timestamp() NULL, + PRIMARY KEY (id) +) +ENGINE=InnoDB +DEFAULT CHARSET=utf8 +COLLATE=utf8_unicode_ci; + +INSERT INTO bs.nightTask (`order`,`schema`,`procedure`) + VALUES (1008,'vn','item_cleanLauncher'); \ No newline at end of file diff --git a/db/versions/.archive/10200-bronzeCyca/00-firstScript.sql b/db/versions/.archive/10200-bronzeCyca/00-firstScript.sql new file mode 100644 index 000000000..d18c9f57a --- /dev/null +++ b/db/versions/.archive/10200-bronzeCyca/00-firstScript.sql @@ -0,0 +1,5 @@ +ALTER TABLE vn.itemConfig ADD monthToDeactivate int(3) DEFAULT 24 NOT NULL; +ALTER TABLE vn.item ADD lastUsed datetime DEFAULT CURRENT_TIMESTAMP; +CREATE INDEX item_lastUsed_IDX USING BTREE ON vn.item (lastUsed); +INSERT INTO bs.nightTask (`order`,`schema`,`procedure`) + VALUES (1007,'vn','item_deactivateUnused'); \ No newline at end of file diff --git a/db/versions/.archive/10201-whiteRaphis/00-firstScript.sql b/db/versions/.archive/10201-whiteRaphis/00-firstScript.sql new file mode 100644 index 000000000..ff254a6d1 --- /dev/null +++ b/db/versions/.archive/10201-whiteRaphis/00-firstScript.sql @@ -0,0 +1,4 @@ +-- Place your SQL code here +ALTER TABLE `vn`.`origin` +CHANGE COLUMN `flag` `flag__` BLOB NULL DEFAULT NULL , +CHANGE COLUMN `nl` `nl__` TINYINT(4) NOT NULL DEFAULT '0' ; \ No newline at end of file diff --git a/db/versions/.archive/10202-redCamellia/00-Remove_FK_to_ediGenus.sql b/db/versions/.archive/10202-redCamellia/00-Remove_FK_to_ediGenus.sql new file mode 100644 index 000000000..c92cd9de5 --- /dev/null +++ b/db/versions/.archive/10202-redCamellia/00-Remove_FK_to_ediGenus.sql @@ -0,0 +1,2 @@ +ALTER TABLE vn.botanicExport DROP FOREIGN KEY botanicExport_FK4; +ALTER TABLE vn.botanicExport DROP FOREIGN KEY botanicExport_FK; \ No newline at end of file diff --git a/db/versions/.archive/10203-redMedeola/00-firstScript.sql b/db/versions/.archive/10203-redMedeola/00-firstScript.sql new file mode 100644 index 000000000..1e6bfa49e --- /dev/null +++ b/db/versions/.archive/10203-redMedeola/00-firstScript.sql @@ -0,0 +1 @@ +ALTER TABLE vn.supplier MODIFY COLUMN postCode char(8) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL; \ No newline at end of file diff --git a/db/versions/.archive/10204-bronzeCarnation/00-firstScript.sql b/db/versions/.archive/10204-bronzeCarnation/00-firstScript.sql new file mode 100644 index 000000000..6c4885bc0 --- /dev/null +++ b/db/versions/.archive/10204-bronzeCarnation/00-firstScript.sql @@ -0,0 +1 @@ +ALTER TABLE vn.state MODIFY COLUMN name varchar(20) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL; -- codi de Sergio \ No newline at end of file diff --git a/db/versions/.archive/10205-bronzeAnthurium/00-firstScript.sql b/db/versions/.archive/10205-bronzeAnthurium/00-firstScript.sql new file mode 100644 index 000000000..d281dbd42 --- /dev/null +++ b/db/versions/.archive/10205-bronzeAnthurium/00-firstScript.sql @@ -0,0 +1,32 @@ +DROP TEMPORARY TABLE IF EXISTS tmp.priority; +CREATE TEMPORARY TABLE tmp.priority + ENGINE = MEMORY + SELECT itemTagId, MaxPriority + FROM (SELECT it.id itemTagId, priorityChange.MaxPriority, i.id + FROM vn.itemTag it + JOIN vn.item i ON i.id = it.itemFk + JOIN vn.itemType ity ON ity.id = i.typeFk + JOIN (SELECT it.itemFk, max(it.priority) + 1 as MaxPriority + FROM vn.itemTag it + GROUP BY it.`itemFk` + ) priorityChange ON priorityChange.itemFk = i.id + JOIN(SELECT it.itemFk,it.priority, min(it.id) as minId + FROM vn.itemTag it + GROUP BY it.`itemFk`,it.`priority` + ) minId ON minId.itemFk = i.id + AND minId.priority = it.priority + WHERE i.isActive + GROUP BY it.itemFk, it.priority + HAVING COUNT(it.priority) > 1)sub + GROUP BY sub.id; + +SET @isTriggerDisabled := TRUE; + UPDATE vn.itemTag it + JOIN tmp.priority tmp ON tmp.itemTagId = it.id + SET it.priority = tmp.MaxPriority; +SET @isTriggerDisabled := FALSE; + +DROP TEMPORARY TABLE IF EXISTS tmp.priority; + +ALTER TABLE `vn`.`itemTag` +ADD UNIQUE INDEX `itemTagItemPriority` (`itemFk` ASC, `priority` ASC); diff --git a/db/versions/.archive/10207-greenRose/00-Alter_table_entry.sql b/db/versions/.archive/10207-greenRose/00-Alter_table_entry.sql new file mode 100644 index 000000000..d562e3f3b --- /dev/null +++ b/db/versions/.archive/10207-greenRose/00-Alter_table_entry.sql @@ -0,0 +1,3 @@ +ALTER TABLE vn.entry ADD invoiceAmount DECIMAL(10,2) DEFAULT NULL; +ALTER TABLE vn.entry ADD buyerFk INT(10) unsigned NULL; +ALTER TABLE vn.entry ADD CONSTRAINT entry_FK FOREIGN KEY (buyerFk) REFERENCES vn.worker(id) ON UPDATE CASCADE; \ No newline at end of file diff --git a/db/versions/.archive/10207-greenRose/00-Alter_table_entry.undo.sql b/db/versions/.archive/10207-greenRose/00-Alter_table_entry.undo.sql new file mode 100644 index 000000000..c39a01c9b --- /dev/null +++ b/db/versions/.archive/10207-greenRose/00-Alter_table_entry.undo.sql @@ -0,0 +1,3 @@ +ALTER TABLE vn.entry DROP invoiceAmount; +ALTER TABLE vn.entry DROP CONSTRAINT entry_FK; +ALTER TABLE vn.entry DROP buyerFk; \ No newline at end of file diff --git a/db/versions/.archive/10207-greenRose/01-Update_invoiceAmount.sql b/db/versions/.archive/10207-greenRose/01-Update_invoiceAmount.sql new file mode 100644 index 000000000..1dc2c8836 --- /dev/null +++ b/db/versions/.archive/10207-greenRose/01-Update_invoiceAmount.sql @@ -0,0 +1,4 @@ + UPDATE IGNORE vn.entry e + JOIN vn.worker w ON w.code = TRIM(Right(REPLACE(e.notes, Char(10), ""), 4)) + SET invoiceAmount = CAST(REPLACE(notes, ',', '.') as DECIMAL (10,2)), + buyerFk = w.id; \ No newline at end of file diff --git a/db/versions/.archive/10208-goldenRuscus/00-firstScript.sql b/db/versions/.archive/10208-goldenRuscus/00-firstScript.sql new file mode 100644 index 000000000..05aaa9b48 --- /dev/null +++ b/db/versions/.archive/10208-goldenRuscus/00-firstScript.sql @@ -0,0 +1,131 @@ +-- Crear tabla en caso de necesitar recuperar + +CREATE TABLE vn.expence__ LIKE vn.expence; +INSERT INTO vn.expence__ SELECT * FROM vn.expence; + +-- Eliminar las Fk en expence + +ALTER TABLE `vn`.`invoiceOutExpence` +DROP FOREIGN KEY `invoiceOutExpence_expenceFk`; +ALTER TABLE `vn`.`invoiceOutExpence` +DROP INDEX `invoiceOutExpence_FK_2_idx` ; + +ALTER TABLE `vn`.`item` +DROP FOREIGN KEY `item_expenceFk`; +ALTER TABLE `vn`.`item` +DROP INDEX `item_expenceFk` ; + +ALTER TABLE `vn`.`invoiceInTax` +DROP FOREIGN KEY `recibida_iva_gastos_id`; +ALTER TABLE `vn`.`invoiceInTax` +DROP INDEX `recibida_iva_gastos_id` ; + +ALTER TABLE `vn`.`invoiceInSage` +DROP FOREIGN KEY `invoiceInSage_expenceFk`; +ALTER TABLE `vn`.`invoiceInSage` +DROP INDEX `invoiceInSage_expenceFk` ; + +ALTER TABLE `vn`.`invoiceIn` +DROP FOREIGN KEY `invoiceIn_expenceFkDeductible`; +ALTER TABLE `vn`.`invoiceIn` +DROP INDEX `invoiceIn_expenceFkDeductible` ; + +ALTER TABLE `vn`.`ticketServiceType` +DROP FOREIGN KEY `ticketServiceType_expenceFk`; +ALTER TABLE `vn`.`ticketServiceType` +DROP INDEX `ticketServiceType_expenceFk` ; + +-- Actualizar tabla expence + +ALTER TABLE `vn`.`expence` +DROP INDEX `iva_tipo_id`; + +ALTER TABLE `vn`.`expence` +DROP COLUMN `isForSale`, +DROP COLUMN `isConbase`; + +CREATE TEMPORARY TABLE tmp.expence +SELECT * + FROM vn.expence + GROUP BY id; + +TRUNCATE vn.expence; + +ALTER TABLE `vn`.`expence` + CHANGE COLUMN `taxTypeFk` `taxTypeFk` TINYINT(4) NULL , + DROP PRIMARY KEY, + ADD PRIMARY KEY (`id`); + +ALTER TABLE `vn`.`expence` + DROP COLUMN `taxTypeFk`; + + +INSERT INTO vn.expence (id, name ,isWithheld) + SELECT id, name ,isWithheld + FROM tmp.expence; + + +-- Volver a poner las Fk en expence + +ALTER TABLE `vn`.`invoiceOutExpence` + ADD INDEX `invoiceOutExpence_expenceFk_idx` (`expenceFk` ASC) ; + +ALTER TABLE `vn`.`invoiceOutExpence` + ADD CONSTRAINT `invoiceOutExpence_expenceFk` + FOREIGN KEY (`expenceFk`) + REFERENCES `vn`.`expence` (`id`) + ON DELETE RESTRICT + ON UPDATE CASCADE; + +ALTER TABLE `vn`.`item` + ADD INDEX `item_expenceFk_idx` (`expenceFk` ASC) ; + +ALTER TABLE `vn`.`item` + ADD CONSTRAINT `item_expenceFk` + FOREIGN KEY (`expenceFk`) + REFERENCES `vn`.`expence` (`id`) + ON DELETE RESTRICT + ON UPDATE CASCADE; + + +ALTER TABLE `vn`.`invoiceInTax` + ADD INDEX `invoiceInTax_idx` (`expenceFk` ASC) ; + +ALTER TABLE `vn`.`invoiceInTax` + ADD CONSTRAINT `invoiceInTax_expenceFk` + FOREIGN KEY (`expenceFk`) + REFERENCES `vn`.`expence` (`id`) + ON DELETE RESTRICT + ON UPDATE CASCADE; + + +ALTER TABLE `vn`.`invoiceInSage` + ADD INDEX `invoiceInSage_idx` (`expenceFk` ASC) ; + +ALTER TABLE `vn`.`invoiceInSage` + ADD CONSTRAINT `invoiceInSage_expenceFk` + FOREIGN KEY (`expenceFk`) + REFERENCES `vn`.`expence` (`id`) + ON DELETE RESTRICT + ON UPDATE CASCADE; + +ALTER TABLE `vn`.`invoiceIn` + ADD INDEX `invoiceIn_expenceFkDeductible_idx` (`expenceFkDeductible` ASC) ; + +ALTER TABLE `vn`.`invoiceIn` + ADD CONSTRAINT `invoiceIn_expenceFkDeductible` + FOREIGN KEY (`expenceFkDeductible`) + REFERENCES `vn`.`expence` (`id`) + ON DELETE RESTRICT + ON UPDATE CASCADE; + +ALTER TABLE `vn`.`ticketServiceType` + ADD INDEX `ticketServiceType_expenceFk_idx` (`expenceFk` ASC) ; + +ALTER TABLE `vn`.`ticketServiceType` + ADD CONSTRAINT `ticketServiceType_expenceFk` + FOREIGN KEY (`expenceFk`) + REFERENCES `vn`.`expence` (`id`) + ON DELETE RESTRICT + ON UPDATE CASCADE; + \ No newline at end of file diff --git a/db/versions/.archive/10209-bronzeBirch/00-firstScript.sql b/db/versions/.archive/10209-bronzeBirch/00-firstScript.sql new file mode 100644 index 000000000..681faa1b1 --- /dev/null +++ b/db/versions/.archive/10209-bronzeBirch/00-firstScript.sql @@ -0,0 +1 @@ +ALTER TABLE account.`user` ADD CONSTRAINT mail UNIQUE KEY (email); \ No newline at end of file diff --git a/db/versions/.archive/10211-greenDendro/01-firstScript.sql b/db/versions/.archive/10211-greenDendro/01-firstScript.sql new file mode 100644 index 000000000..ebea1865e --- /dev/null +++ b/db/versions/.archive/10211-greenDendro/01-firstScript.sql @@ -0,0 +1,24 @@ +USE `vn`; + +DROP TABLE IF EXISTS vn.splitFilter; +CREATE TABLE `vn`.`splitFilter` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `autonomyFk` int(11) DEFAULT NULL, + `clientFk` int(11) DEFAULT NULL, + `nickname` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `splitFilter_UN` (`autonomyFk`), + UNIQUE KEY `splitFilter_UN1` (`clientFk`), + KEY `splitFilter_FK` (`autonomyFk`), + KEY `splitFilter_FK_1` (`clientFk`), + CONSTRAINT `splitFilter_FK` FOREIGN KEY (`autonomyFk`) REFERENCES `autonomy` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `splitFilter_FK_1` FOREIGN KEY (`clientFk`) REFERENCES `client` (`id`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='define los clientes que tienen split y el nombre a mostrar en la etiqueta'; + +INSERT INTO vn.splitFilter +(id, autonomyFk, clientFk, nickname) +VALUES(1, 7, NULL, '<
diff --git a/front/salix/components/user-popover/index.html b/front/salix/components/user-popover/index.html
index 0fa6800c5..06a4af1e0 100644
--- a/front/salix/components/user-popover/index.html
+++ b/front/salix/components/user-popover/index.html
@@ -58,7 +58,7 @@
label="Local bank"
id="localBank"
ng-model="$ctrl.localBankFk"
- url="Banks"
+ url="Accountings"
select-fields="['id','bank']"
show-field="bank"
order="id"
diff --git a/front/salix/locale/es.yml b/front/salix/locale/es.yml
index bed41c63b..044d0d043 100644
--- a/front/salix/locale/es.yml
+++ b/front/salix/locale/es.yml
@@ -18,6 +18,7 @@ Show summary: Mostrar vista previa
What is new: Novedades de la versión
Settings: Ajustes
There is a new version, click here to reload: Hay una nueva versión, pulse aquí para recargar
+This ticket is locked: Este ticket está bloqueado
# Actions
diff --git a/front/salix/module.js b/front/salix/module.js
index f8fa0faf0..53b718427 100644
--- a/front/salix/module.js
+++ b/front/salix/module.js
@@ -13,7 +13,7 @@ export function run($window, $rootScope, vnAuth, vnApp, vnToken, $state) {
if (!collection || !size || !id) return;
const basePath = `/api/Images/${collection}/${size}/${id}`;
- return `${basePath}/download?access_token=${vnToken.token}`;
+ return `${basePath}/download?access_token=${vnToken.tokenMultimedia}`;
};
$window.validations = {};
@@ -120,7 +120,7 @@ function $exceptionHandler(vnApp, $window, $state, $injector) {
messageT = 'Invalid login';
break;
case 403:
- messageT = 'Access denied';
+ messageT = exception.data?.error?.message || 'Access Denied';
break;
case 502:
messageT = 'It seems that the server has fall down';
diff --git a/gulpfile.js b/gulpfile.js
index d7e7d8e86..aa2b65bc1 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,21 +1,20 @@
+/* eslint-disable no-console */
require('require-yaml');
const gulp = require('gulp');
const PluginError = require('plugin-error');
-const argv = require('minimist')(process.argv.slice(2));
const log = require('fancy-log');
-const Docker = require('./db/docker.js');
+const Myt = require('@verdnatura/myt/myt');
+const Run = require('@verdnatura/myt/myt-run');
+const Start = require('@verdnatura/myt/myt-start');
// Configuration
let isWindows = /^win/.test(process.platform);
-if (argv.NODE_ENV)
- process.env.NODE_ENV = argv.NODE_ENV;
-
let langs = ['es', 'en'];
let srcDir = './front';
let modulesDir = './modules';
-let buildDir = 'dist';
+let buildDir = 'front/dist';
let backSources = [
'!node_modules',
@@ -65,19 +64,40 @@ back.description = `Starts backend and database service`;
const defaultTask = gulp.parallel(front, back);
defaultTask.description = `Starts all application services`;
-function install() {
- const install = require('gulp-install');
- const print = require('gulp-print');
+async function install() {
+ const spawn = require('child_process').spawn;
- let npmArgs = [];
- if (argv.ci) npmArgs = ['--no-audit', '--prefer-offline'];
+ console.log('-> Installing global packages...');
+ await pnpmInstall();
- let packageFiles = ['front/package.json', 'print/package.json'];
- return gulp.src(packageFiles)
- .pipe(print(filepath => {
- return `Installing packages in ${filepath}`;
- }))
- .pipe(install({npm: npmArgs}));
+ const modules = ['front', 'print'];
+ for (const module of modules) {
+ console.log(`-> Installing '${module}' packages...`);
+ await pnpmInstall(module);
+ }
+
+ async function pnpmInstall(prefix) {
+ let args = ['install', '--prefer-offline'];
+ if (prefix) args = args.concat(['--prefix', prefix]);
+
+ const options = {
+ stdio: [
+ process.stdin,
+ process.stdout,
+ process.stderr
+ ]
+ };
+
+ await new Promise((resolve, reject) => {
+ const child = spawn('pnpm', args, options);
+ child.on('exit', code => {
+ if (code !== 0)
+ reject(new Error(`pnpm exit code ${code}`));
+ else
+ resolve(code);
+ });
+ });
+ }
}
install.description = `Installs node dependencies in all directories`;
@@ -231,16 +251,20 @@ watch.description = `Watches for changes in routes and locale files`;
// Docker
async function dockerStart() {
- const container = new Docker('salix-db');
- await container.start();
+ const myt = new Myt();
+ await myt.init({workspace: __dirname});
+ await myt.run(Start);
+ await myt.deinit();
}
-dockerStart.description = `Starts the salix-db container`;
+dockerStart.description = `Starts the DB container`;
async function docker() {
- const container = new Docker('salix-db');
- await container.run();
+ const myt = new Myt();
+ await myt.init({workspace: __dirname});
+ await myt.run(Run);
+ await myt.deinit();
}
-docker.description = `Runs the salix-db container`;
+docker.description = `Builds and starts the DB container`;
module.exports = {
default: defaultTask,
@@ -258,5 +282,6 @@ module.exports = {
locales,
localesRoutes,
watch,
+ dockerStart,
docker
};
diff --git a/jest.front.config.js b/jest.front.config.js
index 3289df8bb..4b292801e 100644
--- a/jest.front.config.js
+++ b/jest.front.config.js
@@ -1,6 +1,8 @@
// For a detailed explanation regarding each configuration property, visit:
// https://jestjs.io/docs/en/configuration.html
/* eslint max-len: ["error", { "code": 150 }]*/
+const cpus = require('os').cpus().length;
+const maxCpus = Math.floor(cpus * 0.45);
module.exports = {
name: 'front end',
@@ -10,8 +12,9 @@ module.exports = {
},
testEnvironment: 'jsdom',
setupFilesAfterEnv: [
- './jest-front.js'
+ './front/jest-setup.js'
],
+ maxWorkers: maxCpus,
testMatch: [
'**/front/**/*.spec.js',
'**/print/**/*.spec.js',
@@ -37,7 +40,7 @@ module.exports = {
],
moduleNameMapper: {
'\\.(css|scss)$': 'identity-obj-proxy',
- '\\.(jpg|ico|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': '/fileMock.js',
+ '\\.(jpg|ico|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': '/front/jest-mock.js',
},
testURL: 'http://localhost',
verbose: false,
diff --git a/loopback/common/methods/application/execute.js b/loopback/common/methods/application/execute.js
new file mode 100644
index 000000000..a468dcd70
--- /dev/null
+++ b/loopback/common/methods/application/execute.js
@@ -0,0 +1,28 @@
+const UserError = require('vn-loopback/util/user-error');
+
+module.exports = Self => {
+ Self.execute = async(ctx, type, query, params, options) => {
+ const userId = ctx.req.accessToken.userId;
+ const models = Self.app.models;
+ params = params ?? [];
+
+ const myOptions = {userId: ctx.req.accessToken.userId};
+ if (typeof options == 'object')
+ Object.assign(myOptions, options);
+
+ const chain = query.split(' ')[1];
+
+ const [canExecute] = await models.ProcsPriv.rawSql(
+ 'SELECT account.user_hasRoutinePriv(?,?,?)',
+ [type, chain, userId],
+ myOptions);
+
+ if (!Object.values(canExecute)[0]) throw new UserError(`You don't have enough privileges`, 'ACCESS_DENIED');
+
+ const argString = params.map(() => '?').join(',');
+
+ const response = await models.ProcsPriv.rawSql(query + `(${argString})`, params, myOptions);
+ if (!Array.isArray(response)) return;
+ return response[0];
+ };
+};
diff --git a/loopback/common/methods/application/executeFunc.js b/loopback/common/methods/application/executeFunc.js
new file mode 100644
index 000000000..a42fdae67
--- /dev/null
+++ b/loopback/common/methods/application/executeFunc.js
@@ -0,0 +1,41 @@
+module.exports = Self => {
+ Self.remoteMethodCtx('executeFunc', {
+ description: 'Return result of function',
+ accessType: 'EXECUTE',
+ accepts: [
+ {
+ arg: 'routine',
+ type: 'string',
+ description: 'The routine name',
+ required: true,
+ http: {source: 'path'}
+ },
+ {
+ arg: 'schema',
+ type: 'string',
+ description: 'The routine schema',
+ required: true,
+ },
+ {
+ arg: 'params',
+ type: ['any'],
+ description: 'The params array',
+ },
+ ],
+ returns: {
+ type: 'any',
+ root: true
+ },
+ http: {
+ path: `/:routine/execute-func`,
+ verb: 'POST'
+ }
+ });
+
+ Self.executeFunc = async(ctx, routine, schema, params, options) => {
+ const query = `SELECT ${schema}.${routine}`;
+
+ const response = await Self.execute(ctx, 'FUNCTION', query, params, options);
+ return Object.values(response)[0];
+ };
+};
diff --git a/loopback/common/methods/application/executeProc.js b/loopback/common/methods/application/executeProc.js
new file mode 100644
index 000000000..a8825da0f
--- /dev/null
+++ b/loopback/common/methods/application/executeProc.js
@@ -0,0 +1,39 @@
+module.exports = Self => {
+ Self.remoteMethodCtx('executeProc', {
+ description: 'Return result of procedure',
+ accessType: 'EXECUTE',
+ accepts: [
+ {
+ arg: 'routine',
+ type: 'string',
+ description: 'The routine name',
+ required: true,
+ http: {source: 'path'}
+ },
+ {
+ arg: 'schema',
+ type: 'string',
+ description: 'The routine schema',
+ required: true,
+ },
+ {
+ arg: 'params',
+ type: ['any'],
+ description: 'The params array',
+ },
+ ],
+ returns: {
+ type: 'any',
+ root: true
+ },
+ http: {
+ path: `/:routine/execute-proc`,
+ verb: 'POST'
+ }
+ });
+
+ Self.executeProc = async(ctx, routine, schema, params, options) => {
+ const query = `CALL ${schema}.${routine}`;
+ return Self.execute(ctx, 'PROCEDURE', query, params, options);
+ };
+};
diff --git a/loopback/common/methods/application/spec/execute.spec.js b/loopback/common/methods/application/spec/execute.spec.js
new file mode 100644
index 000000000..1a0a8ace9
--- /dev/null
+++ b/loopback/common/methods/application/spec/execute.spec.js
@@ -0,0 +1,161 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('Application execute()/executeProc()/executeFunc()', () => {
+ const userWithoutPrivileges = 1;
+ const userWithPrivileges = 9;
+ const userWithInheritedPrivileges = 120;
+ let tx;
+
+ function getCtx(userId) {
+ return {
+ req: {
+ accessToken: {userId},
+ headers: {origin: 'http://localhost'}
+ }
+ };
+ }
+
+ beforeEach(async() => {
+ tx = await models.Application.beginTransaction({});
+ const options = {transaction: tx};
+
+ await models.Application.rawSql(`
+ CREATE OR REPLACE PROCEDURE vn.myProcedure(vMyParam INT)
+ BEGIN
+ SELECT vMyParam myParam, t.*
+ FROM ticket t
+ LIMIT 2;
+ END
+ `, null, options);
+
+ await models.Application.rawSql(`
+ CREATE OR REPLACE FUNCTION bs.myFunction(vMyParam INT) RETURNS int(11)
+ BEGIN
+ RETURN vMyParam;
+ END
+ `, null, options);
+
+ await models.Application.rawSql(`
+ GRANT EXECUTE ON PROCEDURE vn.myProcedure TO developer;
+ GRANT EXECUTE ON FUNCTION bs.myFunction TO developer;
+ `, null, options);
+ });
+
+ it('should throw error when execute procedure and not have privileges', async() => {
+ const ctx = getCtx(userWithoutPrivileges);
+
+ let error;
+ try {
+ const options = {transaction: tx};
+
+ await models.Application.execute(
+ ctx,
+ 'PROCEDURE',
+ 'CALL vn.myProcedure',
+ [1],
+ options
+ );
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ error = e;
+ }
+
+ expect(error.message).toEqual(`You don't have enough privileges`);
+ });
+
+ it('should execute procedure and get data', async() => {
+ const ctx = getCtx(userWithPrivileges);
+ try {
+ const options = {transaction: tx};
+
+ const response = await models.Application.execute(
+ ctx,
+ 'PROCEDURE',
+ 'CALL vn.myProcedure',
+ [1],
+ options
+ );
+
+ expect(response.length).toEqual(2);
+ expect(response[0].myParam).toEqual(1);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+
+ describe('Application executeProc()', () => {
+ it('should execute procedure and get data (executeProc)', async() => {
+ const ctx = getCtx(userWithPrivileges);
+ try {
+ const options = {transaction: tx};
+
+ const response = await models.Application.executeProc(
+ ctx,
+ 'myProcedure',
+ 'vn',
+ [1],
+ options
+ );
+
+ expect(response.length).toEqual(2);
+ expect(response[0].myParam).toEqual(1);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+ });
+
+ describe('Application executeFunc()', () => {
+ it('should execute function and get data', async() => {
+ const ctx = getCtx(userWithPrivileges);
+ try {
+ const options = {transaction: tx};
+
+ const response = await models.Application.executeFunc(
+ ctx,
+ 'myFunction',
+ 'bs',
+ [1],
+ options
+ );
+
+ expect(response).toEqual(1);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+
+ it('should execute function and get data with user with inherited privileges', async() => {
+ const ctx = getCtx(userWithInheritedPrivileges);
+ try {
+ const options = {transaction: tx};
+
+ const response = await models.Application.executeFunc(
+ ctx,
+ 'myFunction',
+ 'bs',
+ [1],
+ options
+ );
+
+ expect(response).toEqual(1);
+
+ await tx.rollback();
+ } catch (e) {
+ await tx.rollback();
+ throw e;
+ }
+ });
+ });
+});
diff --git a/loopback/common/methods/schema/model-info.js b/loopback/common/methods/schema/model-info.js
index 6a4db033d..0648deb80 100644
--- a/loopback/common/methods/schema/model-info.js
+++ b/loopback/common/methods/schema/model-info.js
@@ -22,7 +22,7 @@ module.exports = Self => {
});
const modelsLocale = new Map();
- const modulesDir = path.resolve(`${__dirname}/../../../../modules`);
+ const modulesDir = path.resolve(`${process.cwd()}/modules`);
const modules = fs.readdirSync(modulesDir);
for (const mod of modules) {
diff --git a/loopback/common/mixins/loggable.js b/loopback/common/mixins/loggable.js
new file mode 100644
index 000000000..24243ba68
--- /dev/null
+++ b/loopback/common/mixins/loggable.js
@@ -0,0 +1,13 @@
+const LoopBackContext = require('loopback-context');
+async function handleObserve(ctx) {
+ const httpCtx = LoopBackContext.getCurrentContext();
+ ctx.options.userId = httpCtx?.active?.accessToken?.userId;
+}
+module.exports = function(Self) {
+ let Mixin = {
+ 'before save': handleObserve,
+ 'before delete': handleObserve,
+ };
+ for (const [listener, handler] of Object.entries(Mixin))
+ Self.observe(listener, handler);
+};
diff --git a/loopback/common/models/application.js b/loopback/common/models/application.js
index 5e767fdc1..ac8ae78f0 100644
--- a/loopback/common/models/application.js
+++ b/loopback/common/models/application.js
@@ -2,4 +2,7 @@
module.exports = function(Self) {
require('../methods/application/status')(Self);
require('../methods/application/post')(Self);
+ require('../methods/application/execute')(Self);
+ require('../methods/application/executeProc')(Self);
+ require('../methods/application/executeFunc')(Self);
};
diff --git a/loopback/common/models/application.json b/loopback/common/models/application.json
index bc72df315..f79001585 100644
--- a/loopback/common/models/application.json
+++ b/loopback/common/models/application.json
@@ -13,6 +13,6 @@
"principalType": "ROLE",
"principalId": "$everyone",
"permission": "ALLOW"
- }
+ }
]
}
diff --git a/loopback/common/models/loggable.js b/loopback/common/models/loggable.js
deleted file mode 100644
index 360c84566..000000000
--- a/loopback/common/models/loggable.js
+++ /dev/null
@@ -1,15 +0,0 @@
-const LoopBackContext = require('loopback-context');
-
-module.exports = function(Self) {
- Self.setup = function() {
- Self.super_.setup.call(this);
- };
-
- Self.observe('before save', async function(ctx) {
- ctx.options.httpCtx = LoopBackContext.getCurrentContext();
- });
-
- Self.observe('before delete', async function(ctx) {
- ctx.options.httpCtx = LoopBackContext.getCurrentContext();
- });
-};
diff --git a/loopback/common/models/loggable.json b/loopback/common/models/loggable.json
deleted file mode 100644
index 9101532a3..000000000
--- a/loopback/common/models/loggable.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "name": "Loggable",
- "base": "VnModel",
- "validateUpsert": true
-}
diff --git a/loopback/common/models/procs-priv.json b/loopback/common/models/procs-priv.json
new file mode 100644
index 000000000..25221d586
--- /dev/null
+++ b/loopback/common/models/procs-priv.json
@@ -0,0 +1,44 @@
+{
+ "name": "ProcsPriv",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "mysql.procs_priv"
+ }
+ },
+ "properties": {
+ "name": {
+ "id": 1,
+ "type": "string",
+ "mysql": {
+ "columnName": "Routine_name"
+ }
+ },
+ "schema": {
+ "id": 3,
+ "type": "string",
+ "mysql": {
+ "columnName": "Db"
+ }
+ },
+ "role": {
+ "type": "string",
+ "mysql": {
+ "columnName": "user"
+ }
+ },
+ "type": {
+ "id": 2,
+ "type": "string",
+ "mysql": {
+ "columnName": "Routine_type"
+ }
+ },
+ "host": {
+ "type": "string",
+ "mysql": {
+ "columnName": "Host"
+ }
+ }
+ }
+}
diff --git a/loopback/locale/en.json b/loopback/locale/en.json
index 645a874e8..31b954a32 100644
--- a/loopback/locale/en.json
+++ b/loopback/locale/en.json
@@ -1,193 +1,226 @@
{
- "State cannot be blank": "State cannot be blank",
- "Cannot be blank": "Cannot be blank",
- "The credit must be an integer greater than or equal to zero": "The credit must be an integer greater than or equal to zero",
- "The grade must be an integer greater than or equal to zero": "The grade must be an integer greater than or equal to zero",
- "Invalid email": "Invalid email",
- "Name cannot be blank": "Name cannot be blank",
- "Phone cannot be blank": "Phone cannot be blank",
- "Description should have maximum of 45 characters": "Description should have maximum of 45 characters",
- "Period cannot be blank": "Period cannot be blank",
- "Sample type cannot be blank": "Sample type cannot be blank",
- "That payment method requires an IBAN": "That payment method requires an IBAN",
- "That payment method requires a BIC": "That payment method requires a BIC",
- "The default consignee can not be unchecked": "The default consignee can not be unchecked",
- "Enter an integer different to zero": "Enter an integer different to zero",
- "Package cannot be blank": "Package cannot be blank",
- "The new quantity should be smaller than the old one": "The new quantity should be smaller than the old one",
- "The sales of this ticket can't be modified": "The sales of this ticket can't be modified",
- "Cannot check Equalization Tax in this NIF/CIF": "Cannot check Equalization Tax in this NIF/CIF",
- "You can't create an order for a frozen client": "You can't create an order for a frozen client",
- "This address doesn't exist": "This address doesn't exist",
- "Warehouse cannot be blank": "Warehouse cannot be blank",
- "Agency cannot be blank": "Agency cannot be blank",
- "The IBAN does not have the correct format": "The IBAN does not have the correct format",
- "You can't make changes on the basic data of an confirmed order or with rows": "You can't make changes on the basic data of an confirmed order or with rows",
- "You can't create a ticket for a inactive client": "You can't create a ticket for a inactive client",
- "Worker cannot be blank": "Worker cannot be blank",
- "You must delete the claim id %d first": "You must delete the claim id %d first",
- "You don't have enough privileges": "You don't have enough privileges",
- "Tag value cannot be blank": "Tag value cannot be blank",
- "A client with that Web User name already exists": "A client with that Web User name already exists",
- "The warehouse can't be repeated": "The warehouse can't be repeated",
- "Barcode must be unique": "Barcode must be unique",
- "You don't have enough privileges to do that": "You don't have enough privileges to do that",
- "You can't create a ticket for a frozen client": "You can't create a ticket for a frozen client",
- "can't be blank": "can't be blank",
- "Street cannot be empty": "Street cannot be empty",
- "City cannot be empty": "City cannot be empty",
- "EXTENSION_INVALID_FORMAT": "Invalid extension",
- "The secret can't be blank": "The secret can't be blank",
- "Invalid TIN": "Invalid Tax number",
- "This ticket can't be invoiced": "This ticket can't be invoiced",
- "The value should be a number": "The value should be a number",
- "The current ticket can't be modified": "The current ticket can't be modified",
- "Extension format is invalid": "Extension format is invalid",
- "NO_ZONE_FOR_THIS_PARAMETERS": "NO_ZONE_FOR_THIS_PARAMETERS",
- "This client can't be invoiced": "This client can't be invoiced",
- "The introduced hour already exists": "The introduced hour already exists",
- "Invalid parameters to create a new ticket": "Invalid parameters to create a new ticket",
- "Concept cannot be blank": "Concept cannot be blank",
- "Ticket id cannot be blank": "Ticket id cannot be blank",
- "Weekday cannot be blank": "Weekday cannot be blank",
- "This ticket can not be modified": "This ticket can not be modified",
- "You can't delete a confirmed order": "You can't delete a confirmed order",
- "Value has an invalid format": "Value has an invalid format",
- "The postcode doesn't exist. Please enter a correct one": "The postcode doesn't exist. Please enter a correct one",
- "Swift / BIC can't be empty": "Swift / BIC can't be empty",
- "Deleted sales from ticket": "I have deleted the following lines from the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{deletions}}}",
- "Added sale to ticket": "I have added the following line to the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{addition}}}",
- "Changed sale discount": "I have changed the following lines discounts from the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
- "Created claim": "I have created the claim [{{claimId}}]({{{claimUrl}}}) for the following lines from the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
- "Changed sale price": "I have changed the price of [{{itemId}} {{concept}}]({{{itemUrl}}}) ({{quantity}}) from {{oldPrice}}€ ➔ *{{newPrice}}€* of the ticket [{{ticketId}}]({{{ticketUrl}}})",
- "Changed sale quantity": "I have changed the quantity of [{{itemId}} {{concept}}]({{{itemUrl}}}) from {{oldQuantity}} ➔ *{{newQuantity}}* of the ticket [{{ticketId}}]({{{ticketUrl}}})",
- "Changed sale reserved state": "I have changed the following lines reserved state from the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
- "Bought units from buy request": "Bought {{quantity}} units of [{{itemId}} {{concept}}]({{{urlItem}}}) for the ticket id [{{ticketId}}]({{{url}}})",
- "MESSAGE_INSURANCE_CHANGE": "I have changed the insurence credit of client [{{clientName}} ({{clientId}})]({{{url}}}) to *{{credit}} €*",
- "Changed client paymethod": "I have changed the pay method for client [{{clientName}} ({{clientId}})]({{{url}}})",
- "Sent units from ticket": "I sent *{{quantity}}* units of [{{concept}} ({{itemId}})]({{{itemUrl}}}) to *\"{{nickname}}\"* coming from ticket id [{{ticketId}}]({{{ticketUrl}}})",
- "Change quantity": "{{concept}} change of {{oldQuantity}} to {{newQuantity}}",
- "Claim will be picked": "The product from the claim [({{claimId}})]({{{claimUrl}}}) from the client *{{clientName}}* will be picked",
- "Claim state has changed to incomplete": "The state of the claim [({{claimId}})]({{{claimUrl}}}) from client *{{clientName}}* has changed to *incomplete*",
- "Claim state has changed to canceled": "The state of the claim [({{claimId}})]({{{claimUrl}}}) from client *{{clientName}}* has changed to *canceled*",
- "Customs agent is required for a non UEE member": "Customs agent is required for a non UEE member",
- "Incoterms is required for a non UEE member": "Incoterms is required for a non UEE member",
- "Client checked as validated despite of duplication": "Client checked as validated despite of duplication from client id {{clientId}}",
- "Landing cannot be lesser than shipment": "Landing cannot be lesser than shipment",
- "NOT_ZONE_WITH_THIS_PARAMETERS": "There's no zone available for this day",
- "Created absence": "The worker {{author}} has added an absence of type '{{absenceType}}' to {{employee}} for day {{dated}}.",
- "Deleted absence": "The worker {{author}} has deleted an absence of type '{{absenceType}}' to {{employee}} for day {{dated}}.",
- "I have deleted the ticket id": "I have deleted the ticket id [{{id}}]({{{url}}})",
- "I have restored the ticket id": "I have restored the ticket id [{{id}}]({{{url}}})",
- "Changed this data from the ticket": "I have changed the data from the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
- "The grade must be similar to the last one": "The grade must be similar to the last one",
- "agencyModeFk": "Agency",
- "clientFk": "Client",
- "zoneFk": "Zone",
- "warehouseFk": "Warehouse",
- "shipped": "Shipped",
- "landed": "Landed",
- "addressFk": "Address",
- "companyFk": "Company",
- "You need to fill sage information before you check verified data": "You need to fill sage information before you check verified data",
- "The social name cannot be empty": "The social name cannot be empty",
- "The nif cannot be empty": "The nif cannot be empty",
- "Amount cannot be zero": "Amount cannot be zero",
- "Company has to be official": "Company has to be official",
- "Unable to clone this travel": "Unable to clone this travel",
- "The observation type can't be repeated": "The observation type can't be repeated",
- "New ticket request has been created with price": "New ticket request has been created *'{{description}}'* for day *{{shipped}}*, with a quantity of *{{quantity}}* and a price of *{{price}} €*",
- "New ticket request has been created": "New ticket request has been created *'{{description}}'* for day *{{shipped}}*, with a quantity of *{{quantity}}*",
- "There's a new urgent ticket": "There's a new urgent ticket: [{{title}}](https://cau.verdnatura.es/WorkOrder.do?woMode=viewWO&woID={{issueId}})",
- "Swift / BIC cannot be empty": "Swift / BIC cannot be empty",
- "Role name must be written in camelCase": "Role name must be written in camelCase",
- "Client assignment has changed": "I did change the salesperson ~*\"<{{previousWorkerName}}>\"*~ by *\"<{{currentWorkerName}}>\"* from the client [{{clientName}} ({{clientId}})]({{{url}}})",
- "None": "None",
- "error densidad = 0": "error densidad = 0",
- "This document already exists on this ticket": "This document already exists on this ticket",
- "serial non editable": "This serial doesn't allow to set a reference",
- "nickname": "nickname",
- "State": "State",
- "regular": "regular",
- "reserved": "reserved",
- "Global invoicing failed": "[Global invoicing] Wasn't able to invoice some of the clients",
- "A ticket with a negative base can't be invoiced": "A ticket with a negative base can't be invoiced",
- "This client is not invoiceable": "This client is not invoiceable",
- "INACTIVE_PROVIDER": "Inactive provider",
- "reference duplicated": "reference duplicated",
- "The PDF document does not exist": "The PDF document does not exists. Try regenerating it from 'Regenerate invoice PDF' option",
- "This item is not available": "This item is not available",
- "Deny buy request": "Purchase request for ticket id [{{ticketId}}]({{{url}}}) has been rejected. Reason: {{observation}}",
- "The type of business must be filled in basic data": "The type of business must be filled in basic data",
- "The worker has hours recorded that day": "The worker has hours recorded that day",
- "isWithoutNegatives": "isWithoutNegatives",
- "routeFk": "routeFk",
- "Not enough privileges to edit a client with verified data": "Not enough privileges to edit a client with verified data",
- "Can't change the password of another worker": "Can't change the password of another worker",
- "No hay un contrato en vigor": "There is no existing contract",
- "No está permitido trabajar": "Not allowed to work",
- "Dirección incorrecta": "Wrong direction",
- "No se permite fichar a futuro": "It is not allowed to sign in the future",
- "Descanso diario 12h.": "Daily rest 12h.",
- "Fichadas impares": "Odd signs",
- "Descanso diario 9h.": "Daily rest 9h.",
- "Descanso semanal 36h. / 72h.": "Weekly rest 36h. / 72h.",
- "Verify email": "Verify email",
- "Click on the following link to verify this email. If you haven't requested this email, just ignore it": "Click on the following link to verify this email. If you haven't requested this email, just ignore it",
- "Password does not meet requirements": "Password does not meet requirements",
- "You don't have privileges to change the zone": "You don't have privileges to change the zone or for these parameters there are more than one shipping options, talk to agencies",
- "Not enough privileges to edit a client": "Not enough privileges to edit a client",
- "Claim pickup order sent": "Claim pickup order sent [{{claimId}}]({{{claimUrl}}}) to client *{{clientName}}*",
- "You don't have grant privilege": "You don't have grant privilege",
- "You don't own the role and you can't assign it to another user": "You don't own the role and you can't assign it to another user",
- "Email verify": "Email verify",
- "Ticket merged": "Ticket [{{originId}}]({{{originFullPath}}}) ({{{originDated}}}) merged with [{{destinationId}}]({{{destinationFullPath}}}) ({{{destinationDated}}})",
- "App locked": "App locked by user {{userId}}",
- "The sales of the receiver ticket can't be modified": "The sales of the receiver ticket can't be modified",
- "Receipt's bank was not found": "Receipt's bank was not found",
- "This receipt was not compensated": "This receipt was not compensated",
- "Client's email was not found": "Client's email was not found",
- "Tickets with associated refunds": "Tickets with associated refunds can't be deleted. This ticket is associated with refund Nº %d",
- "It is not possible to modify tracked sales": "It is not possible to modify tracked sales",
- "It is not possible to modify sales that their articles are from Floramondo": "It is not possible to modify sales that their articles are from Floramondo",
- "It is not possible to modify cloned sales": "It is not possible to modify cloned sales",
- "Warehouse inventory not set": "Almacén inventario no está establecido",
- "Component cost not set": "Componente coste no está estabecido",
- "Description cannot be blank": "Description cannot be blank",
- "company": "Company",
- "country": "Country",
- "clientId": "Id client",
- "clientSocialName": "Client",
- "amount": "Amount",
- "taxableBase": "Taxable base",
- "ticketFk": "Id ticket",
- "isActive": "Active",
- "hasToInvoice": "Invoice",
- "isTaxDataChecked": "Data checked",
- "comercialId": "Id Comercial",
- "comercialName": "Comercial",
- "Added observation": "Added observation",
- "Comment added to client": "Comment added to client",
- "This ticket is already a refund": "This ticket is already a refund",
- "A claim with that sale already exists": "A claim with that sale already exists",
- "Pass expired": "The password has expired, change it from Salix",
- "Can't transfer claimed sales": "Can't transfer claimed sales",
- "Invalid quantity": "Invalid quantity",
- "Failed to upload delivery note": "Error to upload delivery note {{id}}",
- "Mail not sent": "There has been an error sending the invoice to the client [{{clientId}}]({{{clientUrl}}}), please check the email address",
- "The renew period has not been exceeded": "The renew period has not been exceeded",
- "You can not use the same password": "You can not use the same password",
- "Valid priorities": "Valid priorities: %d",
- "Negative basis of tickets": "Negative basis of tickets: {{ticketsIds}}",
- "This ticket cannot be left empty.": "This ticket cannot be left empty. %s",
- "Social name should be uppercase": "Social name should be uppercase",
- "Street should be uppercase": "Street should be uppercase",
- "You don't have enough privileges.": "You don't have enough privileges.",
- "This ticket is locked.": "This ticket is locked.",
- "This ticket is not editable.": "This ticket is not editable.",
- "The ticket doesn't exist.": "The ticket doesn't exist.",
- "The sales do not exists": "The sales do not exists",
- "Ticket without Route": "Ticket without route",
- "Booking completed": "Booking complete",
- "The ticket is in preparation": "The ticket [{{ticketId}}]({{{ticketUrl}}}) of the sales person {{salesPersonId}} is in preparation"
+ "State cannot be blank": "State cannot be blank",
+ "Cannot be blank": "Cannot be blank",
+ "The credit must be an integer greater than or equal to zero": "The credit must be an integer greater than or equal to zero",
+ "The grade must be an integer greater than or equal to zero": "The grade must be an integer greater than or equal to zero",
+ "Invalid email": "Invalid email",
+ "Name cannot be blank": "Name cannot be blank",
+ "Phone cannot be blank": "Phone cannot be blank",
+ "Description should have maximum of 45 characters": "Description should have maximum of 45 characters",
+ "Period cannot be blank": "Period cannot be blank",
+ "Sample type cannot be blank": "Sample type cannot be blank",
+ "That payment method requires an IBAN": "That payment method requires an IBAN",
+ "That payment method requires a BIC": "That payment method requires a BIC",
+ "The default consignee can not be unchecked": "The default consignee can not be unchecked",
+ "Enter an integer different to zero": "Enter an integer different to zero",
+ "Package cannot be blank": "Package cannot be blank",
+ "The price of the item changed": "The price of the item changed",
+ "The sales of this ticket can't be modified": "The sales of this ticket can't be modified",
+ "Cannot check Equalization Tax in this NIF/CIF": "Cannot check Equalization Tax in this NIF/CIF",
+ "You can't create an order for a frozen client": "You can't create an order for a frozen client",
+ "This address doesn't exist": "This address doesn't exist",
+ "Warehouse cannot be blank": "Warehouse cannot be blank",
+ "Agency cannot be blank": "Agency cannot be blank",
+ "The IBAN does not have the correct format": "The IBAN does not have the correct format",
+ "You can't make changes on the basic data of an confirmed order or with rows": "You can't make changes on the basic data of an confirmed order or with rows",
+ "You can't create a ticket for an inactive client": "You can't create a ticket for an inactive client",
+ "Worker cannot be blank": "Worker cannot be blank",
+ "You must delete the claim id %d first": "You must delete the claim id %d first",
+ "You don't have enough privileges": "You don't have enough privileges",
+ "Tag value cannot be blank": "Tag value cannot be blank",
+ "A client with that Web User name already exists": "A client with that Web User name already exists",
+ "The warehouse can't be repeated": "The warehouse can't be repeated",
+ "Barcode must be unique": "Barcode must be unique",
+ "You don't have enough privileges to do that": "You don't have enough privileges to do that",
+ "You can't create a ticket for a frozen client": "You can't create a ticket for a frozen client",
+ "can't be blank": "can't be blank",
+ "Street cannot be empty": "Street cannot be empty",
+ "City cannot be empty": "City cannot be empty",
+ "EXTENSION_INVALID_FORMAT": "Invalid extension",
+ "The secret can't be blank": "The secret can't be blank",
+ "Invalid TIN": "Invalid Tax number",
+ "This ticket can't be invoiced": "This ticket can't be invoiced",
+ "The value should be a number": "The value should be a number",
+ "The current ticket can't be modified": "The current ticket can't be modified",
+ "Extension format is invalid": "Extension format is invalid",
+ "NO_ZONE_FOR_THIS_PARAMETERS": "NO_ZONE_FOR_THIS_PARAMETERS",
+ "This client can't be invoiced": "This client can't be invoiced",
+ "You must provide the correction information to generate a corrective invoice": "You must provide the correction information to generate a corrective invoice",
+ "The introduced hour already exists": "The introduced hour already exists",
+ "Invalid parameters to create a new ticket": "Invalid parameters to create a new ticket",
+ "Concept cannot be blank": "Concept cannot be blank",
+ "Ticket id cannot be blank": "Ticket id cannot be blank",
+ "Weekday cannot be blank": "Weekday cannot be blank",
+ "This ticket can not be modified": "This ticket can not be modified",
+ "You can't delete a confirmed order": "You can't delete a confirmed order",
+ "Value has an invalid format": "Value has an invalid format",
+ "The postcode doesn't exist. Please enter a correct one": "The postcode doesn't exist. Please enter a correct one",
+ "Swift / BIC can't be empty": "Swift / BIC can't be empty",
+ "Deleted sales from ticket": "I have deleted the following lines from the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{deletions}}}",
+ "Added sale to ticket": "I have added the following line to the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{addition}}}",
+ "Changed sale discount": "I have changed the following lines discounts from the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
+ "Created claim": "I have created the claim [{{claimId}}]({{{claimUrl}}}) for the following lines from the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
+ "Changed sale price": "I have changed the price of [{{itemId}} {{concept}}]({{{itemUrl}}}) ({{quantity}}) from {{oldPrice}}€ ➔ *{{newPrice}}€* of the ticket [{{ticketId}}]({{{ticketUrl}}})",
+ "Changed sale quantity": "I have changed the quantity of [{{itemId}} {{concept}}]({{{itemUrl}}}) from {{oldQuantity}} ➔ *{{newQuantity}}* of the ticket [{{ticketId}}]({{{ticketUrl}}})",
+ "Changed sale reserved state": "I have changed the following lines reserved state from the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
+ "Bought units from buy request": "Bought {{quantity}} units of [{{itemId}} {{concept}}]({{{urlItem}}}) for the ticket id [{{ticketId}}]({{{url}}})",
+ "MESSAGE_INSURANCE_CHANGE": "I have changed the insurence credit of client [{{clientName}} ({{clientId}})]({{{url}}}) to *{{credit}} €*",
+ "Changed client paymethod": "I have changed the pay method for client [{{clientName}} ({{clientId}})]({{{url}}})",
+ "Sent units from ticket": "I sent *{{quantity}}* units of [{{concept}} ({{itemId}})]({{{itemUrl}}}) to *\"{{nickname}}\"* coming from ticket id [{{ticketId}}]({{{ticketUrl}}})",
+ "Change quantity": "{{concept}} change of {{oldQuantity}} to {{newQuantity}}",
+ "Claim will be picked": "The product from the claim [({{claimId}})]({{{claimUrl}}}) from the client *{{clientName}}* will be picked",
+ "Claim state has changed to": "The state of the claim [({{claimId}})]({{{claimUrl}}}) from client *{{clientName}}* has changed to *{{newState}}*",
+ "Customs agent is required for a non UEE member": "Customs agent is required for a non UEE member",
+ "Incoterms is required for a non UEE member": "Incoterms is required for a non UEE member",
+ "Client checked as validated despite of duplication": "Client checked as validated despite of duplication from client id {{clientId}}",
+ "Landing cannot be lesser than shipment": "Landing cannot be lesser than shipment",
+ "NOT_ZONE_WITH_THIS_PARAMETERS": "There's no zone available for this day",
+ "Created absence": "The worker {{author}} has added an absence of type '{{absenceType}}' to {{employee}} for day {{dated}}.",
+ "Deleted absence": "The worker {{author}} has deleted an absence of type '{{absenceType}}' to {{employee}} for day {{dated}}.",
+ "I have deleted the ticket id": "I have deleted the ticket id [{{id}}]({{{url}}})",
+ "I have restored the ticket id": "I have restored the ticket id [{{id}}]({{{url}}})",
+ "Changed this data from the ticket": "I have changed the data from the ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
+ "The grade must be similar to the last one": "The grade must be similar to the last one",
+ "agencyModeFk": "Agency",
+ "clientFk": "Client",
+ "zoneFk": "Zone",
+ "warehouseFk": "Warehouse",
+ "shipped": "Shipped",
+ "landed": "Landed",
+ "addressFk": "Address",
+ "companyFk": "Company",
+ "You need to fill sage information before you check verified data": "You need to fill sage information before you check verified data",
+ "The social name cannot be empty": "The social name cannot be empty",
+ "The nif cannot be empty": "The nif cannot be empty",
+ "Amount cannot be zero": "Amount cannot be zero",
+ "Company has to be official": "Company has to be official",
+ "Unable to clone this travel": "Unable to clone this travel",
+ "The observation type can't be repeated": "The observation type can't be repeated",
+ "New ticket request has been created with price": "New ticket request has been created *'{{description}}'* for day *{{shipped}}*, with a quantity of *{{quantity}}* and a price of *{{price}} €*",
+ "New ticket request has been created": "New ticket request has been created *'{{description}}'* for day *{{shipped}}*, with a quantity of *{{quantity}}*",
+ "There's a new urgent ticket": "There's a new urgent ticket: [{{title}}](https://cau.verdnatura.es/WorkOrder.do?woMode=viewWO&woID={{issueId}})",
+ "Swift / BIC cannot be empty": "Swift / BIC cannot be empty",
+ "Role name must be written in camelCase": "Role name must be written in camelCase",
+ "Client assignment has changed": "I did change the salesperson ~*\"<{{previousWorkerName}}>\"*~ by *\"<{{currentWorkerName}}>\"* from the client [{{clientName}} ({{clientId}})]({{{url}}})",
+ "None": "None",
+ "error densidad = 0": "error densidad = 0",
+ "This document already exists on this ticket": "This document already exists on this ticket",
+ "serial non editable": "This serial doesn't allow to set a reference",
+ "nickname": "nickname",
+ "State": "State",
+ "regular": "regular",
+ "reserved": "reserved",
+ "Global invoicing failed": "[Global invoicing] Wasn't able to invoice some of the clients",
+ "A ticket with a negative base can't be invoiced": "A ticket with a negative base can't be invoiced",
+ "This client is not invoiceable": "This client is not invoiceable",
+ "INACTIVE_PROVIDER": "Inactive provider",
+ "reference duplicated": "reference duplicated",
+ "The PDF document does not exist": "The PDF document does not exists. Try regenerating it from 'Regenerate invoice PDF' option",
+ "This item is not available": "This item is not available",
+ "Deny buy request": "Purchase request for ticket id [{{ticketId}}]({{{url}}}) has been rejected. Reason: {{observation}}",
+ "The type of business must be filled in basic data": "The type of business must be filled in basic data",
+ "The worker has hours recorded that day": "The worker has hours recorded that day",
+ "isWithoutNegatives": "isWithoutNegatives",
+ "routeFk": "routeFk",
+ "Not enough privileges to edit a client with verified data": "Not enough privileges to edit a client with verified data",
+ "Can't change the password of another worker": "Can't change the password of another worker",
+ "No hay un contrato en vigor": "There is no existing contract",
+ "No está permitido trabajar": "Not allowed to work",
+ "Dirección incorrecta": "Wrong direction",
+ "No se permite fichar a futuro": "It is not allowed to sign in the future",
+ "Descanso diario 12h.": "Daily rest 12h.",
+ "Fichadas impares": "Odd signs",
+ "Descanso diario 9h.": "Daily rest 9h.",
+ "Descanso semanal 36h. / 72h.": "Weekly rest 36h. / 72h.",
+ "Verify email": "Verify email",
+ "Click on the following link to verify this email. If you haven't requested this email, just ignore it": "Click on the following link to verify this email. If you haven't requested this email, just ignore it",
+ "Password does not meet requirements": "Password does not meet requirements",
+ "You don't have privileges to change the zone": "You don't have privileges to change the zone or for these parameters there are more than one shipping options, talk to agencies",
+ "Not enough privileges to edit a client": "Not enough privileges to edit a client",
+ "Claim pickup order sent": "Claim pickup order sent [{{claimId}}]({{{claimUrl}}}) to client *{{clientName}}*",
+ "You don't have grant privilege": "You don't have grant privilege",
+ "You don't own the role and you can't assign it to another user": "You don't own the role and you can't assign it to another user",
+ "Email verify": "Email verify",
+ "Ticket merged": "Ticket [{{originId}}]({{{originFullPath}}}) ({{{originDated}}}) merged with [{{destinationId}}]({{{destinationFullPath}}}) ({{{destinationDated}}})",
+ "App locked": "App locked by user {{userId}}",
+ "The sales of the receiver ticket can't be modified": "The sales of the receiver ticket can't be modified",
+ "Receipt's bank was not found": "Receipt's bank was not found",
+ "This receipt was not compensated": "This receipt was not compensated",
+ "Client's email was not found": "Client's email was not found",
+ "Tickets with associated refunds": "Tickets with associated refunds can't be deleted. This ticket is associated with refund Nº %d",
+ "It is not possible to modify tracked sales": "It is not possible to modify tracked sales",
+ "It is not possible to modify sales that their articles are from Floramondo": "It is not possible to modify sales that their articles are from Floramondo",
+ "It is not possible to modify cloned sales": "It is not possible to modify cloned sales",
+ "Warehouse inventory not set": "Almacén inventario no está establecido",
+ "Component cost not set": "Componente coste no está estabecido",
+ "Description cannot be blank": "Description cannot be blank",
+ "company": "Company",
+ "country": "Country",
+ "clientId": "Id client",
+ "clientSocialName": "Client",
+ "amount": "Amount",
+ "taxableBase": "Taxable base",
+ "ticketFk": "Id ticket",
+ "isActive": "Active",
+ "hasToInvoice": "Invoice",
+ "isTaxDataChecked": "Data checked",
+ "comercialId": "Id Comercial",
+ "comercialName": "Comercial",
+ "Added observation": "Added observation",
+ "Comment added to client": "Comment added to client",
+ "This ticket is already a refund": "This ticket is already a refund",
+ "A claim with that sale already exists": "A claim with that sale already exists",
+ "Pass expired": "The password has expired, change it from Salix",
+ "Can't transfer claimed sales": "Can't transfer claimed sales",
+ "Invalid quantity": "Invalid quantity",
+ "Failed to upload delivery note": "Error to upload delivery note {{id}}",
+ "Mail not sent": "There has been an error sending the invoice to the client [{{clientId}}]({{{clientUrl}}}), please check the email address",
+ "The renew period has not been exceeded": "The renew period has not been exceeded",
+ "You can not use the same password": "You can not use the same password",
+ "Valid priorities": "Valid priorities: %d",
+ "hasAnyNegativeBase": "Negative basis of tickets: {{ticketsIds}}",
+ "hasAnyPositiveBase": "Positive basis of tickets: {{ticketsIds}}",
+ "This ticket cannot be left empty.": "This ticket cannot be left empty. %s",
+ "Social name should be uppercase": "Social name should be uppercase",
+ "Street should be uppercase": "Street should be uppercase",
+ "You don't have enough privileges.": "You don't have enough privileges.",
+ "This ticket is locked": "This ticket is locked",
+ "This ticket is not editable.": "This ticket is not editable.",
+ "The ticket doesn't exist.": "The ticket doesn't exist.",
+ "The sales do not exists": "The sales do not exists",
+ "Ticket without Route": "Ticket without route",
+ "Select a different client": "Select a different client",
+ "Fill all the fields": "Fill all the fields",
+ "Error while generating PDF": "Error while generating PDF",
+ "Can't invoice to future": "Can't invoice to future",
+ "This ticket is already invoiced": "This ticket is already invoiced",
+ "Negative basis of tickets: 23": "Negative basis of tickets: 23",
+ "Booking completed": "Booking complete",
+ "The ticket is in preparation": "The ticket [{{ticketId}}]({{{ticketUrl}}}) of the sales person {{salesPersonId}} is in preparation",
+ "You can only add negative amounts in refund tickets": "You can only add negative amounts in refund tickets",
+ "Bank entity must be specified": "Bank entity must be specified",
+ "Try again": "Try again",
+ "keepPrice": "keepPrice",
+ "Cannot past travels with entries": "Cannot past travels with entries",
+ "It was not able to remove the next expeditions:": "It was not able to remove the next expeditions: {{expeditions}}",
+ "Incorrect pin": "Incorrect pin.",
+ "The notification subscription of this worker cant be modified": "The notification subscription of this worker cant be modified",
+ "Name should be uppercase": "Name should be uppercase",
+ "You cannot update these fields": "You cannot update these fields",
+ "CountryFK cannot be empty": "Country cannot be empty",
+ "You are not allowed to modify the alias": "You are not allowed to modify the alias",
+ "You already have the mailAlias": "You already have the mailAlias",
+ "This machine is already in use.": "This machine is already in use.",
+ "the plate does not exist": "The plate {{plate}} does not exist",
+ "We do not have availability for the selected item": "We do not have availability for the selected item",
+ "You are already using a machine": "You are already using a machine",
+ "this state does not exist": "This state does not exist",
+ "The line could not be marked": "The line could not be marked",
+ "The sale cannot be tracked": "The sale cannot be tracked",
+ "Shelving not valid": "Shelving not valid",
+ "printerNotExists": "The printer does not exist",
+ "There are not picking tickets": "There are not picking tickets",
+ "ticketCommercial": "The ticket {{ ticket }} for the salesperson {{ salesMan }} is in preparation. (automatically generated message)",
+ "This password can only be changed by the user themselves": "This password can only be changed by the user themselves",
+ "They're not your subordinate": "They're not your subordinate"
}
diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index 6e478c000..5b13ef7a0 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -1,324 +1,353 @@
{
- "Phone format is invalid": "El formato del teléfono no es correcto",
- "You are not allowed to change the credit": "No tienes privilegios para modificar el crédito",
- "Unable to mark the equivalence surcharge": "No se puede marcar el recargo de equivalencia",
- "The default consignee can not be unchecked": "No se puede desmarcar el consignatario predeterminado",
- "Unable to default a disabled consignee": "No se puede poner predeterminado un consignatario desactivado",
- "Can't be blank": "No puede estar en blanco",
- "Invalid TIN": "NIF/CIF invalido",
- "TIN must be unique": "El NIF/CIF debe ser único",
- "A client with that Web User name already exists": "Ya existe un cliente con ese Usuario Web",
- "Is invalid": "Is invalid",
- "Quantity cannot be zero": "La cantidad no puede ser cero",
- "Enter an integer different to zero": "Introduce un entero distinto de cero",
- "Package cannot be blank": "El embalaje no puede estar en blanco",
- "The company name must be unique": "La razón social debe ser única",
- "Invalid email": "Correo electrónico inválido",
- "The IBAN does not have the correct format": "El IBAN no tiene el formato correcto",
- "That payment method requires an IBAN": "El método de pago seleccionado requiere un IBAN",
- "That payment method requires a BIC": "El método de pago seleccionado requiere un BIC",
- "State cannot be blank": "El estado no puede estar en blanco",
- "Worker cannot be blank": "El trabajador no puede estar en blanco",
- "Cannot change the payment method if no salesperson": "No se puede cambiar la forma de pago si no hay comercial asignado",
- "can't be blank": "El campo no puede estar vacío",
- "Observation type must be unique": "El tipo de observación no puede repetirse",
- "The credit must be an integer greater than or equal to zero": "The credit must be an integer greater than or equal to zero",
- "The grade must be similar to the last one": "El grade debe ser similar al último",
- "Only manager can change the credit": "Solo el gerente puede cambiar el credito de este cliente",
- "Name cannot be blank": "El nombre no puede estar en blanco",
- "Phone cannot be blank": "El teléfono no puede estar en blanco",
- "Period cannot be blank": "El periodo no puede estar en blanco",
- "Choose a company": "Selecciona una empresa",
- "Se debe rellenar el campo de texto": "Se debe rellenar el campo de texto",
- "Description should have maximum of 45 characters": "La descripción debe tener maximo 45 caracteres",
- "Cannot be blank": "El campo no puede estar en blanco",
- "The grade must be an integer greater than or equal to zero": "El grade debe ser un entero mayor o igual a cero",
- "Sample type cannot be blank": "El tipo de plantilla no puede quedar en blanco",
- "Description cannot be blank": "Se debe rellenar el campo de texto",
- "The new quantity should be smaller than the old one": "La nueva cantidad debe de ser menor que la anterior",
- "The value should not be greater than 100%": "El valor no debe de ser mayor de 100%",
- "The value should be a number": "El valor debe ser un numero",
- "This order is not editable": "Esta orden no se puede modificar",
- "You can't create an order for a frozen client": "No puedes crear una orden para un cliente congelado",
- "You can't create an order for a client that has a debt": "No puedes crear una orden para un cliente con deuda",
- "is not a valid date": "No es una fecha valida",
- "Barcode must be unique": "El código de barras debe ser único",
- "The warehouse can't be repeated": "El almacén no puede repetirse",
- "The tag or priority can't be repeated for an item": "El tag o prioridad no puede repetirse para un item",
- "The observation type can't be repeated": "El tipo de observación no puede repetirse",
- "A claim with that sale already exists": "Ya existe una reclamación para esta línea",
- "You don't have enough privileges to change that field": "No tienes permisos para cambiar ese campo",
- "Warehouse cannot be blank": "El almacén no puede quedar en blanco",
- "Agency cannot be blank": "La agencia no puede quedar en blanco",
- "Not enough privileges to edit a client with verified data": "No tienes permisos para hacer cambios en un cliente con datos comprobados",
- "This address doesn't exist": "Este consignatario no existe",
- "You must delete the claim id %d first": "Antes debes borrar la reclamación %d",
- "You don't have enough privileges": "No tienes suficientes permisos",
- "Cannot check Equalization Tax in this NIF/CIF": "No se puede marcar RE en este NIF/CIF",
- "You can't make changes on the basic data of an confirmed order or with rows": "No puedes cambiar los datos basicos de una orden con artículos",
- "INVALID_USER_NAME": "El nombre de usuario solo debe contener letras minúsculas o, a partir del segundo carácter, números o subguiones, no esta permitido el uso de la letra ñ",
- "You can't create a ticket for a frozen client": "No puedes crear un ticket para un cliente congelado",
- "You can't create a ticket for a inactive client": "No puedes crear un ticket para un cliente inactivo",
- "Tag value cannot be blank": "El valor del tag no puede quedar en blanco",
- "ORDER_EMPTY": "Cesta vacía",
- "You don't have enough privileges to do that": "No tienes permisos para cambiar esto",
- "NO SE PUEDE DESACTIVAR EL CONSIGNAT": "NO SE PUEDE DESACTIVAR EL CONSIGNAT",
- "Error. El NIF/CIF está repetido": "Error. El NIF/CIF está repetido",
- "Street cannot be empty": "Dirección no puede estar en blanco",
- "City cannot be empty": "Cuidad no puede estar en blanco",
- "Code cannot be blank": "Código no puede estar en blanco",
- "You cannot remove this department": "No puedes eliminar este departamento",
- "The extension must be unique": "La extensión debe ser unica",
- "The secret can't be blank": "La contraseña no puede estar en blanco",
- "We weren't able to send this SMS": "No hemos podido enviar el SMS",
- "This client can't be invoiced": "Este cliente no puede ser facturado",
- "This ticket can't be invoiced": "Este ticket no puede ser facturado",
- "You cannot add or modify services to an invoiced ticket": "No puedes añadir o modificar servicios a un ticket facturado",
- "This ticket can not be modified": "Este ticket no puede ser modificado",
- "The introduced hour already exists": "Esta hora ya ha sido introducida",
- "INFINITE_LOOP": "Existe una dependencia entre dos Jefes",
- "The sales of the receiver ticket can't be modified": "Las lineas del ticket al que envias no pueden ser modificadas",
- "NO_AGENCY_AVAILABLE": "No hay una zona de reparto disponible con estos parámetros",
- "ERROR_PAST_SHIPMENT": "No puedes seleccionar una fecha de envío en pasado",
- "The current ticket can't be modified": "El ticket actual no puede ser modificado",
- "The current claim can't be modified": "La reclamación actual no puede ser modificada",
- "The sales of this ticket can't be modified": "Las lineas de este ticket no pueden ser modificadas",
- "The sales do not exists": "La(s) línea(s) seleccionada(s) no existe(n)",
- "Please select at least one sale": "Por favor selecciona al menos una linea",
- "All sales must belong to the same ticket": "Todas las lineas deben pertenecer al mismo ticket",
- "NO_ZONE_FOR_THIS_PARAMETERS": "Para este día no hay ninguna zona configurada",
- "This item doesn't exists": "El artículo no existe",
- "NOT_ZONE_WITH_THIS_PARAMETERS": "Para este día no hay ninguna zona configurada",
- "Extension format is invalid": "El formato de la extensión es inválido",
- "Invalid parameters to create a new ticket": "Parámetros inválidos para crear un nuevo ticket",
- "This item is not available": "Este artículo no está disponible",
- "This postcode already exists": "Este código postal ya existe",
- "Concept cannot be blank": "El concepto no puede quedar en blanco",
- "File doesn't exists": "El archivo no existe",
- "You don't have privileges to change the zone": "No tienes permisos para cambiar la zona o para esos parámetros hay más de una opción de envío, hable con las agencias",
- "This ticket is already on weekly tickets": "Este ticket ya está en tickets programados",
- "Ticket id cannot be blank": "El id de ticket no puede quedar en blanco",
- "Weekday cannot be blank": "El día de la semana no puede quedar en blanco",
- "You can't delete a confirmed order": "No puedes borrar un pedido confirmado",
- "The social name has an invalid format": "El nombre fiscal tiene un formato incorrecto",
- "Invalid quantity": "Cantidad invalida",
- "This postal code is not valid": "This postal code is not valid",
- "is invalid": "is invalid",
- "The postcode doesn't exist. Please enter a correct one": "El código postal no existe. Por favor, introduce uno correcto",
- "The department name can't be repeated": "El nombre del departamento no puede repetirse",
- "This phone already exists": "Este teléfono ya existe",
- "You cannot move a parent to its own sons": "No puedes mover un elemento padre a uno de sus hijos",
- "You can't create a claim for a removed ticket": "No puedes crear una reclamación para un ticket eliminado",
- "You cannot delete a ticket that part of it is being prepared": "No puedes eliminar un ticket en el que una parte que está siendo preparada",
- "You must delete all the buy requests first": "Debes eliminar todas las peticiones de compra primero",
- "You should specify a date": "Debes especificar una fecha",
- "You should specify at least a start or end date": "Debes especificar al menos una fecha de inicio o de fín",
- "Start date should be lower than end date": "La fecha de inicio debe ser menor que la fecha de fín",
- "You should mark at least one week day": "Debes marcar al menos un día de la semana",
- "Swift / BIC can't be empty": "Swift / BIC no puede estar vacío",
- "Customs agent is required for a non UEE member": "El agente de aduanas es requerido para los clientes extracomunitarios",
- "Incoterms is required for a non UEE member": "El incoterms es requerido para los clientes extracomunitarios",
- "Deleted sales from ticket": "He eliminado las siguientes lineas del ticket [{{ticketId}}]({{{ticketUrl}}}): {{{deletions}}}",
- "Added sale to ticket": "He añadido la siguiente linea al ticket [{{ticketId}}]({{{ticketUrl}}}): {{{addition}}}",
- "Changed sale discount": "He cambiado el descuento de las siguientes lineas al ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
- "Created claim": "He creado la reclamación [{{claimId}}]({{{claimUrl}}}) de las siguientes lineas del ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
- "Changed sale price": "He cambiado el precio de [{{itemId}} {{concept}}]({{{itemUrl}}}) ({{quantity}}) de {{oldPrice}}€ ➔ *{{newPrice}}€* del ticket [{{ticketId}}]({{{ticketUrl}}})",
- "Changed sale quantity": "He cambiado la cantidad de [{{itemId}} {{concept}}]({{{itemUrl}}}) de {{oldQuantity}} ➔ *{{newQuantity}}* del ticket [{{ticketId}}]({{{ticketUrl}}})",
- "State": "Estado",
- "regular": "normal",
- "reserved": "reservado",
- "Changed sale reserved state": "He cambiado el estado reservado de las siguientes lineas al ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
- "Bought units from buy request": "Se ha comprado {{quantity}} unidades de [{{itemId}} {{concept}}]({{{urlItem}}}) para el ticket id [{{ticketId}}]({{{url}}})",
- "Deny buy request": "Se ha rechazado la petición de compra para el ticket id [{{ticketId}}]({{{url}}}). Motivo: {{observation}}",
- "MESSAGE_INSURANCE_CHANGE": "He cambiado el crédito asegurado del cliente [{{clientName}} ({{clientId}})]({{{url}}}) a *{{credit}} €*",
- "Changed client paymethod": "He cambiado la forma de pago del cliente [{{clientName}} ({{clientId}})]({{{url}}})",
- "Sent units from ticket": "Envio *{{quantity}}* unidades de [{{concept}} ({{itemId}})]({{{itemUrl}}}) a *\"{{nickname}}\"* provenientes del ticket id [{{ticketId}}]({{{ticketUrl}}})",
- "Change quantity": "{{concept}} cambia de {{oldQuantity}} a {{newQuantity}}",
- "Claim will be picked": "Se recogerá el género de la reclamación [({{claimId}})]({{{claimUrl}}}) del cliente *{{clientName}}*",
- "Claim state has changed to incomplete": "Se ha cambiado el estado de la reclamación [({{claimId}})]({{{claimUrl}}}) del cliente *{{clientName}}* a *incompleta*",
- "Claim state has changed to canceled": "Se ha cambiado el estado de la reclamación [({{claimId}})]({{{claimUrl}}}) del cliente *{{clientName}}* a *anulado*",
- "Client checked as validated despite of duplication": "Cliente comprobado a pesar de que existe el cliente id {{clientId}}",
- "ORDER_ROW_UNAVAILABLE": "No hay disponibilidad de este producto",
- "Distance must be lesser than 1000": "La distancia debe ser inferior a 1000",
- "This ticket is deleted": "Este ticket está eliminado",
- "Unable to clone this travel": "No ha sido posible clonar este travel",
- "This thermograph id already exists": "La id del termógrafo ya existe",
- "Choose a date range or days forward": "Selecciona un rango de fechas o días en adelante",
- "ORDER_ALREADY_CONFIRMED": "ORDER_ALREADY_CONFIRMED",
- "Invalid password": "Invalid password",
- "Password does not meet requirements": "La contraseña no cumple los requisitos",
- "Role already assigned": "Role already assigned",
- "Invalid role name": "Invalid role name",
- "Role name must be written in camelCase": "Role name must be written in camelCase",
- "Email already exists": "Email already exists",
- "User already exists": "User already exists",
- "Absence change notification on the labour calendar": "Notificacion de cambio de ausencia en el calendario laboral",
- "Record of hours week": "Registro de horas semana {{week}} año {{year}} ",
- "Created absence": "El empleado {{author}} ha añadido una ausencia de tipo '{{absenceType}}' a {{employee}} para el día {{dated}}.",
- "Deleted absence": "El empleado {{author}} ha eliminado una ausencia de tipo '{{absenceType}}' a {{employee}} del día {{dated}}.",
- "I have deleted the ticket id": "He eliminado el ticket id [{{id}}]({{{url}}})",
- "I have restored the ticket id": "He restaurado el ticket id [{{id}}]({{{url}}})",
- "You can only restore a ticket within the first hour after deletion": "Únicamente puedes restaurar el ticket dentro de la primera hora después de su eliminación",
- "Changed this data from the ticket": "He cambiado estos datos del ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
- "agencyModeFk": "Agencia",
- "clientFk": "Cliente",
- "zoneFk": "Zona",
- "warehouseFk": "Almacén",
- "shipped": "F. envío",
- "landed": "F. entrega",
- "addressFk": "Consignatario",
- "companyFk": "Empresa",
- "The social name cannot be empty": "La razón social no puede quedar en blanco",
- "The nif cannot be empty": "El NIF no puede quedar en blanco",
- "You need to fill sage information before you check verified data": "Debes rellenar la información de sage antes de marcar datos comprobados",
- "ASSIGN_ZONE_FIRST": "Asigna una zona primero",
- "Amount cannot be zero": "El importe no puede ser cero",
- "Company has to be official": "Empresa inválida",
- "You can not select this payment method without a registered bankery account": "No se puede utilizar este método de pago si no has registrado una cuenta bancaria",
- "Action not allowed on the test environment": "Esta acción no está permitida en el entorno de pruebas",
- "The selected ticket is not suitable for this route": "El ticket seleccionado no es apto para esta ruta",
- "New ticket request has been created with price": "Se ha creado una nueva petición de compra '{{description}}' para el día *{{shipped}}*, con una cantidad de *{{quantity}}* y un precio de *{{price}} €*",
- "New ticket request has been created": "Se ha creado una nueva petición de compra '{{description}}' para el día *{{shipped}}*, con una cantidad de *{{quantity}}*",
- "Swift / BIC cannot be empty": "Swift / BIC no puede estar vacío",
- "This BIC already exist.": "Este BIC ya existe.",
- "That item doesn't exists": "Ese artículo no existe",
- "There's a new urgent ticket:": "Hay un nuevo ticket urgente:",
- "Invalid account": "Cuenta inválida",
- "Compensation account is empty": "La cuenta para compensar está vacia",
- "This genus already exist": "Este genus ya existe",
- "This specie already exist": "Esta especie ya existe",
- "Client assignment has changed": "He cambiado el comercial ~*\"<{{previousWorkerName}}>\"*~ por *\"<{{currentWorkerName}}>\"* del cliente [{{clientName}} ({{clientId}})]({{{url}}})",
- "None": "Ninguno",
- "The contract was not active during the selected date": "El contrato no estaba activo durante la fecha seleccionada",
- "Cannot add more than one '1/2 day vacation'": "No puedes añadir más de un 'Vacaciones 1/2 dia'",
- "This document already exists on this ticket": "Este documento ya existe en el ticket",
- "Some of the selected tickets are not billable": "Algunos de los tickets seleccionados no son facturables",
- "You can't invoice tickets from multiple clients": "No puedes facturar tickets de multiples clientes",
- "nickname": "nickname",
- "INACTIVE_PROVIDER": "Proveedor inactivo",
- "This client is not invoiceable": "Este cliente no es facturable",
- "serial non editable": "Esta serie no permite asignar la referencia",
- "Max shipped required": "La fecha límite es requerida",
- "Can't invoice to future": "No se puede facturar a futuro",
- "Can't invoice to past": "No se puede facturar a pasado",
- "This ticket is already invoiced": "Este ticket ya está facturado",
- "A ticket with an amount of zero can't be invoiced": "No se puede facturar un ticket con importe cero",
- "A ticket with a negative base can't be invoiced": "No se puede facturar un ticket con una base negativa",
- "Global invoicing failed": "[Facturación global] No se han podido facturar algunos clientes",
- "Wasn't able to invoice the following clients": "No se han podido facturar los siguientes clientes",
- "Can't verify data unless the client has a business type": "No se puede verificar datos de un cliente que no tiene tipo de negocio",
- "You don't have enough privileges to set this credit amount": "No tienes suficientes privilegios para establecer esta cantidad de crédito",
- "You can't change the credit set to zero from a financialBoss": "No puedes cambiar el cŕedito establecido a cero por un jefe de finanzas",
- "Amounts do not match": "Las cantidades no coinciden",
- "The PDF document does not exist": "El documento PDF no existe. Prueba a regenerarlo desde la opción 'Regenerar PDF factura'",
- "The type of business must be filled in basic data": "El tipo de negocio debe estar rellenado en datos básicos",
- "You can't create a claim from a ticket delivered more than seven days ago": "No puedes crear una reclamación de un ticket entregado hace más de siete días",
- "The worker has hours recorded that day": "El trabajador tiene horas fichadas ese día",
- "The worker has a marked absence that day": "El trabajador tiene marcada una ausencia ese día",
- "You can not modify is pay method checked": "No se puede modificar el campo método de pago validado",
- "The account size must be exactly 10 characters": "El tamaño de la cuenta debe ser exactamente de 10 caracteres",
- "Can't transfer claimed sales": "No puedes transferir lineas reclamadas",
- "You don't have privileges to create refund": "No tienes permisos para crear un abono",
- "The item is required": "El artículo es requerido",
- "The agency is already assigned to another autonomous": "La agencia ya está asignada a otro autónomo",
- "date in the future": "Fecha en el futuro",
- "reference duplicated": "Referencia duplicada",
- "This ticket is already a refund": "Este ticket ya es un abono",
- "isWithoutNegatives": "isWithoutNegatives",
- "routeFk": "routeFk",
- "Can't change the password of another worker": "No se puede cambiar la contraseña de otro trabajador",
- "No hay un contrato en vigor": "No hay un contrato en vigor",
- "No se permite fichar a futuro": "No se permite fichar a futuro",
- "No está permitido trabajar": "No está permitido trabajar",
- "Fichadas impares": "Fichadas impares",
- "Descanso diario 12h.": "Descanso diario 12h.",
- "Descanso semanal 36h. / 72h.": "Descanso semanal 36h. / 72h.",
- "Dirección incorrecta": "Dirección incorrecta",
- "Modifiable user details only by an administrator": "Detalles de usuario modificables solo por un administrador",
- "Modifiable password only via recovery or by an administrator": "Contraseña modificable solo a través de la recuperación o por un administrador",
- "Not enough privileges to edit a client": "No tienes suficientes privilegios para editar un cliente",
- "This route does not exists": "Esta ruta no existe",
- "Claim pickup order sent": "Reclamación Orden de recogida enviada [{{claimId}}]({{{claimUrl}}}) al cliente *{{clientName}}*",
- "You don't have grant privilege": "No tienes privilegios para dar privilegios",
- "You don't own the role and you can't assign it to another user": "No eres el propietario del rol y no puedes asignarlo a otro usuario",
- "Ticket merged": "Ticket [{{originId}}]({{{originFullPath}}}) ({{{originDated}}}) fusionado con [{{destinationId}}]({{{destinationFullPath}}}) ({{{destinationDated}}})",
- "Already has this status": "Ya tiene este estado",
- "There aren't records for this week": "No existen registros para esta semana",
- "Empty data source": "Origen de datos vacio",
- "App locked": "Aplicación bloqueada por el usuario {{userId}}",
- "Email verify": "Correo de verificación",
- "Landing cannot be lesser than shipment": "Landing cannot be lesser than shipment",
- "Receipt's bank was not found": "No se encontró el banco del recibo",
- "This receipt was not compensated": "Este recibo no ha sido compensado",
- "Client's email was not found": "No se encontró el email del cliente",
- "Negative basis": "Base negativa",
- "This worker code already exists": "Este codigo de trabajador ya existe",
- "This personal mail already exists": "Este correo personal ya existe",
- "This worker already exists": "Este trabajador ya existe",
- "App name does not exist": "El nombre de aplicación no es válido",
- "Try again": "Vuelve a intentarlo",
- "Aplicación bloqueada por el usuario 9": "Aplicación bloqueada por el usuario 9",
- "Failed to upload delivery note": "Error al subir albarán {{id}}",
- "The DOCUWARE PDF document does not exists": "El documento PDF Docuware no existe",
- "It is not possible to modify tracked sales": "No es posible modificar líneas de pedido que se hayan empezado a preparar",
- "It is not possible to modify sales that their articles are from Floramondo": "No es posible modificar líneas de pedido cuyos artículos sean de Floramondo",
- "It is not possible to modify cloned sales": "No es posible modificar líneas de pedido clonadas",
- "A supplier with the same name already exists. Change the country.": "Un proveedor con el mismo nombre ya existe. Cambie el país.",
- "There is no assigned email for this client": "No hay correo asignado para este cliente",
- "Exists an invoice with a future date": "Existe una factura con fecha posterior",
- "Invoice date can't be less than max date": "La fecha de factura no puede ser inferior a la fecha límite",
- "Warehouse inventory not set": "El almacén inventario no está establecido",
- "This locker has already been assigned": "Esta taquilla ya ha sido asignada",
- "Tickets with associated refunds": "No se pueden borrar tickets con abonos asociados. Este ticket está asociado al abono Nº %d",
- "Not exist this branch": "La rama no existe",
- "This ticket cannot be signed because it has not been boxed": "Este ticket no puede firmarse porque no ha sido encajado",
- "Collection does not exist": "La colección no existe",
- "Cannot obtain exclusive lock": "No se puede obtener un bloqueo exclusivo",
- "Insert a date range": "Inserte un rango de fechas",
- "Added observation": "{{user}} añadió esta observacion: {{text}}",
- "Comment added to client": "Observación añadida al cliente {{clientFk}}",
- "Invalid auth code": "Código de verificación incorrecto",
- "Invalid or expired verification code": "Código de verificación incorrecto o expirado",
- "Cannot create a new claimBeginning from a different ticket": "No se puede crear una línea de reclamación de un ticket diferente al origen",
- "company": "Compañía",
- "country": "País",
- "clientId": "Id cliente",
- "clientSocialName": "Cliente",
- "amount": "Importe",
- "taxableBase": "Base",
- "ticketFk": "Id ticket",
- "isActive": "Activo",
- "hasToInvoice": "Facturar",
- "isTaxDataChecked": "Datos comprobados",
- "comercialId": "Id comercial",
- "comercialName": "Comercial",
- "Pass expired": "La contraseña ha caducado, cambiela desde Salix",
- "Invalid NIF for VIES": "Invalid NIF for VIES",
- "Ticket does not exist": "Este ticket no existe",
- "Ticket is already signed": "Este ticket ya ha sido firmado",
- "Authentication failed": "Autenticación fallida",
- "You can't use the same password": "No puedes usar la misma contraseña",
- "You can only add negative amounts in refund tickets": "Solo se puede añadir cantidades negativas en tickets abono",
- "Fecha fuera de rango": "Fecha fuera de rango",
- "Error while generating PDF": "Error al generar PDF",
- "Error when sending mail to client": "Error al enviar el correo al cliente",
- "Mail not sent": "Se ha producido un fallo al enviar la factura al cliente [{{clientId}}]({{{clientUrl}}}), por favor revisa la dirección de correo electrónico",
- "The renew period has not been exceeded": "El periodo de renovación no ha sido superado",
- "Valid priorities": "Prioridades válidas: %d",
- "Negative basis of tickets": "Base negativa para los tickets: {{ticketsIds}}",
- "You cannot assign an alias that you are not assigned to": "No puede asignar un alias que no tenga asignado",
- "This ticket cannot be left empty.": "Este ticket no se puede dejar vacío. %s",
- "The company has not informed the supplier account for bank transfers": "La empresa no tiene informado la cuenta de proveedor para transferencias bancarias",
- "You cannot assign/remove an alias that you are not assigned to": "No puede asignar/eliminar un alias que no tenga asignado",
- "This invoice has a linked vehicle.": "Esta factura tiene un vehiculo vinculado",
- "You don't have enough privileges.": "No tienes suficientes permisos.",
- "This ticket is locked.": "Este ticket está bloqueado.",
- "This ticket is not editable.": "Este ticket no es editable.",
- "The ticket doesn't exist.": "No existe el ticket.",
- "Social name should be uppercase": "La razón social debe ir en mayúscula",
- "Street should be uppercase": "La dirección fiscal debe ir en mayúscula",
- "The response is not a PDF": "La respuesta no es un PDF",
- "Ticket without Route": "Ticket sin ruta",
- "Booking completed": "Reserva completada",
- "The ticket is in preparation": "El ticket [{{ticketId}}]({{{ticketUrl}}}) del comercial {{salesPersonId}} está en preparación"
-}
+ "Phone format is invalid": "El formato del teléfono no es correcto",
+ "You are not allowed to change the credit": "No tienes privilegios para modificar el crédito",
+ "Unable to mark the equivalence surcharge": "No se puede marcar el recargo de equivalencia",
+ "The default consignee can not be unchecked": "No se puede desmarcar el consignatario predeterminado",
+ "Unable to default a disabled consignee": "No se puede poner predeterminado un consignatario desactivado",
+ "Can't be blank": "No puede estar en blanco",
+ "Invalid TIN": "NIF/CIF inválido",
+ "TIN must be unique": "El NIF/CIF debe ser único",
+ "A client with that Web User name already exists": "Ya existe un cliente con ese Usuario Web",
+ "Is invalid": "Es inválido",
+ "Quantity cannot be zero": "La cantidad no puede ser cero",
+ "Enter an integer different to zero": "Introduce un entero distinto de cero",
+ "Package cannot be blank": "El embalaje no puede estar en blanco",
+ "The company name must be unique": "La razón social debe ser única",
+ "Invalid email": "Correo electrónico inválido",
+ "The IBAN does not have the correct format": "El IBAN no tiene el formato correcto",
+ "That payment method requires an IBAN": "El método de pago seleccionado requiere un IBAN",
+ "That payment method requires a BIC": "El método de pago seleccionado requiere un BIC",
+ "State cannot be blank": "El estado no puede estar en blanco",
+ "Worker cannot be blank": "El trabajador no puede estar en blanco",
+ "Cannot change the payment method if no salesperson": "No se puede cambiar la forma de pago si no hay comercial asignado",
+ "can't be blank": "El campo no puede estar vacío",
+ "Observation type must be unique": "El tipo de observación no puede repetirse",
+ "The credit must be an integer greater than or equal to zero": "The credit must be an integer greater than or equal to zero",
+ "The grade must be similar to the last one": "El grade debe ser similar al último",
+ "Only manager can change the credit": "Solo el gerente puede cambiar el credito de este cliente",
+ "Name cannot be blank": "El nombre no puede estar en blanco",
+ "Phone cannot be blank": "El teléfono no puede estar en blanco",
+ "Period cannot be blank": "El periodo no puede estar en blanco",
+ "Choose a company": "Selecciona una empresa",
+ "Se debe rellenar el campo de texto": "Se debe rellenar el campo de texto",
+ "Description should have maximum of 45 characters": "La descripción debe tener maximo 45 caracteres",
+ "Cannot be blank": "El campo no puede estar en blanco",
+ "The grade must be an integer greater than or equal to zero": "El grade debe ser un entero mayor o igual a cero",
+ "Sample type cannot be blank": "El tipo de plantilla no puede quedar en blanco",
+ "Description cannot be blank": "Se debe rellenar el campo de texto",
+ "The price of the item changed": "El precio del artículo cambió",
+ "The value should not be greater than 100%": "El valor no debe de ser mayor de 100%",
+ "The value should be a number": "El valor debe ser un numero",
+ "This order is not editable": "Esta orden no se puede modificar",
+ "You can't create an order for a frozen client": "No puedes crear una orden para un cliente congelado",
+ "You can't create an order for a client that has a debt": "No puedes crear una orden para un cliente con deuda",
+ "is not a valid date": "No es una fecha valida",
+ "Barcode must be unique": "El código de barras debe ser único",
+ "The warehouse can't be repeated": "El almacén no puede repetirse",
+ "The tag or priority can't be repeated for an item": "El tag o prioridad no puede repetirse para un item",
+ "The observation type can't be repeated": "El tipo de observación no puede repetirse",
+ "A claim with that sale already exists": "Ya existe una reclamación para esta línea",
+ "You don't have enough privileges to change that field": "No tienes permisos para cambiar ese campo",
+ "Warehouse cannot be blank": "El almacén no puede quedar en blanco",
+ "Agency cannot be blank": "La agencia no puede quedar en blanco",
+ "Not enough privileges to edit a client with verified data": "No tienes permisos para hacer cambios en un cliente con datos comprobados",
+ "This address doesn't exist": "Este consignatario no existe",
+ "You must delete the claim id %d first": "Antes debes borrar la reclamación %d",
+ "You don't have enough privileges": "No tienes suficientes permisos",
+ "Cannot check Equalization Tax in this NIF/CIF": "No se puede marcar RE en este NIF/CIF",
+ "You can't make changes on the basic data of an confirmed order or with rows": "No puedes cambiar los datos básicos de una orden con artículos",
+ "INVALID_USER_NAME": "El nombre de usuario solo debe contener letras minúsculas o, a partir del segundo carácter, números o subguiones, no está permitido el uso de la letra ñ",
+ "You can't create a ticket for a frozen client": "No puedes crear un ticket para un cliente congelado",
+ "You can't create a ticket for an inactive client": "No puedes crear un ticket para un cliente inactivo",
+ "Tag value cannot be blank": "El valor del tag no puede quedar en blanco",
+ "ORDER_EMPTY": "Cesta vacía",
+ "You don't have enough privileges to do that": "No tienes permisos para cambiar esto",
+ "NO SE PUEDE DESACTIVAR EL CONSIGNAT": "NO SE PUEDE DESACTIVAR EL CONSIGNAT",
+ "Error. El NIF/CIF está repetido": "Error. El NIF/CIF está repetido",
+ "Street cannot be empty": "Dirección no puede estar en blanco",
+ "City cannot be empty": "Ciudad no puede estar en blanco",
+ "Code cannot be blank": "Código no puede estar en blanco",
+ "You cannot remove this department": "No puedes eliminar este departamento",
+ "The extension must be unique": "La extensión debe ser unica",
+ "The secret can't be blank": "La contraseña no puede estar en blanco",
+ "We weren't able to send this SMS": "No hemos podido enviar el SMS",
+ "This client can't be invoiced": "Este cliente no puede ser facturado",
+ "You must provide the correction information to generate a corrective invoice": "Debes informar la información de corrección para generar una factura rectificativa",
+ "This ticket can't be invoiced": "Este ticket no puede ser facturado",
+ "You cannot add or modify services to an invoiced ticket": "No puedes añadir o modificar servicios a un ticket facturado",
+ "This ticket can not be modified": "Este ticket no puede ser modificado",
+ "The introduced hour already exists": "Esta hora ya ha sido introducida",
+ "INFINITE_LOOP": "Existe una dependencia entre dos Jefes",
+ "The sales of the receiver ticket can't be modified": "Las lineas del ticket al que envias no pueden ser modificadas",
+ "NO_AGENCY_AVAILABLE": "No hay una zona de reparto disponible con estos parámetros",
+ "ERROR_PAST_SHIPMENT": "No puedes seleccionar una fecha de envío en pasado",
+ "The current ticket can't be modified": "El ticket actual no puede ser modificado",
+ "The current claim can't be modified": "La reclamación actual no puede ser modificada",
+ "The sales of this ticket can't be modified": "Las lineas de este ticket no pueden ser modificadas",
+ "The sales do not exists": "La(s) línea(s) seleccionada(s) no existe(n)",
+ "Please select at least one sale": "Por favor selecciona al menos una linea",
+ "All sales must belong to the same ticket": "Todas las lineas deben pertenecer al mismo ticket",
+ "NO_ZONE_FOR_THIS_PARAMETERS": "Para este día no hay ninguna zona configurada",
+ "This item doesn't exists": "El artículo no existe",
+ "NOT_ZONE_WITH_THIS_PARAMETERS": "Para este día no hay ninguna zona configurada",
+ "Extension format is invalid": "El formato de la extensión es inválido",
+ "Invalid parameters to create a new ticket": "Parámetros inválidos para crear un nuevo ticket",
+ "This item is not available": "Este artículo no está disponible",
+ "This postcode already exists": "Este código postal ya existe",
+ "Concept cannot be blank": "El concepto no puede quedar en blanco",
+ "File doesn't exists": "El archivo no existe",
+ "You don't have privileges to change the zone": "No tienes permisos para cambiar la zona o para esos parámetros hay más de una opción de envío, hable con las agencias",
+ "This ticket is already on weekly tickets": "Este ticket ya está en tickets programados",
+ "Ticket id cannot be blank": "El id de ticket no puede quedar en blanco",
+ "Weekday cannot be blank": "El día de la semana no puede quedar en blanco",
+ "You can't delete a confirmed order": "No puedes borrar un pedido confirmado",
+ "The social name has an invalid format": "El nombre fiscal tiene un formato incorrecto",
+ "Invalid quantity": "Cantidad invalida",
+ "This postal code is not valid": "Este código postal no es válido",
+ "is invalid": "es inválido",
+ "The postcode doesn't exist. Please enter a correct one": "El código postal no existe. Por favor, introduce uno correcto",
+ "The department name can't be repeated": "El nombre del departamento no puede repetirse",
+ "This phone already exists": "Este teléfono ya existe",
+ "You cannot move a parent to its own sons": "No puedes mover un elemento padre a uno de sus hijos",
+ "You can't create a claim for a removed ticket": "No puedes crear una reclamación para un ticket eliminado",
+ "You cannot delete a ticket that part of it is being prepared": "No puedes eliminar un ticket en el que una parte que está siendo preparada",
+ "You must delete all the buy requests first": "Debes eliminar todas las peticiones de compra primero",
+ "You should specify a date": "Debes especificar una fecha",
+ "You should specify at least a start or end date": "Debes especificar al menos una fecha de inicio o de fin",
+ "Start date should be lower than end date": "La fecha de inicio debe ser menor que la fecha de fin",
+ "You should mark at least one week day": "Debes marcar al menos un día de la semana",
+ "Swift / BIC can't be empty": "Swift / BIC no puede estar vacío",
+ "Customs agent is required for a non UEE member": "El agente de aduanas es requerido para los clientes extracomunitarios",
+ "Incoterms is required for a non UEE member": "El incoterms es requerido para los clientes extracomunitarios",
+ "Deleted sales from ticket": "He eliminado las siguientes lineas del ticket [{{ticketId}}]({{{ticketUrl}}}): {{{deletions}}}",
+ "Added sale to ticket": "He añadido la siguiente linea al ticket [{{ticketId}}]({{{ticketUrl}}}): {{{addition}}}",
+ "Changed sale discount": "He cambiado el descuento de las siguientes lineas al ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
+ "Created claim": "He creado la reclamación [{{claimId}}]({{{claimUrl}}}) de las siguientes lineas del ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
+ "Changed sale price": "He cambiado el precio de [{{itemId}} {{concept}}]({{{itemUrl}}}) ({{quantity}}) de {{oldPrice}}€ ➔ *{{newPrice}}€* del ticket [{{ticketId}}]({{{ticketUrl}}})",
+ "Changed sale quantity": "He cambiado la cantidad de [{{itemId}} {{concept}}]({{{itemUrl}}}) de {{oldQuantity}} ➔ *{{newQuantity}}* del ticket [{{ticketId}}]({{{ticketUrl}}})",
+ "State": "Estado",
+ "regular": "normal",
+ "reserved": "reservado",
+ "Changed sale reserved state": "He cambiado el estado reservado de las siguientes lineas al ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
+ "Bought units from buy request": "Se ha comprado {{quantity}} unidades de [{{itemId}} {{concept}}]({{{urlItem}}}) para el ticket id [{{ticketId}}]({{{url}}})",
+ "Deny buy request": "Se ha rechazado la petición de compra para el ticket id [{{ticketId}}]({{{url}}}). Motivo: {{observation}}",
+ "MESSAGE_INSURANCE_CHANGE": "He cambiado el crédito asegurado del cliente [{{clientName}} ({{clientId}})]({{{url}}}) a *{{credit}} €*",
+ "Changed client paymethod": "He cambiado la forma de pago del cliente [{{clientName}} ({{clientId}})]({{{url}}})",
+ "Sent units from ticket": "Envio *{{quantity}}* unidades de [{{concept}} ({{itemId}})]({{{itemUrl}}}) a *\"{{nickname}}\"* provenientes del ticket id [{{ticketId}}]({{{ticketUrl}}})",
+ "Change quantity": "{{concept}} cambia de {{oldQuantity}} a {{newQuantity}}",
+ "Claim will be picked": "Se recogerá el género de la reclamación [({{claimId}})]({{{claimUrl}}}) del cliente *{{clientName}}*",
+ "Claim state has changed to": "Se ha cambiado el estado de la reclamación [({{claimId}})]({{{claimUrl}}}) del cliente *{{clientName}}* a *{{newState}}*",
+ "Client checked as validated despite of duplication": "Cliente comprobado a pesar de que existe el cliente id {{clientId}}",
+ "ORDER_ROW_UNAVAILABLE": "No hay disponibilidad de este producto",
+ "Distance must be lesser than 4000": "La distancia debe ser inferior a 4000",
+ "This ticket is deleted": "Este ticket está eliminado",
+ "Unable to clone this travel": "No ha sido posible clonar este travel",
+ "This thermograph id already exists": "La id del termógrafo ya existe",
+ "Choose a date range or days forward": "Selecciona un rango de fechas o días en adelante",
+ "ORDER_ALREADY_CONFIRMED": "ORDEN YA CONFIRMADA",
+ "Invalid password": "Invalid password",
+ "Password does not meet requirements": "La contraseña no cumple los requisitos",
+ "Role already assigned": "Rol ya asignado",
+ "Invalid role name": "Nombre de rol no válido",
+ "Role name must be written in camelCase": "El nombre del rol debe escribirse en camelCase",
+ "Email already exists": "El correo ya existe",
+ "User already exists": "El/La usuario/a ya existe",
+ "Absence change notification on the labour calendar": "Notificación de cambio de ausencia en el calendario laboral",
+ "Record of hours week": "Registro de horas semana {{week}} año {{year}} ",
+ "Created absence": "El empleado {{author}} ha añadido una ausencia de tipo '{{absenceType}}' a {{employee}} para el día {{dated}}.",
+ "Deleted absence": "El empleado {{author}} ha eliminado una ausencia de tipo '{{absenceType}}' a {{employee}} del día {{dated}}.",
+ "I have deleted the ticket id": "He eliminado el ticket id [{{id}}]({{{url}}})",
+ "I have restored the ticket id": "He restaurado el ticket id [{{id}}]({{{url}}})",
+ "You can only restore a ticket within the first hour after deletion": "Únicamente puedes restaurar el ticket dentro de la primera hora después de su eliminación",
+ "Changed this data from the ticket": "He cambiado estos datos del ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
+ "agencyModeFk": "Agencia",
+ "clientFk": "Cliente",
+ "zoneFk": "Zona",
+ "warehouseFk": "Almacén",
+ "shipped": "F. envío",
+ "landed": "F. entrega",
+ "addressFk": "Consignatario",
+ "companyFk": "Empresa",
+ "The social name cannot be empty": "La razón social no puede quedar en blanco",
+ "The nif cannot be empty": "El NIF no puede quedar en blanco",
+ "You need to fill sage information before you check verified data": "Debes rellenar la información de sage antes de marcar datos comprobados",
+ "ASSIGN_ZONE_FIRST": "Asigna una zona primero",
+ "Amount cannot be zero": "El importe no puede ser cero",
+ "Company has to be official": "Empresa inválida",
+ "You can not select this payment method without a registered bankery account": "No se puede utilizar este método de pago si no has registrado una cuenta bancaria",
+ "Action not allowed on the test environment": "Esta acción no está permitida en el entorno de pruebas",
+ "The selected ticket is not suitable for this route": "El ticket seleccionado no es apto para esta ruta",
+ "New ticket request has been created with price": "Se ha creado una nueva petición de compra '{{description}}' para el día *{{shipped}}*, con una cantidad de *{{quantity}}* y un precio de *{{price}} €*",
+ "New ticket request has been created": "Se ha creado una nueva petición de compra '{{description}}' para el día *{{shipped}}*, con una cantidad de *{{quantity}}*",
+ "Swift / BIC cannot be empty": "Swift / BIC no puede estar vacío",
+ "This BIC already exist.": "Este BIC ya existe.",
+ "That item doesn't exists": "Ese artículo no existe",
+ "There's a new urgent ticket:": "Hay un nuevo ticket urgente:",
+ "Invalid account": "Cuenta inválida",
+ "Compensation account is empty": "La cuenta para compensar está vacia",
+ "This genus already exist": "Este genus ya existe",
+ "This specie already exist": "Esta especie ya existe",
+ "Client assignment has changed": "He cambiado el comercial ~*\"<{{previousWorkerName}}>\"*~ por *\"<{{currentWorkerName}}>\"* del cliente [{{clientName}} ({{clientId}})]({{{url}}})",
+ "None": "Ninguno",
+ "The contract was not active during the selected date": "El contrato no estaba activo durante la fecha seleccionada",
+ "Cannot add more than one '1/2 day vacation'": "No puedes añadir más de un 'Vacaciones 1/2 dia'",
+ "This document already exists on this ticket": "Este documento ya existe en el ticket",
+ "Some of the selected tickets are not billable": "Algunos de los tickets seleccionados no son facturables",
+ "You can't invoice tickets from multiple clients": "No puedes facturar tickets de multiples clientes",
+ "nickname": "nickname",
+ "INACTIVE_PROVIDER": "Proveedor inactivo",
+ "This client is not invoiceable": "Este cliente no es facturable",
+ "serial non editable": "Esta serie no permite asignar la referencia",
+ "Max shipped required": "La fecha límite es requerida",
+ "Can't invoice to future": "No se puede facturar a futuro",
+ "Can't invoice to past": "No se puede facturar a pasado",
+ "This ticket is already invoiced": "Este ticket ya está facturado",
+ "A ticket with an amount of zero can't be invoiced": "No se puede facturar un ticket con importe cero",
+ "A ticket with a negative base can't be invoiced": "No se puede facturar un ticket con una base negativa",
+ "Global invoicing failed": "[Facturación global] No se han podido facturar algunos clientes",
+ "Wasn't able to invoice the following clients": "No se han podido facturar los siguientes clientes",
+ "Can't verify data unless the client has a business type": "No se puede verificar datos de un cliente que no tiene tipo de negocio",
+ "You don't have enough privileges to set this credit amount": "No tienes suficientes privilegios para establecer esta cantidad de crédito",
+ "You can't change the credit set to zero from a financialBoss": "No puedes cambiar el cŕedito establecido a cero por un jefe de finanzas",
+ "Amounts do not match": "Las cantidades no coinciden",
+ "The PDF document does not exist": "El documento PDF no existe. Prueba a regenerarlo desde la opción 'Regenerar PDF factura'",
+ "The type of business must be filled in basic data": "El tipo de negocio debe estar rellenado en datos básicos",
+ "You can't create a claim from a ticket delivered more than seven days ago": "No puedes crear una reclamación de un ticket entregado hace más de siete días",
+ "The worker has hours recorded that day": "El trabajador tiene horas fichadas ese día",
+ "The worker has a marked absence that day": "El trabajador tiene marcada una ausencia ese día",
+ "You can not modify is pay method checked": "No se puede modificar el campo método de pago validado",
+ "The account size must be exactly 10 characters": "El tamaño de la cuenta debe ser exactamente de 10 caracteres",
+ "Can't transfer claimed sales": "No puedes transferir lineas reclamadas",
+ "You don't have privileges to create refund": "No tienes permisos para crear un abono",
+ "The item is required": "El artículo es requerido",
+ "The agency is already assigned to another autonomous": "La agencia ya está asignada a otro autónomo",
+ "date in the future": "Fecha en el futuro",
+ "reference duplicated": "Referencia duplicada",
+ "This ticket is already a refund": "Este ticket ya es un abono",
+ "isWithoutNegatives": "Sin negativos",
+ "routeFk": "routeFk",
+ "Can't change the password of another worker": "No se puede cambiar la contraseña de otro trabajador",
+ "No hay un contrato en vigor": "No hay un contrato en vigor",
+ "No se permite fichar a futuro": "No se permite fichar a futuro",
+ "No está permitido trabajar": "No está permitido trabajar",
+ "Fichadas impares": "Fichadas impares",
+ "Descanso diario 12h.": "Descanso diario 12h.",
+ "Descanso semanal 36h. / 72h.": "Descanso semanal 36h. / 72h.",
+ "Dirección incorrecta": "Dirección incorrecta",
+ "Modifiable user details only by an administrator": "Detalles de usuario modificables solo por un administrador",
+ "Modifiable password only via recovery or by an administrator": "Contraseña modificable solo a través de la recuperación o por un administrador",
+ "Not enough privileges to edit a client": "No tienes suficientes privilegios para editar un cliente",
+ "This route does not exists": "Esta ruta no existe",
+ "Claim pickup order sent": "Reclamación Orden de recogida enviada [{{claimId}}]({{{claimUrl}}}) al cliente *{{clientName}}*",
+ "You don't have grant privilege": "No tienes privilegios para dar privilegios",
+ "You don't own the role and you can't assign it to another user": "No eres el propietario del rol y no puedes asignarlo a otro usuario",
+ "Ticket merged": "Ticket [{{originId}}]({{{originFullPath}}}) ({{{originDated}}}) fusionado con [{{destinationId}}]({{{destinationFullPath}}}) ({{{destinationDated}}})",
+ "Already has this status": "Ya tiene este estado",
+ "There aren't records for this week": "No existen registros para esta semana",
+ "Empty data source": "Origen de datos vacio",
+ "App locked": "Aplicación bloqueada por el usuario {{userId}}",
+ "Email verify": "Correo de verificación",
+ "Landing cannot be lesser than shipment": "Landing cannot be lesser than shipment",
+ "Receipt's bank was not found": "No se encontró el banco del recibo",
+ "This receipt was not compensated": "Este recibo no ha sido compensado",
+ "Client's email was not found": "No se encontró el email del cliente",
+ "Negative basis": "Base negativa",
+ "This worker code already exists": "Este codigo de trabajador ya existe",
+ "This personal mail already exists": "Este correo personal ya existe",
+ "This worker already exists": "Este trabajador ya existe",
+ "App name does not exist": "El nombre de aplicación no es válido",
+ "Try again": "Vuelve a intentarlo",
+ "Aplicación bloqueada por el usuario 9": "Aplicación bloqueada por el usuario 9",
+ "Failed to upload delivery note": "Error al subir albarán {{id}}",
+ "The DOCUWARE PDF document does not exists": "El documento PDF Docuware no existe",
+ "It is not possible to modify tracked sales": "No es posible modificar líneas de pedido que se hayan empezado a preparar",
+ "It is not possible to modify sales that their articles are from Floramondo": "No es posible modificar líneas de pedido cuyos artículos sean de Floramondo",
+ "It is not possible to modify cloned sales": "No es posible modificar líneas de pedido clonadas",
+ "A supplier with the same name already exists. Change the country.": "Un proveedor con el mismo nombre ya existe. Cambie el país.",
+ "There is no assigned email for this client": "No hay correo asignado para este cliente",
+ "Exists an invoice with a future date": "Existe una factura con fecha posterior",
+ "Invoice date can't be less than max date": "La fecha de factura no puede ser inferior a la fecha límite",
+ "Warehouse inventory not set": "El almacén inventario no está establecido",
+ "This locker has already been assigned": "Esta taquilla ya ha sido asignada",
+ "Tickets with associated refunds": "No se pueden borrar tickets con abonos asociados. Este ticket está asociado al abono Nº %d",
+ "Not exist this branch": "La rama no existe",
+ "This ticket cannot be signed because it has not been boxed": "Este ticket no puede firmarse porque no ha sido encajado",
+ "Collection does not exist": "La colección no existe",
+ "Cannot obtain exclusive lock": "No se puede obtener un bloqueo exclusivo",
+ "Insert a date range": "Inserte un rango de fechas",
+ "Added observation": "{{user}} añadió esta observacion: {{text}}",
+ "Comment added to client": "Observación añadida al cliente {{clientFk}}",
+ "Invalid auth code": "Código de verificación incorrecto",
+ "Invalid or expired verification code": "Código de verificación incorrecto o expirado",
+ "Cannot create a new claimBeginning from a different ticket": "No se puede crear una línea de reclamación de un ticket diferente al origen",
+ "company": "Compañía",
+ "country": "País",
+ "clientId": "Id cliente",
+ "clientSocialName": "Cliente",
+ "amount": "Importe",
+ "taxableBase": "Base",
+ "ticketFk": "Id ticket",
+ "isActive": "Activo",
+ "hasToInvoice": "Facturar",
+ "isTaxDataChecked": "Datos comprobados",
+ "comercialId": "Id comercial",
+ "comercialName": "Comercial",
+ "Pass expired": "La contraseña ha caducado, cambiela desde Salix",
+ "Invalid NIF for VIES": "Invalid NIF for VIES",
+ "Ticket does not exist": "Este ticket no existe",
+ "Ticket is already signed": "Este ticket ya ha sido firmado",
+ "Authentication failed": "Autenticación fallida",
+ "You can't use the same password": "No puedes usar la misma contraseña",
+ "You can only add negative amounts in refund tickets": "Solo se puede añadir cantidades negativas en tickets abono",
+ "Fecha fuera de rango": "Fecha fuera de rango",
+ "Error while generating PDF": "Error al generar PDF",
+ "Error when sending mail to client": "Error al enviar el correo al cliente",
+ "Mail not sent": "Se ha producido un fallo al enviar la factura al cliente [{{clientId}}]({{{clientUrl}}}), por favor revisa la dirección de correo electrónico",
+ "The renew period has not been exceeded": "El periodo de renovación no ha sido superado",
+ "Valid priorities": "Prioridades válidas: %d",
+ "hasAnyNegativeBase": "Base negativa para los tickets: {{ticketsIds}}",
+ "hasAnyPositiveBase": "Base positivas para los tickets: {{ticketsIds}}",
+ "You cannot assign an alias that you are not assigned to": "No puede asignar un alias que no tenga asignado",
+ "This ticket cannot be left empty.": "Este ticket no se puede dejar vacío. %s",
+ "The company has not informed the supplier account for bank transfers": "La empresa no tiene informado la cuenta de proveedor para transferencias bancarias",
+ "You cannot assign/remove an alias that you are not assigned to": "No puede asignar/eliminar un alias que no tenga asignado",
+ "This invoice has a linked vehicle.": "Esta factura tiene un vehiculo vinculado",
+ "You don't have enough privileges.": "No tienes suficientes permisos.",
+ "This ticket is locked": "Este ticket está bloqueado.",
+ "This ticket is not editable.": "Este ticket no es editable.",
+ "The ticket doesn't exist.": "No existe el ticket.",
+ "Social name should be uppercase": "La razón social debe ir en mayúscula",
+ "Street should be uppercase": "La dirección fiscal debe ir en mayúscula",
+ "Ticket without Route": "Ticket sin ruta",
+ "Select a different client": "Seleccione un cliente distinto",
+ "Fill all the fields": "Rellene todos los campos",
+ "The response is not a PDF": "La respuesta no es un PDF",
+ "Booking completed": "Reserva completada",
+ "The ticket is in preparation": "El ticket [{{ticketId}}]({{{ticketUrl}}}) del comercial {{salesPersonId}} está en preparación",
+ "The notification subscription of this worker cant be modified": "La subscripción a la notificación de este trabajador no puede ser modificada",
+ "User disabled": "Usuario desactivado",
+ "The amount cannot be less than the minimum": "La cantidad no puede ser menor que la cantidad mínima",
+ "quantityLessThanMin": "La cantidad no puede ser menor que la cantidad mínima",
+ "Cannot past travels with entries": "No se pueden pasar envíos con entradas",
+ "It was not able to remove the next expeditions:": "No se pudo eliminar las siguientes expediciones: {{expeditions}}",
+ "This claim has been updated": "La reclamación con Id: {{claimId}}, ha sido actualizada",
+ "This user does not have an assigned tablet": "Este usuario no tiene tablet asignada",
+ "Field are invalid": "El campo '{{tag}}' no es válido",
+ "Incorrect pin": "Pin incorrecto.",
+ "You already have the mailAlias": "Ya tienes este alias de correo",
+ "The alias cant be modified": "Este alias de correo no puede ser modificado",
+ "No tickets to invoice": "No hay tickets para facturar",
+ "this warehouse has not dms": "El Almacén no acepta documentos",
+ "This ticket already has a cmr saved": "Este ticket ya tiene un cmr guardado",
+ "Name should be uppercase": "El nombre debe ir en mayúscula",
+ "Bank entity must be specified": "La entidad bancaria es obligatoria",
+ "An email is necessary": "Es necesario un email",
+ "You cannot update these fields": "No puedes actualizar estos campos",
+ "CountryFK cannot be empty": "El país no puede estar vacío",
+ "Cmr file does not exist": "El archivo del cmr no existe",
+ "You are not allowed to modify the alias": "No estás autorizado a modificar el alias",
+ "The address of the customer must have information about Incoterms and Customs Agent": "El consignatario del cliente debe tener informado Incoterms y Agente de aduanas",
+ "The line could not be marked": "La linea no puede ser marcada",
+ "This password can only be changed by the user themselves": "Esta contraseña solo puede ser modificada por el propio usuario",
+ "They're not your subordinate": "No es tu subordinado/a."
+}
\ No newline at end of file
diff --git a/loopback/server/boot/date.js b/loopback/server/boot/date.js
index 810745562..d592dc416 100644
--- a/loopback/server/boot/date.js
+++ b/loopback/server/boot/date.js
@@ -1,6 +1,5 @@
module.exports = () => {
- Date.vnUTC = () => {
- const env = process.env.NODE_ENV;
+ Date.vnUTC = (env = process.env.NODE_ENV) => {
if (!env || env === 'development')
return new Date(Date.UTC(2001, 0, 1, 11));
diff --git a/loopback/server/connectors/vn-mysql.js b/loopback/server/connectors/vn-mysql.js
index 40ad78bde..5edef4395 100644
--- a/loopback/server/connectors/vn-mysql.js
+++ b/loopback/server/connectors/vn-mysql.js
@@ -270,12 +270,12 @@ class VnMySQL extends MySQL {
isLoggable(model) {
const Model = this.getModelDefinition(model).model;
- const settings = Model.definition.settings;
- return settings.base && settings.base === 'Loggable';
+ const {settings} = Model.definition;
+ return settings.mixins?.Loggable;
}
invokeMethod(method, args, model, ctx, opts, cb) {
- if (!this.isLoggable(model))
+ if (!this.isLoggable(model) && !opts?.userId)
return super[method].apply(this, args);
this.invokeMethodP(method, [...args], model, ctx, opts)
@@ -287,11 +287,11 @@ class VnMySQL extends MySQL {
let tx;
if (!opts.transaction) {
tx = await Transaction.begin(this, {});
- opts = Object.assign({transaction: tx, httpCtx: opts.httpCtx}, opts);
+ opts = Object.assign({transaction: tx}, opts);
}
try {
- const userId = opts.httpCtx && opts.httpCtx.active.accessToken.userId;
+ const {userId} = opts;
if (userId) {
const user = await Model.app.models.VnUser.findById(userId, {fields: ['name']}, opts);
await this.executeP(`CALL account.myUser_loginWithName(?)`, [user.name], opts);
diff --git a/loopback/server/datasources.json b/loopback/server/datasources.json
index aadee048c..341d5d578 100644
--- a/loopback/server/datasources.json
+++ b/loopback/server/datasources.json
@@ -103,6 +103,35 @@
"video/mp4"
]
},
+ "entryStorage": {
+ "name": "entryStorage",
+ "connector": "loopback-component-storage",
+ "provider": "filesystem",
+ "root": "./storage/dms",
+ "maxFileSize": "31457280",
+ "allowedContentTypes": [
+ "image/png",
+ "image/jpeg",
+ "image/jpg",
+ "image/webp",
+ "video/mp4"
+ ]
+ },
+ "supplierStorage": {
+ "name": "supplierStorage",
+ "connector": "loopback-component-storage",
+ "provider": "filesystem",
+ "root": "./storage/dms",
+ "maxFileSize": "31457280",
+ "allowedContentTypes": [
+ "image/png",
+ "image/jpeg",
+ "image/jpg",
+ "image/webp",
+ "video/mp4",
+ "application/pdf"
+ ]
+ },
"accessStorage": {
"name": "accessStorage",
"connector": "loopback-component-storage",
diff --git a/loopback/server/middleware.json b/loopback/server/middleware.json
index 31a2f113b..cfc693217 100644
--- a/loopback/server/middleware.json
+++ b/loopback/server/middleware.json
@@ -39,7 +39,7 @@
"./middleware/salix-version": {}
},
"parse": {
- "body-parser#json":{}
+ "body-parser#json":{}
},
"routes": {
"loopback#rest": {
diff --git a/loopback/server/middleware/error-handler.js b/loopback/server/middleware/error-handler.js
index 725826ae7..cc7b81618 100644
--- a/loopback/server/middleware/error-handler.js
+++ b/loopback/server/middleware/error-handler.js
@@ -1,10 +1,11 @@
+const SalixError = require('../../util/salixError');
const UserError = require('../../util/user-error');
const logToConsole = require('strong-error-handler/lib/logger');
module.exports = function() {
return function(err, req, res, next) {
// Thrown user errors
- if (err instanceof UserError) {
+ if (err instanceof SalixError) {
err.message = req.__(err.message, ...err.translateArgs);
return next(err);
}
@@ -13,7 +14,7 @@ module.exports = function() {
if (err.statusCode == 422) {
try {
let code;
- let messages = err.details.messages;
+ let {messages} = err.details;
for (code in messages) break;
err.message = req.__(messages[code][0]);
return next(err);
diff --git a/loopback/server/middleware/salix-version.js b/loopback/server/middleware/salix-version.js
index 988a3b39c..93ed6a9c4 100644
--- a/loopback/server/middleware/salix-version.js
+++ b/loopback/server/middleware/salix-version.js
@@ -1,4 +1,4 @@
-const packageJson = require('../../../package.json');
+const packageJson = require(`${process.cwd()}/package.json`);
module.exports = function(options) {
return function(req, res, next) {
diff --git a/loopback/server/model-config.json b/loopback/server/model-config.json
index 52b539f60..56b5360e8 100644
--- a/loopback/server/model-config.json
+++ b/loopback/server/model-config.json
@@ -25,20 +25,19 @@
"FieldAcl": {
"dataSource": "vn"
},
- "Role": {
- "dataSource": "vn",
- "options": {
- "mysql": {
- "table": "salix.Role"
- }
- }
- },
"RoleMapping": {
"dataSource": "vn",
"options": {
"mysql": {
"table": "salix.RoleMapping"
}
+ },
+ "relations": {
+ "role": {
+ "type": "belongsTo",
+ "model": "VnRole",
+ "foreignKey": "roleId"
+ }
}
},
"Schema": {
@@ -49,5 +48,13 @@
},
"Container": {
"dataSource": "vn"
+ },
+ "ProcsPriv": {
+ "dataSource": "vn",
+ "options": {
+ "mysql": {
+ "table": "mysql.procs_priv"
+ }
+ }
}
-}
\ No newline at end of file
+}
diff --git a/loopback/server/server.js b/loopback/server/server.js
index 188b5eb0f..5e2f4ebd2 100644
--- a/loopback/server/server.js
+++ b/loopback/server/server.js
@@ -28,7 +28,7 @@ module.exports = app;
let rootDir = __dirname;
let lbDir = path.resolve(`${rootDir}/..`);
-let appDir = path.resolve(`${__dirname}/../..`);
+let appDir = process.cwd();
let localeDir = `${lbDir}/locale`;
let modulesDir = `${appDir}/modules`;
@@ -80,13 +80,13 @@ app.boot = function(bootOptions, callback) {
`${__dirname}/model-config.json`
];
let modelSources = [
- `loopback/common/models`,
- `loopback/server/models`,
+ `${lbDir}/common/models`,
+ `${lbDir}/server/models`,
`${__dirname}/../common/models`
];
let mixinDirs = [
- `loopback/common/mixins`,
- `loopback/server/mixins`,
+ `${lbDir}/common/mixins`,
+ `${lbDir}/server/mixins`,
`${__dirname}/../common/mixins`
];
let bootDirs = [
diff --git a/loopback/util/forbiddenError.js b/loopback/util/forbiddenError.js
index 998cb4593..8f6561059 100644
--- a/loopback/util/forbiddenError.js
+++ b/loopback/util/forbiddenError.js
@@ -1,7 +1,8 @@
-module.exports = class ForbiddenError extends Error {
+const SalixError = require('./salixError');
+module.exports = class ForbiddenError extends SalixError {
constructor(message, code, ...translateArgs) {
super(message);
- this.name = 'ForbiddenError';
+ this.name = ForbiddenError.name;
this.statusCode = 403;
this.code = code;
this.translateArgs = translateArgs;
diff --git a/loopback/util/salixError.js b/loopback/util/salixError.js
new file mode 100644
index 000000000..427b871ab
--- /dev/null
+++ b/loopback/util/salixError.js
@@ -0,0 +1,5 @@
+module.exports = class SalixError extends Error {
+ constructor(message) {
+ super(message);
+ }
+};
diff --git a/loopback/util/user-error.js b/loopback/util/user-error.js
index c2d01e080..feee208b3 100644
--- a/loopback/util/user-error.js
+++ b/loopback/util/user-error.js
@@ -4,10 +4,11 @@
* the final user, so they cannot contain sensitive data and must
* be understandable by people who do not have a technical profile.
*/
-module.exports = class UserError extends Error {
+const SalixError = require('./salixError');
+module.exports = class UserError extends SalixError {
constructor(message, code, ...translateArgs) {
super(message);
- this.name = 'UserError';
+ this.name = UserError.name;
this.statusCode = 400;
this.code = code;
this.translateArgs = translateArgs;
diff --git a/loopback/util/validateIban.js b/loopback/util/validateIban.js
index ed3e00426..2386538b5 100644
--- a/loopback/util/validateIban.js
+++ b/loopback/util/validateIban.js
@@ -3,7 +3,6 @@ module.exports = function(iban, countryCode) {
if (typeof iban != 'string') return false;
if (countryCode?.toLowerCase() != 'es') return true;
- iban = iban.toUpperCase();
iban = trim(iban);
iban = iban.replace(/\s/g, '');
diff --git a/modules/account/back/methods/account-synchronizer/test.js b/modules/account/back/methods/account-linker/test.js
similarity index 59%
rename from modules/account/back/methods/account-synchronizer/test.js
rename to modules/account/back/methods/account-linker/test.js
index a77940168..990af2df8 100644
--- a/modules/account/back/methods/account-synchronizer/test.js
+++ b/modules/account/back/methods/account-linker/test.js
@@ -1,3 +1,4 @@
+const NotFoundError = require('vn-loopback/util/not-found-error');
module.exports = Self => {
Self.remoteMethod('test', {
@@ -9,7 +10,8 @@ module.exports = Self => {
});
Self.test = async function() {
- let connector = await Self.getSynchronizer();
+ const connector = await Self.getLinker();
+ if (!connector) throw new NotFoundError('Linker not configured');
await connector.test();
};
};
diff --git a/modules/account/back/methods/account/logout.js b/modules/account/back/methods/account/logout.js
index 5db3efa33..7d2e8153e 100644
--- a/modules/account/back/methods/account/logout.js
+++ b/modules/account/back/methods/account/logout.js
@@ -15,7 +15,8 @@ module.exports = Self => {
http: {
path: `/logout`,
verb: 'POST'
- }
+ },
+ accessScopes: ['DEFAULT', 'read:multimedia']
});
Self.logout = async ctx => Self.app.models.VnUser.logout(ctx.req.accessToken.id);
diff --git a/modules/account/back/methods/account/specs/change-password.spec.js b/modules/account/back/methods/account/specs/change-password.spec.js
index 2fa3010af..c79960212 100644
--- a/modules/account/back/methods/account/specs/change-password.spec.js
+++ b/modules/account/back/methods/account/specs/change-password.spec.js
@@ -2,7 +2,7 @@ const {models} = require('vn-loopback/server/server');
describe('account changePassword()', () => {
const userId = 70;
- const unauthCtx = {
+ const unAuthCtx = {
req: {
headers: {},
connection: {
@@ -79,7 +79,7 @@ describe('account changePassword()', () => {
passExpired: yesterday
}
, options);
- await models.VnUser.signIn(unauthCtx, 'trainee', 'nightmare', options);
+ await models.VnUser.signIn(unAuthCtx, 'trainee', 'nightmare', options);
} catch (e) {
if (e.message != 'Pass expired')
throw e;
diff --git a/modules/account/back/methods/account/sync.js b/modules/account/back/methods/account/sync.js
index a5befc22c..1026c5020 100644
--- a/modules/account/back/methods/account/sync.js
+++ b/modules/account/back/methods/account/sync.js
@@ -1,3 +1,4 @@
+const ForbiddenError = require('vn-loopback/util/forbiddenError');
module.exports = Self => {
Self.remoteMethod('sync', {
@@ -25,21 +26,46 @@ module.exports = Self => {
});
Self.sync = async function(userName, password, force, options) {
+ const models = Self.app.models;
const myOptions = {};
-
+ let tx;
+
if (typeof options == 'object')
Object.assign(myOptions, options);
- const models = Self.app.models;
- const user = await models.VnUser.findOne({
- fields: ['id'],
- where: {name: userName}
- }, myOptions);
- const isSync = !await models.UserSync.exists(userName, myOptions);
+ if (!myOptions.transaction) {
+ tx = await Self.beginTransaction({});
+ myOptions.transaction = tx;
+ };
- if (!force && isSync && user) return;
- await models.AccountConfig.syncUser(userName, password);
- await models.UserSync.destroyById(userName, myOptions);
+ try {
+ const user = await models.VnUser.findOne({
+ fields: ['id', 'password'],
+ where: {name: userName}
+ }, myOptions);
+
+ if (user && password && !await user.hasPassword(password))
+ throw new ForbiddenError('Wrong password');
+
+ const isSync = !await models.UserSync.exists(userName, myOptions);
+
+ if (!force && isSync && user) {
+ if (tx) await tx.rollback();
+ return;
+ }
+
+ await Self.rawSql(`
+ SELECT id
+ FROM account.user
+ WHERE id = ?
+ FOR UPDATE`, [user.id], myOptions);
+
+ await models.AccountConfig.syncUser(userName, password);
+ await models.UserSync.destroyById(userName, myOptions);
+ if (tx) await tx.commit();
+ } catch (err) {
+ if (tx) await tx.rollback();
+ throw err;
+ }
};
};
-
diff --git a/modules/account/back/mixins/account-synchronizer.js b/modules/account/back/mixins/account-linker.js
similarity index 85%
rename from modules/account/back/mixins/account-synchronizer.js
rename to modules/account/back/mixins/account-linker.js
index 8ba8bfe9d..c882d0893 100644
--- a/modules/account/back/mixins/account-synchronizer.js
+++ b/modules/account/back/mixins/account-linker.js
@@ -3,14 +3,14 @@ const app = require('vn-loopback/server/server');
const UserError = require('vn-loopback/util/user-error');
module.exports = function(Self, options) {
- require('../methods/account-synchronizer/test')(Self);
+ require('../methods/account-linker/test')(Self);
Self.once('attached', function() {
- app.models.AccountConfig.addSynchronizer(Self);
+ app.models.AccountConfig.addLinker(Self);
});
/**
- * Mixin for user synchronizers.
+ * Mixin for account linkers.
*
* @property {Array} $
* @property {Object} accountConfig
@@ -18,12 +18,12 @@ module.exports = function(Self, options) {
*/
let Mixin = {
/**
- * Initalizes the synchronizer.
+ * Initalizes the linker.
*/
async init() {},
/**
- * Deinitalizes the synchronizer.
+ * Deinitalizes the linker.
*/
async deinit() {},
@@ -57,7 +57,7 @@ module.exports = function(Self, options) {
async syncRoles() {},
/**
- * Tests synchronizer configuration.
+ * Tests linker configuration.
*/
async test() {
try {
diff --git a/modules/account/back/model-config.json b/modules/account/back/model-config.json
index a4eb9fa57..0cd43d0ce 100644
--- a/modules/account/back/model-config.json
+++ b/modules/account/back/model-config.json
@@ -14,6 +14,9 @@
"MailAliasAccount": {
"dataSource": "vn"
},
+ "MailAliasAcl": {
+ "dataSource": "vn"
+ },
"MailConfig": {
"dataSource": "vn"
},
@@ -35,6 +38,9 @@
"SambaConfig": {
"dataSource": "vn"
},
+ "SignInLog": {
+ "dataSource": "vn"
+ },
"Sip": {
"dataSource": "vn"
},
diff --git a/modules/account/back/models/account-config.js b/modules/account/back/models/account-config.js
index 0db699b99..2cc6b240d 100644
--- a/modules/account/back/models/account-config.js
+++ b/modules/account/back/models/account-config.js
@@ -3,94 +3,85 @@ const models = require('vn-loopback/server/server').models;
module.exports = Self => {
Object.assign(Self, {
- synchronizers: [],
+ linkers: [],
- addSynchronizer(synchronizer) {
- this.synchronizers.push(synchronizer);
+ addLinker(linker) {
+ this.linkers.push(linker);
},
- async getInstance() {
- let instance = await Self.findOne({
+ async initEngine() {
+ const accountConfig = await Self.findOne({
fields: ['homedir', 'shell', 'idBase']
});
- await instance.synchronizerInit();
- return instance;
+ const mailConfig = await models.MailConfig.findOne({
+ fields: ['domain']
+ });
+
+ const linkers = [];
+
+ for (const Linker of Self.linkers) {
+ const linker = await Linker.getLinker();
+ if (!linker) continue;
+ Object.assign(linker, {accountConfig});
+ await linker.init();
+ linkers.push(linker);
+ }
+
+ Object.assign(accountConfig, {
+ linkers,
+ domain: mailConfig.domain
+ });
+
+ return {
+ accountConfig,
+ linkers
+ };
+ },
+
+ async deinitEngine(engine) {
+ for (const linker of engine.linkers)
+ await linker.deinit();
+ },
+
+ async syncUser(userName, password) {
+ const engine = await Self.initEngine();
+ try {
+ await Self.syncUserBase(engine, userName, password, true);
+ } finally {
+ await Self.deinitEngine(engine);
+ }
},
async syncUsers() {
- let instance = await Self.getInstance();
+ const engine = await Self.initEngine();
+
+ let usersToSync = new Set();
+ for (const linker of engine.linkers)
+ await linker.getUsers(usersToSync);
- let usersToSync = await instance.synchronizerGetUsers();
usersToSync = Array.from(usersToSync.values())
.sort((a, b) => a.localeCompare(b));
for (let userName of usersToSync) {
try {
+ // eslint-disable-next-line no-console
console.log(`Synchronizing user '${userName}'`);
- await instance.synchronizerSyncUser(userName);
+
+ await Self.syncUserBase(engine, userName);
+
+ // eslint-disable-next-line no-console
console.log(` -> User '${userName}' sinchronized`);
} catch (err) {
+ // eslint-disable-next-line no-console
console.error(` -> User '${userName}' synchronization error:`, err.message);
}
}
- await instance.synchronizerDeinit();
+ await Self.deinitEngine(engine);
await Self.syncRoles();
},
- async syncUser(userName, password) {
- let instance = await Self.getInstance();
- try {
- await instance.synchronizerSyncUser(userName, password, true);
- } finally {
- await instance.synchronizerDeinit();
- }
- },
-
- async syncRoles() {
- let instance = await Self.getInstance();
- try {
- await instance.synchronizerSyncRoles();
- } finally {
- await instance.synchronizerDeinit();
- }
- },
-
- async getSynchronizer() {
- return await Self.findOne();
- }
- });
-
- Object.assign(Self.prototype, {
- async synchronizerInit() {
- let mailConfig = await models.MailConfig.findOne({
- fields: ['domain']
- });
-
- let synchronizers = [];
-
- for (let Synchronizer of Self.synchronizers) {
- let synchronizer = await Synchronizer.getSynchronizer();
- if (!synchronizer) continue;
- Object.assign(synchronizer, {
- accountConfig: this
- });
- await synchronizer.init();
- synchronizers.push(synchronizer);
- }
-
- Object.assign(this, {
- synchronizers,
- domain: mailConfig.domain
- });
- },
-
- async synchronizerDeinit() {
- for (let synchronizer of this.synchronizers)
- await synchronizer.deinit();
- },
-
- async synchronizerSyncUser(userName, password, syncGroups) {
+ async syncUserBase(engine, userName, password, syncGroups) {
if (!userName) return;
userName = userName.toLowerCase();
@@ -98,7 +89,7 @@ module.exports = Self => {
if (['administrator', 'root'].indexOf(userName) >= 0)
return;
- let user = await models.VnUser.findOne({
+ const user = await models.VnUser.findOne({
where: {name: userName},
fields: [
'id',
@@ -130,27 +121,28 @@ module.exports = Self => {
]
});
- let info = {
+ const info = {
user,
hasAccount: false
};
if (user) {
- let exists = await models.Account.exists(user.id);
+ const exists = await models.Account.exists(user.id);
+ const {accountConfig} = engine;
Object.assign(info, {
hasAccount: user.active && exists,
- corporateMail: `${userName}@${this.domain}`,
- uidNumber: this.idBase + user.id
+ corporateMail: `${userName}@${accountConfig.domain}`,
+ uidNumber: accountConfig.idBase + user.id
});
}
- let errs = [];
+ const errs = [];
- for (let synchronizer of this.synchronizers) {
+ for (const linker of engine.linkers) {
try {
- await synchronizer.syncUser(userName, info, password);
+ await linker.syncUser(userName, info, password);
if (syncGroups)
- await synchronizer.syncUserGroups(userName, info);
+ await linker.syncUserGroups(userName, info);
} catch (err) {
errs.push(err);
}
@@ -159,18 +151,16 @@ module.exports = Self => {
if (errs.length) throw errs[0];
},
- async synchronizerGetUsers() {
- let usersToSync = new Set();
+ async syncRoles() {
+ const engine = await Self.initEngine();
+ try {
+ await Self.rawSql(`CALL account.role_sync`);
- for (let synchronizer of this.synchronizers)
- await synchronizer.getUsers(usersToSync);
-
- return usersToSync;
- },
-
- async synchronizerSyncRoles() {
- for (let synchronizer of this.synchronizers)
- await synchronizer.syncRoles();
+ for (const linker of engine.linkers)
+ await linker.syncRoles();
+ } finally {
+ await Self.deinitEngine(engine);
+ }
}
});
};
diff --git a/modules/account/back/models/account.js b/modules/account/back/models/account.js
index 5021a5d94..ceb26053c 100644
--- a/modules/account/back/models/account.js
+++ b/modules/account/back/models/account.js
@@ -1,4 +1,7 @@
+const ForbiddenError = require('vn-loopback/util/forbiddenError');
+const {models} = require('vn-loopback/server/server');
+
module.exports = Self => {
require('../methods/account/sync')(Self);
require('../methods/account/sync-by-id')(Self);
@@ -7,4 +10,11 @@ module.exports = Self => {
require('../methods/account/logout')(Self);
require('../methods/account/change-password')(Self);
require('../methods/account/set-password')(Self);
+
+ Self.setUnverifiedPassword = async(id, pass, options) => {
+ const {emailVerified} = await models.VnUser.findById(id, {fields: ['emailVerified']}, options);
+ if (emailVerified) throw new ForbiddenError('This password can only be changed by the user themselves');
+
+ await models.VnUser.setPassword(id, pass, options);
+ };
};
diff --git a/modules/account/back/models/account.json b/modules/account/back/models/account.json
index 3c22521cb..6c2784696 100644
--- a/modules/account/back/models/account.json
+++ b/modules/account/back/models/account.json
@@ -1,49 +1,49 @@
{
- "name": "Account",
- "base": "VnModel",
- "options": {
- "mysql": {
- "table": "account.account"
- }
- },
- "properties": {
- "id": {
- "id": true
- }
- },
- "relations": {
- "user": {
- "type": "belongsTo",
- "model": "VnUser",
- "foreignKey": "id"
- },
- "aliases": {
- "type": "hasMany",
- "model": "MailAliasAccount",
- "foreignKey": "account"
- }
- },
- "acls": [
- {
- "property": "login",
- "accessType": "EXECUTE",
- "principalType": "ROLE",
- "principalId": "$everyone",
- "permission": "ALLOW"
+ "name": "Account",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "account.account"
+ }
+ },
+ "properties": {
+ "id": {
+ "id": true
+ }
+ },
+ "relations": {
+ "user": {
+ "type": "belongsTo",
+ "model": "VnUser",
+ "foreignKey": "id"
},
- {
+ "aliases": {
+ "type": "hasMany",
+ "model": "MailAliasAccount",
+ "foreignKey": "account"
+ }
+ },
+ "acls": [
+ {
+ "property": "login",
+ "accessType": "EXECUTE",
+ "principalType": "ROLE",
+ "principalId": "$everyone",
+ "permission": "ALLOW"
+ },
+ {
"property": "logout",
- "accessType": "EXECUTE",
- "principalType": "ROLE",
- "principalId": "$authenticated",
- "permission": "ALLOW"
- },
- {
+ "accessType": "EXECUTE",
+ "principalType": "ROLE",
+ "principalId": "$authenticated",
+ "permission": "ALLOW"
+ },
+ {
"property": "changePassword",
- "accessType": "EXECUTE",
- "principalType": "ROLE",
- "principalId": "$everyone",
- "permission": "ALLOW"
- }
- ]
+ "accessType": "EXECUTE",
+ "principalType": "ROLE",
+ "principalId": "$everyone",
+ "permission": "ALLOW"
+ }
+ ]
}
diff --git a/modules/account/back/models/ldap-config.js b/modules/account/back/models/ldap-config.js
index f9ae7562b..89f0add48 100644
--- a/modules/account/back/models/ldap-config.js
+++ b/modules/account/back/models/ldap-config.js
@@ -5,9 +5,9 @@ const crypto = require('crypto');
const nthash = require('smbhash').nthash;
module.exports = Self => {
- const shouldSync = process.env.NODE_ENV === 'production';
+ const shouldSync = process.env.NODE_ENV !== 'test';
- Self.getSynchronizer = async function() {
+ Self.getLinker = async function() {
return await Self.findOne({
fields: [
'server',
@@ -24,6 +24,7 @@ module.exports = Self => {
this.client = ldap.createClient({
url: this.server
});
+ this.client.on('error', () => {});
await this.client.bind(this.rdn, this.password);
},
@@ -140,6 +141,7 @@ module.exports = Self => {
try {
if (shouldSync)
await client.del(dn);
+ // eslint-disable-next-line no-console
console.log(` -> User '${userName}' removed from LDAP`);
} catch (e) {
if (e.name !== 'NoSuchObjectError') throw e;
@@ -237,7 +239,7 @@ module.exports = Self => {
// Prepare data
- let roles = await $.Role.find({
+ let roles = await $.VnRole.find({
fields: ['id', 'name', 'description']
});
let roleRoles = await $.RoleRole.find({
diff --git a/modules/account/back/models/ldap-config.json b/modules/account/back/models/ldap-config.json
index 2fd5aa901..d4d3a094d 100644
--- a/modules/account/back/models/ldap-config.json
+++ b/modules/account/back/models/ldap-config.json
@@ -7,7 +7,7 @@
}
},
"mixins": {
- "AccountSynchronizer": {}
+ "AccountLinker": {}
},
"properties": {
"id": {
diff --git a/modules/account/back/models/mail-alias-account.js b/modules/account/back/models/mail-alias-account.js
index 6f5213f24..61ca344e9 100644
--- a/modules/account/back/models/mail-alias-account.js
+++ b/modules/account/back/models/mail-alias-account.js
@@ -1,55 +1,45 @@
-const UserError = require('vn-loopback/util/user-error');
+const ForbiddenError = require('vn-loopback/util/forbiddenError');
module.exports = Self => {
- Self.observe('before save', async ctx => {
- const changes = ctx.currentInstance || ctx.instance;
-
- await Self.hasGrant(ctx, changes.mailAlias);
+ Self.rewriteDbError(function(err) {
+ if (err.code === 'ER_DUP_ENTRY')
+ return new UserError(`You already have the mailAlias`);
+ return err;
});
- Self.observe('before delete', async ctx => {
- const mailAliasAccount = await Self.findById(ctx.where.id);
-
- await Self.hasGrant(ctx, mailAliasAccount.mailAlias);
+ Self.beforeRemote('create', async function(ctx) {
+ const mailAlias = ctx.args.data?.mailAlias;
+ if (!mailAlias) return;
+ await checkModifyPermission(ctx, mailAlias);
+ });
+ Self.beforeRemote('deleteById', async function(ctx) {
+ const instance = await Self.findById(ctx.args.id,
+ {fields: ['mailAlias']}
+ );
+ await checkModifyPermission(ctx, instance.mailAlias);
});
- /**
- * Checks if current user has
- * grant to add/remove alias
- *
- * @param {Object} ctx - Request context
- * @param {Interger} mailAlias - mailAlias id
- * @return {Boolean} True for user with grant
- */
- Self.hasGrant = async function(ctx, mailAlias) {
+ async function checkModifyPermission(ctx, mailAliasFk) {
const models = Self.app.models;
- const accessToken = {req: {accessToken: ctx.options.accessToken}};
- const userId = accessToken.req.accessToken.userId;
+ const userId = ctx.req.accessToken.userId;
- const canEditAlias = await models.ACL.checkAccessAcl(accessToken, 'MailAliasAccount', 'canEditAlias', 'WRITE');
- if (canEditAlias) return true;
+ const canEditAlias = await models.ACL.checkAccessAcl(ctx,
+ 'MailAliasAccount', 'canEditAlias', 'WRITE');
+ if (canEditAlias) return;
- const user = await models.VnUser.findById(userId, {fields: ['hasGrant']});
- if (!user.hasGrant)
- throw new UserError(`You don't have grant privilege`);
-
- const account = await models.Account.findById(userId, {
- fields: ['id'],
- include: {
- relation: 'aliases',
- scope: {
- fields: ['mailAlias']
- }
- }
+ const allowedRoles = await models.MailAliasAcl.find({
+ fields: ['roleFk'],
+ where: {mailAliasFk}
});
+ const nRoles = allowedRoles.length &&
+ await models.RoleMapping.count({
+ principalId: userId,
+ principalType: 'USER',
+ roleId: {inq: allowedRoles.map(x => x.roleFk)}
+ });
- const aliases = account.aliases().map(alias => alias.mailAlias);
-
- const hasAlias = aliases.includes(mailAlias);
- if (!hasAlias)
- throw new UserError(`You cannot assign/remove an alias that you are not assigned to`);
-
- return true;
- };
+ if (!nRoles)
+ throw new ForbiddenError('You are not allowed to modify the alias');
+ }
};
diff --git a/modules/account/back/models/mail-alias-account.json b/modules/account/back/models/mail-alias-account.json
index 416c2acd8..54e986ef7 100644
--- a/modules/account/back/models/mail-alias-account.json
+++ b/modules/account/back/models/mail-alias-account.json
@@ -23,5 +23,20 @@
"model": "VnUser",
"foreignKey": "account"
}
- }
+ },
+ "acls": [
+ {
+ "property": "create",
+ "accessType": "WRITE",
+ "principalType": "ROLE",
+ "principalId": "$authenticated",
+ "permission": "ALLOW"
+ }, {
+ "property": "deleteById",
+ "accessType": "WRITE",
+ "principalType": "ROLE",
+ "principalId": "$authenticated",
+ "permission": "ALLOW"
+ }
+ ]
}
diff --git a/modules/account/back/models/mail-alias-acl.json b/modules/account/back/models/mail-alias-acl.json
new file mode 100644
index 000000000..014b95d14
--- /dev/null
+++ b/modules/account/back/models/mail-alias-acl.json
@@ -0,0 +1,31 @@
+{
+ "name": "MailAliasAcl",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "account.mailAliasAcl"
+ }
+ },
+ "properties": {
+ "mailAliasFk": {
+ "id": true,
+ "type": "number"
+ },
+ "roleFk": {
+ "id": true,
+ "type": "number"
+ }
+ },
+ "relations": {
+ "mailAlias": {
+ "type": "belongsTo",
+ "model": "MailAlias",
+ "foreignKey": "mailAliasFk"
+ },
+ "role": {
+ "type": "belongsTo",
+ "model": "Role",
+ "foreignKey": "roleFk"
+ }
+ }
+}
diff --git a/modules/account/back/models/mail-forward.json b/modules/account/back/models/mail-forward.json
index edef1bf08..874810b7a 100644
--- a/modules/account/back/models/mail-forward.json
+++ b/modules/account/back/models/mail-forward.json
@@ -21,5 +21,16 @@
"model": "VnUser",
"foreignKey": "account"
}
- }
+ },
+ "acls": [{
+ "accessType": "READ",
+ "principalType": "ROLE",
+ "principalId": "$owner",
+ "permission": "ALLOW"
+ }, {
+ "accessType": "WRITE",
+ "principalType": "ROLE",
+ "principalId": "$owner",
+ "permission": "ALLOW"
+ }]
}
diff --git a/modules/account/back/models/role-config.js b/modules/account/back/models/role-config.js
index ba7bf9d52..d6c57b70b 100644
--- a/modules/account/back/models/role-config.js
+++ b/modules/account/back/models/role-config.js
@@ -1,6 +1,6 @@
module.exports = Self => {
- Self.getSynchronizer = async function() {
+ Self.getLinker = async function() {
let NODE_ENV = process.env.NODE_ENV;
if (!NODE_ENV || NODE_ENV == 'development')
return null;
@@ -27,8 +27,7 @@ module.exports = Self => {
const [row] = await Self.rawSql(
`SELECT COUNT(*) AS nRows
FROM mysql.user
- WHERE User = ?
- AND Host = ?`,
+ WHERE User = ? AND Host = ?`,
[mysqlUser, this.userHost]
);
let userExists = row.nRows > 0;
@@ -38,8 +37,7 @@ module.exports = Self => {
const [row] = await Self.rawSql(
`SELECT Priv AS priv
FROM mysql.global_priv
- WHERE User = ?
- AND Host = ?`,
+ WHERE User = ? AND Host = ?`,
[mysqlUser, this.userHost]
);
const priv = row && JSON.parse(row.priv);
@@ -47,6 +45,7 @@ module.exports = Self => {
}
if (!isUpdatable) {
+ // eslint-disable-next-line no-console
console.warn(`RoleConfig.syncUser(): User '${userName}' cannot be updated, not managed by me`);
return;
}
@@ -84,14 +83,23 @@ module.exports = Self => {
[mysqlUser, this.userHost]);
} catch (err) {
if (err.code == 'ER_REVOKE_GRANTS')
+ // eslint-disable-next-line no-console
console.warn(`${err.code}: ${err.sqlMessage}: ${err.sql}`);
else
throw err;
}
- await Self.rawSql('GRANT ? TO ?@?',
- [role, mysqlUser, this.userHost]);
- if (role) {
+ const [row] = await Self.rawSql(
+ `SELECT COUNT(*) AS nRows
+ FROM mysql.user
+ WHERE User = ? AND Host = ''`,
+ [role]
+ );
+ const roleExists = row.nRows > 0;
+
+ if (roleExists) {
+ await Self.rawSql('GRANT ? TO ?@?',
+ [role, mysqlUser, this.userHost]);
await Self.rawSql('SET DEFAULT ROLE ? FOR ?@?',
[role, mysqlUser, this.userHost]);
} else {
diff --git a/modules/account/back/models/role-config.json b/modules/account/back/models/role-config.json
index f4138bea8..3b843eaea 100644
--- a/modules/account/back/models/role-config.json
+++ b/modules/account/back/models/role-config.json
@@ -7,7 +7,7 @@
}
},
"mixins": {
- "AccountSynchronizer": {}
+ "AccountLinker": {}
},
"properties": {
"id": {
diff --git a/modules/account/back/models/role-inherit.js b/modules/account/back/models/role-inherit.js
index 7d31e62b1..e994f844e 100644
--- a/modules/account/back/models/role-inherit.js
+++ b/modules/account/back/models/role-inherit.js
@@ -9,7 +9,7 @@ module.exports = Self => {
Self.observe(hook, async() => {
try {
await Self.rawSql(`
- CREATE EVENT account.role_sync
+ CREATE DEFINER = CURRENT_ROLE EVENT account.role_sync
ON SCHEDULE AT CURRENT_TIMESTAMP + INTERVAL 5 SECOND
DO CALL role_sync;
`);
diff --git a/modules/account/back/models/role-inherit.json b/modules/account/back/models/role-inherit.json
index 4b69ffdc2..a89f47b77 100644
--- a/modules/account/back/models/role-inherit.json
+++ b/modules/account/back/models/role-inherit.json
@@ -15,12 +15,12 @@
"relations": {
"owner": {
"type": "belongsTo",
- "model": "Role",
+ "model": "VnRole",
"foreignKey": "role"
},
"inherits": {
"type": "belongsTo",
- "model": "Role",
+ "model": "VnRole",
"foreignKey": "inheritsFrom"
}
}
diff --git a/modules/account/back/models/role-role.json b/modules/account/back/models/role-role.json
index 77df7a920..e59351c59 100644
--- a/modules/account/back/models/role-role.json
+++ b/modules/account/back/models/role-role.json
@@ -14,12 +14,12 @@
"relations": {
"owner": {
"type": "belongsTo",
- "model": "Role",
+ "model": "VnRole",
"foreignKey": "role"
},
"inherits": {
"type": "belongsTo",
- "model": "Role",
+ "model": "VnRole",
"foreignKey": "inheritsFrom"
}
}
diff --git a/modules/account/back/models/samba-config.js b/modules/account/back/models/samba-config.js
index 168b5ffb4..927510a29 100644
--- a/modules/account/back/models/samba-config.js
+++ b/modules/account/back/models/samba-config.js
@@ -1,17 +1,20 @@
const ldap = require('../util/ldapjs-extra');
-const ssh = require('node-ssh');
+const execFile = require('child_process').execFile;
/**
* Summary of userAccountControl flags:
* https://docs.microsoft.com/en-us/troubleshoot/windows-server/identity/useraccountcontrol-manipulate-account-properties
*/
const UserAccountControlFlags = {
- ACCOUNTDISABLE: 2
+ ACCOUNTDISABLE: 0x2,
+ DONT_EXPIRE_PASSWD: 0x10000
};
module.exports = Self => {
- Self.getSynchronizer = async function() {
+ const shouldSync = process.env.NODE_ENV !== 'test';
+
+ Self.getLinker = async function() {
return await Self.findOne({
fields: [
'host',
@@ -19,6 +22,7 @@ module.exports = Self => {
'adController',
'adUser',
'adPassword',
+ 'userDn',
'verifyCert'
]
});
@@ -26,88 +30,125 @@ module.exports = Self => {
Object.assign(Self.prototype, {
async init() {
- let sshClient = new ssh.NodeSSH();
- await sshClient.connect({
- host: this.adController,
- username: this.adUser,
- password: this.adPassword
- });
+ const baseDn = this.adDomain
+ .split('.')
+ .map(part => `dc=${part}`)
+ .join(',');
+ const bindDn = `cn=${this.adUser},cn=Users,${baseDn}`;
- let adUser = `cn=${this.adUser},${this.usersDn()}`;
-
- let adClient = ldap.createClient({
+ const adClient = ldap.createClient({
url: `ldaps://${this.adController}:636`,
tlsOptions: {rejectUnauthorized: this.verifyCert}
});
- await adClient.bind(adUser, this.adPassword);
-
+ adClient.on('error', () => {});
+ await adClient.bind(bindDn, this.adPassword);
Object.assign(this, {
- sshClient,
- adClient
+ adClient,
+ fullUsersDn: `${this.userDn},${baseDn}`,
+ bindDn
});
},
async deinit() {
- await this.sshClient.dispose();
await this.adClient.unbind();
},
- usersDn() {
- let dnBase = this.adDomain
- .split('.')
- .map(part => `dc=${part}`)
- .join(',');
- return `cn=Users,${dnBase}`;
+ async sambaTool(command, args = []) {
+ let authArgs = [
+ '--URL', `ldaps://${this.adController}`,
+ '--simple-bind-dn', this.bindDn,
+ '--password', this.adPassword
+ ];
+ if (!this.verifyCert)
+ authArgs.push('--option', 'tls verify peer = no_check');
+
+ const allArgs = [command].concat(
+ args, authArgs
+ );
+
+ if (!shouldSync) return;
+ return await new Promise((resolve, reject) => {
+ execFile('samba-tool', allArgs, (err, stdout, stderr) => {
+ if (err)
+ reject(err);
+ else
+ resolve({stdout, stderr});
+ });
+ });
},
- async syncUser(userName, info, password) {
- let {sshClient} = this;
-
- let sambaUser = await this.adClient.searchOne(this.usersDn(), {
+ async getAdUser(userName) {
+ const sambaUser = await this.adClient.searchOne(this.fullUsersDn, {
scope: 'sub',
- attributes: ['userAccountControl'],
+ attributes: [
+ 'dn',
+ 'userAccountControl',
+ 'uidNumber',
+ 'accountExpires',
+ 'mail'
+ ],
filter: `(&(objectClass=user)(sAMAccountName=${userName}))`
});
- let isEnabled = sambaUser
- && !(sambaUser.userAccountControl & UserAccountControlFlags.ACCOUNTDISABLE);
-
- if (process.env.NODE_ENV === 'test')
- return;
+ if (sambaUser) {
+ for (const intProp of ['uidNumber', 'userAccountControl']) {
+ if (sambaUser[intProp] != null)
+ sambaUser[intProp] = parseInt(sambaUser[intProp]);
+ }
+ }
+ return sambaUser;
+ },
+
+ async syncUser(userName, info, password) {
+ let sambaUser = await this.getAdUser(userName);
+ let entry;
if (info.hasAccount) {
if (!sambaUser) {
- await sshClient.exec('samba-tool user create', [
- userName,
- '--uid-number', `${info.uidNumber}`,
- '--mail-address', info.corporateMail,
+ await this.sambaTool('user', [
+ 'create', userName,
+ '--userou', this.userDn,
'--random-password'
]);
- await sshClient.exec('samba-tool user setexpiry', [
- userName,
- '--noexpiry'
- ]);
- await sshClient.exec('mkhomedir_helper', [
- userName,
- '0027'
- ]);
- }
- if (!isEnabled) {
- await sshClient.exec('samba-tool user enable', [
- userName
- ]);
+ sambaUser = await this.getAdUser(userName);
}
if (password) {
- await sshClient.exec('samba-tool user setpassword', [
- userName,
+ await this.sambaTool('user', [
+ 'setpassword', userName,
'--newpassword', password
]);
}
- } else if (isEnabled) {
- await sshClient.exec('samba-tool user disable', [
- userName
- ]);
+
+ entry = {
+ userAccountControl: (sambaUser.userAccountControl
+ | UserAccountControlFlags.DONT_EXPIRE_PASSWD)
+ & ~UserAccountControlFlags.ACCOUNTDISABLE,
+ uidNumber: info.uidNumber,
+ accountExpires: 0,
+ mail: info.corporateMail
+ };
+ } else if (sambaUser) {
+ entry = {
+ userAccountControl: sambaUser.userAccountControl
+ | UserAccountControlFlags.ACCOUNTDISABLE
+ };
+ // eslint-disable-next-line no-console
console.log(` -> User '${userName}' disabled on Samba`);
}
+
+ if (sambaUser && entry) {
+ const changes = [];
+ for (const prop in entry) {
+ if (sambaUser[prop] == entry[prop]) continue;
+ changes.push(new ldap.Change({
+ operation: 'replace',
+ modification: {
+ [prop]: entry[prop]
+ }
+ }));
+ }
+ if (changes.length && shouldSync)
+ await this.adClient.modify(sambaUser.dn, changes);
+ }
},
/**
@@ -117,14 +158,15 @@ module.exports = Self => {
*/
async getUsers(usersToSync) {
const LDAP_MATCHING_RULE_BIT_AND = '1.2.840.113556.1.4.803';
- let filter = `!(userAccountControl:${LDAP_MATCHING_RULE_BIT_AND}:=${UserAccountControlFlags.ACCOUNTDISABLE})`;
+ const filter = `!(userAccountControl:${LDAP_MATCHING_RULE_BIT_AND}`
+ + `:=${UserAccountControlFlags.ACCOUNTDISABLE})`;
- let opts = {
+ const opts = {
scope: 'sub',
attributes: ['sAMAccountName'],
filter: `(&(objectClass=user)(${filter}))`
};
- await this.adClient.searchForeach(this.usersDn(), opts,
+ await this.adClient.searchForeach(this.fullUsersDn, opts,
o => usersToSync.add(o.sAMAccountName));
}
});
diff --git a/modules/account/back/models/samba-config.json b/modules/account/back/models/samba-config.json
index 732c9b071..4c9e0a794 100644
--- a/modules/account/back/models/samba-config.json
+++ b/modules/account/back/models/samba-config.json
@@ -7,7 +7,7 @@
}
},
"mixins": {
- "AccountSynchronizer": {}
+ "AccountLinker": {}
},
"properties": {
"id": {
@@ -28,6 +28,10 @@
"adPassword": {
"type": "string"
},
+ "userDn": {
+ "type": "string",
+ "required": true
+ },
"verifyCert": {
"type": "boolean"
}
diff --git a/modules/account/back/models/sign_in-log.json b/modules/account/back/models/sign_in-log.json
new file mode 100644
index 000000000..8656e92dc
--- /dev/null
+++ b/modules/account/back/models/sign_in-log.json
@@ -0,0 +1,49 @@
+{
+ "name": "SignInLog",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "account.signInLog"
+ }
+ },
+ "properties": {
+ "id": {
+ "type": "number",
+ "id": true,
+ "description": "Identifier"
+ },
+ "token": {
+ "required": true,
+ "type": "string",
+ "description": "Token's user"
+ },
+ "creationDate": {
+ "type": "date"
+ },
+ "userFk": {
+ "required": true,
+ "type": "number"
+ },
+ "ip": {
+ "type": "string"
+ },
+ "userName": {
+ "type": "string"
+ },
+ "owner": {
+ "type": "boolean",
+ "required": true,
+ "default": true
+ }
+ },
+ "relations": {
+ "user": {
+ "type": "belongsTo",
+ "model": "VnUser",
+ "foreignKey": "userFk"
+ }
+ },
+ "scope": {
+ "order": ["creationDate DESC", "id DESC"]
+ }
+}
diff --git a/modules/account/back/models/sip-config.js b/modules/account/back/models/sip-config.js
index 3b5cb2dbb..703783337 100644
--- a/modules/account/back/models/sip-config.js
+++ b/modules/account/back/models/sip-config.js
@@ -2,7 +2,7 @@
const app = require('vn-loopback/server/server');
module.exports = Self => {
- Self.getSynchronizer = async function() {
+ Self.getLinker = async function() {
return await Self.findOne({fields: ['id']});
};
diff --git a/modules/account/back/models/sip-config.json b/modules/account/back/models/sip-config.json
index 6c5ba3db3..a25d09c67 100644
--- a/modules/account/back/models/sip-config.json
+++ b/modules/account/back/models/sip-config.json
@@ -7,7 +7,7 @@
}
},
"mixins": {
- "AccountSynchronizer": {}
+ "AccountLinker": {}
},
"properties": {
"id": {
@@ -16,4 +16,3 @@
}
}
}
-
\ No newline at end of file
diff --git a/modules/account/front/accounts/index.html b/modules/account/front/accounts/index.html
index 6941bb15b..6847e68d1 100644
--- a/modules/account/front/accounts/index.html
+++ b/modules/account/front/accounts/index.html
@@ -12,40 +12,40 @@
@@ -61,10 +61,6 @@
label="Synchronize all"
ng-click="$ctrl.onSynchronizeAll()">
-
-
@@ -77,25 +73,3 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/modules/account/front/accounts/index.js b/modules/account/front/accounts/index.js
index 0e78ab8d6..ab19126a1 100644
--- a/modules/account/front/accounts/index.js
+++ b/modules/account/front/accounts/index.js
@@ -1,6 +1,5 @@
import ngModule from '../module';
import Section from 'salix/components/section';
-import UserError from 'core/lib/user-error';
export default class Controller extends Section {
onSynchronizeAll() {
@@ -8,27 +7,10 @@ export default class Controller extends Section {
this.$http.patch(`Accounts/syncAll`);
}
- onUserSync() {
- if (!this.syncUser)
- throw new UserError('Please enter the username');
-
- let params = {
- password: this.syncPassword,
- force: true
- };
- return this.$http.patch(`Accounts/${this.syncUser}/sync`, params)
- .then(() => this.vnApp.showSuccess(this.$t('User synchronized!')));
- }
-
onSynchronizeRoles() {
this.$http.patch(`RoleInherits/sync`)
.then(() => this.vnApp.showSuccess(this.$t('Roles synchronized!')));
}
-
- onSyncClose() {
- this.syncUser = '';
- this.syncPassword = '';
- }
}
ngModule.component('vnAccountAccounts', {
diff --git a/modules/account/front/accounts/locale/es.yml b/modules/account/front/accounts/locale/es.yml
index 9a6bb5073..614ade3eb 100644
--- a/modules/account/front/accounts/locale/es.yml
+++ b/modules/account/front/accounts/locale/es.yml
@@ -3,7 +3,6 @@ Homedir base: Directorio base para carpetas de usuario
Shell: Intérprete de línea de comandos
User and role base id: Id base usuarios y roles
Synchronize all: Sincronizar todo
-Synchronize user: Sincronizar usuario
Synchronize roles: Sincronizar roles
If password is not specified, just user attributes are synchronized: >-
Si la contraseña no se especifica solo se sincronizarán lo atributos del usuario
@@ -12,5 +11,4 @@ Users synchronized!: ¡Usuarios sincronizados!
Username: Nombre de usuario
Synchronize: Sincronizar
Please enter the username: Por favor introduce el nombre de usuario
-User synchronized!: ¡Usuario sincronizado!
Roles synchronized!: ¡Roles sincronizados!
diff --git a/modules/account/front/acl/create/index.html b/modules/account/front/acl/create/index.html
index 7f4fa9e46..14332f737 100644
--- a/modules/account/front/acl/create/index.html
+++ b/modules/account/front/acl/create/index.html
@@ -15,7 +15,7 @@
@@ -32,7 +32,7 @@
diff --git a/modules/account/front/acl/search-panel/index.html b/modules/account/front/acl/search-panel/index.html
index b83b9c255..a3efab440 100644
--- a/modules/account/front/acl/search-panel/index.html
+++ b/modules/account/front/acl/search-panel/index.html
@@ -4,7 +4,7 @@
-
\ No newline at end of file
+