diff --git a/db/routines/vn/events/clientsDisable.sql b/db/routines/vn/events/clientsDisable.sql
index 00cd4ed8b..238e060dd 100644
--- a/db/routines/vn/events/clientsDisable.sql
+++ b/db/routines/vn/events/clientsDisable.sql
@@ -7,9 +7,8 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `vn`.`clientsDisable`
 DO BEGIN
 	UPDATE account.user u
 			JOIN client c ON c.id = u.id
-			JOIN clientType ct ON ct.id = c.typeFk
 		SET u.active = FALSE
-		WHERE ct.code = 'normal'
+		WHERE c.typeFk = 'normal'
 			AND u.id NOT IN (
 				SELECT DISTINCT c.id
 					FROM client c
diff --git a/db/routines/vn/procedures/collection_assign.sql b/db/routines/vn/procedures/collection_assign.sql
index 6d31fbc8f..49b4eb7bb 100644
--- a/db/routines/vn/procedures/collection_assign.sql
+++ b/db/routines/vn/procedures/collection_assign.sql
@@ -1,8 +1,8 @@
-DELIMITER $$
+DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`collection_assign`(
 	vUserFk INT,
 	OUT vCollectionFk INT
-)
+)
 proc:BEGIN   
 /**
  * Comprueba si existen colecciones libres que se ajustan
@@ -15,6 +15,13 @@ proc:BEGIN
 	DECLARE vHasTooMuchCollections BOOL;
 	DECLARE vLockTime INT DEFAULT 15;
 
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		DO RELEASE_LOCK('collection_assign');
+		
+		RESIGNAL;
+	END;
+
 	-- Si hay colecciones sin terminar, sale del proceso
 	CALL collection_get(vUserFk);
 
@@ -84,5 +91,5 @@ proc:BEGIN
 		WHERE id = vCollectionFk;
 
 	DO RELEASE_LOCK('collection_assign');
-END$$
-DELIMITER ;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/collection_new.sql b/db/routines/vn/procedures/collection_new.sql
index 82196585d..1292707af 100644
--- a/db/routines/vn/procedures/collection_new.sql
+++ b/db/routines/vn/procedures/collection_new.sql
@@ -219,9 +219,11 @@ proc:BEGIN
 			UPDATE tmp.productionBuffer pb
 					JOIN (
 						SELECT SUM(litros) liters,
-								@lines:= COUNT(*) + @lines `lines`,
+								@lines:= COUNT(*) + @lines,
+								COUNT(*) `lines`,
 								MAX(i.`size`) height,
-								@volume := SUM(sv.volume) + @volume volume
+								@volume := SUM(sv.volume) + @volume,
+								SUM(sv.volume) volume
 							FROM saleVolume sv
 								JOIN sale s ON s.id = sv.saleFk
 								JOIN item i ON i.id = s.itemFk
diff --git a/db/versions/10975-whiteIvy/00-action.sql b/db/versions/10975-whiteIvy/00-action.sql
new file mode 100644
index 000000000..3f9cf9d8b
--- /dev/null
+++ b/db/versions/10975-whiteIvy/00-action.sql
@@ -0,0 +1 @@
+CREATE INDEX expeditionLog_action_IDX USING BTREE ON srt.expeditionLog (`action`);
diff --git a/db/versions/10975-whiteIvy/01-expeditionFk.sql b/db/versions/10975-whiteIvy/01-expeditionFk.sql
new file mode 100644
index 000000000..ac1e01e6f
--- /dev/null
+++ b/db/versions/10975-whiteIvy/01-expeditionFk.sql
@@ -0,0 +1 @@
+CREATE INDEX expeditionLog_expeditionFk_IDX USING BTREE ON srt.expeditionLog (expeditionFk);
diff --git a/modules/claim/back/methods/claim/updateClaim.js b/modules/claim/back/methods/claim/updateClaim.js
index 68fff7846..82351f802 100644
--- a/modules/claim/back/methods/claim/updateClaim.js
+++ b/modules/claim/back/methods/claim/updateClaim.js
@@ -96,9 +96,9 @@ module.exports = Self => {
             // When claimState has been changed
             if (args.claimStateFk) {
                 const newState = await models.ClaimState.findById(args.claimStateFk, null, myOptions);
-                await notifyStateChange(ctx, salesPerson.id, claim, newState.code);
+                await notifyStateChange(ctx, salesPerson.id, claim, newState.description);
                 if (newState.code == 'canceled')
-                    await notifyStateChange(ctx, claim.workerFk, claim, newState.code);
+                    await notifyStateChange(ctx, claim.workerFk, claim, newState.description);
             }
 
             if (tx) await tx.commit();
diff --git a/modules/ticket/back/methods/ticket/closure.js b/modules/ticket/back/methods/ticket/closure.js
index f616894ec..1d3077b9d 100644
--- a/modules/ticket/back/methods/ticket/closure.js
+++ b/modules/ticket/back/methods/ticket/closure.js
@@ -147,6 +147,10 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
                 );
             }
         } catch (error) {
+            await Self.rawSql(`
+                INSERT INTO util.debug (variable, value)
+                    VALUES ('invoicingTicketError', ?)
+            `, [ticket.id + ' - ' + error]);
             // Domain not found
             if (error.responseCode == 450) return invalidEmail(ticket);