Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
This commit is contained in:
commit
ceda2718d5
|
@ -23,7 +23,8 @@ BEGIN
|
||||||
JOIN vn.travel t ON t.id = e.travelFk
|
JOIN vn.travel t ON t.id = e.travelFk
|
||||||
JOIN vn.warehouse w ON w.id = t.warehouseInFk
|
JOIN vn.warehouse w ON w.id = t.warehouseInFk
|
||||||
WHERE t.shipped >= util.VN_CURDATE()
|
WHERE t.shipped >= util.VN_CURDATE()
|
||||||
AND e.currencyFk = vCurrency;
|
AND e.currencyFk = vCurrency
|
||||||
|
AND NOT e.isBooked;
|
||||||
|
|
||||||
SET vComission = currency_getCommission(vCurrency);
|
SET vComission = currency_getCommission(vCurrency);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue