This commit is contained in:
parent
5d209314f6
commit
272c7c0289
|
@ -1 +0,0 @@
|
|||
ALTER TABLE vn.negativeOrigin MODIFY COLUMN `type` enum('FALTAS','CONTENEDOR','ENTRADAS','OVERBOOKING', 'SUSTITUCION') CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL;
|
|
@ -256,8 +256,5 @@
|
|||
"Incorrect delivery order alert on route": "Incorrect delivery order alert on route: {{ route }} zone: {{ zone }}",
|
||||
"Ticket has been delivered out of order": "The ticket {{ticket}} of route {{{fullUrl}}} has been delivered out of order.",
|
||||
"negativeReplaced": "(Negativos) Sustituido el articulo [#{{oldItemId}}]({{{oldItemUrl}}}) {{oldItem}} por [#{{newItemId}}]({{{newItemUrl}}}) {{newItem}} del ticket [{{ticketId}}]({{{ticketUrl}}})",
|
||||
"price retrieval failed": "price retrieval failed",
|
||||
"workerSocialName": "workerSocialName",
|
||||
"workerName": "workerName",
|
||||
"The tag or priority can't be repeated for an item": "The tag or priority can't be repeated for an item",
|
||||
"The tag or priority can't be repeated for an item": "The tag or priority can't be repeated for an item"
|
||||
}
|
||||
|
|
|
@ -396,6 +396,6 @@
|
|||
"There are tickets to be invoiced": "La zona tiene tickets por facturar",
|
||||
"Incorrect delivery order alert on route": "Alerta de orden de entrega incorrecta en ruta: {{ route }} zona: {{ zone }}",
|
||||
"Ticket has been delivered out of order": "El ticket {{ticket}} {{{fullUrl}}} no ha sido entregado en su orden.",
|
||||
"Price cannot be blank": "El precio no puede estar en blanco"
|
||||
|
||||
"Price cannot be blank": "El precio no puede estar en blanco",
|
||||
"negativeReplaced": "negativeReplaced"
|
||||
}
|
|
@ -73,7 +73,6 @@ module.exports = Self => {
|
|||
query: [sale.ticketFk]
|
||||
};
|
||||
const salesPerson = await Self.rawSql(salesPersonQuery.sql, salesPersonQuery.query, myOptions);
|
||||
if (tx) await tx.commit();
|
||||
const url = await models.Url.getUrl();
|
||||
const substitution = await models.Item.findById(substitutionFk, {
|
||||
fields: ['id', 'name', 'longName']
|
||||
|
|
|
@ -44,7 +44,6 @@ module.exports = Self => {
|
|||
}, myOptions);
|
||||
if (count === 1)
|
||||
return {ticket: ticketFk, status: 'noSplit'};
|
||||
// continue;
|
||||
|
||||
const [, [{vNewTicket}]] = await Self.rawSql(`
|
||||
CALL vn.ticket_clone(?, @vNewTicket);
|
||||
|
|
Loading…
Reference in New Issue