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

4011 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 ' show rightPanel' () from 6243-warmfix-showRightPanel into test 
Reviewed-on: 
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-21 08:52:56 +00:00
Carlos Satorres 9d38c1ff1c Merge pull request 'refs fix formModel claimFilter claimCard' () from 6504-fixCardClaim into dev 
Reviewed-on: 
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 show rightPanel 2024-06-21 10:47:09 +02:00
Alex Moreno d23dbca7bf fix(EntryBuys): fix VnSubtoolbar 2024-06-21 08:12:03 +02:00
Alex Moreno bcda488aae Merge pull request ' - VnTable V1' () from 6825-vnTable into dev 
Reviewed-on: 
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
Alex Moreno 1b3828ceba Merge branch 'dev' into 6825-vnTable 2024-06-20 12:35:35 +00:00
Jon Elias b60fa62c99 Merge pull request ' end orders migration' () from 6896-EndOrderMigration into dev 
Reviewed-on: 
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
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 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' () from 7129-finishRouteMigration into dev 
Reviewed-on: 
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 fix formModel claimFilter claimCard 2024-06-20 10:26:22 +02:00
Jon Elias a84c20f2ce refactor: refs changes requested in PR 2024-06-20 08:33:29 +02:00
Alex Moreno 702b031650 feat(VnFilter): merge objects 2024-06-19 15:18:38 +02:00
Alex Moreno 02f8288b22 feat(customerList): add searchbar 2024-06-19 15:02:26 +02:00
Javier Segarra 3fdad15f21 fix: comments 2024-06-19 13:43:32 +02:00
Guillermo Bonet 577452df8a Merge pull request 'feat: refs Deleted hasIncoterms client column' () from 7545-hasIncoterms into dev 
Reviewed-on: 
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-19 09:32:12 +00:00
Guillermo Bonet 42807d6785 Merge branch 'dev' into 7545-hasIncoterms 2024-06-19 09:31:21 +00:00
Alex Moreno 188bc3ff4f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable 2024-06-19 10:53:21 +02:00
Alex Moreno 27a8c9684f build: increase version 2428 2024-06-19 10:51:45 +02:00
Alex Moreno 43ae3d5a35 Merge pull request '7596-devToTest_2426' () from 7596-devToTest_2426 into test 
Reviewed-on: 
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-06-19 08:49:20 +00:00
Alex Moreno 9f3a266239 Merge branch 'test' into 7596-devToTest_2426 2024-06-19 08:46:41 +00:00
Alex Moreno cd6c0f586e Merge pull request 'fix: refs fix spec remove enter key' () from 7599-fixspec into dev 
Reviewed-on: 
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-19 08:25:13 +00:00
Pablo Natek 188f225cf7 Merge branch 'dev' into 7599-fixspec 2024-06-19 08:24:07 +00:00
Pablo Natek 825762d70e Merge branch 'dev' into 7129-finishRouteMigration 2024-06-19 08:20:14 +00:00
Pablo Natek cbeebc8c9c Merge branch '7129-finishRouteMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 7129-finishRouteMigration 2024-06-19 10:19:20 +02:00
Pablo Natek 2ea87ea920 fix: refs remove consoleLog 2024-06-19 10:19:12 +02:00
Pablo Natek 83428d0398 fix: refs fix spec remove enter key 2024-06-19 10:16:33 +02:00
Alex Moreno 819d1230c4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable 2024-06-19 09:57:31 +02:00
Jon Elias 97c4130b05 Merge pull request ' fixed summary cards and table' () from 7566-FixCustomerSummary into dev 
Reviewed-on: 
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-06-19 07:55:58 +00:00
Alex Moreno b5bf4bab54 feat(CustomerFIlter): use correct table 2024-06-19 09:55:30 +02:00
Javier Segarra d5bd8c4432 fix: remove v-if 2024-06-19 09:54:24 +02:00
Alex Moreno 40842f4ba6 test(arrayData) add front test 2024-06-19 09:42:08 +02:00
Jon Elias a80caa7c93 Merge branch 'dev' into 7566-FixCustomerSummary 2024-06-19 07:07:05 +00:00
Javier Segarra 6eb44b2cd6 Merge pull request 'Account Submodule' () from hyervoni/salix-front-mindshore:feature/AccountList into dev 
Reviewed-on: 
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-06-19 05:45:07 +00:00
Javier Segarra ced1eaa801 Merge branch 'dev' into feature/AccountList 2024-06-19 05:43:46 +00:00
Alex Moreno 92cac607e4 test: front test for arrayData 2024-06-18 15:20:07 +02:00