8144-devToTest_2448 #3216

Merged
alexm merged 256 commits from 8144-devToTest_2448 into test 2024-11-19 07:36:04 +00:00
1 changed files with 3 additions and 6 deletions
Showing only changes of commit c5f1b05671 - Show all commits

View File

@ -25,18 +25,17 @@ BEGIN
LIMIT 1;
RETURN IFNULL(vCommission, 0);
ELSE
SELECT e.id INTO vLastEntryFk
FROM vn.entry e
JOIN vn.travel tr ON tr.id = e.travelFk
FROM `entry` e
JOIN travel tr ON tr.id = e.travelFk
WHERE e.supplierFk = vSupplierFk
ORDER BY tr.landed DESC
LIMIT 1;
IF vLastEntryFk THEN
SELECT commission INTO vCurrentCommission
FROM vn.entry
FROM `entry`
WHERE id = vLastEntryFk;
ELSE
@ -47,8 +46,6 @@ BEGIN
END IF;
RETURN vCurrentCommission;
END IF;
END$$
DELIMITER ;