diff --git a/db/routines/vn/procedures/collection_assign.sql b/db/routines/vn/procedures/collection_assign.sql
index 49b4eb7bb4..bfc7b0f932 100644
--- a/db/routines/vn/procedures/collection_assign.sql
+++ b/db/routines/vn/procedures/collection_assign.sql
@@ -13,11 +13,16 @@ proc:BEGIN
* @param vCollectionFk Id de colección
*/
DECLARE vHasTooMuchCollections BOOL;
+ DECLARE vItemPackingTypeFk VARCHAR(1);
+ DECLARE vWarehouseFk INT;
+ DECLARE vLockName VARCHAR(215);
DECLARE vLockTime INT DEFAULT 15;
DECLARE EXIT HANDLER FOR SQLEXCEPTION
BEGIN
- DO RELEASE_LOCK('collection_assign');
+ IF vLockName IS NOT NULL THEN
+ DO RELEASE_LOCK(vLockName);
+ END IF;
RESIGNAL;
END;
@@ -28,7 +33,7 @@ proc:BEGIN
SELECT (pc.maxNotReadyCollections - COUNT(*)) <= 0
INTO vHasTooMuchCollections
FROM tCollection
- JOIN productionConfig pc ;
+ JOIN productionConfig pc;
DROP TEMPORARY TABLE tCollection;
@@ -37,7 +42,18 @@ proc:BEGIN
LEAVE proc;
END IF;
- IF NOT GET_LOCK('collection_assign',vLockTime) THEN
+ SELECT warehouseFk, itemPackingTypeFk
+ INTO vWarehouseFk, vItemPackingTypeFk
+ FROM operator
+ WHERE workerFk = vUserFk;
+
+ SET vLockName = CONCAT_WS('/',
+ 'collection_assign',
+ vWarehouseFk,
+ vItemPackingTypeFk
+ );
+
+ IF NOT GET_LOCK(vLockName, vLockTime) THEN
LEAVE proc;
END IF;
@@ -90,6 +106,6 @@ proc:BEGIN
SET workerFk = vUserFk
WHERE id = vCollectionFk;
- DO RELEASE_LOCK('collection_assign');
+ DO RELEASE_LOCK(vLockName);
END$$
DELIMITER ;
diff --git a/db/routines/vn/procedures/invoiceInTax_getFromEntries.sql b/db/routines/vn/procedures/invoiceInTax_getFromEntries.sql
index 5a53b75436..631b8f31c1 100644
--- a/db/routines/vn/procedures/invoiceInTax_getFromEntries.sql
+++ b/db/routines/vn/procedures/invoiceInTax_getFromEntries.sql
@@ -4,16 +4,9 @@ BEGIN
DECLARE vRate DOUBLE DEFAULT 1;
DECLARE vDated DATE;
DECLARE vExpenseFk VARCHAR(10);
- DECLARE vIsBooked BOOLEAN DEFAULT FALSE;
- SELECT isBooked INTO vIsBooked
- FROM invoiceIn ii
- WHERE id = vInvoiceInFk;
+ CALL invoiceIn_checkBooked(vInvoiceInFk);
- IF vIsBooked THEN
- CALL util.throw('A booked invoice cannot be modified');
- END IF;
-
SELECT MAX(rr.dated) INTO vDated
FROM referenceRate rr
JOIN invoiceIn ii ON ii.id = vInvoiceInFk
diff --git a/modules/route/front/summary/index.html b/modules/route/front/summary/index.html
index 56f7a49b9b..8269bf118b 100644
--- a/modules/route/front/summary/index.html
+++ b/modules/route/front/summary/index.html
@@ -81,7 +81,7 @@
City
PC
Client
- Warehouse
+ State
Packages
m³
Packaging
@@ -109,7 +109,7 @@
{{ticket.nickname}}
- {{ticket.warehouseName}}
+ {{ticket.ticketStateName}}
{{ticket.packages}}
{{ticket.volume}}
{{ticket.ipt}}