Merge branch '#2222-ticket.index-modificar-orden-de-las-secciones' of verdnatura/salix into dev

db/changes/10180-holyWeek/01-componentRenameMismatchXImbalance.sql

@@ -0,0 +1 @@
+UPDATE `vn`.`component` SET `code` = 'imbalance' WHERE (`id` = '36');

db/changes/10180-holyWeek/02-catalog_calculate.sql

@@ -131,6 +131,7 @@ proc: BEGIN
 				JOIN (
 					SELECT MIN(price) price, itemFk, priceKg
 						FROM tmp.ticketComponentPrice
+                            WHERE warehouseFk = vWarehouseFk
 						GROUP BY itemFk
 				) bl ON bl.itemFk = tl.itemFk
 			WHERE tl.zoneFk = vZoneFk AND tl.warehouseFk = vWarehouseFk

db/changes/10180-holyWeek/02-sale_calculateComponent.sql

@@ -10,8 +10,6 @@ proc: BEGIN
  *
  * @param vSale Delivery date
  * @param vOption indica en que componente pone el descuadre, NULL en casos habituales
- * @return tmp.ticketLot(warehouseFk, available, itemFk, buyFk)
- * @return tmp.sale(saleFk, warehouseFk)
  */  
 	DECLARE vShipped DATE; 
 	DECLARE vWarehouseFk SMALLINT;
@@ -20,27 +18,55 @@ proc: BEGIN
     DECLARE vTicket BIGINT;
     DECLARE vItem BIGINT;
     DECLARE vLanded DATE; 
-    DECLARE vTicketFree BOOLEAN DEFAULT TRUE;
+    DECLARE vIsEditable BOOLEAN;
     DECLARE vZoneFk INTEGER;
     
-	SELECT  NOT (t.refFk IS NOT NULL OR ts.alertLevel > 0) OR s.price = 0, s.ticketFk, s.itemFk , t.zoneFk
-			INTO vTicketFree, vTicket, vItem, vZoneFk
-		FROM vn.ticket t
-			JOIN vn.sale s ON s.ticketFk = t.id
-			LEFT JOIN vn.ticketState ts ON ts.ticketFk = t.id
-		WHERE s.id = vSale
-		LIMIT 1;
-    	
-	SELECT t.warehouseFk, DATE(t.shipped), t.addressFk, t.agencyModeFk, t.landed
-			INTO vWarehouseFk, vShipped, vAddressFk, vAgencyModeFk, vLanded
-		FROM agencyMode a 
-			JOIN ticket t ON t.agencyModeFk = a.id
-		WHERE t.id = vTicket;
+	SELECT t.refFk IS NULL AND (IFNULL(ts.alertLevel, 0) = 0 OR s.price = 0), 
+				s.ticketFk, 
+				s.itemFk , 
+				t.zoneFk, 
+				t.warehouseFk, 
+				t.shipped, 
+				t.addressFk, 
+				t.agencyModeFk, 
+				t.landed
+			INTO vIsEditable, 
+				vTicket, 
+				vItem, 
+				vZoneFk, 
+				vWarehouseFk, 
+				vShipped, 
+				vAddressFk, 
+				vAgencyModeFk, 
+				vLanded
+		FROM ticket t
+			JOIN sale s ON s.ticketFk = t.id
+			LEFT JOIN ticketState ts ON ts.ticketFk = t.id
+		WHERE s.id = vSale;
 
-    IF IFNULL(vZoneFk,0) = 0 THEN
-		CALL util.throw('ticket dont have zone');
-    END IF;
-    
+	IF vLanded IS NULL OR vZoneFk IS NULL THEN
+
+		CALL zone_getLanded(vShipped, vAddressFk, vAgencyModeFk, vWarehouseFk);
+
+		IF (SELECT COUNT(*) FROM tmp.zoneGetLanded LIMIT 1) = 0 THEN
+			CALL util.throw('There is no zone for these parameters');
+		END IF;
+
+		UPDATE ticket t
+			SET t.landed = (SELECT landed FROM tmp.zoneGetLanded LIMIT 1) 
+			WHERE t.id = vTicketFk AND t.landed IS NULL;
+
+		IF vZoneFk IS NULL THEN
+			SELECT zoneFk INTO vZoneFk FROM tmp.zoneGetLanded LIMIT 1;
+			UPDATE ticket t
+				SET t.zoneFk = vZoneFk
+				WHERE t.id = vTicketFk AND t.zoneFk IS NULL;
+		END IF;
+		DROP TEMPORARY TABLE tmp.zoneGetLanded;
+		
+	END IF;
+
+	-- rellena la tabla buyUltimate con la ultima compra	
     CALL buyUltimate (vWarehouseFk, vShipped);  
     
 	DELETE FROM tmp.buyUltimate WHERE itemFk != vItem;
@@ -58,14 +84,14 @@ proc: BEGIN
 	CREATE TEMPORARY TABLE tmp.sale
 					(PRIMARY KEY (saleFk)) ENGINE = MEMORY
 		SELECT vSale saleFk,vWarehouseFk warehouseFk;
-    
+
     IF vOption IS NULL THEN
-		SET vOption = IF(vTicketFree, 1, 6);
+		SET vOption = IF(vIsEditable, 1, 6);
     END IF;
     
 	CALL ticketComponentUpdateSale(vOption); 
 
