db/routines/vn/procedures/collection_assign.sql

@@ -3,7 +3,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`collection_assign`(
 	vUserFk INT,
 	OUT vCollectionFk INT
 )
-proc:BEGIN   
+BEGIN   
 /**
  * Comprueba si existen colecciones libres que se ajustan
  * al perfil del usuario y le asigna la más antigua.
@@ -16,7 +16,7 @@ proc:BEGIN
 	DECLARE vItemPackingTypeFk VARCHAR(1);
 	DECLARE vWarehouseFk INT;
 	DECLARE vLockName VARCHAR(215);
-	DECLARE vLockTime INT DEFAULT 15;
+	DECLARE vLockTime INT DEFAULT 30;
 
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
 	BEGIN
@@ -39,7 +39,6 @@ proc:BEGIN
 
 	IF vHasTooMuchCollections THEN
 		CALL util.throw('Hay colecciones pendientes');
-		LEAVE proc;
 	END IF;
 
 	SELECT warehouseFk, itemPackingTypeFk
@@ -54,7 +53,7 @@ proc:BEGIN
 	);
 
 	IF NOT GET_LOCK(vLockName, vLockTime) THEN
-		LEAVE proc;
+		CALL util.throw(CONCAT('Cannot get lock: ', vLockName));
 	END IF;
 
 	-- Se eliminan las colecciones sin asignar que estan obsoletas

db/routines/vn/procedures/collection_new.sql

@@ -1,6 +1,6 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`collection_new`(vUserFk INT, OUT vCollectionFk INT)
-proc:BEGIN
+BEGIN
 /**
  * Genera colecciones de tickets sin asignar trabajador.
  *
@@ -26,7 +26,7 @@ proc:BEGIN
 	DECLARE vHasUniqueCollectionTime BOOL;
 	DECLARE vDone INT DEFAULT FALSE;
 	DECLARE vLockName VARCHAR(215);
-	DECLARE vLockTime INT DEFAULT 15;
+	DECLARE vLockTime INT DEFAULT 30;
 	DECLARE vFreeWagonFk INT;
 
 	DECLARE c1 CURSOR FOR
@@ -86,7 +86,7 @@ proc:BEGIN
 	);
 
 	IF NOT GET_LOCK(vLockName, vLockTime) THEN
-		LEAVE proc;
+		CALL util.throw(CONCAT('Cannot get lock: ', vLockName));
 	END IF;
 
 	-- Se prepara el tren, con tantos vagones como sea necesario.

db/routines/vn/procedures/company_getSuppliersDebt.sql

@@ -188,7 +188,7 @@ BEGIN
 		FROM tPendingDuedates vp
 			LEFT JOIN supplier s ON s.id = vp.supplierFk
 			LEFT JOIN client c ON c.fi = s.nif
-			JOIN clientRisk cr ON cr.clientFk = c.id 
+			LEFT JOIN clientRisk cr ON cr.clientFk = c.id 
 				AND cr.companyFk = vp.companyFk
 			LEFT JOIN supplierAccount sa ON sa.supplierFk = s.id
 			LEFT JOIN bankEntity be ON be.id = sa.bankEntityFk

db/routines/vn2008/views/payrollWorker.sql

@@ -1,6 +1,9 @@
 CREATE OR REPLACE DEFINER=`root`@`localhost`
 	SQL SECURITY DEFINER
-	VIEW `vn2008`.`payroll_employee`
-AS SELECT `pw`.`workerFkA3` AS `CodTrabajador`,
-	`pw`.`companyFkA3` AS `codempresa`
-FROM `vn`.`payrollWorker` `pw`
+	VIEW `vn2008`.`payroll_employee` AS
+SELECT
+    `pw`.`workerFkA3` AS `CodTrabajador`,
+    `pw`.`companyFkA3` AS `codempresa`,
+    `pw`.`workerFk` AS `workerFk`
+FROM
+    `vn`.`payrollWorker` `pw`;