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

feat(ssalix): refs #7648 remove select field
gitea/salix/pipeline/pr-dev This commit looks good Details

This commit is contained in:
Javier Segarra 2024-07-12 08:52:03 +02:00
parent 5a8634356a
commit 47cff3f894
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/entry/back/methods/entry/filter.js
View File

@ -189,8 +189,7 @@ module.exports = Self => {
t.landed,
t.ref AS travelRef,
t.warehouseInFk,
w.name warehouseInName,
util.VN_CURDATE()
w.name warehouseInName
FROM vn.entry e
JOIN vn.supplier s ON s.id = e.supplierFk
JOIN vn.travel t ON t.id = e.travelFk
@ -201,12 +200,13 @@ module.exports = Self => {
);
if (supplier) {
const days = ctx.args.days ?? DEFAULT_INTERVAL_DAYS;
stmt.merge({
sql: `
AND t.shipped < util.VN_CURDATE() + INTERVAL ? + 1 DAY
AND t.shipped >= util.VN_CURDATE()
`,
params: Array(1).fill(ctx.args.days ?? DEFAULT_INTERVAL_DAYS)
params: [days]
});
}
stmt.merge(conn.makeSuffix(filter));