-	INSERT INTO vn.ticketLog (originFk, userFk, `action`, description)
+	INSERT INTO ticketLog (originFk, userFk, `action`, description)
 		VALUES (vTicket, account.userGetId(), 'update', CONCAT('Bionizo linea id ', vSale));
 	
     CALL catalog_componentPurge();

db/changes/10180-holyWeek/02-ticketCalculateClon.sql

@@ -5,85 +5,87 @@ DELIMITER $$
 USE `vn`$$
 CREATE DEFINER=`root`@`%` PROCEDURE `ticketCalculateClon`(IN vTicketNew INT, vTicketOld INT)
 BEGIN
-	/*
-	* @vTicketNew id del nuevo ticket clonado
-    * @vTicketOld id ticket original, a partir del qual se clonara el nuevo
-	* Este procedimiento "rebioniza" una linea, eliminando los componentes existentes e insertandolos de nuevo
-	*/
+/*
+ * Recalcula los componentes un ticket clonado,
+ * las lineas a precio cero fuerza para que tengan precio, el resto lo respeta
+ * @param vTicketNew nuevo ticket clonado
+ * @param vTicketOld icket original, a partir del qual se clonara el nuevo
+*/
 	DECLARE vShipped DATE;
 	DECLARE vClient INT;
 	DECLARE vWarehouse SMALLINT;
-    DECLARE vAgencyMode INT;
-    DECLARE vAddress INT;
+	DECLARE vAgencyMode INT;
+	DECLARE vAddress INT;
 	DECLARE vLanded DATE;
-    DECLARE vAgency INT;
-    DECLARE vZoneFk INT;
+	DECLARE vAgency INT;
+	DECLARE vZoneFk INT;
 
-    REPLACE INTO orderTicket(orderFk,ticketFk)
+	REPLACE INTO orderTicket(orderFk,ticketFk)
 		SELECT orderFk, vTicketNew 
 			FROM orderTicket 
             WHERE ticketFk = vTicketOld;
     
 	SELECT t.clientFk, t.warehouseFk, date(t.shipped), t.addressFk, t.agencyModeFk, t.landed, a.agencyFk, t.zoneFk
 		INTO vClient, vWarehouse, vShipped, vAddress, vAgencyMode, vLanded, vAgency, vZoneFk
-    FROM vn.agencyMode a
-		JOIN vn.ticket t ON t.agencyModeFk = a.id
-    WHERE t.id = vTicketNew;
+	FROM agencyMode a
+		JOIN ticket t ON t.agencyModeFk = a.id
+	WHERE t.id = vTicketNew;
 
 	IF vLanded IS NULL THEN
 		CALL zone_getLanded(vShipped, vAddress, vAgency, vWarehouse);
-        UPDATE ticket t
+		UPDATE ticket t
 				JOIN tmp.zoneGetLanded zgl ON t.warehouseFk = zgl.warehouseFk 
 			SET t.landed = zgl.landed,
 				t.zone = zgl.zoneFk
 			WHERE t.id = vTicketNew;
 		
-        SELECT zoneFk INTO vZoneFk FROM tmp.zoneGetLanded LIMIT 1;
+		SELECT zoneFk INTO vZoneFk FROM tmp.zoneGetLanded LIMIT 1;
 		DROP TEMPORARY TABLE IF EXISTS tmp.zoneGetLanded;
-    END IF;
-    
-    -- rellena la tabla tmp.buyUltimate con la ultima compra
-    CALL buyUltimate(vWarehouse, vShipped);  
-    
-    DROP TEMPORARY TABLE IF EXISTS tmp.ticketLot;
-    CREATE TEMPORARY TABLE tmp.ticketLot 
+	END IF;
+
+	-- rellena la tabla tmp.buyUltimate con la ultima compra
+	CALL buyUltimate(vWarehouse, vShipped);  
+
+	DROP TEMPORARY TABLE IF EXISTS tmp.ticketLot;
+	CREATE TEMPORARY TABLE tmp.ticketLot 
 		SELECT vWarehouse warehouseFk, NULL available, s.itemFk, bu.buyFk, vZoneFk zoneFk
 			FROM sale s
 				LEFT JOIN tmp.buyUltimate bu ON bu.itemFk = s.itemFk
 			WHERE s.ticketFk = vTicketOld GROUP BY s.itemFk;
-                    
+					
 	CALL catalog_componentPrepare();            
 	CALL catalog_componentCalculate(vZoneFk, vAddress, vAgencyMode, vWarehouse);
-    
-    -- Bionizamos lineas con Preu = 0
-    DROP TEMPORARY TABLE IF EXISTS tmp.sale;
+
+	-- Bionizamos lineas con Preu = 0
+	DROP TEMPORARY TABLE IF EXISTS tmp.sale;
 	CREATE TEMPORARY TABLE tmp.sale
 				(PRIMARY KEY (saleFk)) ENGINE = MEMORY
 			SELECT s.id saleFk, vWarehouse warehouseFk 
 				FROM sale s
 					JOIN ticket t on t.id = s.ticketFk WHERE s.ticketFk =  vTicketNew AND s.price = 0;
-                
+				
 	CALL ticketComponentUpdateSale(1);
-    
-    -- Bionizamos lineas con Preu > 0
+
+	-- Bionizamos lineas con Preu > 0
 	DROP TEMPORARY TABLE IF EXISTS tmp.sale;
 	CREATE TEMPORARY TABLE tmp.sale
 				(PRIMARY KEY (saleFk)) ENGINE = MEMORY
 			SELECT s.id saleFk, vWarehouse warehouseFk 
 				FROM sale s 
 					JOIN ticket t on t.id = s.ticketFk WHERE s.ticketFk =  vTicketNew
