Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness

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/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

loopback/locale/en.json

@@ -231,6 +231,6 @@
 	"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",
 	"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({