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

7019 Commits

Author SHA1 Message Date
Alex Moreno d1e4017869 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-10-23 13:59:11 +02:00
Alex Moreno 5d4b5ad598 Merge pull request 'fix: refs #8010 footer class' (!857) from 8010-fix_vnTable_footer_class into test 
Reviewed-on: verdnatura/salix-front#857
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
 2024-10-23 11:58:46 +00:00
Alex Moreno 2420c6dee2 Merge branch 'dev' of https: refs #8039//gitea.verdnatura.es/verdnatura/salix-front into 8039-canceledError_not_notify 2024-10-23 13:14:30 +02:00
Alex Moreno 0528474250 chore: refs #8010 kebab-case 2024-10-23 13:13:00 +02:00
Jon Elias 76ed5150a5 Merge branch 'dev' into Fix_OrderModuleProblems 2024-10-23 11:05:14 +00:00
Jon Elias 37b3affdbf refactor: revert catalog changes 2024-10-23 13:02:28 +02:00
Carlos Satorres d8b80cfa6d fix: refs #7283 fix pr 2024-10-23 12:30:04 +02:00
Jon Elias b69ef48a44 refactor: refs #7132 deleted pageTitles repeated 2024-10-23 12:21:34 +02:00
Jon Elias 03f2da8169 Merge branch 'dev' of https: refs #7132//gitea.verdnatura.es/verdnatura/salix-front into 7132-FixTranslations 2024-10-23 12:14:50 +02:00
Alex Moreno e7acdfd4f7 fix: refs #8010 footer class 2024-10-23 10:48:30 +02:00
Carlos Satorres d2da1e3544 Merge branch 'dev' of https: refs #7283//gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration 2024-10-23 09:54:25 +02:00
Carlos Satorres b40af0ce7b fix: refs #7283 fix pr 2024-10-23 09:49:48 +02:00
Jon Elias 4bde0dffa7 fix: fixed item packaging type field showing repetitive values 2024-10-23 09:17:14 +02:00
Carlos Satorres 84dae53d66 Merge branch 'dev' of https: refs #7283//gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration 2024-10-23 07:53:02 +02:00
Javi Gallego 3cbd294168 Merge pull request '#7943 -permisosWorker' (!855) from 7349-permisosWorker into dev 
Reviewed-on: verdnatura/salix-front#855
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-23 05:52:48 +00:00
Javi Gallego 1bf1844c8f fix: refs #7349 dependencia no usada 2024-10-23 07:46:52 +02:00
Javi Gallego ae56c06628 feat: refs #7349 usa back con permisos 2024-10-23 07:45:00 +02:00
Alex Moreno 735ee09ef8 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-10-22 15:08:20 +02:00
Alex Moreno aaf749db6c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-10-22 15:08:11 +02:00
Alex Moreno 81a55a9e7a chore: test gitea 2024-10-22 14:55:47 +02:00
Jorge Penadés 41509c60dd Merge pull request '#8083 add change state btn' (!854) from 8083-hotfix-changeState into master 
Reviewed-on: verdnatura/salix-front#854
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-22 12:47:58 +00:00
Jorge Penadés 033d6bddbe fix: refs #8083 move expeditions 2024-10-22 14:43:43 +02:00
Jorge Penadés da4c1e9c12 fix: refs #8083 add order 2024-10-22 14:36:30 +02:00
Jorge Penadés 9f3c834ce4 Merge branch 'master' of https: refs #8083//gitea.verdnatura.es/verdnatura/salix-front into 8083-hotfix-changeState 2024-10-22 14:24:41 +02:00
Jorge Penadés b1a511ff6f fix: refs #8083 delete btn & redirect 2024-10-22 14:21:03 +02:00
Alex Moreno f9392464e5 Merge branch '8039-canceledError_not_notify' of https://gitea.verdnatura.es/verdnatura/salix-front into 8039-canceledError_not_notify 2024-10-22 14:07:28 +02:00
Alex Moreno ee31bc8262 chore: refs #8039 not required 2024-10-22 14:07:27 +02:00
Alex Moreno 0d3e8bb5d2 Merge branch 'dev' into 8039-canceledError_not_notify 2024-10-22 12:06:41 +00:00
Alex Moreno dd2dc86eea fix: refs #8039 o not handle unnecessary errors 2024-10-22 14:05:15 +02:00
Javi Gallego 93025007f1 Merge pull request '#7524 add my team filter' (!849) from 7524-hotfix-myTeamFilter into master 
Reviewed-on: verdnatura/salix-front#849
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-10-22 12:00:03 +00:00
Alex Moreno cd00a3c67f test: refs #8039 fix WorkerNotification e2e 2024-10-22 13:55:35 +02:00
Alex Moreno 0c9c01b6e9 test: refs #8039 fix ZoneWarehouse e2e 2024-10-22 13:53:01 +02:00
Alex Moreno 2d81cffb33 feat: refs #8039 show duplicate request in local 2024-10-22 13:34:20 +02:00
Jorge Penadés f751408de2 feat: refs #8083 add change state btn 2024-10-22 13:22:43 +02:00
Alex Moreno a732ec05fb test: refs #8039 add hasNotify and, refactor: agencyWorkCenter test 2024-10-22 13:21:16 +02:00
Javier Segarra d25cdbf34e test: refs #6943 #6943 use command correctly 2024-10-22 12:43:58 +02:00
Javier Segarra 0ba577ad04 Merge branch 'dev' into 6943_customer_spec 2024-10-22 12:37:24 +02:00
Alex Moreno 9db1c4f721 fix: refs #8039 bad tests 2024-10-22 12:29:33 +02:00
Alex Moreno ffd4a402ab Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8039-canceledError_not_notify 2024-10-22 12:14:09 +02:00
Javier Segarra 49c0d64c07 fix: refs #7283 #7283 ItemSummary bugs 2024-10-22 12:13:43 +02:00
Javier Segarra fff3310658 fix: refs #7283 tooltips !Item 2024-10-22 12:09:32 +02:00
Javier Segarra d6b8d41b6c fix: refs #7283 #7283 ItemSummary bugs 2024-10-22 12:09:19 +02:00
Jon Elias 1346a2e7fd fix: tag chips 2024-10-22 12:05:44 +02:00
Javier Segarra f3a6209189 fix: refs #7283 #7283 bugs 2024-10-22 12:00:11 +02:00
Jon Elias 5b116a7301 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix_OrderModuleProblems 2024-10-22 11:31:45 +02:00
Carlos Satorres c799d17e19 Merge pull request '8144-devToTest_2444' (!852) from 8144-devToTest_2444 into test 
Reviewed-on: verdnatura/salix-front#852
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-10-22 08:55:43 +00:00
Alex Moreno 36221121f5 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-10-22 07:43:07 +02:00
Alex Moreno b4d4844100 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-10-22 07:42:54 +02:00
Javier Segarra f4a7e20c57 test: refs #6943 #6943 add comands to solve tests 2024-10-21 14:31:31 +02:00
Jorge Penadés 0fbd5f45e1 fix: refs #7524 select department 2024-10-21 14:29:29 +02:00