-                    AND s.price > 0;
-                
+					AND s.price > 0;
+				
 	CALL ticketComponentUpdateSale(6);
-	
+
 	-- Log
-    CALL `logAdd`(vTicketNew, 'update', ' ticket' , 'Bioniza Ticket');
+	CALL `logAdd`(vTicketNew, 'update', ' ticket' , 'Bioniza Ticket');
 
 	-- Limpieza
-    CALL catalog_componentPurge();
-	DROP TEMPORARY TABLE IF EXISTS tmp.buyUltimate;
-    DROP TEMPORARY TABLE IF EXISTS tmp.sale;
-	DROP TEMPORARY TABLE IF EXISTS tmp.zoneGetLanded;
+	CALL catalog_componentPurge();
+	DROP TEMPORARY TABLE IF EXISTS 
+		tmp.buyUltimate, 
+		tmp.sale, 
+		tmp.zoneGetLanded;
     
 END$$
 

db/changes/10180-holyWeek/02-ticketCalculateSaleForcePrice2.sql

@@ -1,61 +0,0 @@
-USE `vn`;
-DROP procedure IF EXISTS `ticketCalculateSaleForcePrice2`;
-
-DELIMITER $$
-USE `vn`$$
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketCalculateSaleForcePrice2`(IN vSale BIGINT)
-proc: BEGIN
-
-	DECLARE vShipped DATE; 
-	DECLARE vWarehouseFk SMALLINT;
-    DECLARE vAddressFk INT;
-    DECLARE vTicket BIGINT;
-    DECLARE vItem BIGINT;
-    DECLARE vZoneFk INT;
-        
-    SELECT ticketFk, itemFk 
-			INTO vTicket, vItem 
-		FROM sale 
-        WHERE id = vSale;
-    	
-	SELECT t.warehouseFk, DATE(t.shipped), t.addressFk, t.zoneFk
-			INTO vWarehouseFk, vShipped, vAddressFk, vZoneFk
-		FROM agencyMode a 
-			JOIN ticket t ON t.agencyModeFk = a.id
-		WHERE t.id = vTicket;
-  
-    IF vZoneFk IS NULL THEN
-		CALL util.throw('ticket without zone');
-    END IF;
-    
-    CALL buyUltimate (vWarehouseFk, vShipped);  
-    
-	DELETE FROM tmp.buyUltimate WHERE itemFk != vItem;
-    
-    DROP TEMPORARY TABLE IF EXISTS tmp.ticketLot;
-    CREATE TEMPORARY TABLE tmp.ticketLot 
-		SELECT vWarehouseFk warehouseFk, NULL available, vItem itemFk, buyFk, vZoneFk zoneFk
-				FROM tmp.buyUltimate
-				WHERE itemFk = vItem;
-                
-    CALL vn.catalog_componentCalculate;            
-	CALL catalog_componentCalculate(vZoneFk, vAddressFk, vShipped, vWarehouseFk);
-    
-    DROP TEMPORARY TABLE IF EXISTS tmp.sale;
-	CREATE TEMPORARY TABLE tmp.sale
-					(PRIMARY KEY (saleFk)) ENGINE = MEMORY
-		SELECT vSale saleFk,vWarehouseFk warehouseFk;
-                
-	CALL ticketComponentUpdateSale(1); 
-
-	INSERT INTO vn.ticketLog (originFk, userFk, `action`, description)
-		VALUES (vTicket, account.userGetId(), 'update', CONCAT('Bionizo linea id ', vSale));
-	
-	DROP TEMPORARY TABLE tmp.buyUltimate;
-	DROP TEMPORARY TABLE tmp.sale;
-	CALL catalog_componentPurge();
-	
-END$$
-
-DELIMITER ;
-

db/changes/10180-holyWeek/02-ticketComponentUpdateSale.sql

@@ -0,0 +1,154 @@
+USE `vn`;
+DROP procedure IF EXISTS `ticketComponentUpdateSale`;
+
+DELIMITER $$
+USE `vn`$$
+CREATE DEFINER=`root`@`%` PROCEDURE `ticketComponentUpdateSale`(vOption INT)
+BEGIN
+/**
+ * A partir de la tabla tmp.sale, crea los Movimientos_componentes
+ * y modifica el campo Preu de la tabla Movimientos
+ *
+ * @param i_option integer tipo de actualizacion
+ * @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;
+			
+			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;
+                
+			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, 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);
+    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
+		UPDATE sale s
+			JOIN item i on i.id = s.itemFk
+			JOIN itemType it on it.id = i.typeFk
+				JOIN (SELECT SUM(sc.value) sumValue, sc.saleFk 
+						FROM saleComponent sc
+							JOIN tmp.sale tmps ON tmps.saleFk = sc.saleFk
+						GROUP BY sc.saleFk) sc ON sc.saleFk = s.id
+				SET s.price = sumValue
+			WHERE it.code != 'PRT' ; 
+            
+		REPLACE INTO saleComponent(saleFk, componentFk, value)
+			SELECT s.id, 21, ROUND((s.price * (100 - s.discount) / 100) - SUM(value), 3) saleValue
+				FROM sale s
+					JOIN tmp.sale tmps ON tmps.saleFk = s.id
+					LEFT JOIN saleComponent sc ON sc.saleFk = s.id
+				WHERE sc.componentFk != 21
+				GROUP BY s.id 
+				HAVING ROUND(saleValue, 4) <> 0;
+    END IF;
+    
+    UPDATE sale s
+		JOIN (
+			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
+					JOIN componentType ct on ct.id = c.typeFk AND ct.isBase
+				GROUP BY sc.saleFk) sc ON sc.saleFk = s.id
+		SET s.priceFixed = sumValue, s.isPriceFixed = 1;
+
+    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
+				JOIN tmp.sale tmps ON tmps.saleFk = s.id
+				JOIN item i ON i.id = s.itemFK
+				JOIN itemType it ON it.id = i.typeFk
+		WHERE it.code = 'PRT' AND s.price > 0;
+END$$
+
+DELIMITER ;
+

db/changes/10180-holyWeek/02-ticket_componentMakeUpdate.sql

@@ -0,0 +1,107 @@
+USE `vn`;
+DROP procedure IF EXISTS `ticket_componentMakeUpdate`;
+
+DELIMITER $$
+USE `vn`$$
+CREATE DEFINER=`root`@`%` PROCEDURE `ticket_componentMakeUpdate`(	
+	vTicketFk INT,
+	vClientFk INT,
+	vAgencyModeFk INT,
+	vAddressFk INT,
+	vZoneFk INT,
+	vWarehouseFk TINYINT,
+	vCompanyFk SMALLINT,
+	vShipped DATETIME,
+	vLanded DATE,
+	vIsDeleted BOOLEAN,
+	vHasToBeUnrouted BOOLEAN,
+	vOption INT)
+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 vAgencyModeFk nueva agencia
+ * @param vAddressFk nuevo consignatario
+ * @param vZoneFk nueva zona
+ * @param vWarehouseFk nuevo almacen
+ * @param vCompanyFk nueva empresa
+ * @param vShipped nueva fecha del envio de mercancia
+ * @param vLanded nueva fecha de recepcion de mercancia
+ * @param vIsDeleted si se borra el ticket
+ * @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);
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		ROLLBACK;
+		RESIGNAL;
+	END;
+
+	CALL ticket_componentPreview (vTicketFk, vLanded, vAddressFk, vZoneFk, vWarehouseFk);
+
+	START TRANSACTION;
+
+	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;
+
+	CALL zone_getShippedWarehouse(vlanded, vAddressFk, vAgencyModeFk);
+
+	SELECT zoneFk, price, bonus INTO vZoneFk, vPrice, vBonus 
+		FROM tmp.zoneGetShipped
+		WHERE shipped = vShipped AND warehouseFk = vWarehouseFk LIMIT 1;
+			
+	UPDATE ticket t
+		SET 
+			t.clientFk = vClientFk,
+			t.agencyModeFk = vAgencyModeFk,
+			t.addressFk = vAddressFk,
+			t.zoneFk = vZoneFk,
+			t.zonePrice = vPrice,
+			t.zoneBonus = vBonus,
+			t.warehouseFk = vWarehouseFk,
+			t.companyFk = vCompanyFk,
+			t.landed = vLanded,
+			t.shipped = vShipped,
+			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;
+
+		DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponent;
+		CREATE TEMPORARY TABLE tmp.ticketComponent
+			SELECT * FROM tmp.ticketComponentPreview;
+
+		CALL ticketComponentUpdateSale (vOption);
+
+		DROP TEMPORARY TABLE tmp.sale;
+		DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponent;
+	END IF;
+	COMMIT;
+
+	DROP TEMPORARY TABLE tmp.zoneGetShipped, tmp.ticketComponentPreview;
+END$$
+
+DELIMITER ;

db/changes/10180-holyWeek/02-ticket_componentPreview.sql

@@ -19,63 +19,60 @@ BEGIN
  * @param vZoneFk nueva zona
  * @param vWarehouseFk nuevo warehouse
  *
- * @return tmp.ticketComponent (warehouseFk, itemFk, componentFk, cost)
+ * @return tmp.ticketComponentPreview (warehouseFk, itemFk, componentFk, cost)
  */
-	DECLARE vShipped DATE;
-	DECLARE vBuyOrderItem INT DEFAULT 100;
+	DECLARE vHasDataChanged BOOL DEFAULT FALSE;    
+	DECLARE vHasAddressChanged BOOL;
+	DECLARE vHasZoneChanged BOOL DEFAULT FALSE;
+	DECLARE vHasWarehouseChanged BOOL DEFAULT FALSE;
 
-    DECLARE vHasDataChanged BOOL DEFAULT FALSE;    
-    DECLARE vHasAddressChanged BOOL;
-    DECLARE vHasZoneChanged BOOL DEFAULT FALSE;
-    DECLARE vHasWarehouseChanged BOOL DEFAULT FALSE;
-    
+	DECLARE vShipped DATE;
 	DECLARE vAddressTypeRateFk INT DEFAULT NULL;
 	DECLARE vAgencyModeTypeRateFk INT DEFAULT NULL;
-    
-    DECLARE vHasChangeAll BOOL DEFAULT FALSE;
-  
+
+	DECLARE vHasChangeAll BOOL DEFAULT FALSE;
+
 	SELECT DATE(landed) <> vLanded, 
 			addressFk <> vAddressFk, 
 			zoneFk <> vZoneFk,
-            warehouseFk <> vWarehouseFk
+			warehouseFk <> vWarehouseFk
 		INTO
 			vHasDataChanged,
-            vHasAddressChanged,
-            vHasZoneChanged,
-            vHasWarehouseChanged
+			vHasAddressChanged,
+			vHasZoneChanged,
+			vHasWarehouseChanged
 		FROM vn.ticket t
-        WHERE t.id = vTicketFk;
+		WHERE t.id = vTicketFk;
 
-    IF vHasDataChanged OR vHasWarehouseChanged THEN
+	IF vHasDataChanged OR vHasWarehouseChanged THEN
 		SET vHasChangeAll = TRUE;
 	END IF;
-    
+
 	IF vHasAddressChanged THEN
 		SET vAddressTypeRateFk = 5;
-    END IF;
-    
+	END IF;
+
 	IF vHasZoneChanged THEN
 		SET vAgencyModeTypeRateFk = 6;
-    END IF;
+	END IF;
 
 	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 ( 
+	CREATE TEMPORARY TABLE tmp.ticketLot ENGINE = MEMORY ( 
 	SELECT 
 			vWarehouseFk AS warehouseFk,
 			NULL AS available,
 			s.itemFk,
 			bu.buyFk,
-            vZoneFk zoneFk
+			vZoneFk zoneFk
 		FROM sale s
 			LEFT JOIN tmp.buyUltimate bu ON bu.itemFk = s.itemFk
 		WHERE s.ticketFk = vTicketFk
-			AND s.itemFk != vBuyOrderItem
 		GROUP BY bu.warehouseFk, bu.itemFk);
 
 	CALL catalog_componentPrepare();
@@ -92,21 +89,22 @@ BEGIN
 					OR 
 					(NOT vHasChangeAll
 						AND (NOT (c.typeFk <=> vAddressTypeRateFk
-                        OR c.typeFk <=> vAgencyModeTypeRateFk))));
+						OR c.typeFk <=> vAgencyModeTypeRateFk))));
 
-    SET @shipped = vShipped;
+	DROP TEMPORARY TABLE IF EXISTS tmp.ticketComponentPreview;
+	CREATE TEMPORARY TABLE tmp.ticketComponentPreview
+		SELECT * FROM tmp.ticketComponent;
 
-	DROP TEMPORARY TABLE
-        tmp.buyUltimate,
-		tmp.ticketLot;
+	CALL catalog_componentPurge();
+	DROP TEMPORARY TABLE tmp.buyUltimate;
 
 	IF vShipped IS NULL THEN
 		CALL util.throw('NO_ZONE_AVAILABLE');
-    END IF;
-    
+	END IF;
+
 	IF vShipped < CURDATE() THEN
 		CALL util.throw('ERROR_PAST_SHIPMENT');
-    END IF;
+	END IF;
 END$$
 
 DELIMITER ;

db/changes/10180-holyWeek/02-ticket_priceDifference.sql

@@ -0,0 +1,50 @@
+USE `vn`;
+DROP procedure IF EXISTS `ticket_priceDifference`;
+
+DELIMITER $$
+USE `vn`$$
+CREATE DEFINER=`root`@`%` PROCEDURE `ticket_priceDifference`(
+	vTicketFk INT,
+    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
+ * @param vZoneFk Id de la zona
+ * @param vWarehouseFk Id del almacén
+ */
+	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, 
+			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 
+				AND tc.warehouseFk = t.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 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;
+END$$
+
+DELIMITER ;
+

db/changes/10180-holyWeek/02-ticket_recalcComponents.sql

@@ -3,37 +3,64 @@ DROP procedure IF EXISTS `ticket_recalcComponents`;
 
 DELIMITER $$
 USE `vn`$$
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_recalcComponents`(IN vTicketFk BIGINT )
+CREATE DEFINER=`root`@`%` PROCEDURE `ticket_recalcComponents`(IN vTicketFk BIGINT, vIsTicketEditable BOOLEAN)
 proc: BEGIN
 
 /**
- * Este procedimiento trata de "rebionizar" un ticket, 
+ * Este procedimiento recalcula los componentes de un ticket, 
  * eliminando los componentes existentes e insertandolos de nuevo
  *
  * @param vTicketFk Id del ticket
- * @return tmp.buyUltimate
+ * @param vIsTicketEditable si no se quiere forzar llamar con NULL
  */
 	DECLARE vShipped DATE;
 	DECLARE vWarehouseFk SMALLINT;
     DECLARE vAgencyModeFk INT;
     DECLARE vAddressFk INT;
     DECLARE vLanded DATE;
