Merge branch 'dev' into 7709-supplierPackaging_ReportSource_2

Reviewed-on: #3161
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

db/dump/fixtures.before.sql

@@ -1505,32 +1505,32 @@ INSERT INTO `vn`.`awb` (id, code, package, weight, created, amount, transitoryFk
         (9,     '99610289193', 302, 2972,   util.VN_CURDATE(),  3871, 442, 1),
         (10,    '07546500856', 185, 2364,   util.VN_CURDATE(),  5321, 442, 1);
 
-INSERT INTO `vn`.`travel`(`id`,`shipped`, `landed`, `warehouseInFk`, `warehouseOutFk`, `agencyModeFk`, `m3`, `kg`,`ref`, `totalEntries`, `cargoSupplierFk`, `awbFK`)
+INSERT INTO `vn`.`travel`(`id`,`shipped`, `landed`, `warehouseInFk`, `warehouseOutFk`, `agencyModeFk`, `m3`, `kg`,`ref`, `totalEntries`, `cargoSupplierFk`, `awbFK`, `daysInForward`)
-    VALUES (1,  DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), 1, 2, 1, 100.00, 1000, 'first travel',   1, 1, 1),
+    VALUES (1,  DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), 1, 2, 1, 100.00, 1000, 'first travel',   1, 1, 1, NULL),
-        (2,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 2, 1, 150.00, 2000, 'second travel',  2, 2, 2),
+        (2,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 2, 1, 150.00, 2000, 'second travel',  2, 2, 2, NULL),
-        (3,  util.VN_CURDATE(),                              util.VN_CURDATE(),                              1, 2, 1, 0.00,   0.00, 'third travel',   1, 1, 3),
+        (3,  util.VN_CURDATE(),                              util.VN_CURDATE(),                              1, 2, 1, 0.00,   0.00, 'third travel',   1, 1, 3, NULL),
-        (4,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 3, 1, 50.00,  500,  'fourth travel',  0, 2, 4),
+        (4,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 3, 1, 50.00,  500,  'fourth travel',  0, 2, 4, NULL),
-        (5,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 3, 3, 1, 50.00,  500,  'fifth travel',   1, 1, 5),
+        (5,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 3, 3, 1, 50.00,  500,  'fifth travel',   1, 1, 5, NULL),
-        (6,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 4, 4, 1, 50.00,  500,  'sixth travel',   1, 2, 6),
+        (6,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 4, 4, 1, 50.00,  500,  'sixth travel',   1, 2, 6, NULL),
-        (7,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 4, 1, 50.00,  500,  'seventh travel', 2, 1, 7),
+        (7,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 4, 1, 50.00,  500,  'seventh travel', 2, 1, 7, 2),
-        (8,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 1, 1, 50.00,  500,  'eight travel',   1, 2, 10),
+        (8,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 1, 1, 50.00,  500,  'eight travel',   1, 2, 10, NULL),
-        (10, DATE_ADD(util.VN_CURDATE(), INTERVAL +5 DAY),   DATE_ADD(util.VN_CURDATE(), INTERVAL +5 DAY),   5, 1, 1, 50.00,  500,  'nineth travel',  1, 2, 10),
+        (10, DATE_ADD(util.VN_CURDATE(), INTERVAL +5 DAY),   DATE_ADD(util.VN_CURDATE(), INTERVAL +5 DAY),   5, 1, 1, 50.00,  500,  'nineth travel',  1, 2, 10, 2),
-        (11, util.VN_CURDATE() - INTERVAL 1 DAY          ,                              util.VN_CURDATE(),   6, 3, 0, 50.00, 500, 'eleventh travel',  1, 2, 4),
+        (11, util.VN_CURDATE() - INTERVAL 1 DAY          ,                              util.VN_CURDATE(),   6, 3, 0, 50.00, 500, 'eleventh travel',  1, 2, 4, NULL),
-        (12, util.VN_CURDATE()                           ,             util.VN_CURDATE() + INTERVAL 1 DAY,   6, 3, 0, 50.00, 500, 'eleventh travel',  1, 2, 4);
+        (12, util.VN_CURDATE()                           ,             util.VN_CURDATE() + INTERVAL 1 DAY,   6, 3, 0, 50.00, 500, 'eleventh travel',  1, 2, 4, NULL);
 
-INSERT INTO `vn`.`entry`(`id`, `supplierFk`, `created`, `travelFk`, `isConfirmed`, `companyFk`, `invoiceNumber`, `reference`, `isExcludedFromAvailable`, `isRaid`, `evaNotes`)
+INSERT INTO `vn`.`entry`(`id`, `supplierFk`, `created`, `travelFk`, `isConfirmed`, `companyFk`, `invoiceNumber`, `reference`, `isExcludedFromAvailable`, `evaNotes`)
     VALUES
-        (1, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 1, 442, 'IN2001', 'Movement 1', 0, 0,    ''),
+        (1, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 1, 442, 'IN2001', 'Movement 1', 0, ''),
-        (2, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2, 0, 442, 'IN2002', 'Movement 2', 0, 0,    'observation two'),
+        (2, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2, 0, 442, 'IN2002', 'Movement 2', 0, 'observation two'),
-        (3, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 3, 0, 442, 'IN2003', 'Movement 3', 0, 0,  'observation three'),
+        (3, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 3, 0, 442, 'IN2003', 'Movement 3', 0, 'observation three'),
-        (4, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2, 0, 69,  'IN2004', 'Movement 4', 0, 0,   'observation four'),
+        (4, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2, 0, 69,  'IN2004', 'Movement 4', 0, 'observation four'),
-        (5, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 0, 442, 'IN2005', 'Movement 5', 0, 0,   'observation five'),
+        (5, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 5, 0, 442, 'IN2005', 'Movement 5', 0, 'observation five'),
-        (6, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 6, 0, 442, 'IN2006', 'Movement 6', 0, 0,    'observation six'),
+        (6, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 6, 0, 442, 'IN2006', 'Movement 6', 0, 'observation six'),
-        (7, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 7, 0, 442, 'IN2007', 'Movement 7', 0, 0,  'observation seven'),
+        (7, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 7, 0, 442, 'IN2007', 'Movement 7', 0, 'observation seven'),
-        (8, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 7, 0, 442, 'IN2008', 'Movement 8', 1, 1,  ''),
+        (8, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 7, 0, 442, 'IN2008', 'Movement 8', 1,''),
-        (9, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL +2 DAY), 10, 0, 442, 'IN2009', 'Movement 9', 1, 1,  ''),
+        (9, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL +2 DAY), 10, 0, 442, 'IN2009', 'Movement 9', 1, ''),
-        (10, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL +2 DAY), 10, 0, 442, 'IN2009', 'Movement 10', 1, 1,  ''),
+        (10, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL +2 DAY), 10, 0, 442, 'IN2009', 'Movement 10', 1, ''),
-        (99, 69,                   '2000-12-01 00:00:00.000', 11, 0, 442, 'IN2009', 'Movement 99', 0, 0, '');
+        (99, 69,                   '2000-12-01 00:00:00.000', 11, 0, 442, 'IN2009', 'Movement 99', 0, '');
 
 INSERT INTO `vn`.`entryConfig` (`defaultEntry`, `inventorySupplierFk`, `defaultSupplierFk`)
 	VALUES (2, 4, 1);
