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

3920 Commits

Author SHA1 Message Date
Jon Elias f41161a28e refactor: refs #6977 use VnImg 2024-06-21 07:24:23 +02: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
Jon Elias 304c7677bc Merge branch 'dev' into 6896-EndOrderMigration 2024-06-20 10:12:24 +00: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
Jon Elias a61196b04d Merge branch 'dev' into 6896-EndOrderMigration 2024-06-20 08:39:32 +00:00
Jon Elias a84c20f2ce refactor: refs #6896 changes requested in PR 2024-06-20 08:33:29 +02:00
Javier Segarra 3fdad15f21 fix: comments 2024-06-19 13:43:32 +02:00
Guillermo Bonet 577452df8a Merge pull request 'feat: refs #7545 Deleted hasIncoterms client column' (!439) from 7545-hasIncoterms into dev 
Reviewed-on: verdnatura/salix-front#439
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 27a8c9684f build: increase version 2428 2024-06-19 10:51:45 +02:00
Alex Moreno cd6c0f586e Merge pull request 'fix: refs #7599 fix spec remove enter key' (!460) from 7599-fixspec into dev 
Reviewed-on: verdnatura/salix-front#460
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 #7129 remove consoleLog 2024-06-19 10:19:12 +02:00
Pablo Natek 83428d0398 fix: refs #7599 fix spec remove enter key 2024-06-19 10:16:33 +02:00
Jon Elias 97c4130b05 Merge pull request '#7566 fixed summary cards and table' (!444) from 7566-FixCustomerSummary into dev 
Reviewed-on: verdnatura/salix-front#444
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-06-19 07:55:58 +00:00
Javier Segarra d5bd8c4432 fix: #7566 remove v-if 2024-06-19 09:54:24 +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' (!412) from hyervoni/salix-front-mindshore:feature/AccountList into dev 
Reviewed-on: verdnatura/salix-front#412
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
Jon Elias db67fd1e43 Merge branch 'dev' into 6896-EndOrderMigration 2024-06-18 11:32:13 +00:00
Jon Elias fa425a4329 Merge branch 'dev' into 7566-FixCustomerSummary 2024-06-18 11:31:48 +00:00
Jon Elias 3023280108 refactor: refs #6896 refactor VnImg 2024-06-18 13:31:25 +02:00
Jon Elias e0b4d86cab Merge branch '7566-FixCustomerSummary' of https://gitea.verdnatura.es/verdnatura/salix-front into 7566-FixCustomerSummary 2024-06-18 13:29:18 +02:00
Jon Elias 546b43ffcf refactor: refs #7566 fix customer summary 2024-06-18 13:29:17 +02:00
Alex Moreno ae75908e46 refactor: simplify code 2024-06-18 10:53:21 +02:00
Javier Segarra cd8e99e1df perf: remove CLI warnings 2024-06-18 10:52:55 +02:00
Alex Moreno cc0eb77228 Merge pull request '#7600 test vnLocation' (!454) from 7600-fix-vnLocation into dev 
Reviewed-on: verdnatura/salix-front#454
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-18 08:52:05 +00:00
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
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