Merge branch 'dev' into 7409-workerIncome
gitea/salix/pipeline/pr-dev This commit looks good Details

This commit is contained in:
Alex Moreno 2024-06-25 11:16:14 +00:00
commit dc628995b3
1 changed files with 5 additions and 5 deletions

View File

@ -75,14 +75,14 @@ BEGIN
JOIN (
WITH entries AS (
SELECT e.id, de.duaFk
FROM `entry` e
JOIN duaEntry de ON de.entryFk = e.id
FROM vn.`entry` e
JOIN vn.duaEntry de ON de.entryFk = e.id
WHERE de.duaFk = vDuaFk
AND (NOT e.isBooked OR NOT e.isConfirmed)
),
notBookedEntries AS (
SELECT e.id
FROM duaEntry
FROM vn.duaEntry
WHERE duaFk = vDuaFk
AND NOT customsValue
)