@@ -2454,7 +2454,7 @@ INSERT INTO `vn`.`workerTimeControl`(`userFk`, `timed`, `manual`, `direction`, `
 INSERT INTO `vn`.`dmsType`
 		(`id`, `name`, 					`readRoleFk`, 	`writeRoleFk`, `code`)
     VALUES
-        (1,  	'Facturas Recibidas',  	NULL,   		NULL,   		'invoiceIn'),
+        (1,  	'Facturas Recibidas',		1,   			1,   		'invoiceIn'),
         (2,  	'Doc oficial',         	NULL,   		NULL,   		'officialDoc'),
         (3,  	'Laboral',             	37,     		37,     		'hhrrData'),
         (4,  	'Albaranes recibidos', 	NULL,   		NULL,   		'deliveryNote'),

db/routines/cache/procedures/availableNoRaids_refresh.sql

@@ -53,7 +53,7 @@ proc: BEGIN
 					WHERE t.landed BETWEEN vInventoryDate AND vStartDate
 						AND t.warehouseInFk = vWarehouse
 						AND s.name != 'INVENTARIO'
-						AND NOT e.isRaid
+						AND NOT t.daysInForward
 					GROUP BY b.itemFk
 			) c
 				JOIN vn.item i ON i.id = c.itemFk

db/routines/edi/triggers/supplyResponse_afterUpdate.sql

@@ -14,7 +14,7 @@ BEGIN
 			b.stickers = NEW.NumberOfUnits
 		WHERE i.supplyResponseFk = NEW.ID
 			AND am.name = 'LOGIFLORA'
-			AND e.isRaid
+			AND tr.daysInForward
 			AND tr.landed >= util.VN_CURDATE();
 
 END$$

db/routines/hedera/procedures/item_getVisible.sql

@@ -59,7 +59,7 @@ BEGIN
 						JOIN vn.travel t ON t.id = e.travelFk
 					WHERE t.landed BETWEEN vDateInv AND vDate
 						AND t.warehouseInFk = vWarehouse
-						AND NOT e.isRaid
+						AND NOT t.daysInForward
 				UNION ALL
 				SELECT b.itemFk, -b.quantity
 					FROM vn.buy b
@@ -67,7 +67,7 @@ BEGIN
 						JOIN vn.travel t ON t.id = e.travelFk
 					WHERE t.shipped BETWEEN vDateInv AND util.VN_CURDATE()
 						AND t.warehouseOutFk = vWarehouse
-						AND NOT e.isRaid
+						AND NOT t.daysInForward
 						AND t.isDelivered
 				UNION ALL
 				SELECT m.itemFk, -m.quantity

db/routines/stock/procedures/log_refreshBuy.sql

@@ -11,7 +11,7 @@ BEGIN
 				e.id entryFk,
 				t.id travelFk,
 				b.itemFk,
-				e.isRaid,
+				t.daysInForward,
 				ADDTIME(t.shipped,
 					IFNULL(t.shipmentHour, '00:00:00')) shipped,
 				t.warehouseOutFk,
@@ -50,7 +50,7 @@ BEGIN
 				itemFk,
 				TIMESTAMPADD(DAY, life, @dated),
 				quantity,
-				IF(isIn, isReceived, isDelivered) AND !isRaid
+				IF(isIn, isReceived, isDelivered) AND NOT daysInForward
 			FROM tValues
 			WHERE isIn OR !lessThanInventory;
 
@@ -65,7 +65,7 @@ BEGIN
 				itemFk,
 				created,
 				quantity,
-				IF(isIn, isDelivered, isReceived) AND !isRaid
+				IF(isIn, isDelivered, isReceived) AND NOT daysInForward
 			FROM tValues
 			WHERE !isIn OR !lessThanInventory;
 

db/routines/vn/events/raidUpdate.sql

@@ -1,8 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` EVENT `vn`.`raidUpdate`
-	ON SCHEDULE EVERY 1 DAY
-		STARTS '2017-12-29 00:05:00.000'
-	ON COMPLETION PRESERVE
-	ENABLE
-DO CALL raidUpdate$$
-DELIMITER ;

db/routines/vn/procedures/absoluteInventoryHistory.sql

@@ -39,7 +39,7 @@ BEGIN
 						AND vWarehouseFk IN (tr.warehouseInFk, 0)
 						AND b.itemFk = vItemFk
 						AND NOT e.isExcludedFromAvailable
-						AND NOT e.isRaid
+						AND NOT tr.daysInForward
 				UNION ALL
 				SELECT tr.shipped,
 						NULL,
@@ -58,7 +58,7 @@ BEGIN
 						AND s.id <> (SELECT supplierFk FROM inventoryConfig)
 						AND b.itemFk = vItemFk
 						AND NOT e.isExcludedFromAvailable
-						AND NOT e.isRaid
+						AND NOT tr.daysInForward
 				UNION ALL
 				SELECT t.shipped,
 						NULL,

db/routines/vn/procedures/available_traslate.sql

@@ -42,7 +42,7 @@ proc: BEGIN
 			WHERE t.landed BETWEEN vDatedInventory AND vDatedFrom
 				AND t.warehouseInFk = vWarehouseLanding
 				AND NOT e.isExcludedFromAvailable
-				AND NOT e.isRaid
+				AND NOT t.daysInForward
 			GROUP BY c.itemFk;
 
 	-- Tabla con el ultimo dia de last_buy para cada producto
@@ -57,7 +57,7 @@ proc: BEGIN
 				JOIN travel tr ON tr.id = e.travelFk
 				LEFT JOIN tItemRange i ON t.itemFk = i.itemFk
 			WHERE t.warehouseFk = vWarehouseShipment
-				AND NOT e.isRaid
+				AND NOT tr.daysInForward
 	ON DUPLICATE KEY UPDATE tItemRange.dated = GREATEST(tItemRange.dated,
 	tr.landed);
 
@@ -94,7 +94,7 @@ proc: BEGIN
 				JOIN tItemRangeLive ir ON ir.itemFk = b.itemFk
 			WHERE NOT e.isExcludedFromAvailable
 				AND b.quantity <> 0
-				AND NOT e.isRaid
+				AND NOT t.daysInForward
 				AND t.warehouseInFk = vWarehouseLanding
 				AND t.landed >= vDatedFrom
 				AND (ir.dated IS NULL OR t.landed <= ir.dated)

db/routines/vn/procedures/clean_logiflora.sql

@@ -28,7 +28,7 @@ BEGIN
 				JOIN agencyMode am ON am.id = tr.agencyModeFk
 			WHERE NOT b.quantity
 				AND am.code = 'logiflora'
-				AND e.isRaid;
+				AND tr.daysInForward;
 
 	START TRANSACTION;
 

db/routines/vn/procedures/collection_getTickets.sql

@@ -30,7 +30,9 @@ BEGIN
 			t.warehouseFk,
 			w.id salesPersonFk,
 			IFNULL(ob.description,'') observaciones,
-			cc.rgb
+			cc.rgb,
+			p.code parkingCode,
+			IF (ps.ticketFk, TRUE, FALSE) isAdvanced
 		FROM vn.ticket t
 			LEFT JOIN vn.ticketCollection tc ON t.id = tc.ticketFk
 			LEFT JOIN vn.collection c2 ON c2.id = tc.collectionFk
@@ -43,6 +45,9 @@ BEGIN
 			LEFT JOIN vn.client c ON c.id = t.clientFk
 			LEFT JOIN vn.worker w ON w.id = c.salesPersonFk
 			LEFT JOIN observation ob ON ob.ticketFk = t.id
+			LEFT JOIN vn.ticketParking tp ON tp.ticketFk = t.id
+			LEFT JOIN vn.parking p ON tp.parkingFk = p.id
+			LEFT JOIN vn.packingSiteAdvanced ps ON ps.ticketFk = t.id
 		WHERE t.id = vParamFk 
 			AND t.shipped >= vYesterday
 	UNION
@@ -52,7 +57,9 @@ BEGIN
 			t.warehouseFk,
 			w.id salesPersonFk,
 			ob.description,
-			IF(NOT (vItemPackingTypeFk <=> 'V'), cc.rgb, NULL) `rgb`
+			IF(NOT (vItemPackingTypeFk <=> 'V'), cc.rgb, NULL) `rgb`,
+			p.code parkingCode,
+			IF (ps.ticketFk, TRUE, FALSE) isAdvanced
 		FROM vn.ticket t
 			JOIN vn.ticketCollection tc ON t.id = tc.ticketFk
 			LEFT JOIN vn.collection c2 ON c2.id = tc.collectionFk 	
@@ -65,6 +72,9 @@ BEGIN
 			LEFT JOIN vn.client c ON c.id = t.clientFk
 			LEFT JOIN vn.worker w ON w.id = c.salesPersonFk
 			LEFT JOIN observation ob ON ob.ticketFk = t.id
+			LEFT JOIN vn.ticketParking tp ON tp.ticketFk = t.id
+			LEFT JOIN vn.parking p ON tp.parkingFk = p.id
+			LEFT JOIN vn.packingSiteAdvanced ps ON ps.ticketFk = t.id
 		WHERE tc.collectionFk = vParamFk
 	UNION
 	SELECT sg.ticketFk,
@@ -73,7 +83,9 @@ BEGIN
 			t.warehouseFk,
 			c.salesPersonFk,
 			ob.description,
-			NULL `rgb`
+			NULL `rgb`,
+			p.code parkingCode,
+			IF (ps.ticketFk, TRUE, FALSE) isAdvanced
 		FROM vn.sectorCollection sc
 			JOIN vn.sectorCollectionSaleGroup ss ON ss.sectorCollectionFk = sc.id 
 			JOIN vn.saleGroup sg ON sg.id = ss.saleGroupFk
@@ -82,6 +94,9 @@ BEGIN
 			LEFT JOIN vn.agencyMode am ON am.id = z.agencyModeFk 
 			LEFT JOIN observation ob ON ob.ticketFk = t.id 
 			LEFT JOIN vn.client c ON c.id = t.clientFk
+			LEFT JOIN vn.ticketParking tp ON tp.ticketFk = t.id
+			LEFT JOIN vn.parking p ON tp.parkingFk = p.id
+			LEFT JOIN vn.packingSiteAdvanced ps ON ps.ticketFk = t.id
 		WHERE sc.id = vParamFk
 			AND t.shipped >= vYesterday
 			GROUP BY ticketFk;

db/routines/vn/procedures/entry_cloneHeader.sql

@@ -17,7 +17,6 @@ BEGIN
 			supplierFk,
 			dated,
 			isExcludedFromAvailable,
-			isRaid,
 			commission,
 			currencyFk,
 			companyFk,
@@ -28,7 +27,6 @@ BEGIN
 				supplierFk,
 				dated,
 				isExcludedFromAvailable,
-				isRaid,
 				commission,
 				currencyFk,
 				companyFk,

db/routines/vn/procedures/entry_getTransfer.sql

@@ -166,7 +166,7 @@ BEGIN
 				LEFT JOIN tmp.buyUltimateFromInterval bufi ON bufi.itemFk = i.id
 				LEFT JOIN buy b3 ON b3.id = bufi.buyFk
 		WHERE ic.display
-			AND NOT e.isRaid
+			AND NOT tr.daysInForward
 			AND (ti.visible OR ti.available)
 			ORDER BY i.typeFk, i.name, i.id, i.size, i.category, o.name;
 

db/routines/vn/procedures/expedition_getFromRoute.sql

@@ -16,7 +16,8 @@ BEGIN
 			a.nickname,
 			sub2.itemPackingTypeConcat,
 			est.code,
-			es.isScanned
+			es2.isScanned,
+			es2.scanOrder
 		FROM expedition e
 			JOIN ticket t ON t.id = e.ticketFk
 			JOIN ticketState ts ON ts.ticketFk = e.ticketFk
@@ -38,6 +39,7 @@ BEGIN
 				    SELECT MAX(id)
 				    	FROM expeditionState es
 				    	WHERE expeditionFk = e.id)
+			LEFT JOIN expeditionState es2 ON es2.id = es.id
 		WHERE t.routeFk = vRouteFk AND e.freightItemFk <> FALSE
 		ORDER BY  r.created,  t.priority DESC;
 END$$

db/routines/vn/procedures/expedition_selfConsumptionPackaging.sql

@@ -0,0 +1,93 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`expedition_selfConsumptionPackaging`(
+	vSelf INT,
+	vAction ENUM('add', 'remove')
+)
+BEGIN
+/**
+ * Maneja el consumo de cajas para autoconsumo, permitiendo
+ * añadir o quitar cajas utilizadas según la acción indicada.
+ *
+ * @param vSelf Id de expedición
+ */
+	DECLARE vClientFk INT;
+	DECLARE vAddressFk INT;
+	DECLARE vItemFk INT;
+	DECLARE vItemName VARCHAR(50);
+	DECLARE vWarehouseFk INT;
+	DECLARE vCreated DATE;
+	DECLARE vTicketFk INT;
+	DECLARE vSaleFk INT;
+	DECLARE vQuantity INT;
+
+	IF vAction NOT IN ('add', 'remove') THEN
+		CALL util.throw('Action not supported');
+	END IF;
+
+	SELECT pc.clientSelfConsumptionFk,
+			pc.addressSelfConsumptionFk,
+			i.id,
+			i.name,
+			t.warehouseFk,
+			e.created
+			INTO vClientFk,
+				vAddressFk,
+				vItemFk,
+				vItemName,
+				vWarehouseFk,
+				vCreated
+		FROM expedition e
+			JOIN packaging p ON p.id = e.packagingFk
+			JOIN item i ON i.id = p.itemFk
+			JOIN ticket t ON t.id = e.ticketFk
+			JOIN productionConfig pc
+		WHERE e.id = vSelf;
+
+	IF vClientFk IS NULL OR vAddressFk IS NULL THEN
+		CALL util.throw('Some config parameters are not set');
+	END IF;
+
+	SET vCreated = DATE(vCreated);
+
+	SELECT id INTO vTicketFk
+		FROM ticket
+			WHERE shipped BETWEEN vCreated AND util.dayEnd(vCreated)
+				AND clientFk = vClientFk
+				AND addressFk = vAddressFk
+				AND warehouseFk = vWarehouseFk;
+
+	IF vTicketFk IS NULL AND vAction = 'add' THEN
+		INSERT INTO ticket(clientFk, warehouseFk, shipped, nickname, addressFk)
+			VALUES (vClientFk, vWarehouseFk, vCreated, 'CAJAS AUTOCONSUMO', vAddressFk);
+
+		SET vTicketFk = LAST_INSERT_ID();
+	END IF;
+
+	SELECT id, quantity INTO vSaleFk, vQuantity
+		FROM sale
+		WHERE itemFk = vItemFk
+			AND ticketFk = vTicketFk
+		LIMIT 1;
+
+	IF vAction = 'add' THEN
+		IF vSaleFk IS NOT NULL THEN
+			UPDATE sale
+				SET quantity = quantity + 1
+				WHERE id = vSaleFk;
+		ELSE
+			INSERT INTO sale(itemFk, ticketFk, concept, quantity)
+				VALUES (vItemFk, vTicketFk, vItemName, 1);
+		END IF;
+	ELSE
+		IF vSaleFk IS NOT NULL THEN
+			IF vQuantity > 1 THEN
+				UPDATE sale
+					SET quantity = quantity - 1
+					WHERE id = vSaleFk;
+			ELSE
+				DELETE FROM sale WHERE id = vSaleFk;
+			END IF;
+		END IF;
+	END IF;
+END$$
+DELIMITER ;

