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

4490 Commits

Author SHA1 Message Date
Javier Segarra 356db41eac Merge branch 'dev' into feature/TicketPackages 2024-07-05 19:02:58 +00:00
William Buezas b87e88ae7f Handle quantity empty value 2024-07-05 12:04:18 -03:00
William Buezas 3490ba1a8c Add input type number 2024-07-05 11:36:37 -03:00
Carlos Satorres 53a75954d1 Merge pull request 'refs #7366 fix travel' (!529) from 7366-fixTravels into dev 
Reviewed-on: verdnatura/salix-front#529
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-07-05 10:28:37 +00:00
Carlos Satorres ae7bb14382 Merge branch 'dev' into 7366-fixTravels 2024-07-05 10:27:45 +00:00
Javier Segarra 4ebcb420c3 test: fix myEntry 2024-07-05 09:31:05 +02:00
Javier Segarra 9d4cfbd90c Merge branch 'dev' into feature/TicketPackages 2024-07-05 09:28:31 +02:00
Carlos Satorres dc923ed36c refs #7366 fix descriptor 2024-07-05 09:07:18 +02:00
Alex Moreno 90da150d63 Merge pull request 'arrayData & VnCard refactor' (!524) from VnTable_fix into dev 
Reviewed-on: verdnatura/salix-front#524
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-07-05 06:52:01 +00:00
Alex Moreno 26ad3d29c7 comment e2e 2024-07-05 08:50:32 +02:00
Jon Elias 9b3bb6ce3a refactor: refactored test e2e & changed openActionsDescriptor function 2024-07-05 07:53:12 +02:00
Jon Elias 05d0322133 Merge branch 'VnTable_fix' of https://gitea.verdnatura.es/verdnatura/salix-front into VnTable_fix 2024-07-05 07:36:21 +02:00
Jon Elias b0ddad5231 fix: fixed e2e tests 2024-07-05 07:36:20 +02:00
Jon Elias dc16534787 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into VnTable_fix 2024-07-05 07:22:29 +02:00
William Buezas 273641cd98 Change translation 2024-07-04 13:02:24 -03:00
William Buezas decf33c0b7 small changes 2024-07-04 09:46:10 -03:00
Carlos Satorres c6ae1aec36 refs #7366 fix travel 2024-07-04 13:41:43 +02:00
Alex Moreno 31fa889d1f Merge branch 'VnTable_fix' of https://gitea.verdnatura.es/verdnatura/salix-front into VnTable_fix 2024-07-04 13:17:59 +02:00
Alex Moreno 699f09cfcf fix: where empty 2024-07-04 13:17:58 +02:00
Alex Moreno 47fe9b25e9 Merge branch 'dev' into VnTable_fix 2024-07-04 10:57:34 +00:00
Jon Elias aec43cb1c5 refactor: arrayData & VnCard refactor 2024-07-04 12:51:46 +02:00
Jorge Penadés 3585f651b8 Merge pull request '#7300 create reset function' (!478) from 7300-createResetFnArrayData into dev 
Reviewed-on: verdnatura/salix-front#478
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-07-04 10:03:40 +00:00
Jorge Penadés fbbeb200be Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7300-createResetFnArrayData 2024-07-04 09:29:28 +02:00
Jorge Penadés b09cbe442c Merge pull request '#6943 removes duplicate toggle menu & fix loading animation' (!491) from 6943-fixCustomerGreuges into dev 
Reviewed-on: verdnatura/salix-front#491
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-07-04 07:25:43 +00:00
Jorge Penadés c2333c9455 chore: refs #7300 reset arrayData 2024-07-03 17:53:37 +02:00
Jorge Penadés d6ff9a184b Merge branch 'dev' into 6943-fixCustomerGreuges 2024-07-03 15:40:45 +00:00
Jorge Penadés 6ad0b0994f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7300-createResetFnArrayData 2024-07-03 17:15:40 +02:00
Carlos Satorres f4c34162a6 Merge pull request 'refs #6898 fix' (!519) from fix-supplierSearchTable into dev 
Reviewed-on: verdnatura/salix-front#519
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
 2024-07-03 12:04:07 +00:00
Jorge Penadés 7098ec03de Merge branch 'dev' into 6943-fixCustomerGreuges 2024-07-03 12:00:40 +00:00
Pablo Natek 1e7fcce26c Merge branch 'dev' into fix-supplierSearchTable 2024-07-03 11:56:47 +00:00
Jorge Penadés e09569378d Merge pull request '#6151 searchbar' (!520) from 6151-fix-searchbar into dev 
Reviewed-on: verdnatura/salix-front#520
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-07-03 11:49:16 +00:00
Jorge Penadés 869d134591 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6151-fix-searchbar 2024-07-03 13:48:06 +02:00
Jorge Penadés 95f488ba76 chore: refs #6151 rollback 2024-07-03 13:47:33 +02:00
Jorge Penadés 218cc47834 fix: refs #6151 searchbar 2024-07-03 13:44:35 +02:00
Carlos Satorres 161ebdc88a refs #6898 fix 2024-07-03 13:44:13 +02:00
Carlos Satorres 553927665f Merge pull request 'fix searchbar' (!518) from fix-filterSearchbar into dev 
Reviewed-on: verdnatura/salix-front#518
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
 2024-07-03 11:29:56 +00:00
Carlos Satorres 109544f475 fix searchbar 2024-07-03 13:18:17 +02:00
Carlos Satorres 2162315905 Merge pull request 'supplier Migration' (!456) from 6898-supplierMigration into dev 
Reviewed-on: verdnatura/salix-front#456
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-07-03 10:51:22 +00:00
Carlos Satorres bb73f60994 Merge branch '6898-supplierMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 6898-supplierMigration 2024-07-03 12:46:53 +02:00
Carlos Satorres f6af1415c2 Merge branch 'dev' into 6898-supplierMigration 2024-07-03 10:44:11 +00:00
Carlos Satorres 92b8104b19 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6898-supplierMigration 2024-07-03 12:21:03 +02:00
Carlos Satorres 199d8fa237 Merge pull request '6897-entryMigration2' (!504) from 6897-entryMigration2 into dev 
Reviewed-on: verdnatura/salix-front#504
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-07-03 10:15:11 +00:00
Carlos Satorres 885decc700 Merge branch 'dev' into 6897-entryMigration2 2024-07-03 10:02:28 +00:00
Jorge Penadés f6f5c2c085 Merge pull request '#6449 update vnLog' (!284) from 6449-updateVnLog into dev 
Reviewed-on: verdnatura/salix-front#284
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-07-03 08:52:08 +00:00
Jorge Penadés 2156692804 Merge branch 'dev' into 6449-updateVnLog 2024-07-03 08:39:11 +00:00
Alex Moreno eeaf7d00e2 Merge pull request 'refs #7366 VnTable' (!489) from 7366-travelMigration2 into dev 
Reviewed-on: verdnatura/salix-front#489
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-07-03 08:32:57 +00:00
Alex Moreno 1463cc8904 Merge branch 'dev' into 7366-travelMigration2 2024-07-03 08:32:00 +00:00
Pablo Natek 6f21e165a2 Merge pull request '7404-add-e2e-to-route' (!516) from 7404-add-e2e-to-route into dev 
Reviewed-on: verdnatura/salix-front#516
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-07-03 08:31:37 +00:00
Carlos Satorres 27876b0bab Merge branch 'dev' into 7366-travelMigration2 2024-07-03 08:30:56 +00:00
Pablo Natek 5b98e968ed remove: refs #7404 remove comments 2024-07-03 10:27:11 +02:00