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

8448-devToTest #3373

Merged
alexm merged 98 commits from 8448-devToTest into test 2025-01-21 10:00:50 +00:00
Conversation 0 Commits 98 Files Changed 51 +2 -2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6b39e5c651 - Show all commits

4
db/routines/bs/procedures/waste_addSales.sql
View File

@ -22,7 +22,7 @@ BEGIN
REPLACE bs.waste REPLACE bs.waste
SELECT YEAR(t.shipped), SELECT YEAR(t.shipped),
WEEK(t.shipped, 4), WEEK(t.shipped, 6),
it.workerFk, it.workerFk,
it.id, it.id,
s.itemFk, s.itemFk,
@ -70,6 +70,6 @@ BEGIN
JOIN vn.buy b ON b.id = lb.buy_id JOIN vn.buy b ON b.id = lb.buy_id
WHERE t.shipped BETWEEN vDateFrom AND vDateTo WHERE t.shipped BETWEEN vDateFrom AND vDateTo
AND w.isManaged AND w.isManaged
GROUP BY YEAR(t.shipped), WEEK(t.shipped, 4), i.id; GROUP BY YEAR(t.shipped), WEEK(t.shipped, 6), i.id;
END$$ END$$
DELIMITER ; DELIMITER ;