Commit Graph

1533 Commits

Author SHA1 Message Date
Jon Elias 7df7382346 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-11 09:41:26 +02:00
Jon Elias f0ad012835 refactor: refs #6436 first wave 2024-06-11 09:39:06 +02:00
Jorge Penadés d30cd68417 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6598-getUserAcls
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-11 09:11:56 +02:00
Pablo Natek d41f1ff561 fix: refs #6404 remove focus from test
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-10 12:36:15 +02:00
Pablo Natek c5227d6cf6 feat: refs #6404 add mail notification
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-06-10 12:24:23 +02:00
Carlos Satorres 48550bd986 refs #6897 fix remove
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-07 11:35:03 +02:00
Sergio De la torre f70605e565 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7195_roadmaps 2024-06-04 16:03:37 +02:00
Alex Moreno 7a803cce37 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
2024-06-04 09:38:50 +02:00
Sergio De la torre 94aef434a9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7195_roadmaps 2024-06-04 07:17:37 +02:00
Pablo Natek b9b0651069 fix: refs #6404 fix agency service selection
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-03 12:38:57 +02:00
Pablo Natek b1a4b42028 fix: refs #6404 change db language on local
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-03 10:29:38 +02:00
Jon Elias cf5b8a27a7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5447-TravelExtraCommunity 2024-06-03 10:04:38 +02:00
Sergio De la torre b9a9f52514 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7195_roadmaps 2024-06-03 07:56:43 +02:00
Sergio De la torre 2985e1c9e8 feat: roadMap refs #7195 2024-05-31 13:08:48 +02:00
Jorge Penadés 9578c506b4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-31 12:58:05 +02:00
Guillermo Bonet 7dc17cd4f6 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-05-31 12:29:32 +02:00
Pablo Natek 988b3cbbee fix: refs #6404 ref #6404 remove console.log
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-31 11:53:55 +02:00
Pablo Natek 884b5f8475 feat: refs #6404 add cero filler to counter 2024-05-31 11:51:32 +02:00
Pablo Natek d901584c3f feat: refs #6404 add deadline field
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-05-30 18:39:06 +02:00
Jorge Penadés 9d58c67b4a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-29 09:16:25 +02:00
Guillermo Bonet f87ee5cb91 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-05-29 08:09:53 +02:00
Jorge Penadés 885aa5208a feat : refs #6889 wip: check if is productionReviewer or owner
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-28 17:23:58 +02:00
Pablo Natek 33e823675e feat: refs #6404 default weight
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-28 10:08:15 +02:00
Sergio De la torre 2d876fa1a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-27 11:33:22 +02:00
Sergio De la torre 74b71079f2 refs #6861 feat: obsrevation
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-27 11:33:04 +02:00
Sergio De la torre 2cd7133a8c refs #6861 feat: skipTest
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-27 08:15:57 +02:00
Sergio De la torre 64f71e0f9d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-27 07:46:21 +02:00
Javier Segarra ab1797ebec Merge branch 'dev' into 7272_bug_redirectToLogin
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-24 11:59:30 +00:00
Jon Elias e902a84d10 refactor: refs #5447 changed models
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-23 09:22:19 +02:00
Carlos Satorres 4c5f46eb9b Merge pull request 'refs #6820 fix back' (!2480) from 6820-fixMaxKmRoute into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2480
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-22 13:55:53 +00:00
Carlos Satorres 4dee90ff57 refs #6820 fix pr
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-22 14:56:46 +02:00
Alex Moreno 28279b0782 Merge branch 'dev' into 7421-fix_checking_NODE_ENV
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-21 13:12:30 +00:00
Alex Moreno ff33c926af fix: move to boot
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-21 15:11:32 +02:00
Alex Moreno d884192066 fix: checking process.env.NODE_ENV
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-21 13:52:50 +02:00
Alex Moreno 18bb8a4ea5 fix: checking process.env.NODE_ENV
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-21 13:50:45 +02:00
Javier Casado d0bb9d7690 Merge branch 'dev' into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-21 05:50:49 +00:00
Pablo Natek 3fa557f90d fix: refs #6404 create shipment
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 13:58:32 +02:00
Pablo Natek 143f9cf0bb fix: refs #6404 fix return
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 12:17:10 +02:00
Pablo Natek d51c9fc120 fix: refs #6404 fix cancel shipment
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 12:14:59 +02:00
Carlos Satorres 7f1210e712 refs #6820 fix back
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 10:26:09 +02:00
Javier Casado 5ee550ebf7 Merge branch 'dev' into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 12:08:41 +00:00
Jorge Penadés 0e51fa861c fix: refs #6598 drop variables
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 11:35:29 +02:00
Jorge Penadés 5abc95af51 feat: refs #6598 back test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 11:29:16 +02:00
Sergio De la torre 75bb08a0c6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-16 07:08:47 +02:00
Jorge Penadés c6242cc2e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6598-getUserAcls
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-15 16:41:15 +02:00
Javier Casado 03f0de489e Merge branch 'dev' into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 05:40:25 +00:00
Sergio De la torre e8a30c1df8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-06 10:30:19 +02:00
Jorge Penadés 411933a608 feat: refs #6598 acls back
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-03 12:17:51 +02:00
Javier Segarra ae91486641 test(salix): refs #7272 #7272 fix renew-token.spec 2024-05-02 10:36:18 +02:00
Javier Segarra be3ee43b06 fix(salix): refs #7272 #7272 Back validateToken endpoint 2024-04-30 11:35:30 +02:00
Robert Ferrús d2c3034ec6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 12:07:53 +02:00
Robert Ferrús fd7dcf2781 fix: refs #7039 fixpr
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 10:26:20 +02:00
Robert Ferrús 2d0d4b5643 Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 06:48:01 +00:00
Pablo Natek 51c42d09b2 fix: refs #4988 agency hook
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 08:39:05 +02:00
Pablo Natek 4693ba13fa Merge branch 'dev' of https: refs #4988//gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency 2024-04-26 08:37:51 +02:00
Pablo Natek 4e11e46fff feat: refs #4988 capture error on duplicate
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 12:40:54 +02:00
Robert Ferrús 8153a526ce feat: refs #7039 country-name
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 12:35:21 +02:00
Pablo Natek c5b02dc239 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency 2024-04-25 09:46:53 +02:00
Javi Gallego dcc46494bc Merge branch 'dev' into 7108-exchange-rate
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 07:45:02 +02:00
Javier Segarra 83d89d13ad Merge branch 'dev' into 7190_renewTokenMultimedia
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-23 08:26:23 +00:00
Pablo Natek adc3b413f5 feat: refs #4988 agency add module
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-22 17:17:17 +02:00
Javi Gallego b0c4f7fd3c feat: moved files to invoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-22 11:45:58 +02:00
Javi Gallego 4416790ce1 Merge branch 'dev' into 7108-exchange-rate 2024-04-22 11:45:02 +02:00
Javier Segarra d2aba88a34 feat(salix): refs #7190 minor change salix-back 2024-04-19 11:36:34 +02:00
Javier Segarra 30d0db163e feat(salix): refs #6930 minor updates 2024-04-19 10:50:14 +02:00
Javier Segarra 322d91d814 feat(salix): refs #6930 Add DEFAULT scope 2024-04-19 10:49:57 +02:00
Sergio De la torre ad13ad856b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-18 09:13:48 +02:00
Pablo Natek 77f7348acb feat(workcenter): refs #4988 add workcenter config menu
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-18 09:02:01 +02:00
Javier Segarra 6214da2c42 feat(salix): refs #6930 Undo rollback salix-back 2024-04-17 09:52:53 +02:00
Pablo Natek d0dfdc668b feat(agency): refs #4988 add new agency
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-16 16:25:27 +02:00
Javi Gallego 58baa45e09 Merge branch 'dev' into 7108-exchange-rate
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-16 09:47:21 +02:00
Javi Gallego 77a1aa4de6 feat: @7108 test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-16 08:45:03 +02:00
Pablo Natek 0418540ef9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-16 07:39:13 +02:00
Pablo Natek 336c3274ea feat(agency): refs #4988 add summary 2024-04-16 07:38:48 +02:00
Javier Segarra 6db0eba72c Merge branch 'dev' into 7190_renewTokenMultimedia
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-15 06:51:03 +00:00
Javier Segarra 25b5c35dc6 refs #6835 fix: issue
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-15 08:47:49 +02:00
Javier Segarra 253465cf13 refs #7190 feat: renewToken for multimedia 2024-04-15 08:47:27 +02:00
Javi Gallego e8001b72e4 feat: minor changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-13 09:05:54 +02:00
Javi Gallego bb6ea31bf7 feat: funcional a falta de test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-12 10:26:32 +02:00
Sergio De la torre 13415b1ef0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-12 09:49:18 +02:00
Pablo Natek 726b1ddc07 Merge branch 'dev' into 6005-backupLabeler
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-12 05:14:29 +00:00
Javi Gallego bc9149ec37 feat: tipo de cambio php to js 2024-04-11 14:32:26 +02:00
Sergio De la torre 3a8dcbfd29 refs #6861 feat:reserve previos
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-11 13:45:43 +02:00
Sergio De la torre 9a98c872d4 Merge branch '5890-itemShelving_asignado' into 6861-Pasar-modo-trabajo-de-previa-a-reservas
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-11 12:34:49 +02:00
Sergio De la torre 68fa64a937 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-11 12:24:00 +02:00
Carlos Andrés 5967bd545c feat: previas con reserva refs #6861
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-11 12:16:00 +02:00
Sergio De la torre d998b650da Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-11 07:06:40 +02:00
Pablo Natek c581deef66 refactor: refs #6005 refactor spec 2024-04-10 13:09:31 +02:00
Pablo Natek ed517399dc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler 2024-04-09 15:04:04 +02:00
Ivan Mas f02c4354ba Merge branch 'dev' into 6827-check-usernames-special-characters
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-09 14:45:29 +02:00
Pablo Natek aff73a179e remove: refs #6005 remove delay from notification model 2024-04-09 13:36:50 +02:00
Pablo Natek da037c5235 refactor: refs #6005 delay on productionConfig 2024-04-09 13:34:33 +02:00
Guillermo Bonet 0e2e68488d Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-09 13:08:54 +02:00
Guillermo Bonet 743dc2144e hotfix: refs #6276 Fix send chat msg getSales
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-09 13:05:01 +02:00
Pablo Natek 7cb40f5d89 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-09 09:42:39 +02:00
Alex Moreno 9134216332 refactor(workerDms): adapat to lilium
gitea/salix/pipeline/pr-dev Build queued... Details
2024-04-08 14:46:35 +02:00
Sergio De la torre 2770919db9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-08 07:09:47 +02:00
Pablo Natek 4b4aaa9e10 feat: refs #6005 move logic from report to hook 2024-04-05 08:04:53 +02:00
Alex Moreno dd9c7283c3 hotFix: handle mail error
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-04 13:32:39 +02:00
Sergio De la torre b742f8a13c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-04 12:26:01 +02:00
Guillermo Bonet c685000b47 hotfix: refs #6930 Rollback tokenMultimedia
gitea/salix/pipeline/head This commit looks good Details
2024-04-04 10:13:56 +02:00
Javier Segarra 8ab9063b50 refs #6436 feat: use mocks
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-01 11:00:55 +02:00
Javier Segarra d6ee5d571e refs #6436 feat: jasmine helper 2024-04-01 10:58:04 +02:00
Javier Segarra cb55740b68 refs #6436 rollback 2024-04-01 10:57:53 +02:00
Javier Segarra 48cc499f37 refs #6436 perf: example to use
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-29 22:19:36 +01:00
Javier Segarra a5d262671d refs #6436 feat: extend BeforeAll 2024-03-29 22:19:23 +01:00
Sergio De la torre 9698c049fc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-28 07:35:37 +01:00
Alex Moreno 2212899400 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-26 08:35:38 +01:00
Alex Moreno dce0155c00 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-03-26 08:18:47 +01:00
Sergio De la torre 2a1204a00a refs #6276 hotFix: setUserError and return
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-25 13:27:52 +01:00
Sergio De la torre 386bc1c934 refs #6276 hotFix: setUserError and return 2024-03-25 13:00:55 +01:00
Jon Elias c49b8bf954 refactor: refs #6556 minor changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-22 09:35:09 +01:00
Jon Elias eadd8f750d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6556-ChangeImages 2024-03-22 08:22:49 +01:00
Sergio De la torre f18d61d17d refs #5890 fix: dev 2024-03-21 17:28:08 +01:00
Sergio De la torre d7d47da3e2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado 2024-03-21 11:19:16 +01:00
Ivan Mas db71e69317 Merge branch 'dev' into 6827-check-usernames-special-characters
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-21 09:21:32 +00:00
Sergio De la torre 9eee26cbe9 refs #6276 feat:newWarehouse
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-21 10:18:54 +01:00
Guillermo Bonet 8a96327d97 Merge branch 'dev' into 6232-refactorConfigTables
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-20 06:17:06 +00:00
Jon Elias 6d4f07adc3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6556-ChangeImages 2024-03-15 14:13:24 +01:00
Guillermo Bonet 5b546079b0 Merge branch '6232-refactorConfigTables' of https://gitea.verdnatura.es/verdnatura/salix into 6232-refactorConfigTables
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-15 12:38:34 +01:00
Guillermo Bonet 0867211573 refs #6403 Fix model mrwConfig 2024-03-15 12:38:33 +01:00
Javier Segarra bfdbbc0fdf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions 2024-03-15 12:22:57 +01:00
Jon Elias 67c572f187 fixed dropped test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-15 10:48:24 +01:00
Javier Segarra 6989299593 Merge branch 'dev' into 6930_scopedToken_Multimedia
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-15 08:26:45 +00:00
Jon Elias c6f7a8bdb0 refactor: #6556 drop useless test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-14 15:49:36 +01:00
Pablo Natek e3b7c7bb60 Merge branch 'dev' into 6005-backupLabeler
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-14 09:39:13 +00:00
Alex Moreno 0ad052c34a refs #7033 deploy(2412): dev to test
gitea/salix/pipeline/pr-test This commit looks good Details
2024-03-14 08:36:19 +01:00
Sergio De la torre bfcfd2245b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado 2024-03-14 07:40:30 +01:00
Javier Segarra c84e86270c refs #6930 perf: remove logoutMultimedia method 2024-03-12 13:30:32 +01:00
Javier Segarra 486b51bcfa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6930_scopedToken_Multimedia 2024-03-12 12:46:46 +01:00
Sergio De la torre 375b690063 Merge branch 'dev' into 6078_workerActivty
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-12 09:12:45 +00:00
Pablo Natek 421ca8654d fix(changes): refs #6005 remove changes files
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-11 13:39:03 +01:00
Pablo Natek 8815f07850 feat(spec): refs #6005 add spec to backup Notify
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-11 12:18:03 +01:00
Sergio De la torre 61de81254a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado 2024-03-11 08:11:00 +01:00
Javier Segarra 18773f34de Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-09 11:27:57 +01:00
Pablo Natek ae25ba3fb6 feat(notify): refs #6005 add restriction on created notification time
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-08 13:44:19 +01:00
Pablo Natek 2421cc7c68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-08 08:23:08 +01:00
Sergio De la torre dd732297c4 Merge branch 'dev' into 6078_workerActivty
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-07 07:31:04 +01:00
Sergio De la torre 69ad44c0bd Merge branch 'dev' into 6078_workerActivty
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-07 07:18:16 +01:00
Guillermo Bonet 39b4e5db28 Merge branch 'dev' into 6948-bank
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-07 06:17:26 +00:00
Javier Segarra 6c06f70121 Merge branch 'dev' into 6930_scopedToken_Multimedia
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-06 18:18:34 +00:00
Sergio De la torre cf181521d6 refs #6078 feat:add workeractivity
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-05 11:53:57 +01:00
Guillermo Bonet e0732835d0 refactor: refs #6948 Bank to Accouting
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-05 10:25:23 +01:00
Jorge Penadés fc08adc064 fix: refs #6276 options
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-05 10:09:32 +01:00
Jorge Penadés 854a9b62af fix: refs #6276 refactor updateInTime & changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-04 09:21:41 +01:00
Jorge Penadés 97f76c64ff refactor: refs #6276 drop sendRocket method
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-01 13:35:07 +01:00
Javier Segarra becd2e6f48 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions 2024-02-29 07:49:24 +01:00
Javier Segarra 5ee9c2b01e refs #6930 fix: revert fdescribe
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-29 07:40:20 +01:00
Ivan Mas 10a89cb790 refs #6827 Check usernames special characters
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-28 13:32:17 +01:00
Javier Segarra 23b3fb81f9 refs 6930 feat: implements logout remoteMethod 2024-02-28 10:43:19 +01:00
Jorge Penadés f95a4f3530 refactor: refs #6276 drop setState function
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-28 09:06:48 +01:00
Sergio De la torre fd077ae60f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado 2024-02-28 07:45:39 +01:00
Javier Segarra f2ad069186 refs 6930 feat: get multimediaToken from new method
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-27 14:26:54 +01:00
Jorge Penadés b86110c898 fix: refs #6276 changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-27 10:29:49 +01:00
Jorge Penadés c875abf5e3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-27 09:42:14 +01:00
Sergio De la torre 96abdd4630 refs #6078 feat:add workeractivity 2024-02-26 12:52:34 +01:00
Javier Segarra 04086e37ee refs #6930 feat: add accessScopes: ['read:multimedia'] forEarch method
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-26 06:57:17 +01:00
Javier Segarra a078de9521 refs #6930 feat: return multimediaToken when login 2024-02-26 06:51:19 +01:00
Juan Ferrer 3f0d301870 Merge pull request 'refs #6915 master into test' (!2092) from master into test
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2092
2024-02-23 18:02:07 +00:00
Pablo Natek c8e0195510 fix throw error
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-23 14:44:59 +01:00
Pablo Natek 44668b2445 remove(focus). refs #6403 remove f
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-23 14:41:35 +01:00
Pablo Natek 94b49efb1f feat(fix): refs #6403 add transaction to createShipment
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-02-23 14:38:44 +01:00
Pablo Natek 277bcafd89 fix(commit): refs #6403 hotFix add commit
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-02-23 14:11:11 +01:00
Jorge Penadés 7fdfd4fcb4 fix: refs #6276 desestructuring
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 13:02:56 +01:00
Jorge Penadés 70c400c5f9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 12:51:22 +01:00
Pablo Natek 18da27179d merge(dev): refs #6005 traduction conflict
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-23 09:40:58 +01:00
Alex Moreno c7dd81e53d Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head There was a failure building this commit Details
gitea/salix/pipeline/pr-dev Build started... Details
2024-02-23 07:12:24 +01:00
Guillermo Bonet 7d3cf162b8 fix: refs #6184 uploadFile
gitea/salix/pipeline/pr-master This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-02-22 11:22:39 +01:00
Javier Segarra d0c82f694e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-22 07:08:41 +01:00
Alex Moreno 92f2282632 Revert "Merge pull request 'Revert "Merge branch 'dev' into test"' (!2064) from test_revert into test"
gitea/salix/pipeline/pr-dev This commit looks good Details
This reverts commit cbe23d8df5, reversing
changes made to c4a64b93cc.
2024-02-21 14:52:28 +01:00
Alex Moreno 01f1bd0088 Revert "Merge branch 'dev' into test"
gitea/salix/pipeline/pr-test This commit looks good Details
This reverts commit c4a64b93cc, reversing
changes made to 2ab1cebb31.
2024-02-21 14:44:34 +01:00
Alex Moreno c4a64b93cc Merge branch 'dev' into test
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-02-21 13:32:54 +00:00
Pablo Natek 5e97f820a2 feat(spec): refs #6005 add spec
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-21 12:59:42 +01:00
Alex Moreno 8182809d8a Merge branch 'master' into 6403-mrwIntegration
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-21 08:50:54 +00:00
Javier Segarra 811a49275d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions 2024-02-20 13:53:18 +01:00
Pablo Natek 1c40e01fcb refactor: refs #6005 move the logic to the report
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-20 13:49:42 +01:00
Pablo Natek ab7eb88913 merge(dev): refs #6005 merge dev
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-20 09:34:08 +01:00
Alex Moreno 668903fa5f hotFix(getUrl): fix prop name environment
gitea/salix/pipeline/head This commit looks good Details
2024-02-20 09:08:32 +01:00
Alex Moreno 4952e0be20 hotFix(getUrl): fix prop name environment 2024-02-20 09:04:50 +01:00
Jorge Penadés d5a3413307 fix: refs #6776 method names & chanmges
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-19 14:46:42 +01:00
Pablo Natek 46043eef9a refactor(description): refs #6403 modify description
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-19 12:54:24 +01:00
Pablo Natek b3ce6e8d45 fix(spec): refs #6403 add mrwSpec
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-19 11:33:56 +01:00
Jorge Penadés 8d1dea8a00 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-19 11:19:59 +01:00
Pablo Natek c10cb7c051 feat(spec): refs #6403 mrwIntegration
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-02-16 14:15:13 +01:00
Sergio De la torre f4ea220578 Merge branch 'dev' into 6559_getSectors
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-16 12:54:45 +00:00
Jorge Penadés 63c615655b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-16 08:34:05 +01:00
Pablo Natek 94fe0220e5 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6403-mrwIntegration 2024-02-16 08:30:06 +01:00
Pablo Natek b6be76c38f feat(test): refs #6403 add spec
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-02-16 08:28:40 +01:00
Sergio De la torre 93de845b67 refs#5890 feat: delete trigger and modify getTickets 2024-02-16 07:03:05 +01:00
Sergio De la torre 0ad8306dd9 refs#5890 feat: delete trigger and modify getTickets 2024-02-16 07:00:08 +01:00
Alex Moreno 625922275c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-02-15 10:14:19 +01:00
Alex Moreno fddbf6451b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-02-15 07:52:08 +01:00
Javier Segarra f608eb1859 Merge pull request '#6386 - Download method add file with extension' (!1993) from 6386_imageWithNoFormat into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1993
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-02-14 08:13:55 +00:00
Juan Ferrer 4f9b46346f fix: refs#6706 back tests spec timeout reduced
gitea/salix/pipeline/head There was a failure building this commit Details
2024-02-13 09:49:33 +01:00
Guillermo Bonet 97f02187e3 Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 07:35:07 +01:00
Javier Segarra e5b7395e5c refs #5858 fix: test Notification getList 2024-02-12 10:27:28 +01:00
Pablo Natek fe79823ce8 refs #6403 2024-02-12 09:24:37 +01:00
Jorge Penadés 4aeb88229d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-09 13:07:42 +01:00
Juan Ferrer f18191d6e9 refactor: refs#6706 root dir clean, minimist dep removed
gitea/salix/pipeline/head There was a failure building this commit Details
2024-02-09 09:23:00 +01:00
Sergio De la torre 36683597ec refs #6559 feat:quit call get_sectors
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-09 07:02:00 +01:00
Sergio De la torre c2360ca154 refs #6559 feat:quit call get_sectors 2024-02-09 06:59:39 +01:00
Jorge Penadés c2fffd1eda fix: refs #6276 drop test
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-08 14:52:23 +01:00
Jorge Penadés 33cca9bfe8 fix: refs #6276 assignColletion
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-08 14:20:05 +01:00
Jorge Penadés 2940c68516 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-08 08:36:05 +01:00
Pablo Natek d2d28889b6 merge(master): refs #6403 merge master fix conflicts
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-02-07 16:55:09 +01:00
Pablo Natek 6c9215bb51 feat(mrw): refs #6403 big commit 2024-02-07 16:52:43 +01:00
Alex Moreno 87864593b2 Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-07 06:17:35 +00:00
Juan Ferrer a67a347a9e ci: refs#6706 CI fixes
gitea/salix/pipeline/head This commit looks good Details
2024-02-06 21:51:15 +01:00
Javier Segarra 4d6e631fca Merge branch 'dev' into 5834-billingDataAutoFillBic
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-06 17:33:27 +01:00
Sergio De la torre 844bab3cc8 #refs 5890 feat:add assignCollection 2024-02-06 16:17:53 +01:00
Guillermo Bonet 2cab007f57 fix: refs #6184 Requested changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-06 12:12:45 +01:00
Guillermo Bonet d6ae1fd1f8 Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-06 06:39:51 +01:00
Juan Ferrer f2071d39ec ci: refs#6706 Jenkinsfile tuning & parallel back test (unstable, disabled)
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-04 23:58:26 +01:00
Javier Segarra 9448b40533 refs #6386 feat: add extension when return file
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-02 14:53:48 +01:00
Jorge Penadés 8f5a5d9cba fix: refs #6703 tests & backs 2024-01-31 13:11:15 +01:00
Javier Segarra b4bb9a4849 refs #5834 feat: new validation 2024-01-31 10:46:16 +01:00
Jorge Penadés 2a6abffef9 fix: refs #6276 fix errors & refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-30 16:07:33 +01:00
Javier Segarra 7ebdf59d97 Merge branch 'dev' into 5834-billingDataAutoFillBic
gitea/salix/pipeline/head There was a failure building this commit Details
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-01-30 14:06:27 +00:00
Jorge Penadés e17fc91415 fix: refs #6276 fix acl, addSaleByCode & tests
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-30 14:58:11 +01:00
Jorge Penadés 88dfdb157f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-30 11:25:17 +01:00
Guillermo Bonet ae7fb12b53 Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-30 09:25:29 +00:00
Juan Ferrer c1726f9390 fix: refs #5483 Remove DB container when back tests end 2024-01-30 10:23:32 +01:00
Guillermo Bonet 13b8964e3d Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-30 07:27:34 +00:00
Sergio De la torre 0f3ffcfa61 fix: refs #6184 Upload sign
gitea/salix/pipeline/head This commit looks good Details
2024-01-30 08:11:33 +01:00
Juan Ferrer 7c18e22c38 feat: refs #5483 myt updated, back tests now use tmpfs for DB 2024-01-29 20:16:03 +01:00
Guillermo Bonet ed43b6be2d Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-29 14:38:14 +01:00
Juan Ferrer 194262a93e fix: refs #6085 ACL canEditAlias checked, migrated to remote hooks
gitea/salix/pipeline/head This commit looks good Details
2024-01-29 13:48:02 +01:00
Jorge Penadés 72e5050d93 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-29 08:37:55 +01:00
Juan Ferrer ce0684e6ff fix: refs #5483 myt updated, jenkins tests and fixtures fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-28 12:40:13 +01:00
Guillermo Bonet 49a08a96da Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head This commit looks good Details
2024-01-26 11:56:43 +00:00
Guillermo Bonet 5828fa9657 feat: #6184 Refactor saveSign
gitea/salix/pipeline/head This commit looks good Details
2024-01-26 10:05:24 +01:00
Juan Ferrer 81639726b2 feat: refs #5483 final merge
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-26 00:09:24 +01:00
Juan Ferrer a5cd4a671c Merge branch 'dev' into 5483-unifyDb 2024-01-25 17:31:19 +01:00
Pablo Natek 3848503853 fix(test): refs #6743 exportDb
gitea/salix/pipeline/head This commit looks good Details
2024-01-25 14:58:48 +01:00
Jorge Penadés 63fb3db8a1 fix: refs #6276 test item_card & general fixes
gitea/salix/pipeline/head This commit looks good Details
2024-01-25 12:14:14 +01:00
Jorge Penadés 01340408c6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-25 08:14:02 +01:00
Jorge Penadés 02e38eb711 fix: refs #6276 fix tests
gitea/salix/pipeline/head Build queued... Details
2024-01-25 08:13:47 +01:00
Jorge Penadés e527780622 fix: refs #6276 drop suitcase sectorCollection_getSales
gitea/salix/pipeline/head This commit looks good Details
2024-01-24 11:24:49 +01:00
Jorge Penadés e849f0b6e2 fix: refs #6276 sectorCollection_getSales
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-24 11:20:08 +01:00
Pablo Natek 065dd0581d feat(spec): refs #6403 add test 2024-01-24 09:06:05 +01:00
Javier Segarra 40d5e8662b refs #6694 perf: remove unused imports
gitea/salix/pipeline/head This commit looks good Details
2024-01-24 08:38:34 +01:00
Javier Segarra 5b2b6a15ad refs #6694 perf: improve filter
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-24 08:36:08 +01:00
Jorge Penadés ae89d59bde feat: refs #6276 WIP test sectorCollection_getSales
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-23 15:58:09 +01:00
Javier Segarra 5d53d69754 refs #6694 perf: update postCode/filter method
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-23 12:52:35 +01:00
Jorge Penadés 08dd37e9e4 feat: refs #6276 test sectorCollection_getSales
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-23 12:13:23 +01:00
Guillermo Bonet 12bfb8ca77 feat: #6184 Added tests and process.env.IS_SPEC_RUNNING 2024-01-23 11:05:39 +01:00
Jorge Penadés 65e5c6dac5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse 2024-01-22 12:45:25 +01:00
Guillermo Bonet 6701f70a33 Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-22 09:07:31 +00:00
Jorge Penadés b7ce6cac9c fix: refs #6276 machineWorker_update & tests
gitea/salix/pipeline/head This commit looks good Details
2024-01-19 12:38:58 +01:00
Jorge Penadés 5c0425b942 feat: refs #6276 test machineWorker_update
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-19 09:52:49 +01:00