Merge branch 'test' into dev

2024-03-21 14:46:09 +01:00 · 2024-03-21 14:46:09 +01:00 · 122fe7eecd
parent 268c63ce8f 6dff42a45d
commit 122fe7eecd
2 changed files with 2 additions and 2 deletions
--- a/db/routines/bs/procedures/ventas_contables_add.sql
+++ b/db/routines/bs/procedures/ventas_contables_add.sql
@ -23,7 +23,7 @@ BEGIN
 		ENGINE = MEMORY
 		SELECT Id_Ticket
 			FROM vn2008.Tickets t
-				JOIN vn.invoiceOut io ON io.id = t.Factura
+				JOIN vn.invoiceOut io ON io.`ref` = t.Factura
 			WHERE year(io.issued) = vYear
 				AND month(io.issued) = vMonth;

--- a/db/routines/vn/procedures/invoiceInTax_recalc.sql
+++ b/db/routines/vn/procedures/invoiceInTax_recalc.sql
@ -11,7 +11,7 @@ BEGIN
 */
 	DECLARE vRate DOUBLE DEFAULT 1;
 	DECLARE vDated DATE;
-	DECLARE vExpenseFk INT;
+	DECLARE vExpenseFk VARCHAR(10);

 	SELECT MAX(rr.dated) INTO vDated
 		FROM referenceRate rr