Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix

2023-10-24 14:20:02 +02:00 · 2023-10-24 14:20:02 +02:00 · 9865af8f81
parent 5442476f05 59aa738f38
commit 9865af8f81
2 changed files with 3 additions and 2 deletions
--- a/db/changes/234003/00-ticket_canAdvance_zone.sql
+++ b/db/changes/234003/00-ticket_canAdvance_zone.sql
@ -72,7 +72,7 @@ BEGIN
 			FROM (
 					SELECT
 							s.ticketFk,
-							t.workerFk,
+							c.salesPersonFk workerFk,
 							t.shipped,
 							t.totalWithVat,
 							st.name futureState,
@ -86,6 +86,7 @@ BEGIN
 							z.name futureZoneName,
 							st.classColor
 						FROM ticket t
+                            JOIN client c ON c.id = t.clientFk
 							JOIN sale s ON s.ticketFk = t.id
 							JOIN saleVolume sv ON sv.saleFk = s.id
 							JOIN item i ON i.id = s.itemFk
--- a/front/Dockerfile
+++ b/front/Dockerfile
@ -1,4 +1,4 @@
-FROM debian:stretch-slim
+FROM debian:bookworm-slim
 EXPOSE 80
 ENV TZ Europe/Madrid