2024-03-07 07:09:08 +00:00
64 changed files with 843 additions and 369 deletions
--- a/1
+++ b/1
@ -235,6 +235,7 @@ pipeline {
                    if (index != -1)
                        message = message.substring(0, index)

+                    setEnv()
                    rocketSend(
                        channel: 'vn-database',
                        message: "*DB version uploaded:* ${message}"
--- a/back/methods/collection/getSectors.js
+++ b/back/methods/collection/getSectors.js
@ -1,20 +0,0 @@
-module.exports = Self => {
-    Self.remoteMethod('getSectors', {
-        description: 'Get all sectors',
-        accessType: 'READ',
-        returns: {
-            type: 'Object',
-            root: true
-        },
-        http: {
-            path: `/getSectors`,
-            verb: 'GET'
-        }
-    });
-
-    Self.getSectors = async() => {
-        const query = `CALL vn.sector_get()`;
-        const [result] = await Self.rawSql(query);
-        return result;
-    };
-};
--- a/back/methods/collection/spec/getSectors.spec.js
+++ b/back/methods/collection/spec/getSectors.spec.js
@ -1,11 +0,0 @@
-const {models} = require('vn-loopback/server/server');
-
-describe('getSectors()', () => {
-    it('return list of sectors', async() => {
-        let response = await models.Collection.getSectors();
-
-        expect(response.length).toBeGreaterThan(0);
-        expect(response[0].id).toEqual(1);
-        expect(response[0].description).toEqual('First sector');
-    });
-});
--- a/back/models/collection.js
+++ b/back/models/collection.js
@ -1,6 +1,5 @@
 module.exports = Self => {
    require('../methods/collection/getCollection')(Self);
-    require('../methods/collection/getSectors')(Self);
    require('../methods/collection/setSaleQuantity')(Self);
    require('../methods/collection/previousLabel')(Self);
    require('../methods/collection/getTickets')(Self);
--- a/db/dump/.dump/data.sql
+++ b/db/dump/.dump/data.sql
@ -1750,8 +1750,6 @@ USE `vn`;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;

-INSERT INTO `agencyTermConfig` VALUES ('6240000000','4721000015',21.0000000000,'Adquisiciones intracomunitarias de servicios');
-
 INSERT INTO `alertLevel` VALUES ('FREE',0,1);
 INSERT INTO `alertLevel` VALUES ('ON_PREPARATION',1,1);
 INSERT INTO `alertLevel` VALUES ('PACKED',2,0);
--- a/db/dump/fixtures.after.sql
+++ b/db/dump/fixtures.after.sql
@ -137,9 +137,6 @@ INSERT INTO vn.ticket (clientFk, warehouseFk, shipped, nickname, refFk, addressF
 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);
 */
-INSERT INTO vn2008.zones (zone_id,name,printingOrder)
-    VALUES (1,'zone Test',1);
-
 -- XXX: lab

 INSERT INTO `vn`.`businessReasonEnd` (`id`, `reason`)
--- a/db/dump/fixtures.before.sql
+++ b/db/dump/fixtures.before.sql
@ -653,6 +653,7 @@ INSERT INTO `vn`.`expense`(`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`.`invoiceOutExpense`(`id`, `invoiceOutFk`, `amount`, `expenseFk`, `created`)
    VALUES
--- a/db/routines/bs/procedures/ventas_contables_add.sql
+++ b/db/routines/bs/procedures/ventas_contables_add.sql
@ -47,12 +47,12 @@ BEGIN
 			  , tp.reino_id
 			  , a.tipo_id
 			  , t.empresa_id
-			  , 7000000000 
+			  , a.expenseFk
 				+ IF(e.empresa_grupo = e2.empresa_grupo
 									  ,1
 									  ,IF(e2.empresa_grupo,2,0)
-									  ) * 1000000  
-				+ tp.reino_id * 10000 as Gasto
+									  ) * 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
--- a/db/routines/vn/functions/isPalletHomogeneus.sql
+++ b/db/routines/vn/functions/isPalletHomogeneus.sql
@ -1,27 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn`.`isPalletHomogeneus`(vExpedition INT)
-	RETURNS tinyint(1)
-	NOT DETERMINISTIC
-	READS SQL DATA
-BEGIN
-	DECLARE vScanId INT;
-	DECLARE vDistinctRoutesInThePallet INT;
-
-	SELECT scan_id INTO vScanId
-		FROM vn2008.scan_line
-		WHERE code = vExpedition
-		LIMIT 1;
-
-		SELECT COUNT(*) INTO vDistinctRoutesInThePallet
-		FROM (
-			SELECT DISTINCT t.Id_Ruta
-			FROM vn2008.scan_line sl
-				JOIN expedition e ON e.id = sl.code
-				JOIN vn2008.Tickets t ON t.Id_Ticket = e.ticketFk
-			WHERE sl.scan_id = vScanId
-				AND t.Id_Ruta
-		) t1;
-			
-	RETURN vDistinctRoutesInThePallet = 1;
-END$$
-DELIMITER ;
--- a/db/routines/vn/procedures/clean.sql
+++ b/db/routines/vn/procedures/clean.sql
@ -22,6 +22,7 @@ BEGIN
 	SET v2Years = util.VN_CURDATE() - INTERVAL 2 YEAR;
 	SET v5Years = util.VN_CURDATE() - INTERVAL 5 YEAR;

+	DELETE FROM workerActivity WHERE created < v2Years;
 	DELETE FROM ticketParking WHERE created < vDateShort;
 	DELETE FROM routesMonitor WHERE dated < vDateShort;
 	DELETE FROM workerTimeControlLog WHERE created < vDateShort;
--- a/db/routines/vn/procedures/invoiceInTax_afterUpsert.sql
+++ b/db/routines/vn/procedures/invoiceInTax_afterUpsert.sql
@ -8,6 +8,7 @@ BEGIN
 */
 	DECLARE vTaxRowLimit INT;
 	DECLARE vLines INT;
+	DECLARE vHasDistinctTransactions INT;

 	SELECT taxRowLimit INTO vTaxRowLimit FROM invoiceInConfig;
 	
@ -19,5 +20,17 @@ BEGIN
 	IF vLines >= vTaxRowLimit THEN 
 		CALL util.throw (CONCAT('The maximum number of lines is ', vTaxRowLimit));
 	END IF;
+
+	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 ;
--- a/db/routines/vn/procedures/itemProposal_Add.sql
+++ b/db/routines/vn/procedures/itemProposal_Add.sql
@ -1,70 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`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;
-
-	DECLARE EXIT HANDLER FOR SQLEXCEPTION
-	BEGIN
-		ROLLBACK;
-		RESIGNAL;
-	END;
-	
-	SELECT s.ticketFk, LEAST(s.quantity, vQuantity), s.itemFk,t.shipped,t.warehouseFk
-		INTO vTicketFk, vQuantity, vItemFk,vDate,vWarehouseFk
-		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, 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;
-
-	START TRANSACTION;
-
-	UPDATE sale
-		SET quantity = quantity - vQuantity
-		WHERE id = vSaleFk;
-	
-	INSERT INTO sale(ticketFk, itemFk, quantity, concept)
-		SELECT vTicketFk,
-				vMateFk,
-				CEIL(vQuantity / vRoundQuantity) * vRoundQuantity,
-				CONCAT('+ ',i.longName)
-		FROM item i
-			WHERE id = vMateFk;
-			
-	SELECT LAST_INSERT_ID() INTO vSaleFk;
-	
-	CALL sale_calculateComponent(vSaleFk, NULL);
-	
-	INSERT INTO itemProposal(itemFk, mateFk, counter)
-		VALUES(vItemFk, vMateFk, 1)
-		ON DUPLICATE KEY UPDATE counter = counter + 1;
-
-	COMMIT;
-END$$
-DELIMITER ;
--- a/db/routines/vn/procedures/itemShelving_add.sql
+++ b/db/routines/vn/procedures/itemShelving_add.sql
@ -20,6 +20,10 @@ BEGIN

 	SELECT barcodeToItem(vBarcode) INTO vItemFk;
 	
+	SET vPacking = COALESCE(vPacking, GREATEST(vn.itemPacking(vBarcode,vWarehouseFk), 1));
+
+	SET vQuantity = vQuantity * vPacking;
+
 	IF (SELECT COUNT(*) FROM shelving WHERE code = vShelvingFk COLLATE utf8_unicode_ci) = 0 THEN

 		INSERT IGNORE INTO parking(code) VALUES(vShelvingFk);
--- a/db/routines/vn/procedures/sale_getBoxPickingList.sql
+++ b/db/routines/vn/procedures/sale_getBoxPickingList.sql
@ -17,7 +17,6 @@ BEGIN

 	CALL productionControl(vWarehouseFk, 0);

-	-- Products with vn.item.isBoxPickingMode = TRUE, pay atention to vn.itemShelving.packing
 	CREATE OR REPLACE TEMPORARY TABLE tmp.sale
 	(saleFk INT PRIMARY KEY)
 	SELECT
@ -29,7 +28,7 @@ BEGIN
 		MAKETIME(pb.HH,pb.mm,0) etd, 
 		pb.routeFk,
 		FLOOR(s.quantity / ish.packing) stickers,
-		ish.packing,
+		IF(i.isBoxPickingMode, ish.packing, i.packingOut) packing,
 		b.packagingFk
 		FROM sale s
 			JOIN item i ON i.id = s.itemFk
@ -52,8 +51,8 @@ BEGIN
 			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 s.quantity BETWEEN ish.packing AND (ish.visible - IFNULL(tISS.reserve,0))
-			AND i.isBoxPickingMode
+		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
@ -64,47 +63,13 @@ BEGIN
 		GROUP BY s.id
 		ORDER BY etd;

-	-- Remaining products, vn.item.packingOut
-	INSERT IGNORE INTO tmp.sale
-	SELECT
-		s.ticketFk,	
-		s.id saleFk,
-		s.itemFk,
-		s.concept,
-		s.quantity,
-		MAKETIME(pb.HH,pb.mm,0) etd, 
-		pb.routeFk,
-		s.quantity / i.packingOut stickers,
-		i.packingOut,
-		pc.defaultBigPackageFk
-		FROM sale s
-			JOIN item i ON i.id = s.itemFk
-			JOIN itemShelving ish ON ish.itemFk = s.itemFk
-			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
-			JOIN packagingConfig pc
-			LEFT JOIN routesMonitor rm ON rm.routeFk = pb.routeFk
-			LEFT JOIN itemShelvingStock iss ON iss.itemFk = s.itemFk AND iss.sectorFk = p.sectorFk
-			LEFT JOIN saleGroupDetail sgd ON sgd.saleFk = s.id
-			LEFT JOIN ticketState ts ON ts.ticketFk = s.ticketFk
-		WHERE s.quantity >= i.packingOut 
-			AND NOT pb.problem
-			AND s.quantity > 0
-			AND sgd.saleFk IS NULL
-			AND p.sectorFk = vSectorFk
-			AND ts.isPreviousPreparable
-			AND iss.visible >= s.quantity
-			AND ((rm.bufferFk AND rm.isPickingAllowed)
-				OR am.code = 'REC_ALG') 
-			AND pb.shipped = vDated
-		GROUP BY s.id
-		ORDER BY etd;
-
-	SELECT * FROM tmp.sale;
+	SELECT *
+		FROM tmp.sale
+		WHERE stickers;

 	DROP TEMPORARY TABLE tmp.productionBuffer;
 	DROP TEMPORARY TABLE tmp.sale;
 	END$$
 DELIMITER ;
+
+CALL `vn`.`sale_getBoxPickingList`(1, curdate());
--- a/db/routines/vn/procedures/sectorCollectionSaleGroup_add.sql
+++ b/db/routines/vn/procedures/sectorCollectionSaleGroup_add.sql
@ -8,6 +8,25 @@ BEGIN
 * @param vSaleGroupFk Identificador de vn.saleGroup
 * @param vSectorCollectionFk Identificador de vn.sectorCollection
 */
+ 	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;
--- a/db/routines/vn/procedures/sector_get.sql
+++ b/db/routines/vn/procedures/sector_get.sql
@ -1,13 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`sector_get`()
-BEGIN
-
-/**
- * Obtiene los sectores
-*/
-
-	SELECT s.id,s.description,s.warehouseFk
-		FROM vn.sector s;
-
-END$$
-DELIMITER ;
--- a/db/routines/vn/procedures/ticket_getTax.sql
+++ b/db/routines/vn/procedures/ticket_getTax.sql
@ -9,6 +9,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))
@ -24,11 +26,11 @@ BEGIN
 			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 (
@ -43,22 +45,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
+					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,
@ -70,24 +71,22 @@ 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
+				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, 
@ -97,7 +96,8 @@ BEGIN
 			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 ;
--- a/db/routines/vn/triggers/saleLabel_afterUpdate.sql
+++ 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 ;
--- a/db/routines/vn/triggers/ticket_beforeUpdate.sql
+++ b/db/routines/vn/triggers/ticket_beforeUpdate.sql
@ -4,7 +4,6 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`ticket_beforeUpdate`
 	FOR EACH ROW
 BEGIN
 	DECLARE vNewTime TIME;
-	DECLARE vHasTicketRefund BOOL;

 	SET NEW.editorFk = account.myUser_getId();

@ -64,14 +63,5 @@ BEGIN

 		CALL vn.routeUpdateM3(NEW.routeFk);
 	END IF;
-
-	SELECT COUNT(*) INTO vHasTicketRefund 
-		FROM ticketRefund 
-		WHERE originalTicketFk = NEW.id 
-			OR refundTicketFk = NEW.id;
-	
-	IF vHasTicketRefund AND NEW.clientFk <> OLD.clientFk THEN
-		CALL util.throw('The ticket has a refund associated');
-	END IF;
 END$$
 DELIMITER ;
--- a/db/routines/vn/views/exchangeInsuranceInPrevious.sql
+++ b/db/routines/vn/views/exchangeInsuranceInPrevious.sql
@ -1,9 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn`.`exchangeInsuranceInPrevious`
-AS SELECT `ei`.`finished` AS `dated`,
-	`ei`.`amount` AS `amount`,
-	`ei`.`rate` AS `rate`
-FROM `vn`.`exchangeInsurance` `ei`
-WHERE `ei`.`amount` <> 0
-	AND `ei`.`financialProductTypefk` = 'SC'
--- a/db/routines/vn/views/unaryScanLineBuy.sql
+++ b/db/routines/vn/views/unaryScanLineBuy.sql
@ -1,6 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn`.`unaryScanLineBuy`
-AS SELECT `u`.`scan_line_id` AS `unaryScanLineFk`,
-	`u`.`Id_Article` AS `itemFk`
-FROM `vn2008`.`unary_scan_line_buy` `u`
--- a/db/routines/vn/views/unaryScanLineExpedition.sql
+++ b/db/routines/vn/views/unaryScanLineExpedition.sql
@ -1,6 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn`.`unaryScanLineExpedition`
-AS SELECT `u`.`scan_line_id` AS `unaryScanLineFk`,
-	`u`.`expedition_id` AS `expeditionFk`
-FROM `vn2008`.`unary_scan_line_expedition` `u`
--- a/db/routines/vn2008/procedures/clean.sql
+++ b/db/routines/vn2008/procedures/clean.sql
@ -45,7 +45,6 @@ proc: BEGIN
 	DELETE FROM cl_main WHERE Fecha < vDate18;
 	DELETE FROM hedera.`order` WHERE date_send < vDate18;
 	DELETE FROM vn.message WHERE sendDate < vDate;
-	DELETE FROM travel_reserve WHERE odbc_date < vDate;

 	DELETE FROM cache.departure_limit WHERE Fecha < util.VN_CURDATE() - INTERVAL 1 MONTH;

--- a/db/routines/vn2008/triggers/movement_label_afterUpdate.sql
+++ b/db/routines/vn2008/triggers/movement_label_afterUpdate.sql
@ -1,8 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn2008`.`movement_label_afterUpdate`
-	AFTER UPDATE ON `movement_label`
-	FOR EACH ROW
-IF NEW.stem >= (SELECT Cantidad FROM Movimientos WHERE Id_Movimiento = NEW.Id_Movimiento) THEN
-	UPDATE Movimientos SET OK = 1 WHERE Id_Movimiento = NEW.Id_Movimiento;
-END IF$$
-DELIMITER ;
--- a/db/routines/vn2008/views/financialProductType.sql
+++ 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;
--- a/db/routines/vn2008/views/flight.sql
+++ 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`;
--- a/db/routines/vn2008/views/gastos_resumen.sql
+++ 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`;
--- a/db/routines/vn2008/views/integra2.sql
+++ 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`;
--- a/db/routines/vn2008/views/integra2_province.sql
+++ 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`;
--- a/db/routines/vn2008/views/pago_sdc.sql
+++ 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`
--- a/db/routines/vn2008/views/warehouse_pickup.sql
+++ 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`;
--- a/db/versions/10862-navyHydrangea/00-alterAgencyTermConfig.sql
+++ 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;
--- a/db/versions/10862-navyHydrangea/00-alterGastosResumen.sql
+++ 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;
--- a/db/versions/10862-navyHydrangea/00-alterInvoiceOutTaxConfig.sql
+++ 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;
--- a/db/versions/10862-navyHydrangea/00-alterItemGroupToOffer.sql
+++ 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;
--- a/db/versions/10862-navyHydrangea/01-ventasContablesPk.sql
+++ 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;
--- a/db/versions/10862-navyHydrangea/02-updateExpenseRegularize.sql
+++ 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';
--- a/db/versions/10862-navyHydrangea/03-updateExpense.sql
+++ 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);
--- a/db/versions/10862-navyHydrangea/04-updateExpenseConflict.sql
+++ 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);
--- a/db/versions/10885-wheatHydrangea/00-revokeUpdateClient.sql
+++ 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;
--- a/db/versions/10896-salmonOrchid/01-financialProductType.sql
+++ b/db/versions/10896-salmonOrchid/01-financialProductType.sql
@ -0,0 +1 @@
+ALTER TABLE IF EXISTS `vn2008`.`financialProductType` RENAME `vn`.`financialProductType`;
--- a/db/versions/10896-salmonOrchid/02-flight.sql
+++ 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;
--- a/db/versions/10896-salmonOrchid/03-gastos_resumen.sql
+++ b/db/versions/10896-salmonOrchid/03-gastos_resumen.sql
@ -0,0 +1,24 @@
+ALTER TABLE IF EXISTS vn2008.gastos_resumen DROP FOREIGN KEY IF EXISTS gastos_resumen_expense_FK;
+ALTER TABLE IF EXISTS `vn2008`.`gastos_resumen` RENAME `vn`.`expenseManual`;
+
+ALTER TABLE IF EXISTS `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 IF EXISTS vn.expenseManual COLLATE=utf8mb3_general_ci;
+
+ALTER TABLE IF EXISTS vn.expenseManual MODIFY COLUMN IF EXISTS expenseFk varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL;
+
+ALTER TABLE IF EXISTS vn.expenseManual ADD CONSTRAINT expenseManual_expense_FK FOREIGN KEY IF NOT EXISTS (expenseFk) REFERENCES vn.expense(id) ON DELETE CASCADE ON UPDATE CASCADE;
+
+ALTER TABLE IF EXISTS vn.expenseManual MODIFY COLUMN IF EXISTS companyFk int(10) unsigned NOT NULL;
+
+ALTER TABLE vn.expenseManual MODIFY COLUMN companyFk int(10) unsigned NULL;
+
+UPDATE vn.expenseManual 
+	SET companyFK= NULL 
+	WHERE companyFk= 0;
+
+ALTER TABLE IF EXISTS vn.expenseManual ADD CONSTRAINT expenseManual_company_FK FOREIGN KEY IF NOT EXISTS (companyFk) REFERENCES vn.company(id) ON DELETE CASCADE ON UPDATE CASCADE;
+
--- a/db/versions/10896-salmonOrchid/04-integra2.sql
+++ 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;
+
--- a/db/versions/10896-salmonOrchid/05-integra2_province.sql
+++ 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;
--- a/db/versions/10896-salmonOrchid/06-intervalos__delete.sql
+++ b/db/versions/10896-salmonOrchid/06-intervalos__delete.sql
@ -0,0 +1 @@
+DROP TABLE IF EXISTS vn2008.intervalos__;
--- a/db/versions/10896-salmonOrchid/10-mail_templates__delete.sql
+++ b/db/versions/10896-salmonOrchid/10-mail_templates__delete.sql
@ -0,0 +1 @@
+DROP TABLE IF EXISTS vn2008.mail_templates__;
--- a/db/versions/10896-salmonOrchid/12-ticket_location__delete.sql
+++ b/db/versions/10896-salmonOrchid/12-ticket_location__delete.sql
@ -0,0 +1 @@
+DROP TABLE IF EXISTS vn2008.ticket_location__;
--- a/db/versions/10896-salmonOrchid/13-turn__delete.sql
+++ b/db/versions/10896-salmonOrchid/13-turn__delete.sql
@ -0,0 +1 @@
+DROP TABLE IF EXISTS vn2008.turn__;
--- a/db/versions/10896-salmonOrchid/14-movement_label.sql
+++ b/db/versions/10896-salmonOrchid/14-movement_label.sql
@ -0,0 +1,8 @@
+DROP TRIGGER IF EXISTS `vn2008`.`movement_label_afterUpdate`;
+
+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;
--- a/db/versions/10896-salmonOrchid/15-pago_sdc.sql
+++ 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;
--- a/db/versions/10896-salmonOrchid/25-warehouse_pickup.sql
+++ 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';
--- a/db/versions/10896-salmonOrchid/29-kk.sql
+++ 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;';
--- a/db/versions/10896-salmonOrchid/30-permissions.sql
+++ 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`;
--- a/db/versions/10898-workerActivity/00-table.sql
+++ 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
+);
--- a/modules/invoiceOut/back/methods/invoiceOut/negativeBases.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/negativeBases.js
@ -46,23 +46,19 @@ module.exports = Self => {

        const stmts = [];
        let stmt;
-        stmts.push(`DROP TEMPORARY TABLE IF EXISTS tmp.ticket`);
-
        stmts.push(new ParameterizedSQL(
-            `CREATE TEMPORARY TABLE tmp.ticket
+            `CREATE OR REPLACE TEMPORARY TABLE tmp.ticket
                (KEY (ticketFk))
                ENGINE = MEMORY
                SELECT id ticketFk
                    FROM ticket t
-                    WHERE shipped BETWEEN ? AND ?
+                    WHERE shipped BETWEEN ? AND util.dayEnd(?)
                        AND refFk IS NULL`, [args.from, args.to]));
        stmts.push(`CALL vn.ticket_getTax(NULL)`);
-        stmts.push(`DROP TEMPORARY TABLE IF EXISTS tmp.filter`);
        stmts.push(new ParameterizedSQL(
-            `CREATE TEMPORARY TABLE tmp.filter
+            `CREATE OR REPLACE TEMPORARY TABLE tmp.filter
                ENGINE = MEMORY
-                SELECT
-                        co.code company,
+                SELECT co.code company,
                        cou.country,
                        c.id clientId,
                        c.socialName clientSocialName,
@ -88,15 +84,13 @@ module.exports = Self => {
                                GROUP BY ticketFk
                                HAVING taxableBase < 0
                        ) negativeBase ON negativeBase.ticketFk = t.id
-                        WHERE t.shipped BETWEEN ? AND ?
+                    WHERE t.shipped BETWEEN ? AND util.dayEnd(?)
                        AND t.refFk IS NULL
                        AND c.typeFk IN ('normal','trust')
                    GROUP BY t.clientFk, negativeBase.taxableBase
                    HAVING amount < 0`, [args.from, args.to]));

-        stmt = new ParameterizedSQL(`
-            SELECT f.*
-            FROM tmp.filter f`);
+        stmt = new ParameterizedSQL(`SELECT * FROM tmp.filter`);

        if (args.filter) {
            stmt.merge(conn.makeWhere(args.filter.where));
--- a/modules/item/back/methods/item-shelving/specs/addListByItem.spec.js
+++ b/modules/item/back/methods/item-shelving/specs/addListByItem.spec.js
@ -0,0 +1,55 @@
+const {models} = require('vn-loopback/server/server');
+const LoopBackContext = require('loopback-context');
+
+describe('ItemShelving upsertItem()', () => {
+    const warehouseFk = 1;
+    let ctx;
+    let options;
+    let tx;
+
+    beforeEach(async() => {
+        ctx = {
+            req: {
+                accessToken: {userId: 9},
+                headers: {origin: 'http://localhost'}
+            },
+            args: {}
+        };
+
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+            active: ctx.req
+        });
+
+        options = {transaction: tx};
+        tx = await models.ItemShelving.beginTransaction({});
+        options.transaction = tx;
+    });
+
+    afterEach(async() => {
+        await tx.rollback();
+    });
+
+    it('should add two new records', async() => {
+        const shelvingFk = 'ZPP';
+        const items = [1, 1, 1, 2];
+
+        await models.ItemShelving.upsertItem(ctx, shelvingFk, items, warehouseFk, options);
+        const itemShelvings = await models.ItemShelving.find({where: {shelvingFk}}, options);
+
+        expect(itemShelvings.length).toEqual(2);
+    });
+
+    it('should update the visible items', async() => {
+        const shelvingFk = 'GVC';
+        const items = [2, 2];
+        const {visible: itemsBefore} = await models.ItemShelving.findOne({
+            where: {shelvingFk, itemFk: items[0]}
+        }, options);
+        await models.ItemShelving.upsertItem(ctx, shelvingFk, items, warehouseFk, options);
+        const {visible: itemsAfter} = await models.ItemShelving.findOne({
+            where: {shelvingFk, itemFk: items[0]}
+        }, options);
+
+        expect(itemsAfter).toEqual(itemsBefore + 2);
+    });
+});
--- a/modules/item/back/methods/item-shelving/upsertItem.js
+++ b/modules/item/back/methods/item-shelving/upsertItem.js
@ -0,0 +1,64 @@
+module.exports = Self => {
+    Self.remoteMethodCtx('upsertItem', {
+        description: 'Add a record or update it if it already exists.',
+        accessType: 'WRITE',
+        accepts: [{
+            arg: 'shelvingFk',
+            type: 'string',
+            required: true,
+        },
+        {
+            arg: 'items',
+            type: ['number'],
+            required: true,
+            description: 'array of item foreign keys'
+        },
+        {
+            arg: 'warehouseFk',
+            type: 'number',
+            required: true
+        }],
+
+        http: {
+            path: `/upsertItem`,
+            verb: 'POST'
+        }
+    });
+
+    Self.upsertItem = async(ctx, shelvingFk, items, warehouseFk, options) => {
+        const myOptions = {userId: ctx.req.accessToken.userId};
+        let tx;
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        if (!myOptions.transaction) {
+            tx = await Self.beginTransaction({});
+            myOptions.transaction = tx;
+        }
+
+        const discardItems = new Set();
+        const itemCounts = items.reduce((acc, item) => {
+            acc[item] = (acc[item] || 0) + 1;
+            return acc;
+        }, {});
+
+        try {
+            for (let item of items) {
+                if (!discardItems.has(item)) {
+                    let quantity = itemCounts[item];
+                    discardItems.add(item);
+
+                    await Self.rawSql('CALL vn.itemShelving_add(?, ?, ?, NULL, NULL, NULL, ?)',
+                        [shelvingFk, item, quantity, warehouseFk], myOptions
+                    );
+                }
+            }
+
+            if (tx) await tx.commit();
+        } catch (e) {
+            if (tx) await tx.rollback();
+            throw e;
+        }
+    };
+};
--- a/modules/item/back/models/item-shelving.js
+++ b/modules/item/back/models/item-shelving.js
@ -1,4 +1,5 @@
 module.exports = Self => {
    require('../methods/item-shelving/deleteItemShelvings')(Self);
+    require('../methods/item-shelving/upsertItem')(Self);
    require('../methods/item-shelving/getInventory')(Self);
 };
