wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity
7,941 Commits 155 Branches 0 Tags 30 MiB
Commit Graph

7941 Commits

Author SHA1 Message Date
Jorge Penadés 5db434676f feat: refs #7936 make fields required 2024-12-18 13:05:40 +01:00
Alex Moreno 5f438de06e Merge pull request '8315-devToTest' (!1094) from 8315-devToTest into test 
Reviewed-on: verdnatura/salix-front#1094
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
 2024-12-18 10:31:54 +00:00
Alex Moreno 8bf4eaa39a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 8315-devToTest 2024-12-18 11:26:38 +01:00
Alex Moreno 17527cb4e7 test: refs #8315 fix VnSelect in e2e 2024-12-18 11:22:04 +01:00
Alex Moreno 50262003d0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8315-devToTest 2024-12-18 10:22:41 +01:00
Jorge Penadés 01eca1eb0d Merge pull request '#7936 improve InvoiceIn' (!1004) from 7936-improveInvoiceIn into dev 
Reviewed-on: verdnatura/salix-front#1004
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-18 09:22:07 +00:00
Jorge Penadés c1ec57c846 Merge branch '7936-improveInvoiceIn' of https://gitea.verdnatura.es/verdnatura/salix-front into 7936-improveInvoiceIn 2024-12-18 10:18:53 +01:00
Jorge Penadés 18d7c194ac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7936-improveInvoiceIn 2024-12-18 10:18:26 +01:00
Alex Moreno c4d11fddbe Merge branch 'dev' into 7936-improveInvoiceIn 2024-12-18 09:18:07 +00:00
Jorge Penadés 8502e13bdb Merge pull request '#8113 mapData' (!1099) from 8113-mapData into master 
Reviewed-on: verdnatura/salix-front#1099
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-18 08:54:50 +00:00
Jorge Penadés 9052b2f1a2 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 8113-mapData 2024-12-18 09:53:20 +01:00
Jorge Penadés df671b4472 Merge pull request '#6583 add destination opt filter' (!899) from 6583-addDestinationFilter into dev 
Reviewed-on: verdnatura/salix-front#899
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-12-18 08:48:45 +00:00
Jorge Penadés f880834271 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6583-addDestinationFilter 2024-12-18 09:43:53 +01:00
Jorge Penadés 0478fd6ec3 Merge pull request 'fix: refs #7323 update date on outside' (!1100) from 7323-hotfix-fetchOnOutside into master 
Reviewed-on: verdnatura/salix-front#1100
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-18 08:42:18 +00:00
Jorge Penadés e54b79fd0d Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-hotfix-fetchOnOutside 2024-12-18 09:38:22 +01:00
Javi Gallego 1e779ea0be Merge pull request 'feat: refs #7235 update invoice out global form to fetch config based on serial type' (!1082) from 7235-InvoiceOutBySerial into dev 
Reviewed-on: verdnatura/salix-front#1082
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-18 08:09:31 +00:00
Alex Moreno 467dec609d Merge pull request 'fix: refs #7146 front rutas' (!1101) from 7146--hotfixRoutes into master 
Reviewed-on: verdnatura/salix-front#1101
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-18 08:09:26 +00:00
Javi Gallego ac4e0f9b07 Merge branch 'dev' into 7235-InvoiceOutBySerial 2024-12-18 08:08:16 +00:00
Carlos Andrés 7028d95b1a fix: refs #7146 front rutas 2024-12-17 18:33:58 +01:00
Jorge Penadés 75b49490f6 fix: refs #7323 update date on outside 2024-12-17 16:18:31 +01:00
Alex Moreno 997a6d18bc fix: refs #8315 ticketBoxing test 2024-12-17 14:48:16 +01:00
Alex Moreno cbb1bb6f60 test: refs #8315 fix clientList 2024-12-17 14:37:15 +01:00
Alex Moreno 5bf3e2c80a test: refs #8315 fix claimDevelopment fixtures 2024-12-17 14:35:37 +01:00
Jorge Penadés bd6038d683 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 8113-mapArrayData 2024-12-17 13:55:11 +01:00
Jorge Penadés 7b118d6621 feat: refs #6583 add locale 2024-12-17 13:38:06 +01:00
Jorge Penadés 9b83490cf1 feat: refs #6583 add locale 2024-12-17 13:37:46 +01:00
Jorge Penadés 19c7337479 feat: refs #6583 add locale 2024-12-17 13:36:52 +01:00
Jorge Penadés 959608c490 feat: refs #6583 add locale 2024-12-17 13:35:46 +01:00
Jorge Penadés 109841eee5 feat: refs #6583 add default param 2024-12-17 13:20:48 +01:00
Carlos Satorres 894fba7772 Merge pull request 'fix: hotfix mix' (!1095) from hotfix-mixTravelSupplierFixedPrice into master 
Reviewed-on: verdnatura/salix-front#1095
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-17 12:10:53 +00:00
Carlos Satorres 35de47f102 Merge pull request 'fix: monitorPayMethodFilter' (!1096) from warmfix-monitorPayMethodFilter into dev 
Reviewed-on: verdnatura/salix-front#1096
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-17 12:08:08 +00:00
Carlos Satorres 646efe52ff fix: fix use-model 2024-12-17 13:04:00 +01:00
Carlos Satorres 3da7425f6f fix: remove url 2024-12-17 12:59:27 +01:00
Jorge Penadés 9d60083360 fix: refs #6583 update checkbox for filtering by destination in TicketAdvanceFilter 2024-12-17 12:46:53 +01:00
Carlos Satorres 2d9d58f79c fix: monitorPayMethodFilter 2024-12-17 12:45:02 +01:00
Jorge Penadés c1543b1b42 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6583-addDestinationFilter 2024-12-17 12:31:53 +01:00
Carlos Satorres 5eb842f1b4 fix: remove params 2024-12-17 12:25:57 +01:00
Carlos Satorres 4ab3934da3 fix: hotfix mix 2024-12-17 12:19:35 +01:00
Jorge Penadés 22daf36c6c fix: refs #7936 rollback 2024-12-17 11:58:57 +01:00
Jorge Penadés ad9063704c feat: refs #7936 enhance downloadFile function to support opening in a new tab 2024-12-17 11:54:12 +01:00
Jorge Penadés a33cec4a34 feat: refs #7936 add optionCaption 2024-12-17 11:12:21 +01:00
Jorge Penadés d90750b2d5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7936-improveInvoiceIn 2024-12-17 10:54:01 +01:00
Alex Moreno e6ced7b2f5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-12-17 10:36:39 +01:00
Alex Moreno a0a6746db4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-12-17 10:36:25 +01:00
Jon Elias 3b3d57ea79 Merge pull request 'Fix: use Teleport to avoid QDrawer overlapping' (!1093) from Fix-QDrawer into dev 
Reviewed-on: verdnatura/salix-front#1093
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-17 09:35:09 +00:00
Jon Elias 4dff5a2eec refactor: use teleport to avoid qdrawer overlapping 2024-12-17 09:03:09 +01:00
Carlos Satorres a3ea359b01 fix: remove useless try catch 2024-12-17 07:02:44 +01:00
Robert Ferrús 943b44934e Merge pull request 'feat: refs #8001 ticketExpeditionGrafana' (!865) from 8001-expeditionGrafana into dev 
Reviewed-on: verdnatura/salix-front#865
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-16 12:35:12 +00:00
Robert Ferrús 61056e008e Merge branch 'dev' into 8001-expeditionGrafana 2024-12-16 12:34:36 +00:00
Jon Elias 96ef2b776c Merge pull request 'Fix: use VnSelectWorker' (!1089) from Fix-ClaimDevelopmentSelectWorker into dev 
Reviewed-on: verdnatura/salix-front#1089
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-16 12:20:53 +00:00