db/routines/vn/procedures/inventoryMake.sql

@@ -137,7 +137,7 @@ BEGIN
 					JOIN travel tr ON tr.id = e.travelFk
 				WHERE tr.warehouseInFk = vWarehouseFk
 					AND tr.landed BETWEEN vDateLastInventory AND vDateYesterday
-					AND NOT isRaid
+					AND NOT tr.daysInForward
 				GROUP BY b.itemFk;
 
 		-- Transfers
@@ -150,7 +150,7 @@ BEGIN
 							JOIN travel tr ON tr.id = e.travelFk
 						WHERE tr.warehouseOutFk = vWarehouseFk
 							AND tr.shipped BETWEEN vDateLastInventory AND vDateYesterday
-							AND NOT isRaid
+							AND NOT tr.daysInForward
 						GROUP BY b.itemFk
 				) sub
 			ON DUPLICATE KEY UPDATE quantity = IFNULL(quantity, 0) + sub.quantityOut;

db/routines/vn/procedures/itemShelving_get.sql

@@ -7,9 +7,10 @@ BEGIN
 * @param vSelf matrícula del carro
 **/
 	SELECT ish.itemFk item, 
-			IFNULL(i.longName, CONCAT(i.name, ' ', i.size)) description, 
+			i.name, 
+			i.longName,
+			i.size, 
 			ish.visible,
-			CEIL(ish.visible/ish.packing) stickers,
 			ish.packing,
 			ish.grouping,
 			p.code,
@@ -17,7 +18,8 @@ BEGIN
 			s.priority,
 			ish.isChecked,
 			ic.url,
-			ish.available
+			ish.available,
+			ish.buyFk
 		FROM itemShelving ish
 			JOIN item i ON i.id = ish.itemFk
 			JOIN shelving s ON vSelf = s.code COLLATE utf8_unicode_ci

db/routines/vn/procedures/item_getBalance.sql

@@ -59,7 +59,7 @@ BEGIN
 					AND (s.id <> vSupplierInventoryFk OR vDated IS NULL)
 					AND b.itemFk = vItemFk
 					AND NOT e.isExcludedFromAvailable
-					AND NOT e.isRaid
+					AND NOT tr.daysInForward
 		),
 		entriesOut AS (
 			SELECT 'entry',
@@ -95,7 +95,7 @@ BEGIN
 						AND b.itemFk = vItemFk
 						AND NOT e.isExcludedFromAvailable
 						AND NOT w.isFeedStock
-						AND NOT e.isRaid
+						AND NOT tr.daysInForward
 		),
 		sales AS (
 			WITH itemSales AS (

db/routines/vn/procedures/item_getMinacum.sql

@@ -63,7 +63,7 @@ BEGIN
 						AND NOT e.isExcludedFromAvailable
 						AND b.quantity <> 0
 						AND (vItemFk IS NULL OR b.itemFk = vItemFk)
-						AND NOT e.isRaid
+						AND NOT t.daysInForward
 				UNION ALL
 				SELECT r.itemFk,
 						r.shipment,

db/routines/vn/procedures/item_multipleBuyByDate.sql

@@ -30,7 +30,7 @@ BEGIN
 			AND NOT s.name = 'INVENTARIO'
 			AND (vWarehouseFk IS NULL OR t.warehouseInFk = vWarehouseFk)
 			AND w.isComparative
-			AND NOT e.isRaid
+			AND NOT t.daysInForward
 		GROUP BY i.id;
 
 	UPDATE tmp.itemInventory y

db/routines/vn/procedures/item_valuateInventory.sql

@@ -109,7 +109,7 @@ BEGIN
 				JOIN warehouse w ON w.id = tr.warehouseInFk
 			WHERE tr.landed BETWEEN vInventoried AND vDateDayEnd
 				AND IF(tr.landed = util.VN_CURDATE(), tr.isReceived, TRUE)
-				AND NOT e.isRaid
+				AND NOT tr.daysInForward
 				AND w.valuatedInventory
 				AND t.isInventory
 				AND e.supplierFk <> vInventorySupplierFk
@@ -131,7 +131,7 @@ BEGIN
 				JOIN itemCategory ic ON ic.id = t.categoryFk
 				JOIN warehouse w ON w.id = tr.warehouseOutFk
 			WHERE tr.shipped BETWEEN vInventoried AND vDateDayEnd
-				AND NOT e.isRaid
+				AND NOT tr.daysInForward
 				AND w.valuatedInventory
 				AND t.isInventory
 				AND (t.id = vItemTypeFk OR vItemTypeFk IS NULL)
@@ -196,7 +196,7 @@ BEGIN
 				JOIN warehouse wIn ON wIn.id = tr.warehouseInFk
 				JOIN warehouse wOut ON wOut.id = tr.warehouseOutFk
 			WHERE vDated >= tr.shipped AND vDated < tr.landed
-				AND NOT isRaid
+				AND NOT tr.daysInForward
 				AND wIn.valuatedInventory
 				AND t.isInventory
 				AND e.isConfirmed

db/routines/vn/procedures/multipleInventory.sql

@@ -60,7 +60,7 @@ proc: BEGIN
 						AND IFNULL(vWarehouseFk, t.warehouseInFk) = t.warehouseInFk
 						AND w.isComparative
 						AND NOT e.isExcludedFromAvailable
-						AND NOT e.isRaid
+						AND NOT t.daysInForward
 				UNION ALL
 				SELECT b.itemFk, - b.quantity
 					FROM buy b
@@ -71,7 +71,7 @@ proc: BEGIN
 						AND IFNULL(vWarehouseFk, t.warehouseOutFk) = t.warehouseOutFk
 						AND w.isComparative
 						AND NOT e.isExcludedFromAvailable
-						AND NOT e.isRaid
+						AND NOT t.daysInForward
 			) sub
 			GROUP BY itemFk;
 
@@ -121,7 +121,7 @@ proc: BEGIN
 						AND IFNULL(vWarehouseFk, t.warehouseInFk) = t.warehouseInFk
 						AND w.isComparative
 						AND NOT e.isExcludedFromAvailable
-						AND NOT e.isRaid
+						AND NOT t.daysInForward
 				UNION ALL
 				SELECT b.itemFk, t.shipped, - b.quantity
 					FROM buy b
@@ -132,7 +132,7 @@ proc: BEGIN
 						AND IFNULL(vWarehouseFk, t.warehouseOutFk) = t.warehouseOutFk
 						AND w.isComparative
 						AND NOT e.isExcludedFromAvailable
-						AND NOT e.isRaid
+						AND NOT t.daysInForward
 			) sub
 			GROUP BY sub.itemFk, sub.dated;
 

db/routines/vn/procedures/raidUpdate.sql

@@ -1,31 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`raidUpdate`()
-BEGIN
-/**
- * Actualiza el travel de las entradas de redadas
- */
-	UPDATE entry e
-		JOIN entryVirtual ev ON ev.entryFk = e.id
-		JOIN travel t ON t.id = e.travelFk
-		JOIN (
-			SELECT *
-				FROM (
-					SELECT t.id, t.landed, tt.warehouseInFk, tt.warehouseOutFk
-						FROM travel t
-							JOIN (
-								SELECT t.warehouseInFk, t.warehouseOutFk
-									FROM entryVirtual ev
-										JOIN entry e ON e.id = ev.entryFk
-										JOIN travel t ON t.id = e.travelFk
-									GROUP BY t.warehouseInFk, t.warehouseOutFk
-							) tt ON t.warehouseInFk = tt.warehouseInFk AND t.warehouseOutFk = tt.warehouseOutFk
-						WHERE shipped > util.VN_CURDATE() AND NOT isDelivered
-						ORDER BY t.landed
-						LIMIT 10000000000000000000
-				) t
-				GROUP BY t.warehouseInFk, t.warehouseOutFk
-		) tt ON t.warehouseInFk = tt.warehouseInFk AND t.warehouseOutFk = tt.warehouseOutFk
-		SET e.travelFk = t.id;
-
-END$$
-DELIMITER ;

db/routines/vn/procedures/travelVolume_get.sql

@@ -10,7 +10,7 @@ BEGIN
 			JOIN vn.entry e ON e.travelFk = tr.id
 			JOIN vn.buy b ON b.entryFk = e.id
 		WHERE tr.landed BETWEEN vFromDated AND vToDated
-			AND e.isRaid = FALSE
+			AND NOT tr.daysInForward
 			AND tr.warehouseInFk = vWarehouseFk
 		GROUP BY tr.landed , a.name ;
 END$$

db/routines/vn/procedures/travel_cloneWithEntries.sql

@@ -71,6 +71,8 @@ BEGIN
 		UPDATE entry
 			SET evaNotes = vEvaNotes
 			WHERE id = vNewEntryFk;
+		
+		CALL buy_recalcPricesByEntry(vNewEntryFk);
 	END LOOP;
 
 	SET @isModeInventory = FALSE;

db/routines/vn/procedures/travel_moveRaids.sql

@@ -1,30 +1,31 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`travel_moveRaids`()
 BEGIN
-
+/**
-/*
+ * Desplaza los travels en el futuro y avisa a los compradores
- * Desplaza al dia siguiente los travels que contengan redadas y avisa a los compradores
  * 
  */
 	DECLARE vDone BOOL DEFAULT FALSE;
-	DECLARE vWorkerName VARCHAR(50);
+	DECLARE vBuyerEmail VARCHAR(40);
-	DECLARE vRaid TEXT;
+	DECLARE vTravelLink TEXT;
-	DECLARE vWorker VARCHAR(50) DEFAULT '';
 	DECLARE vMailBody TEXT DEFAULT '';
 
 	DECLARE vCur CURSOR FOR
