From 638a5e9a1e6b379638ed55484b03b2e3f936d439 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Andr=C3=A9s?= <carlosap@verdnatura.es>
Date: Wed, 5 Jun 2024 15:44:11 +0200
Subject: [PATCH 1/2] Hotfix modificar entradas contabilizadas Ticket 191417

---
 .../vn/procedures/entry_checkBooked.sql       | 22 -----------------
 .../vn/procedures/entry_isEditable.sql        | 24 +++++++++++++++++++
 db/routines/vn/triggers/buy_beforeDelete.sql  |  2 +-
 db/routines/vn/triggers/buy_beforeInsert.sql  |  2 +-
 db/routines/vn/triggers/buy_beforeUpdate.sql  |  2 +-
 .../vn/triggers/entry_beforeDelete.sql        |  2 +-
 .../vn/triggers/entry_beforeUpdate.sql        |  2 +-
 7 files changed, 29 insertions(+), 27 deletions(-)
 delete mode 100644 db/routines/vn/procedures/entry_checkBooked.sql
 create mode 100644 db/routines/vn/procedures/entry_isEditable.sql

diff --git a/db/routines/vn/procedures/entry_checkBooked.sql b/db/routines/vn/procedures/entry_checkBooked.sql
deleted file mode 100644
index 7ee1fee22..000000000
--- a/db/routines/vn/procedures/entry_checkBooked.sql
+++ /dev/null
@@ -1,22 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`entry_checkBooked`(
-	vSelf INT
-)
-BEGIN
-/**
- * Comprueba si una entrada está contabilizada,
- * y si lo está retorna un throw.
- *
- * @param vSelf Id de entrada
- */
-	DECLARE vIsBooked BOOL;
-
-	SELECT isBooked INTO vIsBooked
-		FROM `entry`
-		WHERE id = vSelf;
-
-	IF vIsBooked AND NOT IFNULL(@isModeInventory, FALSE) THEN
-		CALL util.throw('Entry is already booked');
-	END IF;
-END$$
-DELIMITER ;
diff --git a/db/routines/vn/procedures/entry_isEditable.sql b/db/routines/vn/procedures/entry_isEditable.sql
new file mode 100644
index 000000000..75e7d9c13
--- /dev/null
+++ b/db/routines/vn/procedures/entry_isEditable.sql
@@ -0,0 +1,24 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`entry_isEditable`(
+	vSelf INT
+)
+BEGIN
+/**
+ * Comprueba si una entrada se puede actualizar
+ * si no se puede retorna un throw.
+ *
+ * @param vSelf Id de entrada
+ */
+	DECLARE vIsEditable BOOL;
+
+	SELECT e.isBooked INTO vIsEditable
+		FROM `entry` e
+			JOIN entryType et ON et.code = e.typeFk 
+		WHERE NOT et.isInformal
+			AND id = vSelf;
+
+	IF vIsEditable AND NOT IFNULL(@isModeInventory, FALSE) THEN
+		CALL util.throw('Entry is not editable');
+	END IF;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/triggers/buy_beforeDelete.sql b/db/routines/vn/triggers/buy_beforeDelete.sql
index 85f1cf298..1bbeadec9 100644
--- a/db/routines/vn/triggers/buy_beforeDelete.sql
+++ b/db/routines/vn/triggers/buy_beforeDelete.sql
@@ -3,7 +3,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`buy_beforeDelete`
 	BEFORE DELETE ON `buy`
 	FOR EACH ROW
 BEGIN 
-	CALL entry_checkBooked(OLD.entryFk);
+	CALL entry_isEditable(OLD.entryFk);
 	IF OLD.printedStickers <> 0 THEN
 		CALL util.throw("it is not possible to delete buys with printed labels ");
 	END IF;
diff --git a/db/routines/vn/triggers/buy_beforeInsert.sql b/db/routines/vn/triggers/buy_beforeInsert.sql
index 6ad72916b..39befcaf1 100644
--- a/db/routines/vn/triggers/buy_beforeInsert.sql
+++ b/db/routines/vn/triggers/buy_beforeInsert.sql
@@ -15,7 +15,7 @@ trig: BEGIN
 		LEAVE trig;
 	END IF;
 
-	CALL entry_checkBooked(NEW.entryFk);
+	CALL entry_isEditable(NEW.entryFk);
 	IF NEW.printedStickers <> 0 THEN
 		CALL util.throw('it is not possible to create buy lines with printedstickers other than 0');
 	END IF;
diff --git a/db/routines/vn/triggers/buy_beforeUpdate.sql b/db/routines/vn/triggers/buy_beforeUpdate.sql
index 2403091c6..dc999095b 100644
--- a/db/routines/vn/triggers/buy_beforeUpdate.sql
+++ b/db/routines/vn/triggers/buy_beforeUpdate.sql
@@ -13,7 +13,7 @@ trig:BEGIN
 		LEAVE trig;
 	END IF;
 
-	CALL entry_checkBooked(OLD.entryFk);
+	CALL entry_isEditable(OLD.entryFk);
 	SET NEW.editorFk = account.myUser_getId();
 
 	SELECT defaultEntry INTO vDefaultEntry
diff --git a/db/routines/vn/triggers/entry_beforeDelete.sql b/db/routines/vn/triggers/entry_beforeDelete.sql
index 1d2c84b9e..5b83daf77 100644
--- a/db/routines/vn/triggers/entry_beforeDelete.sql
+++ b/db/routines/vn/triggers/entry_beforeDelete.sql
@@ -3,7 +3,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`entry_beforeDelete`
 	BEFORE DELETE ON `entry`
 	FOR EACH ROW
 BEGIN
-	CALL entry_checkBooked(OLD.id);
+	CALL entry_isEditable(OLD.id);
 	DELETE FROM buy WHERE entryFk = OLD.id;
 END$$
 DELIMITER ;
diff --git a/db/routines/vn/triggers/entry_beforeUpdate.sql b/db/routines/vn/triggers/entry_beforeUpdate.sql
index d56db5e01..9b0d8f083 100644
--- a/db/routines/vn/triggers/entry_beforeUpdate.sql
+++ b/db/routines/vn/triggers/entry_beforeUpdate.sql
@@ -9,7 +9,7 @@ BEGIN
 	DECLARE vTotalBuy INT;
 	
 	IF NEW.isBooked = OLD.isBooked THEN
-		CALL entry_checkBooked(OLD.id);
+		CALL entry_isEditable(OLD.id);
 	ELSE
 		IF NEW.isBooked THEN
 			SELECT COUNT(*) INTO vTotalBuy

From b78ef97813591c29cdbf925da2370fb7312d2c9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Andr=C3=A9s?= <carlosap@verdnatura.es>
Date: Wed, 5 Jun 2024 15:50:16 +0200
Subject: [PATCH 2/2] Hotfix modificar entradas contabilizadas Ticket 191417

---
 db/routines/vn/procedures/entry_isEditable.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/routines/vn/procedures/entry_isEditable.sql b/db/routines/vn/procedures/entry_isEditable.sql
index 75e7d9c13..a05a1fd92 100644
--- a/db/routines/vn/procedures/entry_isEditable.sql
+++ b/db/routines/vn/procedures/entry_isEditable.sql
@@ -15,7 +15,7 @@ BEGIN
 		FROM `entry` e
 			JOIN entryType et ON et.code = e.typeFk 
 		WHERE NOT et.isInformal
-			AND id = vSelf;
+			AND e.id = vSelf;
 
 	IF vIsEditable AND NOT IFNULL(@isModeInventory, FALSE) THEN
 		CALL util.throw('Entry is not editable');