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

fix: prevent deleting absences for past dates #3346

Merged
jorgep merged 9 commits from hotfix-restrictAbsencePrivs into master 2025-01-09 08:53:25 +00:00
Conversation 0 Commits 9 Files Changed 5 +3 -3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7391beb29e - Show all commits

2
back/methods/vn-user/update-user.js
View File

@ -22,7 +22,7 @@ module.exports = Self => {
description: 'The user email' description: 'The user email'
}, { }, {
arg: 'lang', arg: 'lang',
type: 'string', type: 'any',
description: 'The user lang' description: 'The user lang'
}, { }, {
arg: 'twoFactor', arg: 'twoFactor',

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 ;