-		SELECT GROUP_CONCAT( DISTINCT CONCAT('https://salix.verdnatura.es/#!/travel/', ttr.id, '/summary ') ORDER BY ttr.id SEPARATOR '\n\r'),
+		SELECT GROUP_CONCAT(DISTINCT 
-			u.name
+				CONCAT('https://salix.verdnatura.es/#!/travel/', 
-			FROM tmp.travel ttr
+					ttm.travelFk, 
-				JOIN entry e ON e.travelFk = ttr.id 
+					'/summary ')
+				ORDER BY ttm.travelFk SEPARATOR '\n\r') travelLink,
+			CONCAT(u.name, '@verdnatura.es') buyerEmail
+			FROM tTravelToMove ttm
+				JOIN entry e ON e.travelFk = ttm.travelFk 
 				JOIN buy b ON b.entryFk = e.id
 				JOIN item i ON i.id = b.itemFk
 				JOIN itemType it ON it.id = i.typeFk
 				JOIN account.user u ON u.id = it.workerFk
 			GROUP BY u.name;
 
-	DECLARE CONTINUE HANDLER FOR NOT FOUND
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; 
-	SET vDone = TRUE; 
 
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
 	BEGIN
@@ -32,41 +33,36 @@ BEGIN
 		RESIGNAL;
 	END;
 
-	DROP TEMPORARY TABLE IF EXISTS tmp.travel;
+	CREATE OR REPLACE TEMPORARY TABLE tTravelToMove
-	CREATE TEMPORARY TABLE tmp.travel
+		SELECT id travelFk, 
-		SELECT tr.id,tr.landed
+				util.VN_CURDATE() + INTERVAL daysInForward  DAY newLanded
-			FROM travel tr
+			FROM travel
-					JOIN entry e ON e.travelFk = tr.id 
+			WHERE daysInForward;
-				WHERE tr.landed = util.tomorrow()
-					AND e.isRaid
-				GROUP BY tr.id;
 
 	START TRANSACTION;
 
 	UPDATE travel tr
-		JOIN tmp.travel ttr ON ttr.id = tr.id
+			JOIN tTravelToMove ttm ON ttm.travelFk = tr.id
-		SET tr.landed = TIMESTAMPADD(DAY, 1, tr.landed);
+		SET tr.landed = ttm.newLanded;
 
 	OPEN vCur;
 
 	l: LOOP
 		SET vDone = FALSE;
-		FETCH vCur INTO vRaid, vWorkerName;
+		FETCH vCur INTO vTravelLink, vBuyerEmail;
 
 		IF vDone THEN
 			LEAVE l;
 		END IF;
 
-		CALL `vn`.`mail_insert`(CONCAT(vWorkerName, '@verdnatura.es'),
+		CALL `vn`.`mail_insert`(
+			vBuyerEmail,
 			'noreply@verdnatura.es',
 			'Cambio de fecha en Redadas',
-								CONCAT('Se ha movido las siguientes redadas: \n\r ', vRaid)
+			CONCAT('Se ha movido los siguientes travels: \n\r ', vTravelLink));
-								);
-
 	END LOOP;
 	CLOSE vCur;
 	COMMIT;
-	DROP TEMPORARY TABLE tmp.travel;
+	DROP TEMPORARY TABLE tTravelToMove;
-
 END$$
 DELIMITER ;

db/routines/vn/triggers/entry_beforeUpdate.sql

@@ -3,7 +3,7 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`entry_beforeUpdate`
 	BEFORE UPDATE ON `entry`
 	FOR EACH ROW
 BEGIN
-	DECLARE vIsVirtual BOOL;
+	DECLARE vDaysInForward INT;
 	DECLARE vPrintedCount INT;
 	DECLARE vHasDistinctWarehouses BOOL;
 	DECLARE vTotalBuy INT;
@@ -38,8 +38,10 @@ BEGIN
 			CALL travel_throwAwb(NEW.travelFk);
 		END IF;
 
-		SELECT COUNT(*) > 0 INTO vIsVirtual
+		SELECT daysInForward INTO vDaysInForward
-			FROM entryVirtual WHERE entryFk = NEW.id;
+			FROM travel t
+				JOIN entry e ON e.travelFk = t.id
+			WHERE entryFk = NEW.id;
 
 		SELECT NOT (o.warehouseInFk <=> n.warehouseInFk)
 				OR NOT (o.warehouseOutFk <=> n.warehouseOutFk)
@@ -48,7 +50,7 @@ BEGIN
 			WHERE o.id = OLD.travelFk
 				AND n.id = NEW.travelFk;
 
-		IF vIsVirtual AND vHasDistinctWarehouses THEN
+		IF vDaysInForward AND vHasDistinctWarehouses THEN
 			SIGNAL SQLSTATE '45000'
 				SET MESSAGE_TEXT = 'A cloned entry cannot be moved to a travel with different warehouses';
 		END IF;

db/routines/vn/triggers/expedition_afterDelete.sql

@@ -8,5 +8,7 @@ BEGIN
 			`changedModel` = 'Expedition',
 			`changedModelId` = OLD.id,
 			`userFk` = account.myUser_getId();
+	
+	CALL expedition_selfConsumptionPackaging(OLD.id, 'remove');
 END$$
 DELIMITER ;

db/routines/vn/triggers/itemType_afterDelete.sql

@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`itemType_afterDelete`
+	AFTER DELETE ON `itemType`
+	FOR EACH ROW
+BEGIN
+	INSERT INTO itemTypeLog
+		SET `action` = 'delete',
+			`changedModel` = 'ItemType',
+			`changedModelId` = OLD.id,
+			`userFk` = account.myUser_getId();
+END$$
+DELIMITER ;

db/routines/vn/triggers/itemType_beforeInsert.sql

@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`itemType_beforeInsert`
+	BEFORE INSERT ON `itemType`
+	FOR EACH ROW
+BEGIN
+	SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;

db/routines/vn/triggers/itemType_beforeUpdate.sql

@@ -3,6 +3,7 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`itemType_beforeUpdate`
 	BEFORE UPDATE ON `itemType`
 	FOR EACH ROW
 BEGIN
+	SET NEW.editorFk = account.myUser_getId();
 	IF NEW.itemPackingTypeFk = '' THEN
 
 		SET NEW.itemPackingTypeFk = NULL;

db/routines/vn/triggers/productionConfig_afterDelete.sql

