2293 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	2d3ddd886a	Merge pull request 'feat: #6514 create supplierDms lilium' (!258) from 6514-gestDocSupplier into dev ... Reviewed-on: #258 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-28 07:33:19 +00:00
Jon Elias	2b1fe6fd77	Merge branch '6514-gestDocSupplier' of https://gitea.verdnatura.es/verdnatura/salix-front into 6514-gestDocSupplier	2024-03-28 08:31:57 +01:00
Jon Elias	b2691a35e1	refactor: refs #6514 fixed tranlation	2024-03-28 08:31:56 +01:00
Alex Moreno	181bff6c0c	Merge branch 'dev' into 6514-gestDocSupplier	2024-03-28 07:17:28 +00:00
Javier Segarra	54b6528962	Merge pull request 'More updates to use scopedMultimedia' (!261) from 6930_scopedMultimedia into dev ... Reviewed-on: #261 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-28 06:38:25 +00:00
Javier Segarra	da93b9cca8	updates	2024-03-28 07:20:54 +01:00
carlosfonseca	8cf14929e3	Se implementa nuevo componente para la gestion de notas	2024-03-27 08:52:31 -05:00
Alex Moreno	f0ccb526f0	Merge pull request 'refs #7147 add value' (!260) from 7147-hotfixLanguage into master ... Reviewed-on: #260 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-27 12:40:35 +00:00
Carlos Satorres	e651e116e7	refs #7147 add value	2024-03-27 13:36:51 +01:00
Jorge Penadés	2bec5f0e9c	Merge pull request '#6893 redirect on fetch just one record' (!257) from 6893-redirectOnFetchOneRecord into dev ... Reviewed-on: #257 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-27 12:14:23 +00:00
Jon Elias	72e3fcb4b7	Merge pull request 'refactor: #6988 changed ticket summary view and fixed notes functionality' (!237) from 6988-SummaryRefactor into dev ... Reviewed-on: #237 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-27 10:51:51 +00:00
Jorge Penadés	5126b6aed8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6893-redirectOnFetchOneRecord	2024-03-27 11:48:56 +01:00
Jorge Penadés	0d74c7f6c7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6893-redirectOnFetchOneRecord	2024-03-27 11:18:41 +01:00
Jorge Penadés	20102a89ab	feat: refs #6893 improve VnSearchbar & create tests	2024-03-27 11:14:54 +01:00
Jon Elias	d555f7e09e	Merge branch 'dev' into 6988-SummaryRefactor	2024-03-27 10:02:18 +00:00
Jorge Penadés	a9f7cfb8d4	Merge pull request '#5186 create parking section' (!197) from 5186-CreateParkingSection into dev ... Reviewed-on: #197 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-03-27 08:42:32 +00:00
Javier Segarra	27f8d5f09c	Merge branch '5186-CreateParkingSection' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection	2024-03-27 09:36:19 +01:00
Jorge Penadés	375461abd7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6893-redirectOnFetchOneRecord	2024-03-27 08:35:24 +01:00
Jorge Penadés	9c83c4cd6c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection	2024-03-27 08:30:37 +01:00
Jon Elias	7cfffbd2de	Merge pull request 'refactor: #6993 set default QTable pagination' (!239) from 6993-HideAllPagination into dev ... Reviewed-on: #239 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-27 07:27:22 +00:00
carlosfonseca	081d4bf5fc	Solucion a comentarios 4	2024-03-26 23:11:41 -05:00
carlosfonseca	1d37b91e09	Solucion a comentarios 3	2024-03-26 17:17:40 -05:00
Jon Elias	7072dc783b	refactor: refs #6993 fix test error	2024-03-26 09:56:33 +01:00
Jon Elias	9f24f1f97c	refactor: refs #6993 merged conflicts	2024-03-26 09:44:54 +01:00
Jon Elias	2c6d95336c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6993-HideAllPagination	2024-03-26 09:35:23 +01:00
Jorge Penadés	a0dcd6aee1	feat: refs #6893 replace id & redirect to Card or list	2024-03-26 09:11:53 +01:00
Jon Elias	50b116627b	Merge branch '6993-HideAllPagination' of https://gitea.verdnatura.es/verdnatura/salix-front into 6993-HideAllPagination	2024-03-26 09:10:00 +01:00
Jon Elias	4a7cb8fe8d	refactor: refs #6993 fixed conflict	2024-03-26 09:09:58 +01:00
Jon Elias	1ec54d7664	feat: #6514 create supplierDms lilium	2024-03-26 08:55:01 +01:00
Jorge Penadés	b46760116f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn	2024-03-26 08:34:15 +01:00
Jorge Penadés	c450290d3c	Merge pull request '#6485 not open new tab on launch' (!256) from 6485-notOpenTabOnRun into dev ... Reviewed-on: #256 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-26 07:23:38 +00:00
Alex Moreno	a4a96a106f	Merge branch 'dev' into 6988-SummaryRefactor	2024-03-26 06:41:39 +00:00
Jorge Penadés	de0166b327	feat: refs #6485 not open new tab on launch	2024-03-25 14:33:32 +01:00
Javier Segarra	4605484845	Merge pull request 'Create worker log' (!247) from hyervoni/salix-front-mindshore:feature/worker-log into dev ... Reviewed-on: #247 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-03-25 12:47:06 +00:00
Kevin Martinez	5e089e616e	Merge branch 'dev' into feature/worker-log	2024-03-25 12:00:06 +00:00
Alex Moreno	c335accffb	refs #6905 fix translation and warnings	2024-03-25 12:42:48 +01:00
Jon Elias	3e0f151570	refactor: refs #6988 fixed error	2024-03-25 12:36:50 +01:00
Jon Elias	c5e9572889	Merge pull request 'refactor(routeList): refs #6971 moved button to subtoolbar + same functionality as other subtoolbar items' (!236) from 6971-MoveBtnToSubtoolbar into dev ... Reviewed-on: #236 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-25 10:58:37 +00:00
Alex Moreno	fc5dbdfbb3	Merge branch 'dev' into 6971-MoveBtnToSubtoolbar	2024-03-25 10:48:12 +00:00
Jon Elias	84a25acf22	refactor: refs #6988 used global translations	2024-03-25 11:42:29 +01:00
Jon Elias	f1d37ed756	Merge pull request 'refactor: refs #6837 move travel search like other sections' (!243) from 6837-moveSearchById into dev ... Reviewed-on: #243 Reviewed-by: Pablo Natek <pablone@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-25 10:26:02 +00:00
Jon Elias	842fc3f98a	Merge branch 'dev' into 6837-moveSearchById	2024-03-25 10:24:39 +00:00
Jon Elias	b7b6d55d1c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6988-SummaryRefactor	2024-03-25 10:06:54 +01:00
Carlos Satorres	2003394fba	Merge pull request 'refs #6905 add rows' (!235) from 6905-userPanelConfig into dev ... Reviewed-on: #235 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-25 08:54:04 +00:00
Jon Elias	bf0e2d3bf6	refactor: refs #6971 fixed request changes	2024-03-25 09:52:04 +01:00
Carlos Satorres	3ed3093fd9	Merge branch 'dev' into 6905-userPanelConfig	2024-03-25 08:50:42 +00:00
Alex Moreno	bd51306fd9	Merge branch 'dev' into 6837-moveSearchById	2024-03-25 08:40:28 +00:00
Jon Elias	a530e44179	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6971-MoveBtnToSubtoolbar	2024-03-25 09:26:45 +01:00
Jorge Penadés	f49c091461	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection	2024-03-25 08:50:18 +01:00
Jorge Penadés	f0c3d90856	Merge pull request '#6951 add ticket clone' (!241) from 6951-cloneTicket into dev ... Reviewed-on: #241 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-25 07:46:49 +00:00