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

8355-testToMaster #3336

Merged
alexm merged 241 commits from 8355-testToMaster into master 2025-01-07 06:44:57 +00:00
Conversation 0 Commits 241 Files Changed 87 +2 -3
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5a92fe1691 - Show all commits

5
db/routines/vn/functions/entry_getCommission.sql
View File

@ -34,9 +34,8 @@ BEGIN
SELECT e.id INTO vLastEntryFk SELECT e.id INTO vLastEntryFk
FROM `entry` e FROM `entry` e
JOIN travel tr ON tr.id = e.travelFk JOIN travel tr ON tr.id = e.travelFk
WHERE tr.landed < vTravelFkLanded WHERE e.supplierFk = vSupplierFk
AND e.supplierFk = vSupplierFk ORDER BY (vTravelFkLanded <= tr.landed) ASC, tr.landed DESC
ORDER BY (vTravelFkLanded - tr.landed) ASC, tr.landed DESC
LIMIT 1; LIMIT 1;
IF vLastEntryFk THEN IF vLastEntryFk THEN