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

3998 Commits

Author SHA1 Message Date
Javier Segarra dc0a938c4c Merge branch 'dev' into feature/AccountList 2024-06-18 10:50:50 +02:00
Javier Segarra f004ab3645 Merge branch 'feature/AccountList' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/AccountList 2024-06-18 10:48:44 +02:00
Jon Elias a5f4f85c80 refactor: refs #6896 requested changes 2024-06-18 10:46:13 +02:00
Jorge Penadés 4ff0901950 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7600-fix-vnLocation 2024-06-18 10:44:58 +02:00
Jorge Penadés 4c40244d41 Merge pull request '#6238 addPercentageColumn' (!443) from 6238-addPercentageColumn into dev 
Reviewed-on: verdnatura/salix-front#443
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-06-18 08:41:42 +00:00
Jorge Penadés cbbcddfd50 fix: refs #7600 test vnLocation 2024-06-18 10:37:49 +02:00
Jorge Penadés 14ef5ccefd fix: refs #6238 rollback 2024-06-18 10:14:55 +02:00
Jorge Penadés 3f2779600a fix: refs #6238 drop old fix 2024-06-18 10:13:43 +02:00
Jorge Penadés 1b4bd2e7f0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6238-addPercentageColumn 2024-06-18 10:12:48 +02:00
Jorge Penadés f280a7d4dd Merge pull request '#7598 fix-formModel' (!453) from 7598-fix-formModel into dev 
Reviewed-on: verdnatura/salix-front#453
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-18 08:01:04 +00:00
Alex Moreno 741e6f27b1 Merge branch 'dev' into 7598-fix-formModel 2024-06-18 07:58:12 +00:00
Alex Moreno e369ea68d4 fix(VnTable): Qtable v-bind 2024-06-18 09:56:03 +02:00
Jorge Penadés 34069f4841 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6238-addPercentageColumn 2024-06-18 09:54:33 +02:00
Jorge Penadés fcc41f0e57 Merge pull request '#6243 load warehouses & iron out column width' (!449) from 6243-fixColumnWidth into dev 
Reviewed-on: verdnatura/salix-front#449
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-18 07:53:42 +00:00
Jorge Penadés b1b0f4efed Merge branch 'dev' into 6243-fixColumnWidth 2024-06-18 07:49:46 +00:00
Jorge Penadés 024687e2d3 fix: refs #7598 fix evt & .value 2024-06-18 09:46:58 +02:00
Jorge Penadés 9725874d5d fix: refs #7598 fix evt & .value 2024-06-18 09:44:50 +02:00
Jorge Penadés 37af8ba8f5 fix: refs #7598 fix evt & .value 2024-06-18 09:43:44 +02:00
Carlos Satorres e6bf73c8d1 Merge pull request 'refs #6897 remove code fix section' (!415) from 6897-EntryMigration into dev 
Reviewed-on: verdnatura/salix-front#415
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-18 06:16:18 +00:00
Carlos Satorres 1cf630378b Merge branch 'dev' into 6897-EntryMigration 2024-06-18 06:15:12 +00:00
Carlos Satorres af59da33aa Merge pull request '7366-travelMigration' (!430) from 7366-travelMigration into dev 
Reviewed-on: verdnatura/salix-front#430
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-18 06:03:41 +00:00
Carlos Satorres 0940872625 Merge branch '6897-EntryMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-EntryMigration 2024-06-18 07:18:47 +02:00
Carlos Satorres bc30531d42 refs #6897 fix trad 2024-06-18 07:18:44 +02:00
Alex Moreno e8054467a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable 2024-06-17 13:00:30 +02:00
Alex Moreno 3394eb10b0 fix(VnFilterPanel): remove key 2024-06-17 12:58:58 +02:00
Alex Moreno fb1bd5ca72 fix: bug replace 2024-06-17 11:29:36 +02:00
Jorge Penadés f64f42f473 fix: refs #6243 load warehouses & iron out column width 2024-06-17 10:46:51 +02:00
Jorge Penadés 94f4e154b0 refactor: refs #6238 use variable & link class 2024-06-17 10:39:36 +02:00
Alex Moreno a479637ee6 feat: customerList is customerExtendedList 2024-06-17 10:14:11 +02:00
Jon Elias fe47215bf7 Merge branch '6896-EndOrderMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 6896-EndOrderMigration 2024-06-17 09:58:21 +02:00
Jon Elias 7c64df6600 refactor: refs #6896 fixed styles 2024-06-17 09:58:20 +02:00
Jon Elias 9c1e79ebee Merge branch 'dev' into 6896-EndOrderMigration 2024-06-17 07:57:16 +00:00
Jon Elias 42008ef74b feat: refs #6896 created VnImg and added to order module 2024-06-17 09:56:16 +02:00
Alex Moreno bc31985a4d remove console.log 2024-06-17 09:54:19 +02:00
Alex Moreno 1c6fab0158 fix(VnTable): duplicate fetch 2024-06-17 09:53:36 +02:00
Pablo Natek ef6a7001e8 Merge branch 'dev' into 7129-finishRouteMigration 2024-06-17 07:21:40 +00:00
Carlos Satorres f4b7d34a7f refs #7366 fix redirect 2024-06-17 08:39:39 +02:00
Alex Moreno 6120c98580 fix(VnTable): warns 2024-06-17 08:19:07 +02:00
Alex Moreno 0ad6b260da fix(VnTable): create scss 2024-06-17 07:32:43 +02:00
Alex Moreno d9d54a351f fix(VnTable): showLabel 2024-06-14 14:54:52 +02:00
Jorge Penadés bd6e45d260 refactor: refs #6238 get percentage from back 2024-06-14 14:52:39 +02:00
Pablo Natek 05d7a61468 fix: refs #7129 remove fix from claim lines 2024-06-14 14:40:40 +02:00
Pablo Natek ac56d6d9d7 feat: refs #7129 fix some code and add order 2024-06-14 13:12:12 +02:00
Pablo Natek 20e0c84035 fix: refs #7129 fix module routes 2024-06-14 13:10:47 +02:00
Carlos Satorres 8002f0a94b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7366-travelMigration 2024-06-14 12:59:16 +02:00
Alex Moreno f86bc9791b fix: fix warnings 2024-06-14 11:49:29 +02:00
Alex Moreno b282ce540e remove unnecessay 2024-06-14 11:39:05 +02:00
Alex Moreno cb87d2b419 fix(VnFilter): filter with params 2024-06-14 11:35:33 +02:00
Alex Moreno bea756d7cb feat(vnTable): reload data when change url 2024-06-14 10:53:02 +02:00
Carlos Satorres 7fccd0ae81 Merge branch '7366-travelMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 7366-travelMigration 2024-06-14 10:47:03 +02:00