0
0
Fork 0
Commit Graph

4775 Commits

Author SHA1 Message Date
Jon Elias 34c877bd64 Merge branch 'dev' into 6899_InvoiceOut_End 2024-07-04 12:05:09 +00:00
Jon Elias d4f70355a7 Merge branch '6899_InvoiceOut_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 6899_InvoiceOut_End 2024-07-04 14:03:59 +02:00
Jon Elias 90fbfd38e0 refcactor: refs #6899 deleted warnings 2024-07-04 14:03:33 +02:00
William Buezas ad61bf61fa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/TicketPhotos 2024-07-04 08:49:18 -03:00
William Buezas 9b1f73d30f Rename catalog item 2024-07-04 08:45:51 -03:00
Carlos Satorres c6ae1aec36 refs #7366 fix travel 2024-07-04 13:41:43 +02:00
Jon Elias 1b839a89f7 refactor: refs #6896 Order migration 2024-07-04 13:35:27 +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
Javier Segarra d6cc447989 Merge branch 'dev' into feature/SaleTracking 2024-07-04 10:44:50 +02:00
Javier Segarra 4a01f1d930 perf: cleancode 2024-07-04 10:40:11 +02:00
Javier Segarra 6ce03287ef perf: remove justify-center CSS class 2024-07-04 09:53:06 +02:00
Javier Segarra 14e26f0285 Merge branch 'dev' into feature/TicketComponents 2024-07-04 09:40:00 +02: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
Jon Elias fcc8d59cb3 Merge branch 'dev' into 6899_InvoiceOut_End 2024-07-04 06:28:17 +00:00
Jon Elias 8dc1ec75b3 refactor: refs #6899 requested changes 2024-07-04 08:27:20 +02:00
Javier Segarra e2054c2eb7 fix: Itemdescriptor .link 2024-07-03 21:35:19 +02:00
Javier Segarra 2b0b470120 fix: TicketComponent Sales column 2024-07-03 21:30:29 +02:00
William Buezas 8baf5b1489 Apply right alignment to total and import columns 2024-07-03 16:14:47 -03:00
William Buezas 02ce4f2658 Small change 2024-07-03 15:12:20 -03:00
William Buezas 91eb966586 Ticket photos 2024-07-03 14:44:36 -03: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
Alex Moreno 2340aaba0b feat: list use vnTable, fix descriptor 2024-07-03 14:39:15 +02:00
Javier Segarra 57b38a8746 test: unit && e2e 2024-07-03 14:20:07 +02:00
Javier Segarra 83fa9a15b9 feat: redirect to login with current path 2024-07-03 14:20:01 +02:00
Javier Segarra 825e4497d2 feat: handle request when unauthorized 2024-07-03 14:19:54 +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
Javier Segarra c25b04e075 improve QChebox 2024-07-03 11:48:51 +02: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