verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 64 Releases Wiki Activity

7691-testToMaster #2703

Merged
alexm merged 268 commits from 7691-testToMaster into master 2024-07-09 05:38:28 +00:00
Conversation 0 Commits 268 Files Changed 185 +5 -5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit dc628995b3 - Show all commits

10
db/routines/vn/procedures/duaInvoiceInBooking.sql
View File

@ -36,7 +36,7 @@ BEGIN
SELECT ASIEN INTO vBookEntry FROM dua WHERE id = vDuaFk; SELECT ASIEN INTO vBookEntry FROM dua WHERE id = vDuaFk;
IF vBookEntry IS NULL THEN IF vBookEntry IS NULL THEN
SELECT YEAR(IFNULL(ii.bookEntried, d.bookEntried)) INTO vFiscalYear SELECT YEAR(IFNULL(ii.bookEntried, d.bookEntried)) INTO vFiscalYear
FROM invoiceIn ii FROM invoiceIn ii
JOIN `entry` e ON e.invoiceInFk = ii.id JOIN `entry` e ON e.invoiceInFk = ii.id
@ -45,7 +45,7 @@ BEGIN
WHERE d.id = vDuaFk WHERE d.id = vDuaFk
LIMIT 1; LIMIT 1;
CALL ledger_nextTx(vFiscalYear, vBookEntry); CALL ledger_nextTx(vFiscalYear, vBookEntry);
END IF; END IF;
OPEN vInvoicesIn; OPEN vInvoicesIn;
@ -75,14 +75,14 @@ BEGIN
JOIN ( JOIN (
WITH entries AS ( WITH entries AS (
SELECT e.id, de.duaFk SELECT e.id, de.duaFk
FROM `entry` e FROM vn.`entry` e
JOIN duaEntry de ON de.entryFk = e.id JOIN vn.duaEntry de ON de.entryFk = e.id
WHERE de.duaFk = vDuaFk WHERE de.duaFk = vDuaFk
AND (NOT e.isBooked OR NOT e.isConfirmed) AND (NOT e.isBooked OR NOT e.isConfirmed)
), ),
notBookedEntries AS ( notBookedEntries AS (
SELECT e.id SELECT e.id
FROM duaEntry FROM vn.duaEntry
WHERE duaFk = vDuaFk WHERE duaFk = vDuaFk
AND NOT customsValue AND NOT customsValue
) )