Commit Graph

14198 Commits

Author SHA1 Message Date
Pau 0b6d7eaffc refs #4791 @30min fix broken test 2022-11-23 08:20:12 +01:00
Vicent Llopis ccce6af021 fix: add translations
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-23 07:57:27 +01:00
Pablo Natek 83ed79569a refs #4844
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 20:45:18 +01:00
Alex Moreno 314e98b838 fix: nested router
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-22 14:57:52 +01:00
Pau 51d3091a40 Merge branch 'dev' into 4511-kkear-expedition.itemFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 13:45:03 +00:00
Pau bb640da8f0 Merge branch 'dev' into 4789-search-ticket-without-invoice
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-22 13:44:23 +00:00
Vicent Llopis df4acb70a3 feat: add backTest
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 14:43:21 +01:00
Vicent Llopis e0ba7d523c refacfor: add ctx 2022-11-22 14:43:15 +01:00
Alex Moreno 660648e01f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password 2022-11-22 14:35:25 +01:00
Alexandre Riera 8613b196d8 Merge branch 'dev' into 4547-fix-compensation
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 13:31:04 +00:00
Vicent Llopis 32f28e91b5 feat: sistema de bloque para ficheros mdb
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-22 14:29:42 +01:00
Alexandre Riera d7843f3298 Merge branch '4547-fix-compensation' of https://gitea.verdnatura.es/verdnatura/salix into 4547-fix-compensation
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 14:24:55 +01:00
Alexandre Riera 34fb80beec fix translations 2022-11-22 14:24:19 +01:00
Joan Sanchez 7476b5dc0f Merge pull request '[test → dev] Hacer luego de [master → test]' (!1168) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1168
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-22 13:03:45 +00:00
Joan Sanchez 7e12938de3 Merge branch 'dev' into test
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 12:53:03 +00:00
Joan Sanchez b702a97655 Merge pull request '[master → test] Hacer primero' (!1167) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1167
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-22 12:52:45 +00:00
Joan Sanchez 139ee9e4bd Merge pull request 'refs #4550 added xmldom module and bugs fixed' (!1166) from 4550-HOTFIX-xmldom-module into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1166
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-22 12:12:13 +00:00
Guillermo Bonet 3c6ed672f5 refs #4550 added xmldom module and bugs fixed
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 12:33:12 +01:00
Alexandre Riera 5552cd654e Merge branch 'dev' into 4547-fix-compensation
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 10:48:11 +00:00
Alexandre Riera d5521adb6b working on tests
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 11:44:36 +01:00
Alexandre Riera 66b932d1ae Merge pull request 'fixes #4700 Ticket.split tour a futuro' (!1136) from 4700-split-tour into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1136
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-22 10:36:34 +00:00
Joan Sanchez 738fc7d348 Merge pull request 'refs #4550 HOTFIX added jsbarcode module in print' (!1165) from 4550-HOTFIX-jsbarcode-module into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1165
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-22 10:30:00 +00:00
Vicent Llopis e148284332 jenkins test
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 11:02:19 +01:00
Guillermo Bonet 6247ebc65c refs #4550 HOTFIX added jsbarcode module in print
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 10:42:39 +01:00
Vicent Llopis 89141419c1 fix: merge filter
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-22 10:36:40 +01:00
Alexandre Riera 6656ea4f54 Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 10:20:42 +01:00
Alexandre Riera 2651081838 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 10:15:31 +01:00
Alexandre Riera c51354b13f refs #3949 textfield, edit and create dialog added
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-22 09:29:25 +01:00
Vicent Llopis 37b312564e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4682-searchbar_filter
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-22 09:23:32 +01:00
Vicent Llopis cac8879ec7 fix: solo vuelve a buscar el mismo filtro en caso de que se encuentre en un index
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-22 09:22:06 +01:00
Vicent Llopis 8876bc2b68 Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-22 08:12:07 +00:00
Alexandre Riera 9236e3e3e8 Merge pull request 'fixes #3557 back sale/missingTrash' (!1143) from 3557-back-missingTrash into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1143
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2022-11-22 07:09:28 +00:00
Alexandre Riera 8e1505d5ee Merge branch 'dev' into 3557-back-missingTrash
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 07:02:56 +00:00
Pau 3b66da20ca Merge branch 'dev' into 4791-refactor-sendsms
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-22 07:01:33 +00:00
Pau 4bd643143b requested changes refs #4791 @1h
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-22 07:59:18 +01:00
Alex Moreno 5e831581a0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker 2022-11-22 07:26:29 +01:00
Alex Moreno 7c75eaadce feat: worker-welcome
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-21 15:15:25 +01:00
Pau cb6ae41c13 Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-21 13:45:28 +00:00
Pau fc08b27fb6 Merge branch 'dev' into 4789-search-ticket-without-invoice
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 13:42:53 +00:00
Pau 3003290e61 refs #4551 @20min requested changes
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 14:38:51 +01:00
Pau 40398da48d refs #4789 @30m tested the requested changes
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 14:21:23 +01:00
Pau 0099b42fe3 requested changes
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 14:06:38 +01:00
Pau 6711593a87 Merge pull request 'Closes #4767 - route.index delete route' (!1154) from 4767-route.index-delete-route into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1154
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-21 12:56:35 +00:00
Pau 52630f0a25 add collections with sectorFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 13:38:53 +01:00
Pau b1e12d7128 Merge branch '4732-new-label' into 4732-previa-label 2022-11-21 13:33:52 +01:00
Pau 2567a1fab3 refs #4732 @4h30m
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-21 13:31:55 +01:00
Alex Moreno 26be27c2ee Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-21 13:13:25 +01:00
Alexandre Riera 6ddd2d95a5 insert acl
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 11:48:18 +01:00
Alexandre Riera 4c21ffac3b Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 11:44:53 +01:00
Alexandre Riera 463e56b631 corrections
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 11:41:17 +01:00