Alexandre Riera
|
ad3c6dcee2
|
wip #5595
|
2023-05-03 14:34:36 +02:00 |
Carlos Satorres
|
dbd0e5138b
|
refs #5328 fix
|
2023-05-03 14:12:26 +02:00 |
Carlos Satorres
|
5aaef31562
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5328-abonarTodoTicket
|
2023-05-03 14:07:29 +02:00 |
Carlos Satorres
|
3ac1ce403c
|
refs #5328 myOptions
|
2023-05-03 14:06:57 +02:00 |
Carlos Satorres
|
566f03c497
|
refs #5328 commit prueba
|
2023-05-03 13:03:14 +02:00 |
Carlos Satorres
|
3b2e1ca8d5
|
ref #5328 refundTicket.id
|
2023-05-03 12:36:30 +02:00 |
Carlos Satorres
|
eaf425fb51
|
refs #5328 mod funcion createTicketRefund
|
2023-05-03 12:30:33 +02:00 |
Juan Ferrer
|
4c0f59399b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2023-05-03 11:57:16 +02:00 |
Juan Ferrer
|
bbd2137e57
|
refs #5517 Avatar componetized
|
2023-05-03 11:57:13 +02:00 |
Alex Moreno
|
a1521f5220
|
Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice
|
2023-05-03 09:39:39 +00:00 |
Alex Moreno
|
bf3aac70f3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired
|
2023-05-03 11:37:07 +02:00 |
Carlos Satorres
|
2467534d1f
|
refs #5090 mod golabel
|
2023-05-03 09:23:16 +02:00 |
Carlos Satorres
|
34a9b3768c
|
Merge pull request '5316-kkeoEntryNotes' (!1449) from 5316-kkeoEntryNotes into dev
Reviewed-on: #1449
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2023-05-03 06:33:55 +00:00 |
Carlos Satorres
|
3f9d711f90
|
Merge branch 'dev' into 5316-kkeoEntryNotes
|
2023-05-03 06:24:04 +00:00 |
Alex Moreno
|
a60497dfc0
|
Merge branch 'dev' into 4797-worker-notification-selector
|
2023-05-03 05:09:33 +00:00 |
Juan Ferrer
|
a029071c4e
|
refs #5517 User image fixes
|
2023-05-02 20:47:56 +02:00 |
Juan Ferrer
|
0ed6fe3d32
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2023-05-02 17:17:18 +02:00 |
Juan Ferrer
|
a5c11a0154
|
refs #5517 Hide worker image on error
|
2023-05-02 17:17:16 +02:00 |
Alex Moreno
|
79e7e7c604
|
refs #5472 feat: add change-password section
|
2023-05-02 15:16:13 +02:00 |
Alexandre Riera
|
04ad2cb3df
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector
|
2023-05-02 14:30:45 +02:00 |
Alexandre Riera
|
4c0ec6faf5
|
changedModel sms
|
2023-05-02 14:26:47 +02:00 |
Carlos Satorres
|
17425a627c
|
Merge branch 'dev' into 5316-kkeoEntryNotes
|
2023-05-02 11:25:17 +00:00 |
Alex Moreno
|
88b4abc2d2
|
Merge pull request 'solve' (!1495) from fdescribe03-fiscal-data into dev
Reviewed-on: #1495
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2023-05-02 10:22:46 +00:00 |
Carlos Satorres
|
ca2ab8d7b2
|
Merge branch 'dev' into fdescribe03-fiscal-data
|
2023-05-02 10:18:48 +00:00 |
Alex Moreno
|
306d73eb69
|
Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice
|
2023-05-02 09:42:56 +00:00 |
Alexandre Riera
|
13c37e88ef
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector
|
2023-05-02 11:38:07 +02:00 |
Carlos Satorres
|
754c5488bf
|
Merge pull request '5540-validarSupplierIsVies' (!1438) from 5540-validarSupplierIsVies into dev
Reviewed-on: #1438
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2023-05-02 09:29:08 +00:00 |
Carlos Satorres
|
ea73e7697d
|
solve
|
2023-05-02 11:27:25 +02:00 |
Alex Moreno
|
48be8b9fe0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired
|
2023-05-02 11:27:14 +02:00 |
Alex Moreno
|
4a7902ae4d
|
Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice
|
2023-05-02 08:41:18 +00:00 |
Carlos Satorres
|
5436eec63e
|
Merge branch '5540-validarSupplierIsVies' of https://gitea.verdnatura.es/verdnatura/salix into 5540-validarSupplierIsVies
|
2023-05-02 10:00:50 +02:00 |
Carlos Satorres
|
8156c17c7d
|
refs #5540 del jasmine
|
2023-05-02 10:00:47 +02:00 |
Alexandre Riera
|
70c46efe27
|
refs #4797 fix back test
|
2023-05-02 09:51:04 +02:00 |
Carlos Satorres
|
d9aae670f7
|
Merge branch 'dev' into 5540-validarSupplierIsVies
|
2023-05-02 06:07:17 +00:00 |
Alexandre Riera
|
c2de5c5ff4
|
refs #4797 added redirection section
|
2023-05-02 07:28:59 +02:00 |
Javi Gallego
|
659d76f022
|
Merge pull request 'refs #5615' (!1493) from 5615-getShipped into master
Reviewed-on: #1493
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
|
2023-05-01 19:23:00 +00:00 |
Javi Gallego
|
ed6b2cf25b
|
refs #5615
|
2023-05-01 14:57:50 +02:00 |
Juan Ferrer
|
ddec9fe406
|
refs #5517 Set tests timezone
|
2023-04-28 19:53:13 +02:00 |
Juan Ferrer
|
eb2c2b386a
|
refs #5517 Duplicated pagination removed
|
2023-04-28 19:48:36 +02:00 |
Carlos Satorres
|
06c01f3e94
|
Merge branch 'dev' into 5540-validarSupplierIsVies
|
2023-04-28 13:02:10 +00:00 |
Carlos Satorres
|
fb59371d54
|
refs #5540 quit logs
|
2023-04-28 14:38:49 +02:00 |
Carlos Satorres
|
0e0db960af
|
refs #5540 supplier
|
2023-04-28 14:23:44 +02:00 |
Alex Moreno
|
a89f400f10
|
use iban
|
2023-04-28 14:22:24 +02:00 |
Alex Moreno
|
ac55dc4cc7
|
refs #5297 feat(worker_new): add payMethod
|
2023-04-28 14:17:19 +02:00 |
Carlos Satorres
|
c0deb745d6
|
refs #5540 arreglo en supplier
|
2023-04-28 14:03:21 +02:00 |
Carlos Satorres
|
38142c121d
|
refs #5540 mods client
|
2023-04-28 12:12:26 +02:00 |
Alex Moreno
|
e00edf0266
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5297-newWorker_iban_not_required
|
2023-04-28 12:06:45 +02:00 |
Alex Moreno
|
c3038a4d61
|
fix(imageCollection):
|
2023-04-28 11:54:11 +02:00 |
Juan Ferrer
|
e70b0b22f3
|
refs #5517 Code clean
|
2023-04-28 11:43:45 +02:00 |
Juan Ferrer
|
14170286d7
|
Merge pull request '5517-improveLogs+translations' (!1439) from 5517-improveLogs+translations into dev
Reviewed-on: #1439
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
|
2023-04-28 09:35:38 +00:00 |