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

4598 Commits

Author SHA1 Message Date
Jon Elias 7914387735 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6899_InvoiceOut_End 2024-07-03 09:46:54 +02:00
Jon Elias 10f5323b9a refactor: refs #6899 fix negativeBases call 2024-07-03 09:45:59 +02:00
Pablo Natek a192c1e994 remove: refs #7404 remove spec 2024-07-03 09:39:49 +02:00
Carlos Satorres dc9463f249 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-entryMigration2 2024-07-03 09:38:37 +02:00
Pablo Natek 11266b602c refactor: refs #7404 route list add table 2024-07-03 09:33:48 +02:00
Pablo Natek 61bd1eaf04 merge dev 2024-07-03 09:33:04 +02:00
Jorge Penadés 79694b9d0c Merge branch 'dev' into 6449-updateVnLog 2024-07-03 07:15:16 +00:00
Jorge Penadés 0fd53872d0 Merge pull request '#7652 fix pagination' (!503) from 7652-fixPagination into dev 
Reviewed-on: verdnatura/salix-front#503
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-07-03 07:11:27 +00:00
Jorge Penadés df55246a4a Merge branch 'dev' into 7652-fixPagination 2024-07-03 07:10:13 +00:00
Alex Moreno 9e042112ff Merge pull request '#6917 - inputDate_inpuTime' (!498) from 6917-inputDate_inpuTime into dev 
Reviewed-on: verdnatura/salix-front#498
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-07-03 06:52:47 +00:00
Alex Moreno 6ac4649210 Merge branch 'dev' into 6917-inputDate_inpuTime 2024-07-03 06:51:38 +00:00
Jon Elias 081d3dc3c3 Merge pull request '#6151 fixed filters' (!497) from 6151-FixOrderModule into dev 
Reviewed-on: verdnatura/salix-front#497
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-07-03 06:50:18 +00:00
Alex Moreno 4272990a7a Merge branch 'dev' into 6917-inputDate_inpuTime 2024-07-03 06:48:59 +00:00
Carlos Satorres b40e3f2c7c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-entryMigration2 2024-07-03 08:48:33 +02:00
Jon Elias 467ec08f3e Merge branch 'dev' into 6151-FixOrderModule 2024-07-03 06:48:33 +00:00
Carlos Satorres 21d5d6b986 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7366-travelMigration2 2024-07-03 08:46:05 +02:00
Carlos Satorres ad2265fe7c refs #7366 fix travel migration 2024-07-03 08:43:23 +02:00
Javier Segarra 69a395c61f Merge pull request '7648 - CustomerView labeler' (!505) from 7648_dev_customerEntries into dev 
Reviewed-on: verdnatura/salix-front#505
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-07-03 06:39:03 +00:00
Javier Segarra f46443ee69 Merge branch 'dev' into 7648_dev_customerEntries 2024-07-03 08:33:33 +02:00
Javier Segarra d15dc7336b Merge branch 'dev' into 7648_dev_customerEntries 2024-07-03 08:26:27 +02:00
Jon Elias e114bd7523 Merge branch '7543-StandarizeDescriptors' of https://gitea.verdnatura.es/verdnatura/salix-front into 7543-StandarizeDescriptors 2024-07-03 08:20:18 +02:00
Jon Elias 363abb899f fix: refs #7543 fix changed descriptors 2024-07-03 08:20:16 +02:00
Jon Elias e13f98dffb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7543-StandarizeDescriptors 2024-07-03 07:12:07 +02:00
Jon Elias 0d4ba3bf27 Merge pull request '#7030 translation proposal' (!458) from 7030-FixTranslations into dev 
Reviewed-on: verdnatura/salix-front#458
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-07-03 05:06:53 +00:00
Jon Elias d5b934a239 Merge branch 'dev' into 7030-FixTranslations 2024-07-03 05:06:01 +00:00
William Buezas 5c36ad14f4 Ticket components 2024-07-02 21:33:19 -03:00
Javier Segarra 147d17301f remove unnussed tags 2024-07-03 01:50:45 +02:00
Javier Segarra dbbc8a4de6 test: change user 2024-07-03 01:48:06 +02:00
Javier Segarra 7e374c258e test: test:e2e 2024-07-03 01:47:14 +02:00
Javier Segarra 0dcd2a861b Merge branch 'dev' into 7543-StandarizeDescriptors 2024-07-02 18:59:43 +00:00
Javier Segarra e70162d342 Merge branch 'dev' into 6917-inputDate_inpuTime 2024-07-02 18:42:29 +00:00
Javier Segarra 5c2c9d0805 perf: change field column 2024-07-02 20:41:37 +02:00
Javier Segarra 8a94701422 Merge branch 'dev' into 7648_dev_customerEntries 2024-07-02 20:32:08 +02:00
Jorge Penadés 96a3298280 Merge branch 'dev' into 7652-fixPagination 2024-07-02 14:04:19 +00:00
Jon Elias 06f8121ede Merge branch 'dev' into 6899_InvoiceOut_End 2024-07-02 15:24:52 +02:00
Javier Segarra 07f76de8b7 Merge pull request 'feat(VnTable): add slots for columns' (!512) from 6825-vnTable-column-slots into dev 
Reviewed-on: verdnatura/salix-front#512
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-07-02 13:03:26 +00:00
Alex Moreno 6d12c0f00c feat(VnTable): add selected funcitionality 2024-07-02 15:01:43 +02:00
Alex Moreno 22f42ca7f9 feat(VnTable): add slots for columns 2024-07-02 14:55:32 +02:00
Jon Elias cdbbd576e3 refactor: refs #6899 end invoiceOut migration with VnTable 2024-07-02 14:54:14 +02:00
William Buezas 9179dc7432 Ticket package 2024-07-02 09:35:18 -03:00
Alex Moreno 73ec367987 Merge pull request 'fix: vntable filter where' (!509) from vnTable-fixes into dev 
Reviewed-on: verdnatura/salix-front#509
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
 2024-07-02 12:12:05 +00:00
Alex Moreno 249aedeaf5 remove unnecessary translation 2024-07-02 13:51:33 +02:00
Alex Moreno 1ca47c1c6c Merge branch 'dev' into vnTable-fixes 2024-07-02 11:49:48 +00:00
Alex Moreno 739be5fe7c fix(VnInputDate & VnInputTime): fix clearable 2024-07-02 13:49:29 +02:00
Alex Moreno af5314dac7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6917-inputDate_inpuTime 2024-07-02 13:39:41 +02:00
Alex Moreno 2961c813a5 build: increase version 2430 2024-07-02 12:41:25 +02:00
Alex Moreno 6b3a1d81d5 Merge pull request '7658-devToTest_2428' (!508) from 7658-devToTest_2428 into test 
Reviewed-on: verdnatura/salix-front#508
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
 2024-07-02 10:38:19 +00:00
Alex Moreno 82234aa7ec test 2024-07-02 12:35:30 +02:00
Alex Moreno 0384123564 fix: vntable filter where 2024-07-02 12:24:33 +02:00
Jon Elias c0e65ff3b7 fix: refs #7030 solve conflicts 2024-07-02 11:50:07 +02:00