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

4177 Commits

Author SHA1 Message Date
Jon Elias 546b43ffcf refactor: refs #7566 fix customer summary 2024-06-18 13:29:17 +02:00
Alex Moreno 8085e1e518 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable 2024-06-18 13:25:44 +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
Alex Moreno ae18cffd30 Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation 2024-06-18 09:56:32 +02: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
Alex Moreno 1bb7f57e64 Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation 2024-06-18 09:34:02 +02:00
Javier Segarra dfbc7df54d perf: Remove div.col 2024-06-18 09:20:45 +02:00
Carlos Satorres 84378187be Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7409-workerBalance 2024-06-18 08:56:23 +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 301bb89460 Merge pull request '7391-defaulterFilter' (!446) from 7391-defaulterFilter into test 
Reviewed-on: verdnatura/salix-front#446
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-18 06:15:48 +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
William Buezas c798874a9e Ticket future 2024-06-17 17:27:06 -03:00
William Buezas c289c247c4 undo change in sms dialog 2024-06-17 12:22:22 -03:00
William Buezas 6b7c76dde3 mini change 2024-06-17 12:19:44 -03:00
William Buezas 06e8e819f4 WIP 2024-06-17 12:11:23 -03:00
Carlos Satorres 0ccfd9ae75 refs #7409 columns trad 2024-06-17 15:50:33 +02:00
Carlos Satorres 25ab5a1b9f refs #7409 front section 2024-06-17 13:55:16 +02:00
William Buezas c807b5feb2 Weekly tickets 2024-06-17 08:21:43 -03: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