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

231801_test_to_master #1519

Merged
alexm merged 490 commits from 231801_test_to_master into master 2023-05-12 06:29:59 +00:00
Conversation 0 Commits 490 Files Changed 557 -5
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3636543f73 - Show all commits

5
modules/client/front/balance/create/locale/es.yml
View File

@ -1,9 +1,4 @@
View receipt: Ver recibo View receipt: Ver recibo
Amount exceeded: Según ley contra el fraude no se puede recibir cobros por importe igual o superior a {{maxAmount}} Amount exceeded: Según ley contra el fraude no se puede recibir cobros por importe igual o superior a {{maxAmount}}
<<<<<<< HEAD
Send email: Enviar correo
There is no assigned email for this client: No hay correo asignado para este cliente
=======
Client Compensation Reference: "({{clientId}}) Ntro Cliente: {{clientName}}" Client Compensation Reference: "({{clientId}}) Ntro Cliente: {{clientName}}"
Supplier Compensation Reference: "({{supplierId}}) Ntro Proveedor: {{supplierName}}" Supplier Compensation Reference: "({{supplierId}}) Ntro Proveedor: {{supplierName}}"
>>>>>>> dev