@@ -3,7 +3,7 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`productionConfig_afterD
 	AFTER DELETE ON `productionConfig`
 	FOR EACH ROW
 BEGIN
-	INSERT INTO productionConfig
+	INSERT INTO productionConfigLog
 		SET `action` = 'delete',
 			`changedModel` = 'ProductionConfig',
 			`changedModelId` = OLD.id,

db/routines/vn/views/itemEntryIn.sql

@@ -6,7 +6,7 @@ AS SELECT `t`.`warehouseInFk` AS `warehouseInFk`,
 	`b`.`itemFk` AS `itemFk`,
 	`b`.`quantity` AS `quantity`,
 	`t`.`isReceived` AS `isReceived`,
-	`e`.`isRaid` AS `isVirtualStock`,
+	`t`.`daysInForward` AS `isVirtualStock`,
 	`e`.`id` AS `entryFk`
 FROM (
 		(

db/routines/vn/views/itemEntryOut.sql

@@ -15,5 +15,5 @@ FROM (
 		JOIN `vn`.`travel` `t` ON(`e`.`travelFk` = `t`.`id`)
 	)
 WHERE `e`.`isExcludedFromAvailable` = 0
-	AND `e`.`isRaid` = 0
+	AND NOT `t`.`daysInForward`
 	AND `b`.`quantity` <> 0

db/routines/vn/views/lastPurchases.sql

@@ -31,5 +31,5 @@ FROM (
 		LEFT JOIN `edi`.`ekt` `ek` ON(`ek`.`id` = `b`.`ektFk`)
 	)
 WHERE `tr`.`landed` BETWEEN `util`.`yesterday`() AND `util`.`tomorrow`()
-	AND `e`.`isRaid` = 0
+	AND NOT  `tr`.`daysInForward`
 	AND `b`.`stickers` > 0

db/routines/vn2008/views/Entradas.sql

@@ -8,7 +8,6 @@ AS SELECT `e`.`id` AS `Id_Entrada`,
 	`e`.`isExcludedFromAvailable` AS `Inventario`,
 	`e`.`isConfirmed` AS `Confirmada`,
 	`e`.`isOrdered` AS `Pedida`,
-	`e`.`isRaid` AS `Redada`,
 	`e`.`commission` AS `comision`,
 	`e`.`created` AS `odbc_date`,
 	`e`.`evaNotes` AS `Notas_Eva`,

db/routines/vn2008/views/Entradas_Auto.sql

@@ -1,5 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`Entradas_Auto`
-AS SELECT `ev`.`entryFk` AS `Id_Entrada`
-FROM `vn`.`entryVirtual` `ev`

db/routines/vn2008/views/entrySource.sql

@@ -8,7 +8,7 @@ AS SELECT `e`.`gestDocFk` AS `gestdoc_id`,
 	`e`.`isExcludedFromAvailable` AS `Inventario`,
 	`e`.`isConfirmed` AS `Confirmada`,
 	`e`.`isOrdered` AS `Pedida`,
-	`e`.`isRaid` AS `Redada`,
+	`tr`.`daysInForward` AS `daysInForward`,
 	`e`.`evaNotes` AS `notas`,
 	`e`.`supplierFk` AS `Id_Proveedor`,
 	`tr`.`shipped` AS `shipment`,

db/routines/vn2008/views/travel.sql

@@ -17,5 +17,6 @@ AS SELECT `t`.`id` AS `id`,
 	`t`.`cargoSupplierFk` AS `cargoSupplierFk`,
 	`t`.`totalEntries` AS `totalEntries`,
 	`t`.`appointment` AS `appointment`,
-	`t`.`awbFk` AS `awbFk`
+	`t`.`awbFk` AS `awbFk`,
+	`t`.`daysInForward` AS `daysInForward`
 FROM `vn`.`travel` `t`

db/routines/vn2008/views/v_compres.sql

@@ -28,7 +28,6 @@ AS SELECT `TP`.`Id_Tipo` AS `Familia`,
 	`E`.`Id_Proveedor` AS `Id_Proveedor`,
 	`E`.`Fecha` AS `Fecha`,
 	`E`.`Confirmada` AS `Confirmada`,
-	`E`.`Redada` AS `Redada`,
 	`E`.`empresa_id` AS `empresa_id`,
 	`E`.`travel_id` AS `travel_id`,
 	`E`.`Pedida` AS `Pedida`,
@@ -85,6 +84,6 @@ FROM (
 		)
 		JOIN `vn2008`.`Cubos` `cb` ON(`cb`.`Id_Cubo` = `C`.`Id_Cubo`)
 	)
-WHERE `W_IN`.`isFeedStock` = 0
+WHERE NOT `W_IN`.`isFeedStock`
-	AND `E`.`Inventario` = 0
+	AND NOT `E`.`Inventario`
-	AND `E`.`Redada` = 0
+	AND NOT `TR`.`daysInForward`

db/versions/11274-redGerbera/00-firstScript4.sql

@@ -1 +0,0 @@
-ALTER TABLE vn.autonomy MODIFY COLUMN isUeeMember tinyint(1) DEFAULT FALSE NOT NULL;

db/versions/11297-graySalal/00-firstScript.sql

@@ -0,0 +1,27 @@
+ALTER TABLE vn.itemType
+    ADD editorFk int(10) unsigned DEFAULT NULL NULL,
+    ADD CONSTRAINT itemType_user_FK FOREIGN KEY (editorFk) REFERENCES account.`user`(id);
+
+CREATE TABLE `vn`.`itemTypeLog` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `originFk` int(11) DEFAULT NULL,
+  `userFk` int(10) unsigned DEFAULT NULL,
+  `action` set('insert','update','delete') NOT NULL,
+  `creationDate` timestamp NULL DEFAULT current_timestamp(),
+  `description` text CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL,
+  `changedModel` enum('ItemType') NOT NULL DEFAULT 'ItemType',
+  `oldInstance` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`oldInstance`)),
+  `newInstance` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`newInstance`)),
+  `changedModelId` int(11) NOT NULL,
+  `changedModelValue` varchar(45) DEFAULT NULL,
+  `summaryId` varchar(30) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `itemTypeLogUserFk_idx` (`userFk`),
+  KEY `itemTypeLog_changedModel` (`changedModel`,`changedModelId`,`creationDate`),
+  KEY `itemTypeLog_originFk` (`originFk`,`creationDate`),
+  KEY `itemTypeLog_creationDate_IDX` (`creationDate` DESC) USING BTREE,
+  CONSTRAINT `itemTypeLogUserFk` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci `PAGE_COMPRESSED`=1;
+
+INSERT IGNORE INTO salix.ACL (model,property,principalId)
+	VALUES ('ItemTypeLog','find','employee');

db/versions/11297-graySalal/01-firstScript.sql

@@ -0,0 +1,3 @@
+ALTER TABLE vn.itemType
+	ADD CONSTRAINT itemType_itemPackingType_FK FOREIGN KEY (itemPackingTypeFk)
+		REFERENCES vn.itemPackingType(code) ON DELETE RESTRICT ON UPDATE CASCADE;

db/versions/11316-chocolateErica/00-firstScript.sql

@@ -0,0 +1,7 @@
+ALTER TABLE vn.travel ADD IF NOT EXISTS daysInForward INT UNSIGNED DEFAULT 0 NOT NULL
+    COMMENT 'Indica que sus entradas son redadas: 0 significa que no es un travel de redadas, y un valor distinto a 0 indica el número de días para el landed respecto a hoy';
+
+ALTER TABLE vn.entry CHANGE isRaid isRaid_ tinyint(1) DEFAULT 0 NOT NULL COMMENT '@deprecated 2024-11-05';
+
+RENAME TABLE vn.entryVirtual TO vn.entryVirtual__;
+ALTER TABLE vn.entryVirtual__  COMMENT='@deprecated 2024-11-05';

db/versions/11319-redEucalyptus/00-firstScript.sql

@@ -0,0 +1,3 @@
+USE vn;
+
+ALTER TABLE vn.expeditionState ADD scanOrder int(11) DEFAULT NULL NULL COMMENT 'Indica la posición al cargar la furgoneta';

db/versions/11325-navyEucalyptus/00-firstScript.sql

@@ -0,0 +1,7 @@
+UPDATE salix.ACL
+	SET property='buyLabelSupplier'
+	WHERE property = 'buyLabel'
+        AND model = 'Entry';
+
+INSERT IGNORE INTO salix.ACL (model,property,principalId)
+	VALUES ('Entry','buyLabel','employee');

db/versions/11326-limeOrchid/00-firstScript.sql

@@ -0,0 +1,7 @@
+DELETE FROM vn.report
+	WHERE `name` = 'LabelItemQr';
+
+UPDATE vn.report
+	SET `method` = 'Entries/{id}/{labelType}/buy-label',
+		`name` = 'LabelBuy'
+	WHERE `name` = 'LabelItemBarcode';

loopback/locale/en.json

@@ -241,5 +241,9 @@
 	"The height must be greater than 50cm": "The height must be greater than 50cm",
 	"The maximum height of the wagon is 200cm": "The maximum height of the wagon is 200cm",
 	"The quantity claimed cannot be greater than the quantity of the line": "The quantity claimed cannot be greater than the quantity of the line",
-    "There are tickets for this area, delete them first": "There are tickets for this area, delete them first"
+	"There are tickets for this area, delete them first": "There are tickets for this area, delete them first",
+	"ticketLostExpedition": "The ticket [{{ticketId}}]({{{ticketUrl}}}) has the following lost expedition:{{ expeditionId }}",
+	"null": "null",
+	"Invalid or expired verification code": "Invalid or expired verification code",
+	"Payment method is required": "Payment method is required"
 }

loopback/locale/es.json

@@ -385,5 +385,7 @@
 	"The quantity claimed cannot be greater than the quantity of the line": "La cantidad reclamada no puede ser mayor que la cantidad de la línea",
 	"type cannot be blank": "Se debe rellenar el tipo",
 	"There are tickets for this area, delete them first": "Hay tickets para esta sección, borralos primero",
-	"There is no company associated with that warehouse": "No hay ninguna empresa asociada a ese almacén"
+	"There is no company associated with that warehouse": "No hay ninguna empresa asociada a ese almacén",
+	"ticketLostExpedition": "El ticket [{{ticketId}}]({{{ticketUrl}}}) tiene la siguiente expedición perdida:{{ expeditionId }}",
+	"The web user's email already exists": "El correo del usuario web ya existe"
 }

loopback/locale/fr.json

@@ -123,7 +123,7 @@
 	"Added sale to ticket": "J'ai ajouté la ligne suivante au ticket [{{ticketId}}]({{{ticketUrl}}}): {{{addition}}}",
 	"Changed sale discount": "J'ai changé le rabais des lignes suivantes du ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
 	"Created claim": "J'ai créé la réclamation [{{claimId}}]({{{claimUrl}}}) des lignes suivantes du ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
-	"Changed sale price": " le prix de [{{itemId}} {{concept}}]({{{itemUrl}}}) ({{quantity}}) de {{oldPrice}}€ ➔ *{{newPrice}}€* du ticket [{{ticketId}}]({{{ticketUrl}}})",,
+	"Changed sale price": " le prix de [{{itemId}} {{concept}}]({{{itemUrl}}}) ({{quantity}}) de {{oldPrice}}€ ➔ *{{newPrice}}€* du ticket [{{ticketId}}]({{{ticketUrl}}})",
 	"Changed sale quantity": "J'ai changé {{changes}} du ticket [{{ticketId}}]({{{ticketUrl}}})",
 	"Changes in sales": "la quantité de {{itemId}} {{concept}} de {{oldQuantity}} ➔ {{newQuantity}}",
 	"State": "État",
@@ -363,5 +363,7 @@
 	"It has been invoiced but the PDF of refund not be generated": "Il a été facturé mais le PDF de remboursement n'a pas été généré",
 	"Cannot send mail": "Impossible d'envoyer le mail",
 	"Original invoice not found": "Facture originale introuvable",
-    "The quantity claimed cannot be greater than the quantity of the line": "Le montant réclamé ne peut pas être supérieur au montant de la ligne"
+	"The quantity claimed cannot be greater than the quantity of the line": "Le montant réclamé ne peut pas être supérieur au montant de la ligne",
+	"ticketLostExpedition": "Le ticket [{{ticketId}}]({{{ticketUrl}}}) a l'expédition perdue suivante : {{expeditionId}}",
+	"The web user's email already exists": "L'email de l'internaute existe déjà"
 }

loopback/locale/pt.json

@@ -363,5 +363,7 @@
 	"It has been invoiced but the PDF of refund not be generated": "Foi faturado mas não foi gerado o PDF do reembolso",
 	"Original invoice not found": "Fatura original não encontrada",
 	"Cannot send mail": "Não é possível enviar o email",
-    "The quantity claimed cannot be greater than the quantity of the line": "O valor reclamado não pode ser superior ao valor da linha"
+	"The quantity claimed cannot be greater than the quantity of the line": "O valor reclamado não pode ser superior ao valor da linha",
+	"ticketLostExpedition": "O ticket [{{ticketId}}]({{{ticketUrl}}}) tem a seguinte expedição perdida: {{expeditionId}}",
+	"The web user's email already exists": "O e-mail do utilizador da web já existe."
 }

modules/client/back/methods/client/createWithUser.js

@@ -1,3 +1,4 @@
+/* eslint max-len: ["error", { "code": 150 }]*/
 const UserError = require('vn-loopback/util/user-error');
 
 module.exports = function(Self) {
@@ -98,6 +99,8 @@ module.exports = function(Self) {
             return client;
         } catch (e) {
             if (tx) await tx.rollback();
+            if (e.message && e.message.includes(`Email already exists`)) throw new UserError(`The web user's email already exists`);
+
             throw e;
         }
     };

modules/entry/back/locale/entry/en.yml

@@ -9,7 +9,6 @@ columns:
     notes: notes
     isConfirmed: confirmed
     isVirtual: virtual
-    isRaid: raid
     commission: commission
     isOrdered: price3
     created: created

modules/entry/back/locale/entry/es.yml

@@ -9,7 +9,6 @@ columns:
     notes: notas
     isConfirmed: confirmado
     isVirtual: virtual
-    isRaid: redada
     commission: comisión
     isOrdered: pedida
     created: creado

modules/entry/back/methods/entry/buyLabel.js

@@ -1,14 +1,28 @@
 module.exports = Self => {
     Self.remoteMethodCtx('buyLabel', {
-        description: 'Returns the entry buy labels',
+        description: 'Returns the buy label',
         accessType: 'READ',
         accepts: [
             {
                 arg: 'id',
                 type: 'number',
                 required: true,
-                description: 'The entry id',
+                description: 'The buy id',
                 http: {source: 'path'}
+            }, {
+                arg: 'labelType',
+                type: 'string',
+                required: true,
+                description: 'The label type',
+                http: {source: 'path'}
+            }, {
+                arg: 'packing',
+                type: 'number',
+                required: false
+            }, {
+                arg: 'copies',
+                type: 'number',
+                required: false
             }
         ],
         returns: [
@@ -27,11 +41,16 @@ module.exports = Self => {
             }
         ],
         http: {
-            path: '/:id/buy-label',
+            path: '/:id/:labelType/buy-label',
             verb: 'GET'
         },
         accessScopes: ['DEFAULT', 'read:multimedia']
     });
 
-    Self.buyLabel = (ctx, id) => Self.printReport(ctx, id, 'buy-label');
+    Self.buyLabel = (ctx, id, labelType) => {
+        if (labelType == 'qr')
+            return Self.printReport(ctx, id, 'buy-label-qr');
+        else
+            return Self.printReport(ctx, id, 'buy-label-barcode');
+    };
 };

