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

6995-testToMaster_2410 #2139

Merged
alexm merged 236 commits from 6995-testToMaster_2410 into master 2024-03-07 07:09:08 +00:00
Conversation 0 Commits 236 Files Changed 116 +2 -2
2 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 89ebd36b9b - Show all commits

2
modules/ticket/back/methods/ticket/saveCmr.js
View File

@ -63,7 +63,7 @@ module.exports = Self => {
warehouseFk: ticket.warehouseFk, warehouseFk: ticket.warehouseFk,
reference: ticket.id, reference: ticket.id,
contentType: 'application/pdf', contentType: 'application/pdf',
hasFile: true hasFile: false
}; };
const dms = await models.Dms.createFromStream(data, 'pdf', pdfStream, myOptions); const dms = await models.Dms.createFromStream(data, 'pdf', pdfStream, myOptions);

2
modules/ticket/back/methods/ticket/saveSign.js
View File

@ -80,7 +80,7 @@ module.exports = Self => {
dmsTypeId: dmsTypeTicket.id, dmsTypeId: dmsTypeTicket.id,
reference: ticket.id, reference: ticket.id,
description: `Firma del cliente - Ruta ${ticket.route().id}`, description: `Firma del cliente - Ruta ${ticket.route().id}`,
hasFile: true hasFile: false
}; };
dms = await models.Dms.uploadFile(ctxUploadFile, myOptions); dms = await models.Dms.uploadFile(ctxUploadFile, myOptions);
// Si se ha subido ya la firma, no se vuelve a subir, ya que si no // Si se ha subido ya la firma, no se vuelve a subir, ya que si no