-    DECLARE vIsTicketEditable BOOLEAN;
     DECLARE vZoneFk INTEGER;
-        
-	SELECT (IFNULL(ts.alertLevel,0) >0 or IFNULL(t.refFk,"") != "") = FALSE, t.zoneFk
-		INTO vIsTicketEditable, vZoneFk
+	
+	IF vIsTicketEditable IS NULL THEN
+		SELECT IFNULL(ts.alertLevel,0) = 0 AND IFNULL(t.refFk,'') = ''
+				INTO vIsTicketEditable
+			FROM ticket t LEFT JOIN ticketState ts ON t.id = ts.ticket
+			WHERE id = vTicketFk;
+	END IF;
+
+	SELECT t.warehouseFk, 
+			t.shipped, 
+			t.addressFk, 
+            t.agencyModeFk, 
+			t.landed,
+			t.zoneFk
+			INTO vWarehouseFk, vShipped, vAddressFk, vAgencyModeFk, vLanded, vZoneFk
 		FROM ticket t LEFT JOIN ticketState ts ON t.id = ts.ticket
-		WHERE id = vTicketFk;
-	
-	SELECT warehouseFk, date(shipped), addressFk, agencyModeFk, landed
-			INTO vWarehouseFk, vShipped, vAddressFk, vAgencyModeFk, vLanded
-		FROM ticket
-		WHERE id = vTicketFk;
+		WHERE t.id = vTicketFk;
+
+	IF vLanded IS NULL OR vZoneFk IS NULL THEN
+
+		CALL zone_getLanded(vShipped, vAddressFk, vAgencyModeFk, vWarehouseFk);
+
+		IF (SELECT COUNT(*) FROM tmp.zoneGetLanded LIMIT 1) = 0 THEN
+			CALL util.throw('There is no zone for these parameters');
+		END IF;
+
+		UPDATE ticket t
+			SET t.landed = (SELECT landed FROM tmp.zoneGetLanded LIMIT 1) 
+			WHERE t.id = vTicketFk AND t.landed IS NULL;
+
+		IF vZoneFk IS NULL THEN
+			SELECT zoneFk INTO vZoneFk FROM tmp.zoneGetLanded LIMIT 1;
+			UPDATE ticket t
+				SET t.zoneFk = vZoneFk
+				WHERE t.id = vTicketFk AND t.zoneFk IS NULL;
+		END IF;
+		DROP TEMPORARY TABLE tmp.zoneGetLanded;
 		
