Merge branch 'dev' into 8127-entry_updateComission

db/versions/11342-crimsonDendro/04-itemShelvingLog.sql

@@ -1,6 +1,8 @@
+/*
 CREATE OR REPLACE TEMPORARY TABLE tmp.tItemShelvingLog
 	(PRIMARY KEY (id))
 	ENGINE = MEMORY
 	SELECT ishl.id, s.id shelvingFk
 		FROM vn.itemShelvingLog ishl
 			JOIN vn.shelving s ON s.code = ishl.shelvingFk COLLATE utf8mb3_unicode_ci;
+*/

db/versions/11342-crimsonDendro/05-itemShelvingLog.sql

@@ -1 +1 @@
-ALTER TABLE vn.itemShelvingLog MODIFY COLUMN shelvingFk int(11) NOT NULL;
+-- ALTER TABLE vn.itemShelvingLog MODIFY COLUMN shelvingFk int(11) NOT NULL;

db/versions/11342-crimsonDendro/06-itemShelvingLog.sql

@@ -1,5 +1,7 @@
+/*
 UPDATE vn.itemShelvingLog ishl
 		JOIN tmp.tItemShelvingLog tishl ON tishl.id = ishl.id
 	SET ishl.shelvingFk = tishl.shelvingFk;
 
 DROP TEMPORARY TABLE tmp.tItemShelvingLog;
+*/