Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 7565-testToMaster

db/routines/vn/procedures/sales_merge.sql

@@ -8,6 +8,8 @@ BEGIN
 	END;
 
 	CREATE OR REPLACE TEMPORARY TABLE tSalesToPreserve
+		(PRIMARY KEY (id))
+		ENGINE = MEMORY
 		SELECT s.id, s.itemFk, SUM(s.quantity) newQuantity
 			FROM sale s
 				JOIN item i ON i.id = s.itemFk
@@ -20,7 +22,7 @@ BEGIN
 
 	UPDATE sale s 
 			JOIN tSalesToPreserve stp ON stp.id = s.id
-		SET quantity = newQuantity
+		SET s.quantity = newQuantity
 		WHERE s.ticketFk = vTicketFk;
 
 	DELETE s.*