Commit Graph

18582 Commits

Author SHA1 Message Date
Alex Moreno 9030aea17c Merge pull request 'fix(client): use account setPassword' (!1500) from client_use_account_setPassword into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1500
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
2023-05-04 07:38:09 +00:00
Alex Moreno 1fa5926c17 Merge branch 'dev' into client_use_account_setPassword
gitea/salix/pipeline/head This commit looks good Details
2023-05-04 07:06:44 +00:00
Alexandre Riera e93b1cba63 Merge pull request 'fixes #4713 ENC - Modificar como se generan los avisos de cambios de cantidades al encajar' (!1374) from 4713-saleTracking into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1374
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-05-04 07:04:55 +00:00
Alex Moreno 2e020b5ebb fix(): correct version
gitea/salix/pipeline/head This commit looks good Details
2023-05-04 09:02:23 +02:00
Alexandre Riera a2d3b79246 Merge branch 'dev' into 4713-saleTracking
gitea/salix/pipeline/head This commit looks good Details
2023-05-04 06:42:39 +00:00
Alex Moreno b64f6d8489 Merge pull request 'refs #4617 use temporary instead of vn' (!1451) from 4617-use_tmp_in_ticketToInvoice into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1451
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-05-04 05:07:18 +00:00
Alex Moreno 5eca583c62 refs #5472 feat(vnUser): override setPassword
gitea/salix/pipeline/head This commit looks good Details
2023-05-03 15:19:19 +02:00
Alex Moreno b2027fddf3 fix(client): use account setPassword
gitea/salix/pipeline/head This commit looks good Details
2023-05-03 14:56:14 +02:00
Alex Moreno a712c0a303 Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice
gitea/salix/pipeline/head This commit looks good Details
2023-05-03 12:51:10 +00:00
Alexandre Riera ad3c6dcee2 wip #5595
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-03 14:34:36 +02:00
Carlos Satorres dbd0e5138b refs #5328 fix
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2023-05-03 14:06:57 +02:00
Carlos Satorres 566f03c497 refs #5328 commit prueba
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-03 13:03:14 +02:00
Carlos Satorres 3b2e1ca8d5 ref #5328 refundTicket.id
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-03 12:36:30 +02:00
Carlos Satorres eaf425fb51 refs #5328 mod funcion createTicketRefund
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-03 12:30:33 +02:00
Juan Ferrer 4c0f59399b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2023-05-03 11:37:07 +02:00
Carlos Satorres 2467534d1f refs #5090 mod golabel
gitea/salix/pipeline/head This commit looks good Details
2023-05-03 09:23:16 +02:00
Carlos Satorres 34a9b3768c Merge pull request '5316-kkeoEntryNotes' (!1449) from 5316-kkeoEntryNotes into dev
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2023-05-03 06:24:04 +00:00
Alex Moreno a60497dfc0 Merge branch 'dev' into 4797-worker-notification-selector
gitea/salix/pipeline/head This commit looks good Details
2023-05-03 05:09:33 +00:00
Juan Ferrer a029071c4e refs #5517 User image fixes
gitea/salix/pipeline/head This commit looks good Details
2023-05-02 20:47:56 +02:00
Juan Ferrer 0ed6fe3d32 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2023-05-02 14:30:45 +02:00
Alexandre Riera 4c0ec6faf5 changedModel sms
gitea/salix/pipeline/head This commit looks good Details
2023-05-02 14:26:47 +02:00
Carlos Satorres 17425a627c Merge branch 'dev' into 5316-kkeoEntryNotes
gitea/salix/pipeline/head Build queued... Details
2023-05-02 11:25:17 +00:00
Alex Moreno 88b4abc2d2 Merge pull request 'solve' (!1495) from fdescribe03-fiscal-data into dev
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2023-05-02 10:18:48 +00:00
Alex Moreno 306d73eb69 Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2023-05-02 11:38:07 +02:00
Carlos Satorres 754c5488bf Merge pull request '5540-validarSupplierIsVies' (!1438) from 5540-validarSupplierIsVies into dev
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2023-05-02 09:51:04 +02:00
Carlos Satorres d9aae670f7 Merge branch 'dev' into 5540-validarSupplierIsVies
gitea/salix/pipeline/head This commit looks good Details
2023-05-02 06:07:17 +00:00
Alexandre Riera c2de5c5ff4 refs #4797 added redirection section
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-02 07:28:59 +02:00
Javi Gallego 659d76f022 Merge pull request 'refs #5615' (!1493) from 5615-getShipped into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1493
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-05-01 19:23:00 +00:00
Javi Gallego ed6b2cf25b refs #5615
gitea/salix/pipeline/head This commit looks good Details
2023-05-01 14:57:50 +02:00
Juan Ferrer ddec9fe406 refs #5517 Set tests timezone
gitea/salix/pipeline/head This commit looks good Details
2023-04-28 19:53:13 +02:00
Juan Ferrer eb2c2b386a refs #5517 Duplicated pagination removed
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-28 19:48:36 +02:00
Carlos Satorres 06c01f3e94 Merge branch 'dev' into 5540-validarSupplierIsVies
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-28 13:02:10 +00:00
Carlos Satorres fb59371d54 refs #5540 quit logs 2023-04-28 14:38:49 +02:00