-    CALL vn.zone_getShipped (vlanded, vAddressFk, vAgencyModeFk, TRUE);
-	
-    CALL vn.buyUltimate (vWarehouseFk, vShipped);  -- rellena la tabla buyUltimate con la ultima compra
+	END IF;
+
+	-- rellena la tabla buyUltimate con la ultima compra	
+	CALL buyUltimate (vWarehouseFk, vShipped);  
 	
     DROP TEMPORARY TABLE IF EXISTS tmp.ticketLot;
     CREATE TEMPORARY TABLE tmp.ticketLot 
@@ -45,33 +72,22 @@ proc: BEGIN
 			GROUP BY s.itemFk;
 	                
 	CALL catalog_componentPrepare();
-	CALL vn.catalog_componentCalculate(vZoneFk, vAddressFk, vShipped, vWarehouseFk);
-   
+	CALL catalog_componentCalculate(vZoneFk, vAddressFk, vShipped, vWarehouseFk);
+
 	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 s.ticketFk = vTicketFk;  
-                                    
-	CALL vn.ticketComponentUpdateSale(IF(vIsTicketEditable,1,6)); -- si el ticket esta facturado, respeta los precios
+			SELECT id saleFk, vWarehouseFk warehouseFk
+				FROM sale s
+				WHERE s.ticketFk = vTicketFk;  
+                  
+	-- si el ticket esta facturado, respeta los precios                               
+	CALL ticketComponentUpdateSale(IF(vIsTicketEditable, 1, 6)); 
     
