verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 62 Releases Wiki Activity

#6321 - Negative tickets #1945

Merged
jsegarra merged 146 commits from 6321_negative_tickets into dev 2025-02-11 08:45:33 +00:00
Conversation 0 Commits 146 Files Changed 27 +9 -6
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2cb57225ff - Show all commits

3
db/dump/fixtures.before.sql
View File

@ -3969,7 +3969,6 @@ INSERT INTO vn.accountDetailType (id, description, code)
(5, 'Referencia Nominas', 'payRef'),
(6, 'ABA', 'aba');
<<<<<<< HEAD
INSERT INTO vn.accountDetailType
(id, description, code)
VALUES
@ -3980,8 +3979,6 @@ VALUES
(5, 'Referencia Nominas', 'payRef'),
(6, 'ABA', 'aba');
=======
>>>>>>> dev
INSERT IGNORE INTO ormConfig
SET id =1,
selectLimit = 1000;

10
modules/item/back/methods/item/getSimilar.js
View File

@ -30,8 +30,14 @@ module.exports = Self => {
new Date().toLocaleDateString('es-ES', {year: 'numeric',
month: '2-digit',
day: '2-digit'});
const query = [where.itemFk, where.warehouseFk, where.date ?? today, where.showType ?? true];
const [results] = await Self.rawSql('CALL vn.item_getSimilar(?, ?, ?, ?)', query, myOptions);
const query = [
where.itemFk,
where.warehouseFk,
jsegarra marked this conversation as resolved Outdated
jgallego commented 2025-01-31 14:22:56 +00:00
Outdated
Review
Copy Link

asegurate que esto es necesario y solo el Date.vnNew() no funciona

asegurate que esto es necesario y solo el Date.vnNew() no funciona
where.date ?? today,
where.showType ?? true,
jgallego marked this conversation as resolved Outdated
jgallego commented 2025-02-05 06:27:47 +00:00
Outdated
Review
Copy Link

aqui asume que te pasan siempre estos 3 parametros

aqui asume que te pasan siempre estos 3 parametros
👍 1
jsegarra commented 2025-02-05 14:42:21 +00:00
Outdated
Review
Copy Link

Al procedimiento si, desde front son opcionales
Los valores que ves, son los mismos que hay en la tabla de access

Al procedimiento si, desde front son opcionales Los valores que ves, son los mismos que hay en la tabla de access
jsegarra commented 2025-02-05 22:44:20 +00:00
Outdated
Review
Copy Link

creo que ya veo lo que quieres decir

creo que ya veo lo que quieres decir
jsegarra commented 2025-02-05 23:47:04 +00:00
Outdated
Review
Copy Link

cambiado

cambiado
where.scopeDays ?? 2
];
const [results] = await Self.rawSql('CALL vn.item_getSimilar(?, ?, ?, ?, ?)', query, myOptions);
return [
{

2
modules/monitor/back/methods/sales-monitor/salesFilter.js
View File

@ -385,6 +385,6 @@ module.exports = Self => {
const sql = ParameterizedSQL.join(stmts, ';');
const result = await conn.executeStmt(sql, myOptions);
return result[ticketsIndex];
return Array(19).fill().flatMap(() => result[ticketsIndex]);
};
};