Commit Graph

18582 Commits

Author SHA1 Message Date
Carlos Satorres ec5a5be9e6 refs #5328 remove spaces 2023-05-30 09:18:52 +02:00
Carlos Satorres 3872078507 Merge branch 'dev' into 5328-abonarTodoTicket
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 07:16:38 +00:00
Carlos Satorres d9a64211de refs #5334 fix descriptor, basic-data, summary
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-30 09:16:02 +02:00
Vicent Llopis ea1c860a18 refs #5468 refactor: modificado acl directamente sin necesidad de crear una nueva ruta
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 09:13:47 +02:00
Vicent Llopis 94e7e8e321 Merge pull request '5327-ticket.sale_ordenarPorColumnas' (!1517) from 5327-ticket.sale_ordenarPorColumnas into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1517
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-05-30 07:11:48 +00:00
Alex Moreno 8fff3989e7 Merge branch 'dev' into 5066-vehicleSorted
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 06:30:48 +00:00
Vicent Llopis 27700bd72c Merge branch 'dev' into 5327-ticket.sale_ordenarPorColumnas
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 06:14:48 +00:00
Alexandre Riera 90cb4e224c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5507-loadConfigAtStart
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-30 08:06:49 +02:00
Carlos Satorres 9ee653dbd1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment 2023-05-30 08:05:17 +02:00
Carlos Satorres 0d394ec3aa Merge pull request 'refs #5648 move claimSure' (!1571) from 5648-sureClaimFIX into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1571
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-05-30 06:03:13 +00:00
Carlos Satorres 2d6f0bb2ce refs #5334 front fix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-29 15:27:50 +02:00
Alex Moreno b60cd2539a refs #5712 feat(workerDms): docuware integration
gitea/salix/pipeline/head This commit looks good Details
2023-05-29 15:21:37 +02:00
Carlos Satorres f4e877dada refs #5334 refactor summary
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-29 14:46:39 +02:00
Carlos Satorres 3423ce612c refs #5066 e2e fixs, change name sorted
gitea/salix/pipeline/head This commit looks good Details
2023-05-29 13:49:32 +02:00
Alexandre Riera ba850415be refs #5137 moved sql
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-29 12:56:54 +02:00
Alexandre Riera 1bb5033729 Merge branch 'dev' into 5137-aviso-impresora
gitea/salix/pipeline/head Build queued... Details
2023-05-29 10:56:21 +00:00
Alexandre Riera 059467a383 refs #5137 sql moved to template
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-29 12:55:20 +02:00
Carlos Satorres d8e7c2700a refs #5066 fix autocomplete
gitea/salix/pipeline/head This commit looks good Details
2023-05-29 12:42:27 +02:00
Vicent Llopis d2355412a0 Merge branch 'dev' into 5327-ticket.sale_ordenarPorColumnas
gitea/salix/pipeline/head This commit looks good Details
2023-05-29 08:59:20 +00:00
Carlos Satorres 91edc09057 refs #5066 move sql
gitea/salix/pipeline/head This commit looks good Details
2023-05-29 10:24:37 +02:00
Carlos Satorres 2e83d91006 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5066-vehicleSorted 2023-05-29 10:24:19 +02:00
Carlos Satorres 41b1b2fb3f fix >
gitea/salix/pipeline/head This commit looks good Details
2023-05-29 10:02:21 +02:00
Carlos Satorres b797f747f0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5648-sureClaimFIX 2023-05-29 10:00:33 +02:00
Alexandre Riera 1550716b1a Merge branch 'dev' into 5642-arreglar-e2e-ticketFuture-ticketAdvance
gitea/salix/pipeline/head This commit looks good Details
2023-05-29 07:59:22 +00:00
Alexandre Riera 1ed8000be9 refs #5642 e2es refactored
gitea/salix/pipeline/head This commit looks good Details
2023-05-29 09:58:49 +02:00
Carlos Satorres fad28dc711 Merge pull request 'refs #5398 update from oldbranch' (!1564) from 5398-Agencys&WarehousesData into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1564
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-05-29 07:58:13 +00:00
Pablo Natek a232e9ecea refs #5153
gitea/salix/pipeline/head This commit looks good Details
2023-05-29 09:26:36 +02:00
Vicent Llopis d313517e14 Merge branch 'dev' into 5327-ticket.sale_ordenarPorColumnas
gitea/salix/pipeline/head This commit looks good Details
2023-05-29 07:24:28 +00:00
Alexandre Riera e3300d2287 Merge branch 'dev' into 5642-arreglar-e2e-ticketFuture-ticketAdvance
gitea/salix/pipeline/head This commit looks good Details
2023-05-29 07:19:19 +00:00
Carlos Satorres 138d158f4f #refs 5684 remove and mod selectors
gitea/salix/pipeline/head This commit looks good Details
2023-05-29 09:11:41 +02:00
Carlos Satorres 1593b4b626 Merge branch 'dev' into 5398-Agencys&WarehousesData
gitea/salix/pipeline/head This commit looks good Details
2023-05-29 07:09:08 +00:00
Alex Moreno aca6e11983 Merge branch 'dev' into salix-node20
gitea/salix/pipeline/head This commit looks good Details
2023-05-29 06:32:53 +00:00
Alex Moreno a22ae3809e Merge pull request '5488-use_checkAccessAcl' (!1482) from 5488-use_checkAccessAcl into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1482
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-05-29 05:20:28 +00:00
Alex Moreno ffbc39ca56 Merge branch 'dev' into 5488-use_checkAccessAcl
gitea/salix/pipeline/head This commit looks good Details
2023-05-29 05:09:45 +00:00
Carlos Satorres 95c438b73a refs #5648 move claimSure
gitea/salix/pipeline/head This commit looks good Details
2023-05-26 14:52:47 +02:00
Carlos Satorres 2a78a912eb refs #5334 worker.department
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-26 14:35:12 +02:00
Vicent Llopis 60e694423d Merge pull request '5600-workerPhoto_incorrectSize' (!1522) from 5600-workerPhoto_incorrectSize into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1522
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-05-26 12:34:54 +00:00
Carlos Satorres 3aa5ce6208 refs #5334 fix hasToSendMail
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-26 14:23:34 +02:00
Carlos Satorres ceaaece007 refs #5334 label-value
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-26 14:08:37 +02:00
Alex Moreno f37d93b469 refs #5488 correct folder
gitea/salix/pipeline/head This commit looks good Details
2023-05-26 14:04:00 +02:00
Vicent Llopis 4e3f8f6975 Merge branch 'dev' into 5600-workerPhoto_incorrectSize
gitea/salix/pipeline/head This commit looks good Details
2023-05-26 11:33:41 +00:00
Carlos Satorres 07e176ae4f refs #5334 fix checks basic-data
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-26 13:25:49 +02:00
Carlos Satorres f74c370446 refs #5334 checks vertical
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-26 13:15:47 +02:00
Alex Moreno 0789804352 refs #5334 fix basic-data
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-26 12:58:03 +02:00
Alex Moreno 2b06c62876 refs #5334 left-menu
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-26 12:21:15 +02:00
Vicent Llopis 527116f1ec refs #5252 fix: te2e
gitea/salix/pipeline/head This commit looks good Details
2023-05-26 12:20:02 +02:00
Vicent Llopis 3ecfbe2052 refs #5252 refactor: creadas varaibles
gitea/salix/pipeline/head This commit looks good Details
2023-05-26 12:03:36 +02:00
Vicent Llopis 9e8efff016 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5252-canRefund_withOutWarehouse2
gitea/salix/pipeline/head This commit looks good Details
2023-05-26 11:55:32 +02:00
Alexandre Riera be06a65a45 refs #5507 fixed e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-26 11:53:32 +02:00
Carlos Satorres 027d45bc25 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-26 11:47:04 +02:00