This commit is contained in:
parent
1231d6dd1d
commit
5529f08ce6
|
@ -188,19 +188,14 @@
|
|||
"The ticket doesn't exist.": "The ticket doesn't exist.",
|
||||
"The sales do not exists": "The sales do not exists",
|
||||
"Ticket without Route": "Ticket without route",
|
||||
<<<<<<< HEAD
|
||||
"Select a different client": "Select a different client",
|
||||
"Fill all the fields": "Fill all the fields",
|
||||
"Error while generating PDF": "Error while generating PDF",
|
||||
"Can't invoice to future": "Can't invoice to future",
|
||||
"This ticket is already invoiced": "This ticket is already invoiced",
|
||||
"Negative basis of tickets: 23": "Negative basis of tickets: 23",
|
||||
"Booking completed": "Booking completed",
|
||||
"The ticket is in preparation": "The ticket [{{ticketId}}]({{{ticketUrl}}}) of the sales person {{salesPersonId}} is in preparation"
|
||||
=======
|
||||
"Booking completed": "Booking complete",
|
||||
"The ticket is in preparation": "The ticket [{{ticketId}}]({{{ticketUrl}}}) of the sales person {{salesPersonId}} is in preparation",
|
||||
"You can only add negative amounts in refund tickets": "You can only add negative amounts in refund tickets"
|
||||
>>>>>>> ae27aa5b1e61c74bfbbc1b7b8af63642072acc6d
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue