8713-testToMaster #3523

Merged
alexm merged 383 commits from 8713-testToMaster into master 2025-03-04 06:52:15 +00:00
1 changed files with 2 additions and 2 deletions
Showing only changes of commit 3dd64e4257 - Show all commits

View File

@ -132,7 +132,7 @@ module.exports = Self => {
WHERE ot.code = 'substitution'
GROUP BY co.clientFk
) substitution ON substitution.clientFk = c.id
WHERE r.shipment BETWEEN util.VN_CURDATE() AND DATE_ADD(util.VN_CURDATE(), INTERVAL ? DAY)
WHERE r.shipment BETWEEN ? AND ? + INTERVAL ? DAY
AND r.created >= ?
AND r.warehouseFk = ?
AND NOT o.confirmed
@ -146,7 +146,7 @@ module.exports = Self => {
scopeDays,
filter.where.alertLevelCode,
scopeDays,
vDated,
vDated, vDated, vDated,
filter.where.warehouseFk,
itemFk
]);