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

4937 Commits

Author SHA1 Message Date
Javier Segarra 6bba14cac9 test: e2e fixed 2024-07-25 14:31:31 +02:00
Javier Segarra ebbe6ef3b1 feat: add customfilter label 2024-07-25 12:36:16 +02:00
Javier Segarra 60708f4a6c feat: improve qFormMixin in production environment 2024-07-25 12:36:04 +02:00
Javier Segarra aef83b7e9a feat: modify myentries filters 2024-07-25 12:35:47 +02:00
Alex Moreno 454c229f13 hotFix: try to fix myEntries 2024-07-25 09:53:59 +02:00
Alex Moreno 687262e78c hotFix: try to fix myEntries 2024-07-25 09:50:30 +02:00
Alex Moreno f0be377951 hotFix: try to fix myEntries 2024-07-24 20:52:14 +02:00
Alex Moreno 3dd6bf8802 hotFix: try to fix myEntries 2024-07-24 20:48:05 +02:00
Alex Moreno f18bc80c0b hotFix: try to fix myEntries 2024-07-24 20:44:55 +02:00
Alex Moreno 80f34edb66 hotFix: try to fix myEntries 2024-07-24 20:41:34 +02:00
Alex Moreno 38de6867b7 hotFix: try to fix myEntries 2024-07-24 20:38:25 +02:00
Alex Moreno e3204e0ce3 hotFix: try to fix myEntries 2024-07-24 20:34:09 +02:00
Alex Moreno c926b047e2 hotFix: try to fix myEntries 2024-07-24 20:29:52 +02:00
Alex Moreno c904f7f88b hotFix: try to fix myEntries 2024-07-24 20:25:46 +02:00
Alex Moreno f88ec2a2ae hotFix: try to fix myEntries 2024-07-24 20:22:31 +02:00
Alex Moreno 29299970f4 hotFix: try to fix myEntries 2024-07-24 20:19:55 +02:00
Alex Moreno 369736f362 hotFix: try to fix myEntries 2024-07-24 20:17:23 +02:00
Alex Moreno 68c4c93f9f hotFix: try to fix myEntries 2024-07-24 20:14:45 +02:00
Alex Moreno 3d6ba060c2 hotFix: try to fix myEntries 2024-07-24 20:10:50 +02:00
Alex Moreno 64a62ca208 hotFix: try to fix myEntries 2024-07-24 20:10:18 +02:00
Alex Moreno 3023d83739 hotFix: myEntries 2024-07-24 20:00:02 +02:00
Alex Moreno ae5ec1328b hotFix: myEntries 2024-07-24 19:55:13 +02:00
Pablo Natek beaddf0199 Merge pull request 'test' (!564) from test into master 
Reviewed-on: verdnatura/salix-front#564
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
 2024-07-24 17:54:27 +00:00
Carlos Satorres fdec25dc88 Merge pull request 'refs #6898 fix' (!562) from fix-supplierMigration into dev 
Reviewed-on: verdnatura/salix-front#562
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-07-24 09:38:01 +00:00
Carlos Satorres 2e56100623 refs #6898 fix 2024-07-24 11:36:00 +02:00
Alex Moreno 8d59fc95e7 Merge pull request '#6943 fix Customer' (!526) from 6943-fixCustomer into dev 
Reviewed-on: verdnatura/salix-front#526
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-07-24 05:53:37 +00:00
Alex Moreno 4d8ba2bca0 Merge branch 'dev' into 6943-fixCustomer 2024-07-24 05:52:29 +00:00
Jon Elias 19fa5a294d Merge pull request '#7014 refactor <module>Main.vue' (!476) from 7014-RefactorQDrawer into dev 
Reviewed-on: verdnatura/salix-front#476
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-07-24 05:17:13 +00:00
Javier Segarra 6c7509856e Merge branch 'dev' into 7014-RefactorQDrawer 2024-07-23 21:08:56 +00:00
Javier Segarra 2c0b215023 Merge branch 'dev' into 6943-fixCustomer 2024-07-23 18:44:08 +00:00
Alex Moreno e6709db3a2 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-07-23 14:46:44 +02:00
Alex Moreno 38437aa2f9 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-07-23 14:46:27 +02:00
Alex Moreno db3813ccf0 warmFix: orderBy tableActions false 2024-07-23 14:46:05 +02:00
Alex Moreno eb90fe359f fix: customer defaulter add amount order 2024-07-23 14:03:45 +02:00
Alex Moreno 0cd42e6fac Merge branch 'dev' into 6943-fixCustomer 2024-07-23 09:47:01 +00:00
Jon Elias 7ce05406cc fix: refs #7014 fix tests 2024-07-23 10:55:30 +02:00
Jon Elias 67275e435e refactor: refs #7014 refactor ZoneCard, deleted ZoneMain & created basic tests for functionality 2024-07-23 10:38:45 +02:00
Alex Moreno 451619fb88 hotFix(VnTable): add ctrl + click 2024-07-23 10:09:42 +02:00
Alex Moreno ad87fd8311 hotfix(entry_latest-buys): refs #6897 img 2024-07-23 09:36:23 +02:00
Jon Elias e76d8bf269 fix: fix conflicts 2024-07-23 09:15:06 +02:00
Jon Elias a3256c7dc8 Merge branch '7014-RefactorQDrawer' of https://gitea.verdnatura.es/verdnatura/salix-front into 7014-RefactorQDrawer 2024-07-23 09:14:53 +02:00
Alex Moreno ca9425cfb7 hotfix(entry_latest-buys): refs #6897 img 2024-07-23 09:14:22 +02:00
Jon Elias 18dac38fb2 Merge branch '7014-RefactorQDrawer' of https://gitea.verdnatura.es/verdnatura/salix-front into 7014-RefactorQDrawer 2024-07-23 09:14:14 +02:00
Jon Elias 33ad8fcb9d refactor: refs #7014 improved route.js & deleted RouteMain 2024-07-23 09:12:00 +02:00
Alex Moreno c7d54668e6 hotfix(entry_latest-buys): refs #6897 redirect to entry 2024-07-23 08:45:54 +02:00
Alex Moreno 53d59ee75c Merge pull request '7773-testToMaster_2430' (!561) from 7773-testToMaster_2430 into master 
Reviewed-on: verdnatura/salix-front#561
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
 2024-07-23 06:24:04 +00:00
Jon Elias 92b053013f Merge branch 'dev' into 7014-RefactorQDrawer 2024-07-23 06:18:17 +00:00
Pablo Natek a421c96e85 Merge pull request '#7129 - fixFilters' (!559) from 7129-fixFilters into test 
Reviewed-on: verdnatura/salix-front#559
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-07-22 16:00:14 +00:00
Pablo Natek 1a091e5b5a Merge branch '7129-fixFilters' of https://gitea.verdnatura.es/verdnatura/salix-front into 7129-fixFilters 2024-07-22 17:50:59 +02:00
Pablo Natek 3ceb0771a7 fix: refs #7129 remove templates 2024-07-22 17:50:58 +02:00