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

master #2200

Merged
sergiodt merged 11 commits from master into test 2024-03-25 07:49:52 +00:00
Conversation 0 Commits 11 Files Changed 11 +2 -1
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9e5e49c28f - Show all commits

2
loopback/locale/es.json
View File

@ -347,5 +347,5 @@
"Cmr file does not exist": "El archivo del cmr no existe", "Cmr file does not exist": "El archivo del cmr no existe",
"You are not allowed to modify the alias": "No estás autorizado a modificar el alias", "You are not allowed to modify the alias": "No estás autorizado a modificar el alias",
"The address of the customer must have information about Incoterms and Customs Agent": "El consignatario del cliente debe tener informado Incoterms y Agente de aduanas", "The address of the customer must have information about Incoterms and Customs Agent": "El consignatario del cliente debe tener informado Incoterms y Agente de aduanas",
"The line could not be marked": "The line could not be marked" "The line could not be marked": "La linea no puede ser marcada"
} }

1
modules/ticket/back/methods/sale-tracking/setPicked.js
View File

@ -91,6 +91,7 @@ module.exports = Self => {
} catch (e) { } catch (e) {
if (tx) await tx.commit(); if (tx) await tx.commit();
} }
if (tx) await tx.commit();
} catch (e) { } catch (e) {
if (tx) await tx.rollback(); if (tx) await tx.rollback();
throw new UserError('The line could not be marked'); throw new UserError('The line could not be marked');