7430_devToTest #2490

Merged
alexm merged 306 commits from 7430_devToTest into test 2024-05-21 09:15:04 +00:00
1 changed files with 1 additions and 4 deletions
Showing only changes of commit 9d98ae4a03 - Show all commits
loopback/locale

View File

@ -357,9 +357,6 @@
"This workCenter is already assigned to this agency": "Este centro de trabajo ya está asignado a esta agencia",
"Select ticket or client": "Elija un ticket o un client",
"It was not able to create the invoice": "No se pudo crear la factura",
<<<<<<< HEAD
"This PDA is already assigned to another user": "This PDA is already assigned to another user"
=======
"This PDA is already assigned to another user": "This PDA is already assigned to another user",
"ticketCommercial": "El ticket {{ ticket }} para el vendedor {{ salesMan }} está en preparación. (mensaje generado automáticamente)"
>>>>>>> test
}