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

3040 Commits

Author SHA1 Message Date
Kevin Martinez cd30d6184a Merge branch 'dev' into feature/ms-28-wagons 2023-11-29 23:11:20 -03:00
William Buezas 0d86fce3ea Merge branch 'dev' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into dev 2023-11-29 16:11:06 -03:00
William Buezas 50d5e38130 visual refactors 2023-11-29 16:10:44 -03:00
Kevin Martinez 01517c638b Update Shelving page 2023-11-29 15:55:31 -03:00
William Buezas 3bb4a75df7 Merge branch 'dev' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into dev 2023-11-29 14:21:36 -03:00
William Buezas db81ab8acf Cambios solicitados 2023-11-29 14:21:26 -03:00
Carlos Fonseca 49dfac3fcb Merge pull request 'Correcciones post PR' (#21) from features/ms_32_correcciones_post_pr_2 into dev 
Reviewed-on: hyervoni/salix-front-mindshore#21
 2023-11-29 16:49:30 +00:00
carlosfonseca 22cf914dc6 Correcciones post PR 2023-11-29 11:48:06 -05:00
Carlos Fonseca 7dabc86e10 Merge pull request 'Primeras correcciones' (#20) from features/ms_32_correcciones_post_pr_1 into dev 
Reviewed-on: hyervoni/salix-front-mindshore#20
 2023-11-29 14:29:47 +00:00
carlosfonseca 9b0d30a776 Primeras correcciones 2023-11-29 09:28:12 -05:00
William Buezas 62a806b813 WIP 2023-11-29 09:07:44 -03:00
Kevin Martinez 37454b91cb Merge branch 'dev' into feature/ms-28-wagons 2023-11-29 08:01:21 -03:00
Javi Gallego 1370ecbd8b Merge branch 'test' into 5815-vite_NODE_ENV 2023-11-29 08:54:04 +00:00
Hernan Yervoni b2edb89118 Merge pull request 'Adapt invoices out global form to new design and some improvements' (#18) from feature/ms-33-AdaptGlobalInvoicesForm into dev 
Reviewed-on: hyervoni/salix-front-mindshore#18
 2023-11-29 08:31:04 +00:00
Alex Moreno 615c5c1477 warmFix: ticket with null zone 2023-11-29 08:44:16 +01:00
Kevin Martinez 36028afa37 Update Wagon List styles 2023-11-28 23:06:30 -03:00
William Buezas fb1fb9ba64 Adapt invoices out global form to new design and some improvements 2023-11-28 16:20:01 -03:00
Kevin Martinez ce4f7d79ed Fix MR 2023-11-28 12:08:33 -03:00
Kevin Martinez 008dfd1be8 Fix merge conflicts 2023-11-28 11:58:42 -03:00
Carlos Fonseca 2f863791f9 Merge pull request 'Se agrega condicion de cardlist2' (#17) from features/ms_32_descargar_csv_4 into dev 
Reviewed-on: hyervoni/salix-front-mindshore#17
 2023-11-28 13:59:21 +00:00
carlosfonseca 33698f0566 Se agrega condicion de cardlist2 2023-11-28 08:58:25 -05:00
Carlos Fonseca a871d98f1c Merge pull request 'Se agrega condicional para mostrar checkbox' (#16) from features/ms_32_descargar_csv_3 into dev 
Reviewed-on: hyervoni/salix-front-mindshore#16
 2023-11-28 13:53:20 +00:00
carlosfonseca f002fd2a98 Se agrega condicional para mostrar checkbox 2023-11-28 08:51:55 -05:00
Carlos Fonseca cc79d699f6 Merge pull request 'Add csv download feature and add descriptors' (#15) from feature/ms-29-NegativeBasesDetails into dev 
Reviewed-on: hyervoni/salix-front-mindshore#15
 2023-11-28 13:26:38 +00:00
Carlos Fonseca ac39a2d398 Merge pull request 'Se mejora logica de descarga csv' (#14) from features/ms_32_descargar_csv_2 into dev 
Reviewed-on: hyervoni/salix-front-mindshore#14
 2023-11-28 13:15:26 +00:00
carlosfonseca 2d08e55c85 Se mejora logica de descarga csv 2023-11-28 08:11:32 -05:00
William Buezas 7646934431 Add csv download feature and add descriptors 2023-11-28 10:11:24 -03:00
Hernan Yervoni d4887699b3 Merge pull request 'Add Create shelving page' (#10) from feature/ms-18-shelving-list into dev 
Reviewed-on: hyervoni/salix-front-mindshore#10
 2023-11-28 12:59:31 +00:00
Jorge Penadés f75b81db71 refs #5835 fix conflicts 2023-11-28 12:08:20 +01:00
Jorge Penadés 0282f8dde8 refs #5835 rate fixed & options descriptor created 2023-11-28 12:05:39 +01:00
Kevin Martinez d65f331d1f Merge branch 'dev' into feature/ms-18-shelving-list 2023-11-28 00:16:37 -03:00
Carlos Fonseca df00ec99eb Merge pull request 'Se crea logica para descargar datos en formato csv' (#13) from features/ms_32_descargar_csv into dev 
Reviewed-on: hyervoni/salix-front-mindshore#13
 2023-11-27 21:45:42 +00:00
Carlos Fonseca e0c4527dc4 Merge pull request 'Negative bases details' (#12) from feature/ms-29-NegativeBasesDetails into dev 
Reviewed-on: hyervoni/salix-front-mindshore#12
 2023-11-27 21:40:09 +00:00
carlosfonseca 41e022e610 Se crea logica para descargar datos en formato csv 2023-11-27 16:36:36 -05:00
William Buezas c1c0dbf1f8 Details 2023-11-27 18:11:06 -03:00
Carlos Fonseca dcdce926f4 Merge pull request 'Travel section' (#11) from feature/ms-22-Travels into dev 
Reviewed-on: hyervoni/salix-front-mindshore#11
 2023-11-27 19:22:07 +00:00
William Buezas 7e22a2924e create travel filters and integrate 2023-11-27 12:49:19 -03:00
Alex Moreno cad5d830a0 Merge pull request 'refs #6062 feat(arrayData): support exprBuilder' (!112) from 6062-exprBuilder into dev 
Reviewed-on: verdnatura/salix-front#112
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
 2023-11-27 12:23:33 +00:00
Javier Segarra 6ac89e7aa2 Update quasar.config.js 2023-11-27 11:57:09 +00:00
William Buezas df599f1e8d add header options menu in travel summary 2023-11-25 21:19:22 -03:00
William Buezas 4eb57ab90e resolve conflicts when pulling dev 2023-11-25 20:04:20 -03:00
William Buezas e291a69846 Add travel clone feature 2023-11-25 19:42:24 -03:00
William Buezas e8b1d0fe7e travel WIP 2023-11-25 19:02:26 -03:00
Alex Moreno 54379b3e65 typo 2023-11-24 13:32:20 +01:00
Alex Moreno 023cfc6ac7 refs #6062 feat(arrayData): support exprBuilder 2023-11-24 13:31:08 +01:00
Javi Gallego 5719857d83 Merge branch 'test' into 5815-vite_NODE_ENV 2023-11-24 10:20:15 +00:00
Jorge Penadés 7595c01293 refs #5835 fix InvoiceInDescriptor 2023-11-24 11:09:12 +01:00
Jorge Penadés b49e2e28e8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-migrateInvoiceIn 2023-11-24 11:03:02 +01:00
Alex Moreno dacfe1a96d refs #5654 fix(descriptors): add data-key 2023-11-24 10:36:31 +01:00
Jorge Penadés b00cff8b0b refs #5835 refactor getTotals 2023-11-24 10:08:51 +01:00