-	IF vLanded IS NULL THEN
-
-		CALL zone_getLanded(vShipped, vAddressFk, vAgencyModeFk, vWarehouseFk);
-        
-        UPDATE vn2008.Tickets t
-			SET t.landing = (SELECT landed FROM tmp.zoneGetLanded) 
-			WHERE Id_Ticket = vTicketFk;
-            
-		DROP TEMPORARY TABLE tmp.zoneGetLanded;
-
-    END IF;
-    
-	DROP TEMPORARY TABLE tmp.buyUltimate;
-    DROP TEMPORARY TABLE tmp.ticketComponentPrice;
-    DROP TEMPORARY TABLE tmp.ticketComponent;
-    DROP TEMPORARY TABLE tmp.sale;
+    CALL catalog_componentPurge();
+	DROP TEMPORARY TABLE 
+		tmp.buyUltimate, 
+		tmp.sale;
 END$$
 
 DELIMITER ;

db/changes/10180-holyWeek/02-ticket_recalcComponentsForcePrice.sql

@@ -1,78 +0,0 @@
-USE `vn`;
-DROP procedure IF EXISTS `ticket_recalcComponentsForcePrice`;
-
-DELIMITER $$
-USE `vn`$$
-CREATE DEFINER=`root`@`%` PROCEDURE `ticket_recalcComponentsForcePrice`(IN vTicketFk BIGINT, vIsTicketEditable BOOLEAN )
-proc: BEGIN
-
-/**
- * Este procedimiento trata de "rebionizar" un ticket, 
- * eliminando los componentes existentes e insertandolos de nuevo
- *
- * @param vTicketFk Id del ticket
- * @return tmp.buyUltimate
- */
-	DECLARE vShipped DATE;
-	DECLARE vWarehouseFk SMALLINT;
-    DECLARE vAgencyModeFk INT;
-    DECLARE vAddressFk INT;
-    DECLARE vLanded DATE;
-    DECLARE vZoneFk INTEGER;
-    
-    IF vIsTicketEditable IS NULL THEN
-		SELECT (IFNULL(ts.alertLevel,0) >0 or IFNULL(t.refFk,"") != "") = FALSE, t.zoneFk
-			INTO vIsTicketEditable, vZoneFk
-			FROM ticket t LEFT JOIN ticketState ts ON t.id = ts.ticket
-			WHERE id = vTicketFk;
-	END IF;
-	SELECT warehouseFk, date(shipped), addressFk, agencyModeFk, landed
-			INTO vWarehouseFk, vShipped, vAddressFk, vAgencyModeFk, vLanded
-		FROM ticket
-		WHERE id = vTicketFk;
-	
-    CALL zone_getShipped (vLanded, vAddressFk, vAgencyModeFk, TRUE);
-	
-    CALL buyUltimate (vWarehouseFk, vShipped);  -- rellena la tabla buyUltimate con la ultima compra
-	
-    DROP TEMPORARY TABLE IF EXISTS tmp.ticketLot;
-    CREATE TEMPORARY TABLE tmp.ticketLot 
-	SELECT vWarehouseFk warehouseFk, NULL available,
-		s.itemFk, bu.buyFk, vZoneFk zoneFk
-			FROM sale s
-				LEFT JOIN tmp.buyUltimate bu ON bu.itemFk = s.itemFk
-			WHERE s.ticketFk = vTicketFk 
-			GROUP BY s.itemFk;
-	
-	CALL catalog_componentPrepare();
-	CALL catalog_componentCalculate(vZoneFk, vAddressFk, vShipped, vWarehouseFk);
-   
-	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 s.ticketFk = vTicketFk;  
-                                    
-	CALL ticketComponentUpdateSale(IF(vIsTicketEditable,1,6)); -- si el ticket esta facturado, respeta los precios
-    
-	IF vLanded IS NULL THEN
-
-		CALL zone_getLanded(vShipped, vAddressFk, vAgencyModeFk, vWarehouseFk);
-        
-        UPDATE vn2008.Tickets t
-			SET t.landing = (SELECT landed FROM tmp.zoneGetLanded) 
-			WHERE Id_Ticket = vTicketFk;
-            
-		DROP TEMPORARY TABLE tmp.zoneGetLanded;
-
-    END IF;
-    
-	DROP TEMPORARY TABLE tmp.buyUltimate;
-    DROP TEMPORARY TABLE tmp.ticketComponentPrice;
-    DROP TEMPORARY TABLE tmp.ticketComponent;
-    DROP TEMPORARY TABLE tmp.sale;
-END$$
-
-DELIMITER ;
-