--- a/modules/ticket/back/methods/ticket/specs/transferClient.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/transferClient.spec.js
@ -1,49 +1,60 @@
 const models = require('vn-loopback/server/server').models;

 describe('Ticket transferClient()', () => {
-    const userId = 9;
-    const activeCtx = {
-        accessToken: {userId: userId},
+    const originalTicketId = 8;
+    const refundTicketId = 24;
+    const clientId = 1;
+    let ctx;
+    let options;
+    let tx;
+    beforeEach(async() => {
+        ctx = {
+            req: {
+                accessToken: {userId: 9},
+                headers: {origin: 'http://localhost'}
+            },
+            args: {}
        };
-    const ctx = {req: activeCtx};
+
+        options = {transaction: tx};
+        tx = await models.Ticket.beginTransaction({});
+        options.transaction = tx;
+    });
+
+    afterEach(async() => {
+        await tx.rollback();
+    });

    it('should throw an error as the ticket is not editable', async() => {
-        const tx = await models.Ticket.beginTransaction({});
-        let error;
-
        try {
-            const options = {transaction: tx};
            const ticketId = 4;
            const clientId = 1;
            await models.Ticket.transferClient(ctx, ticketId, clientId, options);
-
-            await tx.rollback();
        } catch (e) {
-            await tx.rollback();
-            error = e;
+            expect(e.message).toEqual(`This ticket is locked`);
        }
-
-        expect(error.message).toEqual(`This ticket is locked`);
    });

-    it('should be assigned a different clientFk', async() => {
-        const tx = await models.Ticket.beginTransaction({});
-        let updatedTicket;
-        const ticketId = 10;
-        const clientId = 1;
+    it('should be assigned a different clientFk in the original ticket', async() => {
+        await models.Ticket.transferClient(ctx, 2, clientId, options);
+        const afterTransfer = await models.Ticket.findById(2, null, options);

-        try {
-            const options = {transaction: tx};
+        expect(afterTransfer.clientFk).toEqual(clientId);
+    });

-            await models.Ticket.transferClient(ctx, ticketId, clientId, options);
-            updatedTicket = await models.Ticket.findById(ticketId, {fields: ['clientFk']}, options);
+    it('should be assigned a different clientFk in the original and refund ticket and claim', async() => {
+        await models.Ticket.transferClient(ctx, originalTicketId, clientId, options);

-            await tx.rollback();
-        } catch (e) {
-            await tx.rollback();
-            throw e;
-        }
+        const [originalTicket, refundTicket] = await models.Ticket.find({
+            where: {id: {inq: [originalTicketId, refundTicketId]}}
+        }, options);

-        expect(updatedTicket.clientFk).toEqual(clientId);
+        const claim = await models.Claim.findOne({
+            where: {ticketFk: originalTicketId}
+        }, options);
+
+        expect(originalTicket.clientFk).toEqual(clientId);
+        expect(refundTicket.clientFk).toEqual(clientId);
+        expect(claim.clientFk).toEqual(clientId);
    });
 });
--- a/modules/ticket/back/methods/ticket/transferClient.js
+++ b/modules/ticket/back/methods/ticket/transferClient.js
@ -2,20 +2,17 @@ module.exports = Self => {
    Self.remoteMethodCtx('transferClient', {
        description: 'Transfering ticket to another client',
        accessType: 'WRITE',
-        accepts: [
-            {
+        accepts: [{
            arg: 'id',
            type: 'number',
            required: true,
            description: 'the ticket id',
            http: {source: 'path'}
-            },
-            {
+        }, {
            arg: 'clientFk',
            type: 'number',
            required: true,
-            },
-        ],
+        }],
        http: {
            path: `/:id/transferClient`,
            verb: 'PATCH'
@ -25,21 +22,51 @@ module.exports = Self => {
    Self.transferClient = async(ctx, id, clientFk, options) => {
        const models = Self.app.models;
        const myOptions = {};
+        let tx;
+
        if (typeof options == 'object')
            Object.assign(myOptions, options);

+        if (!myOptions.transaction) {
+            tx = await Self.beginTransaction({});
+            myOptions.transaction = tx;
+        }
+
+        try {
            await Self.isEditableOrThrow(ctx, id, myOptions);

-        const ticket = await models.Ticket.findById(
-            id,
-            {fields: ['id', 'shipped', 'clientFk', 'addressFk']},
-            myOptions
-        );
-        const client = await models.Client.findById(clientFk, {fields: ['id', 'defaultAddressFk']}, myOptions);
+            const ticketRefund = await models.TicketRefund.findOne({
+                where: {or: [{originalTicketFk: id}, {refundTicketFk: id}]},
+                include: [{relation: 'refundTicket'}, {relation: 'originalTicket'}]
+            }, myOptions);

-        await ticket.updateAttributes({
-            clientFk,
-            addressFk: client.defaultAddressFk,
-        });
+            const {defaultAddressFk: addressFk} = await models.Client.findById(clientFk,
+                {fields: ['id', 'defaultAddressFk']}, myOptions);
+
+            const attributes = {clientFk, addressFk};
+
+            const tickets = [];
+            const ticketIds = [];
+
+            if (ticketRefund) {
+                const {refundTicket, originalTicket} = ticketRefund;
+                tickets.push(refundTicket(), originalTicket());
+
+                for (const ticket of tickets) {
+                    await ticket.updateAttributes(attributes, myOptions);
+                    ticketIds.push(ticket.id);
+                }
+            } else {
+                await Self.updateAll({id}, attributes, myOptions);
+                ticketIds.push(id);
+            }
+
+            await models.Claim.updateAll({ticketFk: {inq: ticketIds}}, {clientFk}, myOptions);
+
+            if (tx) await tx.commit();
+        } catch (e) {
+            if (tx) await tx.rollback();
+            throw e;
+        }
    };
 };
--- a/modules/worker/back/methods/worker/specs/new.spec.js
+++ b/modules/worker/back/methods/worker/specs/new.spec.js
@ -36,6 +36,7 @@ describe('Worker new', () => {
        payMethodFk: 1,
        roleFk: 1
    };
+
    const req = {accessToken: {userId: 9}};

    it('should return error if personal mail already exists', async() => {
@ -140,15 +141,24 @@ describe('Worker new', () => {
    it('should create a new worker', async() => {
        const newWorker = await models.Worker.new({args: defaultWorker, req});

-        await models.Worker.destroyById(newWorker.id);
-        await models.Address.destroyAll({clientFk: newWorker.id});
-        await models.Mandate.destroyAll({clientFk: newWorker.id});
-        await models.Client.destroyById(newWorker.id);
-        await models.VnUser.destroyById(newWorker.id);
+        await removeWorker(newWorker.id);

        expect(newWorker.id).toBeDefined();
    });

+    it('should create a new client', async() => {
+        let newWorker;
+        let client;
+        try {
+            newWorker = await models.Worker.new({args: defaultWorker, req});
+            client = await models.Client.findById(newWorker.id);
+        } finally {
+            await removeWorker(newWorker.id);
+        }
+
+        expect(client).toBeDefined();
+    });
+
    it('should create a new worker in client', async() => {
        const bruceWayneId = 1101;
        const client = await models.Client.findById(bruceWayneId, {fields: ['fi', 'email']});
@ -170,3 +180,11 @@ describe('Worker new', () => {
        expect(newWorker.id).toEqual(bruceWayneId);
    });
 });
+
+async function removeWorker(id) {
+    await models.Worker.destroyById(id);
+    await models.Address.destroyAll({clientFk: id});
+    await models.Mandate.destroyAll({clientFk: id});
+    await models.Client.destroyById(id);
+    await models.VnUser.destroyById(id);
+}
--- a/myt.config.yml
+++ b/myt.config.yml
@ -44,7 +44,6 @@ fixtures:
    - module
    - defaultViewConfig
  vn:
-    - agencyTermConfig
    - alertLevel
    - bookingPlanner
    - businessType
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
    "name": "salix-back",
-    "version": "24.8.0",
+    "version": "24.10.0",
    "author": "Verdnatura Levante SL",
    "description": "Salix backend",
    "license": "GPL-3.0",
				`@ -0,0 +1 @@`
				ALTER TABLE IF EXISTS `vn2008`.`financialProductType` RENAME `vn`.`financialProductType`;
				`@ -0,0 +1 @@`
				`DROP TABLE IF EXISTS vn2008.mail_templates__;`
				`@ -0,0 +1 @@`
				`DROP TABLE IF EXISTS vn2008.ticket_location__;`