Merge branch 'master' into test

2024-06-05 11:15:56 +02:00 · 2024-06-05 11:15:56 +02:00 · ceda2718d5
parent f903d7cd2a 82954ed299
commit ceda2718d5
1 changed files with 2 additions and 1 deletions
--- a/db/routines/vn/procedures/entry_updateComission.sql
+++ b/db/routines/vn/procedures/entry_updateComission.sql
@ -23,7 +23,8 @@ BEGIN
 				JOIN vn.travel t ON t.id = e.travelFk
 				JOIN vn.warehouse w ON w.id = t.warehouseInFk 
 			WHERE t.shipped >= util.VN_CURDATE()
-				AND e.currencyFk = vCurrency;
+				AND e.currencyFk = vCurrency
+				AND NOT e.isBooked;

 	SET vComission = currency_getCommission(vCurrency);