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

7729-devToTest_2430 #2739

Merged
alexm merged 339 commits from 7729-devToTest_2430 into test 2024-07-16 07:11:37 +00:00
Conversation 0 Commits 339 Files Changed 242 +4 -4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 90802bd330 - Show all commits

4
db/routines/hedera/procedures/order_addItem.sql
View File

@ -59,8 +59,8 @@ BEGIN
SELECT quantity INTO vMinQuantity SELECT quantity INTO vMinQuantity
FROM vn.itemMinimumQuantity FROM vn.itemMinimumQuantity
WHERE itemFk = vItem WHERE itemFk = vItem
AND (util.VN_CURDATE() >= `started` AND `started` <= util.VN_CURDATE()
AND (util.VN_CURDATE() <= `ended` OR `ended` IS NULL)) AND (`ended` >= util.VN_CURDATE() OR `ended` IS NULL)
AND (warehouseFk = vWarehouse OR warehouseFk IS NULL) AND (warehouseFk = vWarehouse OR warehouseFk IS NULL)
LIMIT 1; LIMIT 1;

4
modules/order/back/methods/order/catalogFilter.js
View File

@ -104,8 +104,8 @@ module.exports = Self => {
WITH minQuantity AS ( WITH minQuantity AS (
SELECT itemFk, quantity, warehouseFk SELECT itemFk, quantity, warehouseFk
FROM vn.itemMinimumQuantity FROM vn.itemMinimumQuantity
WHERE (util.VN_CURDATE() BETWEEN started AND ended WHERE started <= util.VN_CURDATE()
OR (util.VN_CURDATE() >= started AND ended IS NULL)) AND (ended >= util.VN_CURDATE() OR ended IS NULL)
GROUP BY itemFk, warehouseFk GROUP BY itemFk, warehouseFk
ORDER BY warehouseFk DESC ORDER BY warehouseFk DESC
) )