Commit Graph

16654 Commits

Author SHA1 Message Date
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
Carlos Satorres 10e085ca1b refs #5334 link department
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-26 11:43:51 +02:00
Carlos Satorres 8adc104cf4 refs #5735 fix currency
gitea/salix/pipeline/head This commit looks good Details
2023-05-26 08:39:58 +02:00
Alex Moreno c7b8e57d95 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl
gitea/salix/pipeline/head This commit looks good Details
2023-05-26 07:41:48 +02:00
Alex Moreno b9cb812e0d Merge pull request 'fix item_getBalance' (!1569) from master_to_test2 into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1569
Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>
2023-05-26 05:37:35 +00:00
Alexandre Riera 8d3ee18172 Merge pull request 'fixes #5634 Adelantar el mismo ticket origen a múltiples tickets destino' (!1529) from 5634-ticketAdvance-mismoOrigen-multiplesDestinos into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1529
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-05-26 05:08:53 +00:00
Juan Ferrer 27d4d10472 refs #5667 Expedition translation fixes
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 18:32:03 +02:00
Juan Ferrer 2e0721b101 refs #5667 Fixes: Id filter, translations
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 18:22:46 +02:00
Vicent Llopis 71d8a355bd refs #5252 fix: te2e
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 15:03:22 +02:00
Alex Moreno 375fdf2a21 fix item_getBalance
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 14:31:28 +02:00
Alexandre Riera c46e6cd862 Merge pull request 'hotfix item_getBalance' (!1563) from hotfix-item_getBalance into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1563
2023-05-25 12:01:14 +00:00
Vicent Llopis 96feb24f12 refs #5252 fix: back test
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 13:28:44 +02:00
Alexandre Riera a584e1ab5e Merge branch 'dev' into 5634-ticketAdvance-mismoOrigen-multiplesDestinos
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 11:22:51 +00:00
Alexandre Riera 7e5fcc73ad modified fixed structure
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 13:10:05 +02:00
Vicent Llopis ce211b436d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5252-canRefund_withOutWarehouse2
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-25 13:00:11 +02:00
Alexandre Riera ee8ce8f0de Merge branch 'hotfix-item_getBalance' of https://gitea.verdnatura.es/verdnatura/salix into hotfix-item_getBalance
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-25 12:42:52 +02:00
Alexandre Riera cd508e970d changed structure like prod 2023-05-25 12:42:49 +02:00
Vicent Llopis 32badef787 delete console.log
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-25 12:07:17 +02:00
Vicent Llopis 06d1de5a63 refs #5554 feat: add back test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-25 12:06:40 +02:00
Vicent Llopis 91700e096e refs #5554 fix: cambiada extensión de archivos de test, y solucionado test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-25 11:51:27 +02:00
Carlos Satorres fa8fd8d5bc refs #5398 update from oldbranch
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 11:41:14 +02:00
Alex Moreno dd83b25bb2 Merge branch 'master' into hotfix-item_getBalance
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-25 09:37:38 +00:00
Alexandre Riera dfac44a87b hotfix 3rd parameter to null
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-25 11:35:25 +02:00
Vicent Llopis b95ee6cbfa refs #5554 feat: add front test
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 11:33:58 +02:00
Alexandre Riera a7363ce2a4 refs #5507 added service
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-25 11:23:33 +02:00
Alex Moreno 79897d8917 Merge pull request 'refs #5730 new version 232401' (!1562) from 232401_dev_init into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1562
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
2023-05-25 08:58:24 +00:00
Alexandre Riera 37a5e6e6c6 Merge branch 'dev' into 5507-loadConfigAtStart 2023-05-25 10:34:03 +02:00
Carlos Satorres d82a7eeeb7 Merge branch 'dev' into 5328-abonarTodoTicket
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 08:25:47 +00:00
Vicent Llopis 886c4a15b5 refs #5554 fix: manejado si la tabla accessTokenConfig esta vacía
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 10:19:00 +02:00
Vicent Llopis f471d62d41 refs #5554 refactor: 'renewToken' utiliza logout y createAccessToken
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 10:09:38 +02:00
Alex Moreno 99f87aaf38 Merge branch 'dev' into 232401_dev_init
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 08:04:15 +00:00
Alex Moreno 1a4ae400c7 Merge pull request 'refs #5678 feat(sale_canEdit): handle exist sale' (!1555) from 5678-sale-canEdit-notSale into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1555
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
2023-05-25 08:03:58 +00:00