db/changes/10180-holyWeek/02-ticket_recalcComponentsForcePrice__.sql

@@ -0,0 +1,2 @@
+USE `vn`;
+DROP procedure IF EXISTS `ticket_recalcComponentsForcePrice`;

db/changes/10180-holyWeek/02-ticket_withoutComponents.sql

@@ -0,0 +1,72 @@
+USE `vn`;
+DROP procedure IF EXISTS `ticket_withoutComponents`;
+DROP procedure IF EXISTS `ticket_checkNoComponents`;
+
+DELIMITER $$
+USE `vn`$$
+CREATE DEFINER=`root`@`%` PROCEDURE `ticket_checkNoComponents`(vShippedFrom DATETIME, vShippedTo DATETIME)
+BEGIN
+
+/**
+ * Comprueba que los tickets entre un rango de fechas tienen componentes
+ *
+ * @param vDatedFrom Id del ticket
+ * @param vIsTicketEditable si no se quiere forzar llamar con NULL
+ */
+	DECLARE v_done BOOL DEFAULT FALSE;
+	DECLARE vSaleFk INTEGER;
+	DECLARE vCur CURSOR FOR
+	SELECT s.id
+		FROM ticket t
+			JOIN client clt ON clt.id = t.clientFk
+			JOIN sale s ON s.ticketFk = t.id
+			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 t.shipped  >= vDatedFrom AND  t.shipped  <= vDatedTo
+			AND c.id IS NULL
+			AND clt.isActive != 0
+			AND ic.merchandise != 0
+		GROUP BY s.id;
+	   
+	  DECLARE CONTINUE HANDLER FOR NOT FOUND
+		SET v_done = TRUE; 
+
+	DROP TEMPORARY TABLE IF EXISTS tmp.coste;
+
+	DROP TEMPORARY TABLE IF EXISTS tmp.coste;
+	CREATE TEMPORARY TABLE tmp.coste
+		 (primary key (id)) ENGINE = MEMORY
+		SELECT s.id
+		FROM ticket t
+			JOIN client clt ON clt.id = t.clientFk
+			JOIN sale s ON s.ticketFk = t.id
+			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 = 1
+		WHERE t.shipped  >= vDatedFrom
+			AND ic.merchandise != 0;
+		
+	OPEN vCur;
+
+	l: LOOP
+		SET v_done = FALSE;
+		FETCH vCur INTO vSaleFk;
+
+		IF v_done THEN
+			LEAVE l;
+		END IF;
+
+		CALL sale_calculateComponent(vSaleFk, 1);
+	END LOOP;
+
+	CLOSE vCur; 
+	DROP TEMPORARY TABLE tmp.coste;	
+ END$$
+
+DELIMITER ;
+

db/changes/10180-holyWeek/03-ticketCalculateSaleForcePrice2__.sql

@@ -0,0 +1,2 @@
+USE `vn`;
+DROP procedure IF EXISTS `ticketCalculateSaleForcePrice2`;

db/changes/10180-holyWeek/03-ticketCalculateSaleForcePrice__ .sql

@@ -0,0 +1,2 @@
+USE `vn`;
+DROP procedure IF EXISTS `ticketCalculateSaleForcePrice`;

db/changes/10180-holyWeek/03-ticketCalculateSale__.sql

@@ -1,9 +1,10 @@
 USE `vn`;
 DROP procedure IF EXISTS `ticketCalculateSale`;
+DROP procedure IF EXISTS `ticketCalculateSale__`;
 
 DELIMITER $$
 USE `vn`$$
