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

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Carlos Jimenez Ruiz 2021-10-07 09:58:32 +02:00
parent cb7d1b24e8 3d57e9a618
commit 8e05301792
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/item/front/last-entries/index.js
View File

@ -11,7 +11,7 @@ class Controller extends Section {
from.setHours(0, 0, 0, 0);
const to = new Date();
to.setDate(to.getDate() + 10);
to.setDate(to.getDate() + 60);
to.setHours(23, 59, 59, 59);
this.filter = {
@ -34,7 +34,7 @@ class Controller extends Section {
from.setHours(0, 0, 0, 0);
const to = new Date();
to.setDate(to.getDate() + 10);
to.setDate(to.getDate() + 60);
to.setHours(23, 59, 59, 59);
this.filter.where.shipped = {

2
modules/zone/back/methods/agency/getShipped.js
View File

@ -42,7 +42,7 @@ module.exports = Self => {
const stmts = [];
stmts.push(new ParameterizedSQL(
`CALL vn.zone_getShippedWarehouse(?, ?, ?)`, [
`CALL vn.zone_getShipped(?, ?, ?, TRUE)`, [
landed,
addressFk,
agencyModeFk