modules/entry/back/methods/entry/buyLabelSupplier.js

@@ -0,0 +1,37 @@
+module.exports = Self => {
+    Self.remoteMethodCtx('buyLabelSupplier', {
+        description: 'Returns the entry buy labels',
+        accessType: 'READ',
+        accepts: [
+            {
+                arg: 'id',
+                type: 'number',
+                required: true,
+                description: 'The entry id',
+                http: {source: 'path'}
+            }
+        ],
+        returns: [
+            {
+                arg: 'body',
+                type: 'file',
+                root: true
+            }, {
+                arg: 'Content-Type',
+                type: 'String',
+                http: {target: 'header'}
+            }, {
+                arg: 'Content-Disposition',
+                type: 'String',
+                http: {target: 'header'}
+            }
+        ],
+        http: {
+            path: '/:id/buy-label-supplier',
+            verb: 'GET'
+        },
+        accessScopes: ['DEFAULT', 'read:multimedia']
+    });
+
+    Self.buyLabelSupplier = (ctx, id) => Self.printReport(ctx, id, 'buy-label-supplier');
+};

modules/entry/back/methods/entry/filter.js

@@ -194,7 +194,7 @@ module.exports = Self => {
                     e.evaNotes observation,
                     e.isConfirmed,
                     e.isOrdered,
-                    e.isRaid,
+                    t.daysInForward,
                     e.commission,
                     e.created,
                     e.travelFk,

modules/entry/back/methods/entry/getEntry.js

@@ -48,7 +48,9 @@ module.exports = Self => {
                             'warehouseInFk',
                             'isReceived',
                             'isDelivered',
-                            'ref'],
+                            'ref',
+                            'daysInForward',
+                        ],
                         include: [
                             {
                                 relation: 'agency',
@@ -85,7 +87,6 @@ module.exports = Self => {
                 }
             ],
         };
-
         return models.Entry.findOne(filter, myOptions);
     };
 };

modules/entry/back/models/buy.js

@@ -2,4 +2,5 @@ module.exports = Self => {
     require('../methods/entry/editLatestBuys')(Self);
     require('../methods/entry/latestBuysFilter')(Self);
     require('../methods/entry/deleteBuys')(Self);
+    require('../methods/entry/buyLabel')(Self);
 };

modules/entry/back/models/entry.json

@@ -33,15 +33,6 @@
         "isConfirmed": {
             "type": "boolean"
         },
-        "isVirtual": {
-            "type": "boolean",
-            "mysql": {
-                "columnName": "isRaid"
-            }
-        },
-        "isRaid": {
-            "type": "boolean"
-        },
         "commission": {
             "type": "number"
         },