-CREATE DEFINER=`root`@`%` PROCEDURE `ticketCalculateSale`(IN vSale BIGINT)
+CREATE DEFINER=`root`@`%` PROCEDURE `ticketCalculateSale__`(IN vSale BIGINT)
 proc: BEGIN
 -- OBSOLETO USAR: sale_calculateComponent(vSale, NULL)
 	DECLARE vShipped DATE; 
@@ -57,10 +58,10 @@ proc: BEGIN
 	INSERT INTO vn.ticketLog (originFk, userFk, `action`, description)
 		VALUES (vTicket, account.userGetId(), 'update', CONCAT('Bionizo linea id ', vSale));
 	
+	CALL catalog_componentPurge();
 	DROP TEMPORARY TABLE tmp.buyUltimate;
     DROP TEMPORARY TABLE IF EXISTS tmp.sale;
-    CALL catalog_componentPurge();
-    
+
 END$$
 
 DELIMITER ;

db/changes/10180-holyWeek/03-ticket_componentUpdate__.sql

@@ -0,0 +1,83 @@
+USE `vn`;
+DROP procedure IF EXISTS `vn`.`ticket_componentUpdate`;
+DROP procedure IF EXISTS `vn`.`ticket_componentUpdate__`;
+
+DELIMITER $$
+USE `vn`$$
+CREATE DEFINER=`root`@`%` PROCEDURE `ticket_componentUpdate__`(
+	 vTicketFk INT,
+     vClientFk INT,
+     vAgencyModeFk INT,
+     vAddressFk INT,
+     vZoneFk INT,
+     vWarehouseFk TINYINT,
+     vCompanyFk SMALLINT,
+     vShipped DATETIME,
+     vLanded DATE,
+     vIsDeleted BOOLEAN,
+     vHasToBeUnrouted BOOLEAN,
+     vOption INT)
+BEGIN
+    DECLARE vPrice DECIMAL(10,2);
+    DECLARE vBonus DECIMAL(10,2);
+    DECLARE EXIT HANDLER FOR SQLEXCEPTION
+    BEGIN
+		ROLLBACK;
+        RESIGNAL;
+	END;
+
+	START TRANSACTION;
+    
+   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;
+    
+    CALL vn.zone_getShippedWarehouse(vlanded, vAddressFk, vAgencyModeFk);
+    
+	SELECT zoneFk, price, bonus INTO vZoneFk, vPrice, vBonus 
+		FROM tmp.zoneGetShipped
+		WHERE shipped = vShipped AND warehouseFk = vWarehouseFk LIMIT 1;
+            
+	UPDATE ticket t
+		SET 
+			t.clientFk = vClientFk,
+			t.agencyModeFk = vAgencyModeFk,
+			t.addressFk = vAddressFk,
+            t.zoneFk = vZoneFk,
+            t.zonePrice = vPrice,
+            t.zoneBonus = vBonus,
+			t.warehouseFk = vWarehouseFk,
+            t.companyFk = vCompanyFk,
+			t.landed = vLanded,
+			t.shipped = vShipped,
+            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;
+	COMMIT;
+END$$
+
+DELIMITER ;
+;

db/tests/vn/ticket_recalcComponents.spec.js

@@ -24,7 +24,7 @@ describe('ticket_recalcComponents()', () => {
 
         let modifiedSales = stmts.push(stmt) - 1;
 
-        stmt = new ParameterizedSQL('CALL vn.ticket_recalcComponents(?)', [
+        stmt = new ParameterizedSQL('CALL vn.ticket_recalcComponents(?, NULL)', [
             ticketId,
         ]);
         stmts.push(stmt);

modules/ticket/back/methods/ticket/recalculateComponents.js

@@ -26,6 +26,6 @@ module.exports = Self => {
         if (!isEditable)
             throw new UserError(`The current ticket can't be modified`);
 
-        return Self.rawSql('CALL vn.ticket_recalcComponents(?)', [id]);
+        return Self.rawSql('CALL vn.ticket_recalcComponents(?, NULL)', [id]);
     };
 };

modules/ticket/front/routes.json

@@ -12,18 +12,18 @@
         "card": [
             {"state": "ticket.card.basicData.stepOne", "icon": "settings"},
             {"state": "ticket.card.sale", "icon": "icon-lines"},
+            {"state": "ticket.card.request.index", "icon": "icon-100"},
+            {"state": "ticket.card.tracking.index", "icon": "remove_red_eye"},
+            {"state": "ticket.card.log", "icon": "history"},
             {"state": "ticket.card.observation", "icon": "insert_drive_file"},
+            {"state": "ticket.card.picture", "icon": "image"},
             {"state": "ticket.card.volume", "icon": "icon-volume"},
             {"state": "ticket.card.expedition", "icon": "icon-package"},
             {"state": "ticket.card.service", "icon": "icon-services"},
             {"state": "ticket.card.package", "icon": "icon-bucket"},
-            {"state": "ticket.card.tracking.index", "icon": "remove_red_eye"},
             {"state": "ticket.card.saleChecked", "icon": "assignment"},
             {"state": "ticket.card.components", "icon": "icon-components"},
             {"state": "ticket.card.saleTracking", "icon": "assignment"},
-            {"state": "ticket.card.picture", "icon": "image"},
-            {"state": "ticket.card.log", "icon": "history"},
-            {"state": "ticket.card.request.index", "icon": "icon-100"},
             {"state": "ticket.card.dms.index", "icon": "cloud_download"}
         ]
     },