db/dump/fixtures.before.sql

@@ -767,7 +767,7 @@ INSERT INTO `vn`.`ticket`(`id`, `priority`, `agencyModeFk`,`warehouseFk`,`routeF
         (35, 1,     1, 1,  3,       util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1102, 'Somewhere in Philippines',                      123, NULL,     0, 1,     16, 0, util.VN_CURDATE(),                                   NULL,      NULL),
         (36, 1,     1, 1,  3,       util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1102, 'Ant-Man Adventure',                             123, NULL,     0, 1,     16, 0, util.VN_CURDATE(),                                   NULL,      NULL),
         (37, 1,     1, 1,  3,       util.VN_CURDATE(),                              util.VN_CURDATE(),                                                        1110, 'Deadpool swords',                               123, NULL,     0, 1,     16, 0, util.VN_CURDATE(),                                   NULL,      NULL);
-        
+
 INSERT INTO `vn`.`ticketObservation`(`id`, `ticketFk`, `observationTypeFk`, `description`)
     VALUES
         (1,  11, 1, 'ready'),
@@ -3848,7 +3848,7 @@ INSERT INTO  `vn`.`ledgerConfig` SET
 INSERT INTO vn.sectorCollection
 	SET id = 2,
 		userFk = 18,
-		sectorFk = 1; 
+		sectorFk = 1;
 
 INSERT INTO vn.sectorCollectionSaleGroup
 	SET id = 8,
@@ -3862,9 +3862,23 @@ INSERT INTO vn.saleGroup (userFk, parkingFk, sectorFk, ticketFk)
 INSERT INTO vn.sectorCollection
 	SET id = 3,
 		userFk = 18,
-		sectorFk = 1; 
+		sectorFk = 1;
 
 INSERT INTO vn.sectorCollectionSaleGroup
 	SET id = 9,
 		sectorCollectionFk = 3,
-		saleGroupFk = 6;
+		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/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);
-	
-		SELECT buy_id INTO vBuyFk
-			FROM cache.last_buy 
-			WHERE item_id = vItemFk 
-				AND warehouse_id = vWarehouseFk;
+		CALL util.throw('The buy is required');
 	END IF;
 
 	IF vPacking IS NULL

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/worker/back/methods/worker/createAbsence.js

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