db/dump/fixtures.before.sql

@@ -3868,3 +3868,17 @@ INSERT INTO vn.sectorCollectionSaleGroup
 	SET id = 9,
 		sectorCollectionFk = 3,
 		saleGroupFk = 6;
+
+
+INSERT INTO `vn`.`calendarHolidays` (calendarHolidaysTypeFk, dated, calendarHolidaysNameFk, workCenterFk)
+	VALUES
+		(1, '2001-05-08', 1, 1),
+		(1, '2001-05-09', 1, 1),
+		(1, '2001-05-10', 1, 1),
+		(1, '2001-05-11', 1, 1),
+		(1, '2001-05-14', 1, 5),
+		(1, '2001-05-15', 1, 5),
+		(1, '2001-05-16', 1, 5),
+		(1, '2001-05-17', 1, 5),
+		(1, '2001-05-18', 1, 5);
+

db/routines/util/procedures/debugAdd.sql

@@ -1,5 +1,8 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`debugAdd`(vVariable VARCHAR(255), vValue VARCHAR(255))
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`debugAdd`(
+    vVariable VARCHAR(255),
+    vValue TEXT
+)
 	MODIFIES SQL DATA
 BEGIN
 /**

db/routines/vn/procedures/collection_new.sql

@@ -28,6 +28,8 @@ BEGIN
 	DECLARE vLockName VARCHAR(215);
 	DECLARE vLockTime INT DEFAULT 30;
 	DECLARE vFreeWagonFk INT;
+	DECLARE vErrorNumber INT;
+	DECLARE vErrorMsg TEXT;
 
 	DECLARE c1 CURSOR FOR
 		SELECT ticketFk, `lines`, m3
@@ -47,12 +49,18 @@ BEGIN
 
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
 	BEGIN
+		GET DIAGNOSTICS CONDITION 1
+			vErrorNumber = MYSQL_ERRNO,
+			vErrorMsg = MESSAGE_TEXT;
+
 		IF vLockName IS NOT NULL THEN
 			DO RELEASE_LOCK(vLockName);
-			CALL util.debugAdd(JSON_OBJECT(
+			CALL util.debugAdd('collection_new', JSON_OBJECT(
-						'type', 'releaseLock',
+					'errorNumber', vErrorNumber,
-						'userFk', vUserFk
+					'errorMsg', vErrorMsg,
-					), vLockName); -- Tmp
+					'lockName', vLockName,
+					'userFk', vUserFk
+				)); -- Tmp
 		END IF;
 
 		RESIGNAL;

db/routines/vn/procedures/itemShelving_add.sql

@@ -1,7 +1,14 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemShelving_add`(IN vShelvingFk VARCHAR(8), IN vBarcode VARCHAR(22), IN vQuantity INT, IN vPackagingFk VARCHAR(10), IN vGrouping INT, IN vPacking INT, IN vWarehouseFk INT)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemShelving_add`(
+	vShelvingFk VARCHAR(8),
+	vBarcode VARCHAR(22),
+	vQuantity INT,
+	vPackagingFk VARCHAR(10),
+	vGrouping INT,
+	vPacking INT,
+	vWarehouseFk INT
+)
 BEGIN
-
 /**
  * Añade registro o lo actualiza si ya existe.
  *
@@ -23,12 +30,7 @@ BEGIN
 	SELECT barcodeToItem(vBarcode) INTO vItemFk;
 
 	IF vBuyFk IS NULL THEN
-		CALL cache.last_buy_refresh(FALSE);
+		CALL util.throw('The buy is required');
-	
-		SELECT buy_id INTO vBuyFk
-			FROM cache.last_buy 
-			WHERE item_id = vItemFk 
-				AND warehouse_id = vWarehouseFk;
 	END IF;
 
 	IF vPacking IS NULL

db/routines/vn/procedures/item_getMinacum.sql

@@ -30,6 +30,7 @@ BEGIN
 					FROM sale s
 						JOIN ticket t ON t.id = s.ticketFk
 					WHERE t.shipped BETWEEN vDatedFrom AND vDatedTo
+						AND t.warehouseFk
 						AND s.quantity != 0
 						AND (vItemFk IS NULL OR s.itemFk = vItemFk)
 						AND (vWarehouseFk IS NULL OR t.warehouseFk = vWarehouseFk)
@@ -40,7 +41,7 @@ BEGIN
 						t.warehouseInFk
 					FROM buy b
 						JOIN entry e ON e.id = b.entryFk
-						LEFT JOIN travel t ON t.id = e.travelFk
+						JOIN travel t ON t.id = e.travelFk
 					WHERE t.landed BETWEEN vDatedFrom AND vDatedTo
 						AND (vWarehouseFk IS NULL OR t.warehouseInFk = vWarehouseFk)
 						AND !e.isExcludedFromAvailable
@@ -53,7 +54,7 @@ BEGIN
 						t.warehouseOutFk
 					FROM buy b
 						JOIN entry e ON e.id = b.entryFk
-						LEFT JOIN travel t ON t.id = e.travelFk
+						JOIN travel t ON t.id = e.travelFk
 					WHERE t.shipped BETWEEN vDatedFrom AND vDatedTo
 						AND (vWarehouseFk IS NULL OR t.warehouseOutFk = vWarehouseFk)
 						AND !e.isExcludedFromAvailable

db/routines/vn/procedures/item_getSimilar.sql

@@ -21,9 +21,6 @@ BEGIN
 
 	CALL cache.available_refresh(vCalcFk, FALSE, vWarehouseFk, vDated);
 
-	-- Añadido temporalmente para que no se cuelgue la db
-	SET vShowType = TRUE;
-
 	WITH itemTags AS (
 		SELECT i.id,
 				typeFk,
@@ -38,7 +35,7 @@ BEGIN
 				t.name,
 				it.value
 			FROM vn.item i
-				LEFT JOIN vn.itemTag it ON it.itemFk = i.id
+				LEFT JOIN vn.itemTag it FORCE INDEX(itemTagItemPriority) ON it.itemFk = i.id
 					AND it.priority = vPriority
 				LEFT JOIN vn.tag t ON t.id = it.tagFk
 			WHERE i.id = vSelf
@@ -68,7 +65,7 @@ BEGIN
 			iss.visible located,
 			b.price2
 		FROM vn.item i
-			JOIN cache.available a ON a.item_id = i.id
+			JOIN cache.available a FORCE INDEX (calc_id_4) ON a.item_id = i.id
 				AND a.calc_id = vCalcFk
 			LEFT JOIN vn.itemProposal ip ON ip.mateFk = i.id
 				AND ip.itemFk = vSelf

db/routines/vn/triggers/deviceProductionConfig_afterUpdate.sql

@@ -1,13 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`deviceProductionConfig_afterUpdate`
-	AFTER UPDATE ON `deviceProductionConfig`
-	FOR EACH ROW
-BEGIN
-	IF NEW.isAllUsersAllowed = 1 OR NEW.isAllUsersAllowed = -1 THEN
-		SET @username := (SELECT account.myUser_getName());
-		INSERT INTO vn.mail (receiver, subject, body)
-		VALUES ('cau@verdnatura.es', 'Se ha activado la autenticación sin restricciones en la app',
-		CONCAT('El usuario ', @username,' ha habilitado la opción para que todos los usuarios puedan acceder a la app sin restricciones'));
-	END IF;
-END$$
-DELIMITER ;

loopback/locale/en.json

@@ -229,8 +229,8 @@
 	"InvoiceIn is already booked": "InvoiceIn is already booked",
 	"This workCenter is already assigned to this agency": "This workCenter is already assigned to this agency",
 	"You can only have one PDA": "You can only have one PDA",
-    "Incoterms and Customs agent are required for a non UEE member": "Incoterms and Customs agent are required for a non UEE member",
+	"Incoterms and Customs agent are required for a non UEE member": "Incoterms and Customs agent are required for a non UEE member",
 	"It has been invoiced but the PDF could not be generated": "It has been invoiced but the PDF could not be generated",
-	"It has been invoiced but the PDF of refund not be generated": "It has been invoiced but the PDF of refund not be generated"
+	"It has been invoiced but the PDF of refund not be generated": "It has been invoiced but the PDF of refund not be generated",
-
+	"Cannot add holidays on this day": "Cannot add holidays on this day"
 }

modules/route/back/methods/route/downloadCmrsZip.js

@@ -41,14 +41,16 @@ module.exports = Self => {
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
-        ids = ids.split(',');
+        const downloadAddZip = async id => {
-
-        for (const id of ids) {
             ctx.args = ctx.args || {};
             ctx.args.id = Number(id);
             const [data] = await models.Route.cmr(ctx, myOptions);
             zip.file(`${id}.pdf`, data, {binary: true});
-        }
+        };
+
+        ids = ids.split(',');
+        const promises = ids.map(id => downloadAddZip(id));
+        await Promise.all(promises);
         const zipStream = zip.generateNodeStream({streamFiles: true});
         return [zipStream, 'application/zip', `filename="cmrs.zip"`];
     };

modules/route/back/models/routesMonitor.json

@@ -48,6 +48,9 @@
         "priority": {
             "type": "number"
         },
+        "roadmapStopFk": {
+            "type": "number"
+        },
         "m3boxes": {
             "type": "number"
         },

modules/supplier/front/search-panel/index.html

@@ -35,7 +35,7 @@
                 label="Country"
                 ng-model="filter.countryFk"
                 url="countries"
-                show-field="country"
+                show-field="name"
                 value-field="id">
             </vn-autocomplete>
         </vn-horizontal>

modules/worker/back/methods/worker/createAbsence.js

@@ -110,8 +110,7 @@ module.exports = Self => {
                     workCenterFk: workCenter.workCenterFk
                 }
             });
-
+            if ((holiday && isFestive) && (workCenter.workcenterFk === holiday.workCenterFk))
-            if (holiday && isFestive)
                 throw new UserError(`Cannot add holidays on this day`);
 
             const absence = await models.Calendar.create({