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

4601 Commits

Author SHA1 Message Date
Javier Segarra 63b8ca46a3 Merge branch 'dev' into feature/TicketLog 2024-06-21 11:33:29 +02:00
Javier Segarra febc7f1f46 fix: notify icon style 2024-06-21 11:33:14 +02:00
Javier Segarra 9ce49bf108 fix: TravelLog 2024-06-21 11:31:09 +02:00
Alex Moreno 961c8140af Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-06-21 10:53:57 +02:00
Jorge Penadés 93407d8219 Merge pull request '#6243 show rightPanel' (!468) from 6243-warmfix-showRightPanel into test 
Reviewed-on: verdnatura/salix-front#468
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-21 08:52:56 +00:00
Carlos Satorres 9d38c1ff1c Merge pull request 'refs #6504 fix formModel claimFilter claimCard' (!464) from 6504-fixCardClaim into dev 
Reviewed-on: verdnatura/salix-front#464
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-21 08:51:12 +00:00
Carlos Satorres 0f2f688f16 Merge branch 'dev' into 6504-fixCardClaim 2024-06-21 08:49:15 +00:00
Jorge Penadés 6aa920b70e fix: refs #6243 show rightPanel 2024-06-21 10:47:09 +02:00
Carlos Satorres f88fffa89c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6898-supplierMigration 2024-06-21 10:32:44 +02:00
Carlos Satorres 0107c21789 refs #7409 fix trad 2024-06-21 09:57:01 +02:00
Carlos Satorres 87a9ee5ccb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7409-workerBalance 2024-06-21 09:50:38 +02:00
Carlos Satorres 79bafdee20 Merge branch '7406-workerFormation' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation 2024-06-21 08:43:00 +02:00
Carlos Satorres fdedf7bf57 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation 2024-06-21 08:42:57 +02:00
Alex Moreno d23dbca7bf fix(EntryBuys): fix VnSubtoolbar 2024-06-21 08:12:03 +02:00
Jon Elias ff75808a28 Merge branch 'dev' into 6977-ClonedURL 2024-06-21 05:25:56 +00:00
Jon Elias f41161a28e refactor: refs #6977 use VnImg 2024-06-21 07:24:23 +02:00
Javier Segarra 159b386d2c fix: comment 4 2024-06-21 00:07:26 +02:00
Javier Segarra 0faa663169 fix: comments 2024-06-21 00:03:26 +02:00
William Buezas 633b13b076 Basic data form 2024-06-20 16:51:07 -03:00
Javi Gallego 44b683b26b feat: #7196 eslint 2024-06-20 16:06:56 +02:00
Alex Moreno bcda488aae Merge pull request '#6825 - VnTable V1' (!396) from 6825-vnTable into dev 
Reviewed-on: verdnatura/salix-front#396
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
 2024-06-20 13:08:55 +00:00
William Buezas 47768faea4 Change model 2024-06-20 09:42:32 -03:00
William Buezas 9f1dd4d74d WIP 2024-06-20 09:41:53 -03:00
Alex Moreno 1b3828ceba Merge branch 'dev' into 6825-vnTable 2024-06-20 12:35:35 +00:00
Jon Elias b60fa62c99 Merge pull request '#6896 end orders migration' (!400) from 6896-EndOrderMigration into dev 
Reviewed-on: verdnatura/salix-front#400
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-06-20 12:31:45 +00:00
Alex Moreno 09545cb2c0 fix: WorkerNotificationsManager test 2024-06-20 14:25:45 +02:00
William Buezas 00ebbbfc78 Ticket log 2024-06-20 08:40:05 -03:00
William Buezas 0ba415c0ea small changes 2024-06-20 07:57:39 -03:00
Alex Moreno e8296d0edd Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable 2024-06-20 12:33:05 +02:00
Alex Moreno 2352b6aac4 fix: invoiceDueDay test 2024-06-20 12:33:04 +02:00
Alex Moreno 28b241bb77 Merge branch 'dev' into 6825-vnTable 2024-06-20 10:26:05 +00:00
Jon Elias f372fb1c65 Merge branch 'dev' into 5447-travelExtraCommunity 2024-06-20 10:16:25 +00:00
Jon Elias d0c3f61b73 Merge branch 'dev' into 6464-fixNegativeBases 2024-06-20 10:15:12 +00:00
Jon Elias 5be23286d7 Merge branch 'dev' into 6739-invoiceOut 2024-06-20 10:14:10 +00:00
Jon Elias 304c7677bc Merge branch 'dev' into 6896-EndOrderMigration 2024-06-20 10:12:24 +00:00
Alex Moreno 03be4bc0e6 refactors 2024-06-20 10:55:29 +02:00
Pablo Natek 47bcb73dab Merge pull request '7129-finishRouteMigration' (!447) from 7129-finishRouteMigration into dev 
Reviewed-on: verdnatura/salix-front#447
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-06-20 08:50:33 +00:00
Pablo Natek f48c5deba1 Merge branch 'dev' into 7129-finishRouteMigration 2024-06-20 08:49:38 +00:00
Alex Moreno 11a82f3ae5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable 2024-06-20 10:47:41 +02:00
Jon Elias a61196b04d Merge branch 'dev' into 6896-EndOrderMigration 2024-06-20 08:39:32 +00:00
Carlos Satorres 6d5973f4b7 refs #6504 fix formModel claimFilter claimCard 2024-06-20 10:26:22 +02:00
Javi Gallego e8e6a88066 feat: fixes #7196 2024-06-20 09:05:19 +02:00
Jon Elias a84c20f2ce refactor: refs #6896 changes requested in PR 2024-06-20 08:33:29 +02:00
Carlos Satorres 35c4b423a5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6898-supplierMigration 2024-06-20 05:52:14 +02:00
William Buezas 6cd8a478fa Clean selectedTickets after moving tickets 2024-06-19 20:58:31 -03:00
William Buezas b6ec10994a Change header titles style 2024-06-19 20:45:08 -03:00
William Buezas 79c606fc70 Add checkbox 2024-06-19 20:43:21 -03:00
William Buezas 4e7c09fa44 Add tooltip to button 2024-06-19 20:40:27 -03:00
William Buezas 22bf0b4598 Search bar changes 2024-06-19 20:38:23 -03:00
William Buezas 45cf4498d3 Cancel button change 2024-06-19 19:46:27 -03:00