Commit Graph

17612 Commits

Author SHA1 Message Date
Vicent Llopis cf8a84e647 Merge pull request '4734-addViaexpress' (!1629) from 4734-addViaexpress into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1629
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-07-28 08:57:30 +00:00
Vicent Llopis 251ed36eca refs #6013 feat: mostrar error en el mail
gitea/salix/pipeline/head This commit looks good Details
2023-07-28 10:51:48 +02:00
Vicent Llopis fbc1e28031 Merge branch 'dev' into 4734-addViaexpress
gitea/salix/pipeline/head This commit looks good Details
2023-07-28 07:54:26 +00:00
Carlos Satorres 0546ae99eb refs #5660 add fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-07-27 17:27:06 +02:00
Carlos Satorres d3aa6ddf6b refs change fixtures acls 2023-07-27 17:26:36 +02:00
Carlos Satorres af60412232 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant 2023-07-27 17:24:50 +02:00
Carlos Satorres d01584bfb3 refs #4764 service
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-27 15:15:55 +02:00
Vicent Llopis 0054f2d82f refs #6013 fix: codigo no bloqueante
gitea/salix/pipeline/head This commit looks good Details
2023-07-27 15:07:10 +02:00
Vicent Llopis 7367d1cdfe refs #6013 fix: add await
gitea/salix/pipeline/head This commit looks good Details
2023-07-27 14:41:53 +02:00
Carlos Andrés 3bc3ffe115 refs #6077 Log-InvoiceInDueday-incorrecto
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-27 13:40:39 +02:00
Vicent Llopis 65b9cadd9e refs #5804 refactor: sustituido activeBuyers por getItemTypeWorker
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-27 12:51:14 +02:00
Alex Moreno 29baa2f0c7 refs #6015 modify changelog
gitea/salix/pipeline/head This commit looks good Details
2023-07-27 08:27:09 +02:00
Vicent Llopis 777426aa05 refs #5561 add backTest
gitea/salix/pipeline/head This commit looks good Details
2023-07-27 07:58:55 +02:00
Alex Moreno 305caaf8aa Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix 2023-07-27 07:20:34 +02:00
Alex Moreno 61b17d1fa5 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-07-27 07:19:48 +02:00
Carlos Satorres 0808fc5b25 Merge pull request 'hotfix change model' (!1690) from hotfix-modelezpx into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1690
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-07-26 12:11:47 +00:00
Carlos Satorres 1277af1399 hotfix mod path
gitea/salix/pipeline/head This commit looks good Details
2023-07-26 13:53:15 +02:00
Jorge Penadés 10361ba78e refs #5216 addExpeditionState refactored
gitea/salix/pipeline/head This commit looks good Details
2023-07-26 13:33:56 +02:00
Carlos Satorres 2a0c363dc5 hotfix change model
gitea/salix/pipeline/head This commit looks good Details
2023-07-26 13:28:40 +02:00
Carlos Satorres 118f41c898 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono
gitea/salix/pipeline/head This commit looks good Details
2023-07-26 13:12:01 +02:00
Jorge Penadés bbc26d8ba4 WIP refs #5216 addExpeditionState
gitea/salix/pipeline/head This commit looks good Details
2023-07-26 12:36:30 +02:00
Jorge Penadés 0b88194f09 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-expeditionStateAdd
gitea/salix/pipeline/head This commit looks good Details
2023-07-26 10:27:01 +02:00
Jorge Penadés fca03e5b7c Merge pull request '5929-editTicketPrice' (!1688) from 5929-editTicketPrice into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1688
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-07-26 08:24:04 +00:00
Jorge Penadés 05eff94217 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-expeditionStateAdd
gitea/salix/pipeline/head This commit looks good Details
2023-07-26 10:22:32 +02:00
Jorge Penadés a0fee6ad50 refs #5929 removed useless vars
gitea/salix/pipeline/head This commit looks good Details
2023-07-26 09:20:54 +02:00
Jorge Penadés 0b6fb70f28 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5929-editTicketPrice 2023-07-26 08:36:29 +02:00
Jorge Penadés b10d774c11 Merge pull request 'refs #6047 added editable-td component' (!1686) from 6047-addEditableTd into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1686
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-07-26 06:05:46 +00:00
Alex Moreno af28cfe6df Merge branch 'dev' into 6047-addEditableTd
gitea/salix/pipeline/head This commit looks good Details
2023-07-26 05:22:44 +00:00
Alex Moreno 47b2aa0ee7 Merge branch 'dev' into 5941-send-to-support
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-26 05:10:30 +00:00
Jorge Penadés fa9dfdf411 refs #5216 try ACL updateExpeditionState
gitea/salix/pipeline/head This commit looks good Details
2023-07-25 16:32:38 +02:00
Jorge Penadés 96483a827f Merge branch 'dev' into 5929-editTicketPrice
gitea/salix/pipeline/head This commit looks good Details
2023-07-25 13:40:08 +00:00
Jorge Penadés 543fbf3c0a refs #5929 isEditableOrThrow created, tests passed
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-25 15:35:08 +02:00
Alex Moreno bf92c5d482 refs #6059 validateLogin sync user
gitea/salix/pipeline/head This commit looks good Details
2023-07-25 15:00:08 +02:00
Jorge Penadés 9978db9d52 refs #5929 WIP test created
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-25 11:33:01 +02:00
Alex Moreno 44ceeac9c4 refs #5983 feat(itemShelving): add userFk field
gitea/salix/pipeline/head This commit looks good Details
2023-07-25 10:21:54 +02:00
Alex Moreno 26ea39cacc Merge pull request '5712-workerDms_integrateDocuware' (!1577) from 5712-workerDms_integrateDocuware into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1577
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-07-25 05:18:03 +00:00
Jorge Penadés ea4190f15c refs #5216 update expedition state added
gitea/salix/pipeline/head This commit looks good Details
2023-07-24 13:32:28 +02:00
Jorge Penadés 4f80221101 refs #5929 added ACL and accurate errors
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-24 10:34:44 +02:00
Jorge Penadés 55f32397c5 removed unnecesary comments
gitea/salix/pipeline/head This commit looks good Details
2023-07-21 13:13:44 +02:00
Jorge Penadés ade7303a6f refs #6047 added editable-td component
gitea/salix/pipeline/head This commit looks good Details
2023-07-21 13:05:55 +02:00
Vicent Llopis 8267daef3a refs #5918 fix: permite reenviar el correo si ha dado fallo
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-21 12:58:44 +02:00
Alex Moreno b400e1983a Merge pull request 'refs #5769 fix(web-access): email rule' (!1684) from 5769-hotFix_client_web-access_email2 into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1684
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
2023-07-21 10:43:32 +00:00
Alex Moreno 203f6a5659 refs #5712 correct sql folder
gitea/salix/pipeline/head This commit looks good Details
2023-07-21 12:41:16 +02:00
Alex Moreno 23308d7ae3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5712-workerDms_integrateDocuware 2023-07-21 12:40:59 +02:00
Alex Moreno 985e258529 refs #5769 fix(web-access): email rule
gitea/salix/pipeline/head This commit looks good Details
2023-07-21 12:33:14 +02:00
Vicent Llopis 9bf891fcec refs #5561 fixed
gitea/salix/pipeline/head This commit looks good Details
2023-07-21 12:20:06 +02:00
Vicent Llopis f926c60017 remove file
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-21 12:02:02 +02:00
Vicent Llopis 51f9055d23 remove file 2023-07-21 12:01:57 +02:00
Vicent Llopis cf0b6f8c6e refs #5561 fix: saleGroupDetail.saleFk UNIQUE
gitea/salix/pipeline/head This commit looks good Details
2023-07-21 12:01:01 +02:00
Vicent Llopis f52b398596 refs #5561 refactor: sustituidos sql por loopback
gitea/salix/pipeline/head This commit looks good Details
2023-07-21 09:50:27 +02:00