@@ -88,7 +79,8 @@
         "travel": {
             "type": "belongsTo",
             "model": "Travel",
-            "foreignKey": "travelFk"
+            "foreignKey": "travelFk",
+            "daysInForward": "daysInForward"
         },
         "company": {
             "type": "belongsTo",

modules/entry/front/descriptor/index.html

@@ -23,14 +23,14 @@
         </div>
         <div class="icons">
             <vn-icon
-                vn-tooltip="Is inventory entry"		
+                vn-tooltip="It is a raid {{$ctrl.entryData.travel.daysInForward}} days forward"
                 icon="icon-inventory"
                ng-if="$ctrl.entry.isExcludedFromAvailable">
             </vn-icon>
             <vn-icon
                 vn-tooltip="Is virtual entry"
                 icon="icon-net"
-               ng-if="$ctrl.entry.isRaid">		
+               ng-if="$ctrl.entryData.travel.daysInForward">
             </vn-icon>
         </div>
         <div class="quicklinks">

modules/entry/front/summary/index.html

@@ -86,7 +86,7 @@ auto-load="true">
             </vn-check>
             <vn-check
                 label="Raid"
-                ng-model="$ctrl.entryData.isRaid"
+                ng-model="$ctrl.entryData.travel.daysInForward"
                 disabled="true">
             </vn-check>
             <vn-check

modules/item/back/methods/item/filter.js

@@ -38,13 +38,23 @@ module.exports = Self => {
                 type: 'integer',
                 description: 'Type id',
             },
+            {
+                arg: 'producerFk',
+                type: 'integer',
+                description: 'Producer id',
+            },
+            {
+                arg: 'instrastatFk',
+                type: 'string',
+                description: 'intrastat id',
+            },
             {
                 arg: 'isActive',
                 type: 'boolean',
                 description: 'Whether the item is or not active',
             },
             {
-                arg: 'buyerFk',
+                arg: 'workerFk',
                 type: 'integer',
                 description: 'The buyer of the item',
             },
@@ -126,14 +136,16 @@ module.exports = Self => {
                 return {'i.stemMultiplier': value};
             case 'categoryFk':
                 return {'ic.id': value};
-            case 'buyerFk':
+            case 'workerFk':
                 return {'it.workerFk': value};
+            case 'producerFk':
+                return {'pr.id': value};
             case 'supplierFk':
                 return {'s.id': value};
             case 'origin':
                 return {'ori.code': value};
-            case 'intrastat':
+            case 'intrastatFk':
-                return {'intr.description': value};
+                return {'i.intrastatFk': value};
             case 'landed':
                 return {'lb.landed': value};
             }
@@ -172,6 +184,7 @@ module.exports = Self => {
                     u.name AS userName,
                     ori.code AS origin,
                     ic.name AS category,
+                    i.intrastatFk,
                     intr.description AS intrastat,
                     b.grouping,
                     b.packing,

modules/item/back/methods/item/labelBarcodePdf.js

@@ -1,55 +0,0 @@
-module.exports = Self => {
-    Self.remoteMethodCtx('labelBarcodePdf', {
-        description: 'Returns the item label pdf with barcode',
-        accessType: 'READ',
-        accepts: [
-            {
-                arg: 'id',
-                type: 'number',
-                required: true,
-                description: 'The item id',
-                http: {source: 'path'}
-            }, {
-                arg: 'warehouseId',
-                type: 'number',
-                required: true
-            }, {
-                arg: 'packing',
-                type: 'number',
-                required: false
-            }, {
-                arg: 'copies',
-                type: 'number',
-                required: false
-            }, {
-                arg: 'userId',
-                type: 'number',
-                description: 'The user id from accessToken',
-                http: ctx => ctx.req.accessToken.userId,
-                required: true
-            }
-        ],
-        returns: [
-            {
-                arg: 'body',
-                type: 'file',
-                root: true
-            }, {
-                arg: 'Content-Type',
-                type: 'String',
-                http: {target: 'header'}
-            }, {
-                arg: 'Content-Disposition',
-                type: 'String',
-                http: {target: 'header'}
-            }
-        ],
-        http: {
-            path: '/:id/label-barcode-pdf',
-            verb: 'GET'
-        },
-        accessScopes: ['DEFAULT', 'read:multimedia']
-    });
-
-    Self.labelBarcodePdf = (ctx, id) => Self.printReport(ctx, id, 'item-label-barcode');
-};

modules/item/back/methods/item/labelQrPdf.js

@@ -1,55 +0,0 @@
-module.exports = Self => {
-    Self.remoteMethodCtx('labelQrPdf', {
-        description: 'Returns the item label pdf with qr',
-        accessType: 'READ',
-        accepts: [
-            {
-                arg: 'id',
-                type: 'number',
-                required: true,
-                description: 'The item id',
-                http: {source: 'path'}
-            }, {
-                arg: 'warehouseId',
-                type: 'number',
-                required: true
-            }, {
-                arg: 'packing',
-                type: 'number',
-                required: false
-            }, {
-                arg: 'copies',
-                type: 'number',
-                required: false
-            }, {
-                arg: 'userId',
-                type: 'number',
-                description: 'The user id from accessToken',
-                http: ctx => ctx.req.accessToken.userId,
-                required: true
-            }
-        ],
-        returns: [
-            {
-                arg: 'body',
-                type: 'file',
-                root: true
-            }, {
-                arg: 'Content-Type',
-                type: 'String',
-                http: {target: 'header'}
-            }, {
-                arg: 'Content-Disposition',
-                type: 'String',
-                http: {target: 'header'}
-            }
-        ],
-        http: {
-            path: '/:id/label-qr-pdf',
-            verb: 'GET'
-        },
-        accessScopes: ['DEFAULT', 'read:multimedia']
-    });
-
-    Self.labelQrPdf = (ctx, id) => Self.printReport(ctx, id, 'item-label-qr');
-};

modules/item/back/methods/item/specs/filter.spec.js

@@ -86,7 +86,7 @@ describe('item filter()', () => {
 
         try {
             const filter = {};
-            const ctx = {args: {filter: filter, buyerFk: 16}, req: {accessToken: {userId: 1}}};
+            const ctx = {args: {filter: filter, workerFk: 16}, req: {accessToken: {userId: 1}}};
             const result = await models.Item.filter(ctx, filter, options);
 
             expect(result.length).toEqual(2);

modules/item/back/model-config.json

@@ -47,6 +47,9 @@
     "ItemType": {
         "dataSource": "vn"
     },
+    "ItemTypeLog": {
+        "dataSource": "vn"
+    },
     "ItemTypeTag": {
         "dataSource": "vn"
     },

modules/item/back/models/item-type-log.json

@@ -0,0 +1,9 @@
+{
+	"name": "ItemTypeLog",
+	"base": "Log",
+	"options": {
+		"mysql": {
+			"table": "itemTypeLog"
+		}
+	}
+}

modules/item/back/models/item-type.json

@@ -29,6 +29,12 @@
         },
         "isLaid": {
             "type": "boolean"
+        },
+        "maxRefs": {
+            "type": "string"
+        },
+        "isFragile": {
+            "type": "boolean"
         }
     },
     "relations": {

modules/item/back/models/item.js

@@ -15,8 +15,6 @@ module.exports = Self => {
     require('../methods/item/getWasteByItem')(Self);
     require('../methods/item/createIntrastat')(Self);
     require('../methods/item/buyerWasteEmail')(Self);
-    require('../methods/item/labelBarcodePdf')(Self);
-    require('../methods/item/labelQrPdf')(Self);
     require('../methods/item/setVisibleDiscard')(Self);
     require('../methods/item/get')(Self);
 

modules/shelving/back/models/parking.json

@@ -38,5 +38,13 @@
             "model": "Sector",
             "foreignKey": "sectorFk"
         }
+    },
+    "scope": {
+        "include": {
+            "relation": "sector",
+            "scope": {
+                "fields": ["id", "description"]
+            }
+        }
     }
 }

modules/ticket/back/methods/expedition-state/addExpeditionState.js

@@ -44,6 +44,7 @@ module.exports = Self => {
 
                 const typeFk = expeditionStateType.id;
                 expeditionId = expedition.expeditionFk;
+                expeditionPosition = expedition?.scanOrder ?? null;
                 const isScannedExpedition = expedition.isScanned ?? false;
 
                 await models.ExpeditionState.create({
@@ -51,6 +52,7 @@ module.exports = Self => {
                     typeFk,
                     userFk: userId,
                     isScanned: isScannedExpedition,
+                    scanOrder: expeditionPosition
                 }, myOptions);
             }
 

modules/ticket/back/methods/expedition-state/specs/addExpeditionState.spec.js

@@ -2,6 +2,7 @@ const models = require('vn-loopback/server/server').models;
 
 describe('expeditionState addExpeditionState()', () => {
     const ctx = beforeAll.getCtx();
+    beforeAll.mockLoopBackContext();
     it('should update the expedition states', async() => {
         const tx = await models.ExpeditionState.beginTransaction({});
         try {

modules/ticket/back/methods/sale/recalculatePrice.js

@@ -48,7 +48,7 @@ module.exports = Self => {
                 CALL vn.sale_recalcComponent(null);
                 DROP TEMPORARY TABLE tmp.recalculateSales;`;
 
-            const recalculation = await Self.rawSql(query, salesIds, myOptions);
+            const recalculation = await Self.rawSql(query, [salesIds], myOptions);
 
             if (tx) await tx.commit();
 

modules/ticket/back/methods/sale/specs/updatePrice.spec.js

@@ -85,6 +85,25 @@ describe('sale updatePrice()', () => {
         }
     });
 
+    it('should check if priceFixed has changed', async() => {
+        const tx = await models.Sale.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+
+            const price = 3;
+            const beforeUpdate = await models.Sale.findById(saleId, null, options);
+            await models.Sale.updatePrice(ctx, saleId, price, options);
+            const afterUpdate = await models.Sale.findById(saleId, null, options);
+
+            expect(beforeUpdate.priceFixed).not.toEqual(afterUpdate.priceFixed);
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+
     it('should set price as a decimal number and check the sale has the mana component changing the salesPersonMana', async() => {
         const tx = await models.Sale.beginTransaction({});
 

modules/ticket/back/methods/sale/updatePrice.js

@@ -91,7 +91,21 @@ module.exports = Self => {
                     value: componentValue
                 }, myOptions);
             }
-            await sale.updateAttributes({price: newPrice}, myOptions);
+
+            const [priceFixed] = await Self.rawSql(`
+                SELECT SUM(value) value
+                    FROM sale s
+                        JOIN saleComponent sc ON sc.saleFk = s.id
+                        JOIN component c ON c.id = sc.componentFk
+                        JOIN componentType ct ON ct.id = c.typeFk
+                    WHERE ct.isBase
+                        AND s.id = ?
+            `, [id], myOptions);
+
+            await sale.updateAttributes({
+                price: newPrice,
+                priceFixed: priceFixed.value
+            }, myOptions);
 
             await Self.rawSql('CALL vn.manaSpellersRequery(?)', [userId], myOptions);
             await Self.rawSql('CALL vn.ticket_recalc(?, NULL)', [sale.ticketFk], myOptions);

modules/ticket/back/models/expedition-state.js

@@ -1,4 +1,66 @@
+const LoopBackContext = require('loopback-context');
+
 module.exports = function(Self) {
     require('../methods/expedition-state/filter')(Self);
     require('../methods/expedition-state/addExpeditionState')(Self);
+
+    Self.observe('before save', async ctx => {
+        const models = Self.app.models;
+        const changes = ctx.data || ctx.instance;
+        const instance = ctx.currentInstance;
+        const loopBackContext = LoopBackContext.getCurrentContext();
+        const httpCtx = {req: loopBackContext.active};
+        const httpRequest = httpCtx.req.http.req;
+        const $t = httpRequest.__;
+        const myOptions = {};
+
+        if (ctx.options && ctx.options.transaction)
+            myOptions.transaction = ctx.options.transaction;
+
+        const newStateType = changes?.typeFk;
+        if (newStateType == null) return;
+
+        const expeditionId = changes?.expeditionFk || instance?.expeditionFk;
+
+        const {code} = await models.ExpeditionStateType.findById(
+            newStateType,
+            {
+                fields: ['code']
+            },
+            myOptions);
+
+        if (code !== 'LOST') return;
+
+        const dataExpedition = await models.Expedition.findById(
+            expeditionId, {
+                fields: ['ticketFk'],
+                include: [{
+                    relation: 'ticket',
+                    scope: {
+                        fields: ['clientFk'],
+                        include: [{
+                            relation: 'client',
+                            scope: {
+                                fields: ['name', 'salesPersonFk']
+                            }
+                        }]
+                    }
+                }],
+
+            }, myOptions);
+
+        const salesPersonFk = dataExpedition.ticket()?.client()?.salesPersonFk;
+
+        if (salesPersonFk) {
+            const url = await Self.app.models.Url.getUrl();
+            const fullUrl = `${url}ticket/${dataExpedition.ticketFk}/expedition`;
+            const message = $t('ticketLostExpedition', {
+                ticketId: dataExpedition.ticketFk,
+                expeditionId: expeditionId,
+                url: fullUrl
+            });
+            await models.Chat.sendCheckingPresence(httpCtx, salesPersonFk, message);
+        }
+    });
 };
+

modules/ticket/back/models/expedition-state.json

@@ -19,13 +19,17 @@
             "type": "number"
         },
         "typeFk": {
-            "type": "number"
+            "type": "number",
+            "required": true
         },
         "userFk": {
             "type": "number"
         },
         "isScanned": {
             "type": "boolean"
+        },
+        "scanOrder": {
+            "type": "number"
         }
     },
     "relations": {

modules/ticket/back/models/sale.json

@@ -28,6 +28,9 @@
         "discount": {
             "type": "number"
         },
+        "priceFixed": {
+            "type": "number"
+        },
         "reserved": {
             "type": "boolean"
         },

modules/travel/back/methods/travel/filter.js

@@ -155,6 +155,7 @@ module.exports = Self => {
                     t.landingHour,
                     t.cargoSupplierFk,
                     t.totalEntries,
+                    t.daysInForward,
                     am.name agencyModeName,
                     win.name warehouseInName,
                     wout.name warehouseOutName,

modules/travel/back/methods/travel/getTravel.js

@@ -44,7 +44,6 @@ module.exports = Self => {
             ],
         };
 
-        let travel = await Self.app.models.Travel.findOne(filter);
+        return Self.app.models.Travel.findOne(filter);
-        return travel;
     };
 };

modules/travel/back/models/travel.json

@@ -50,6 +50,9 @@
         },
         "landingHour": {
             "type": "string"
+        },
+        "daysInForward": {
+            "type": "number"
         }
     },
     "relations": {

modules/worker/back/models/worker.json

@@ -204,6 +204,15 @@
             ]
         },
         "summary": {
+            "fields": [
+                "id",
+                "firstName",
+                "lastName",
+                "bossFk",
+                "sex",
+                "phone",
+                "mobileExtension"
+            ],
             "include": [
                 {
                     "relation": "user",
@@ -247,10 +256,21 @@
                     }
                 },
                 {
-                    "relation": "boss"
+                    "relation": "boss",
+                    "scope": {
+                        "fields": [
+                            "id",
+                            "name"
+                        ]
+                    }
                 },
                 {
-                    "relation": "client"
+                    "relation": "client",
+                    "scope": {
+                        "fields": [
+                            "id"
+                        ]
+                    }
                 },
                 {
                     "relation": "sip",
@@ -272,14 +292,16 @@
             "fields": [
                 "id",
                 "fiDueDate",
-                "sex",
                 "seniority",
                 "fi",
                 "isFreelance",
                 "isSsDiscounted",
                 "hasMachineryAuthorized",
                 "isDisable",
-                "birth"
+                "birth",
+                "educationLevelFk",
+                "originCountryFk",
+                "maritalStatus"
             ]
         }
     }

print/templates/reports/buy-label-barcode/assets/css/style.css

@@ -1,7 +1,7 @@
 html {
     font-family: "Roboto", "Helvetica", "Arial", sans-serif;
     margin-top: -9px;
-    margin-left: -6px;
+    margin-left: -3px;
 }
 table {
     width: 100%;
@@ -52,8 +52,8 @@ td {
     max-height: 50px;
 }
 .md-height {
-    height: 75px;
+    height: 70px;
-    max-height: 75px;
+    max-height: 70px;
 }
 .sm-width {
     width: 60px;

print/templates/reports/buy-label-barcode/buy-label-barcode.html

@@ -1,16 +1,16 @@
 <!DOCTYPE html>
 <html>
-<body table v-for="item in items" style="break-before: page">
+<body table v-for="buy in buys" style="break-before: page">
 	<table>
 			<tr>
 				<td class="md-txt bold center black-bg lg-width md-height">
 					<div class="overflow-multiline">
-						{{item.item}}
+						{{buy.item}}
 					</div>
 				</td>
 				<td colspan="2" class="xl-txt bold center black-bg md-height md-width">
 					<div class="overflow-line">
-						{{item.size}}
+						{{buy.size}}
 					</div>
 				</td>
 			</tr>
@@ -18,61 +18,64 @@
 				<td class="right lg-width">
 					<div class="overflow-line">
 						{{
-							(item.longName && item.size && item.subName)
+							(buy.longName && buy.size && buy.subName)
-							? `${item.longName} ${item.size} ${item.subName}`
+							? `${buy.longName} ${buy.size} ${buy.subName}`
-							: item.comment
+							: buy.comment
 						}}
 					</div>
 				</td>
 				<td class="center sm-width">
 					<div class="overflow-line">
-						{{item.producerName || item.producerFk}}
+						{{buy.producerName || buy.producerFk}}
 					</div>
 				</td>
 				<td class="center sm-width">
 					<div class="overflow-line">
-						{{item.inkFk}}
+						{{buy.inkFk}}
 					</div>
 				</td>
 			</tr>
 			<tr>
 				<td class="md-txt xl-width bold center">
 					<div class="overflow-line">
-						{{item.itemFk}}
+						{{buy.itemFk}}
 					</div>
 				</td>
 				<td colspan="2" class="md-txt md-width center">
 					<div class="overflow-line">
-						{{`${(packing || item.packing)} x ${item.stems || ''}`}}
+						{{`${(packing || buy.packing)} x ${buy.stems || ''}`}}
 					</div>
 				</td>
 			</tr>
 			<tr>
 				<td rowspan="2" class="center">
-					<div v-html="getBarcode(item.buyFk)"></div>
+					<div v-html="getBarcode(buy.buyFk)"></div>
 				</td>
 				<td colspan="2" class="center md-width xs-height xs-txt">
-					<div class="overflow-line">
+					<div v-if="buy.isLaid && typeId === 'buy'" class="overflow-line black-bg bold">
-						{{item.entryFk}}
+						{{'LAID'}}
+					</div>
+					<div v-else class="overflow-line">
+						{{buy.entryFk}}
 					</div>
 				</td>
 			</tr>
 			<tr>
 				<td class="center xs-txt sm-width">
 					<div class="overflow-line">
-						{{item.buyerName}}
+						{{buy.buyerName}}
 					</div>
 				</td>
 				<td class="center xs-txt sm-width">
 					<div class="overflow-line">
-						{{item.origin}}
+						{{buy.origin}}
 					</div>
 				</td>
 			</tr>
 			<tr>
 				<td class="center xl-width">
 					<div class="overflow-line">
-						{{item.buyFk}}
+						{{buy.buyFk}}
 					</div>
 				</td>
 				<td class="xs-txt sm-width center">
@@ -82,7 +85,7 @@
 				</td>
 				<td class="xs-txt sm-width cursive center bold">
 					<div class="overflow-line">
-						{{`${item.labelNum}/${item.quantity / (packing || item.packing)}`}}
+						{{`${buy.labelNum}/${buy.quantity / (packing || buy.packing)}`}}
 					</div>
 				</td>
 			</tr>

print/templates/reports/buy-label-barcode/buy-label-barcode.js

@@ -4,20 +4,11 @@ const moment = require('moment');
 const jsbarcode = require('jsbarcode');
 
 module.exports = {
-    name: 'item-label-barcode',
+    name: 'buy-label-barcode',
     async serverPrefetch() {
-        this.company = await this.findOneFromDef('company', [this.warehouseId]);
-        if (!this.company)
-            throw new UserError(`There is no company associated with that warehouse`);
-
         this.date = Date.vnNew();
-        this.lastBuy = await this.findOneFromDef('lastBuy', [
+        this.buys = await this.rawSqlFromDef('buy', [this.copies || 1, this.id]);
-            this.id,
+        if (!this.buys.length) throw new UserError(`Empty data source`);
-            this.warehouseId,
-            this.date
-        ]);
-        this.items = await this.rawSqlFromDef('item', [this.copies || 1, this.lastBuy.id]);
-        if (!this.items.length) throw new UserError(`Empty data source`);
         this.date = moment(this.date).format('WW/E');
     },
     methods: {
@@ -51,8 +42,8 @@ module.exports = {
         copies: {
             type: Number
         },
-        userId: {
+        typeId: {
-            type: Number
+            type: String
         }
     }
 };

print/templates/reports/buy-label-barcode/options.json

@@ -3,7 +3,7 @@
     "height": "4.9cm",
     "margin": {
         "top": "0.17cm",
-        "right": "0.745cm",
+        "right": "0.37cm",
         "bottom": "0cm",
         "left": "0cm"
     },

print/templates/reports/buy-label-barcode/sql/buy.sql

@@ -22,7 +22,9 @@ SELECT ROW_NUMBER() OVER() labelNum,
 		ig.longName,
 		ig.subName,
 		i.comment,
-		w.code buyerName
+		w.code buyerName,
+		i.isLaid,
+		c.code company
 	FROM vn.buy b
 		JOIN vn.item i ON i.id = b.itemFk
 		LEFT JOIN vn.item ig ON ig.id = b.itemOriginalFk
@@ -30,5 +32,7 @@ SELECT ROW_NUMBER() OVER() labelNum,
 		LEFT JOIN vn.producer p ON p.id = i.producerFk
 		JOIN vn.itemType it ON it.id = i.typeFk
 		JOIN vn.worker w ON w.id = it.workerFk
+		JOIN vn.entry e ON e.id = b.entryFk
+		JOIN vn.company c ON c.id = e.companyFk
 		JOIN numbers num
 	WHERE b.id = ?

print/templates/reports/buy-label-qr/assets/css/style.css

@@ -1,7 +1,7 @@
 html {
     font-family: "Roboto", "Helvetica", "Arial", sans-serif;
     margin-top: -7px;
-    margin-left: -6px;
+    margin-left: -3px;
 }
 .leftTable {
     width: 47%;

print/templates/reports/buy-label-qr/buy-label-qr.html

@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-<body v-for="item in items" style="break-before: page">
+<body v-for="buy in buys" style="break-before: page">
 	<table class="leftTable">
 			<tr>
 				<td>
@@ -12,7 +12,7 @@
 			</tr>
 			<tr>
 				<td colspan="2">
-					{{item.buyFk}}
+					{{buy.buyFk}}
 				</td>
 			</tr>
 			<tr>
@@ -28,58 +28,65 @@
 		<tr>
 			<td colspan="3" class="lg-width black-bg center bold xl-txt padding">
 				<div class="overflow-line">
-					{{item.itemFk}}
+					{{buy.itemFk}}
 				</div>
 			</td>
 		</tr>
 		<tr>
 			<td colspan="2" class="black-bg center bold md-txt md-width md-height">
 				<div class="overflow-multiline">
-					{{item.item}}
+					{{buy.item}}
 				</div>
 			</td>
 			<td class="xs-width black-bg center bold xl-txt">
 				<div class="overflow-line">
-					{{item.size}}
+					{{buy.size}}
 				</div>
 			</td>
 		</tr>
 		<tr>
 			<td class="sm-width">
 				<div class="overflow-line">
-					<i>Color:</i> <b>{{item.inkFk}}</b>
+					<i>Color:</i> <b>{{buy.inkFk}}</b>
 				</div>
 			</td>
 			<td rowspan="2" class="xs-width center md-txt">
 				<div class="overflow-line cell">
-					{{packing || item.packing}}
+					{{packing || buy.packing}}
 				</div>
 			</td>
 			<td rowspan="2" class="xs-width center md-txt">
 				<div class="overflow-line cell">
-					{{item.stems}}
+					{{buy.stems}}
 				</div>
 			</td>
 		</tr>
 		<tr>
 			<td class="sm-width">
 				<div class="overflow-line">
-					<i>Origen:</i> {{item.origin}}
+					<i>Origen:</i> {{buy.origin}}
 				</div>
 			</td>
 		</tr>
 		<tr>
 			<td colspan="2" class="md-width">
 				<div class="overflow-line">
-					<i>Productor:</i> {{item.producerName || item.producerFk}}
+					<i>Productor:</i> {{buy.producerName || buy.producerFk}}
+				</div>
+			</td>
+			<td class="center xs-width xs-txt">
+				<div v-if="buy.isLaid && typeId === 'buy'" class="overflow-line black-bg bold">
+					{{'LAID'}}
+				</div>
+				<div v-else class="overflow-line">
+					{{buy.entryFk}}
 				</div>
 			</td>
-			<td></td>
 		</tr>
 		<tr>
 			<td class="sm-width">
 				<div class="overflow-line">
-					<i>Comprador:</i> {{item.buyerName}}
+					<i>Comprador:</i> {{buy.buyerName}}
 				</div>
 			</td>
 			<td rowspan="2" class="xs-width">
@@ -89,14 +96,14 @@
 			</td>
 			<td rowspan="2" class="xs-width center cursive bold md-txt">
 				<div class="overflow-line">
-					{{`${item.labelNum}/${item.quantity / (packing || item.packing)}`}}
+					{{`${buy.labelNum}/${buy.quantity / (packing || buy.packing)}`}}
 				</div>
 			</td>
 		</tr>
 		<tr>
 			<td class="sm-width">
 				<div class="overflow-line">
-					<i>Entrada:</i> {{item.entryFk}}
+					<i>Entrada:</i> {{buy.entryFk}}
 				</div>
 			</td>
 		</tr>
@@ -104,9 +111,9 @@
 			<td colspan="3" class="lg-width center cursive bold">
 				<div class="overflow-line">
 					{{
-						(item.longName && item.size && item.subName)
+						(buy.longName && buy.size && buy.subName)
-						? `${item.longName} ${item.size} ${item.subName}`
+						? `${buy.longName} ${buy.size} ${buy.subName}`
-						: item.comment
+						: buy.comment
 					}}
 				</div>
 			</td>

print/templates/reports/buy-label-qr/buy-label-qr.js

@@ -3,27 +3,18 @@ const moment = require('moment');
 const qrcode = require('qrcode');
 
 module.exports = {
-    name: 'item-label-qr',
+    name: 'buy-label-qr',
     async serverPrefetch() {
-        this.company = await this.findOneFromDef('company', [this.warehouseId]);
-        if (!this.company)
-            throw new UserError(`There is no company associated with that warehouse`);
-
         this.date = Date.vnNew();
-        this.lastBuy = await this.findOneFromDef('lastBuy', [
+        this.buys = await this.rawSqlFromDef('buy', [this.copies || 1, this.id]);
-            this.id,
+        if (!this.buys.length) throw new UserError(`Empty data source`);
-            this.warehouseId,
+        this.qr = await this.getQr(this.buys[0].buyFk);
-            this.date
-        ]);
-        this.items = await this.rawSqlFromDef('item', [this.copies || 1, this.lastBuy.id]);
-        if (!this.items.length) throw new UserError(`Empty data source`);
-        this.qr = await this.getQr(this.items[0].buyFk);
         this.date = moment(this.date).format('WW/E');
     },
     methods: {
         getQr(data) {
             data = {
-                company: this.company,
+                company: this.buys.company,
                 user: this.userId,
                 created: this.date,
                 table: 'buy',
@@ -52,6 +43,9 @@ module.exports = {
         },
         userId: {
             type: Number
+        },
+        typeId: {
+            type: String
         }
     }
 };

print/templates/reports/buy-label-qr/options.json

@@ -3,7 +3,7 @@
     "height": "4.9cm",
     "margin": {
         "top": "0.17cm",
-        "right": "0.6cm",
+        "right": "0.3cm",
         "bottom": "0cm",
         "left": "0cm"
     },

print/templates/reports/buy-label-qr/sql/buy.sql

@@ -22,7 +22,9 @@ SELECT ROW_NUMBER() OVER() labelNum,
 		ig.longName,
 		ig.subName,
 		i.comment,
-		w.code buyerName
+		w.code buyerName,
+		i.isLaid,
+		c.code company
 	FROM vn.buy b
 		JOIN vn.item i ON i.id = b.itemFk
 		LEFT JOIN vn.item ig ON ig.id = b.itemOriginalFk
@@ -30,5 +32,7 @@ SELECT ROW_NUMBER() OVER() labelNum,
 		LEFT JOIN vn.producer p ON p.id = i.producerFk
 		JOIN vn.itemType it ON it.id = i.typeFk
 		JOIN vn.worker w ON w.id = it.workerFk
+		JOIN vn.entry e ON e.id = b.entryFk
+		JOIN vn.company c ON c.id = e.companyFk
 		JOIN numbers num
 	WHERE b.id = ?

print/templates/reports/buy-label-supplier/buy-label-supplier.js

@@ -5,7 +5,7 @@ const jsBarcode = require('jsbarcode');
 const moment = require('moment');
 
 module.exports = {
-    name: 'buy-label',
+    name: 'buy-label-supplier',
     mixins: [vnReport],
     async serverPrefetch() {
         const buy = await models.Buy.findById(this.id, null);