8279 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	a54483f9a5	Merge branch 'test' into perf_redirectTransition	2025-01-09 07:30:37 +00:00
Alex Moreno	b28873c67d	perf: simplify if	2025-01-09 08:30:23 +01:00
Carlos Satorres	14b8fc150b	Merge pull request 'fix: modelName' (!1189) from hotfix-7366travelPopup into master ... Reviewed-on: #1189 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-09 07:07:43 +00:00
Alex Moreno	2505061b8c	perf: simplify if	2025-01-09 08:06:35 +01:00
Carlos Satorres	5e31b93675	fix: modelName	2025-01-09 08:00:30 +01:00
Alex Moreno	6d1478f703	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2025-01-09 07:59:34 +01:00
Alex Moreno	b563eda782	Merge branch '8264-hotFix_globalInvoicing_paralellism' of https://gitea.verdnatura.es/verdnatura/salix-front into 8264-hotFix_globalInvoicing_paralellism	2025-01-09 07:56:00 +01:00
Alex Moreno	0c30a82440	fix(InvoiceOutGlobal): refs #8264 fix invoicing	2025-01-09 07:55:57 +01:00
Alex Moreno	83d4997c89	Merge branch 'master' into 8264-hotFix_globalInvoicing_paralellism	2025-01-08 13:29:39 +00:00
Robert Ferrús	60191b61ce	Merge pull request 'fix: refs #8001 change link grafana' (!1186) from 8001-expeditionGrafanaHotFix into master ... Reviewed-on: #1186 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-08 12:34:55 +00:00
Robert Ferrús	65b9da7b54	Merge branch 'master' into 8001-expeditionGrafanaHotFix	2025-01-08 12:02:23 +00:00
Alex Moreno	e693323166	fix: workerTimeControl state week colors	2025-01-08 12:57:15 +01:00
Robert Ferrús	1a72eda359	fix: refs #8001 change link grafana	2025-01-08 12:44:35 +01:00
Alex Moreno	b889bfd178	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2025-01-08 12:19:38 +01:00
Alex Moreno	70f692ffd5	fix(WorkerTimeControl): fix isoYear	2025-01-08 12:19:27 +01:00
Pablo Natek	1dee824224	Merge pull request 'feat: refs #8348 add CSV download functionality and update print label icon' (!1172) from 8348-exportDataOnCsv into master ... Reviewed-on: #1172 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-08 07:55:25 +00:00
Pablo Natek	d392e93efd	Merge branch 'master' into 8348-exportDataOnCsv	2025-01-08 07:15:05 +00:00
Alex Moreno	621d98b32b	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2025-01-07 15:05:33 +01:00
Alex Moreno	ebb4d36fda	fix: refs #8264 parallelism	2025-01-07 15:04:45 +01:00
Jorge Penadés	0703a8c105	Merge pull request 'fix: refs #7323 update getAbsences to handle multiple years for absence data' (!1181) from 7323-hotfix-getNextYearAbsences into master ... Reviewed-on: #1181 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-07 11:05:20 +00:00
Jorge Penadés	da0e31b978	fix: refs #7323 update getAbsences to handle multiple years for absence data	2025-01-07 11:17:56 +01:00
Jorge Penadés	c6ccbd98b1	Merge pull request 'fix: refs #7936 disable option caption in EditTableCellValueForm' (!1180) from 7936-hotfix-hideCaption into master ... Reviewed-on: #1180 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-07 09:39:26 +00:00
Jorge Penadés	e0179d99d6	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7936-hotfix-hideCaption	2025-01-07 10:33:05 +01:00
Jorge Penadés	59c755329a	fix: refs #7936 update VnSelect to conditionally render option caption	2025-01-07 10:29:37 +01:00
Jorge Penadés	13d51bedc9	fix: refs #7936 disable option caption in EditTableCellValueForm	2025-01-07 10:00:29 +01:00
Alex Moreno	1d92e84227	fix: claimList order	2025-01-07 09:51:36 +01:00
Alex Moreno	3a0d545b94	Merge pull request '8356-devToTest' (!1179) from 8356-devToTest into test ... Reviewed-on: #1179 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2025-01-07 08:39:23 +00:00
Alex Moreno	ddc2f99efd	Merge branch 'test' of https: refs #8356//gitea.verdnatura.es/verdnatura/salix-front into 8356-devToTest	2025-01-07 09:33:47 +01:00
Alex Moreno	e46b4b0b97	fix: vnNotes filter & fix: itemFixedPrice order	2025-01-07 09:06:41 +01:00
Alex Moreno	97fee8d1d0	perf: order	2025-01-07 08:26:33 +01:00
Alex Moreno	d8c3e6bce7	perf: revert processData	2025-01-07 08:24:37 +01:00
Alex Moreno	e06d5df89f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-01-07 08:23:01 +01:00
Alex Moreno	76b9fbc267	perf: redirect transition list to card	2025-01-07 08:21:09 +01:00
Alex Moreno	cc6ee7ce30	Merge pull request '8355-testToMaster' (!1177) from 8355-testToMaster into master ... Reviewed-on: #1177 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2025-01-07 06:46:54 +00:00
Jon Elias	1bc0a6dcdf	Merge pull request '#8246: Added new field in list' (!1176) from 8246-ZoneAddressFk into dev ... Reviewed-on: #1176 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-01-07 06:40:46 +00:00
Alex Moreno	ea157eaf73	build: refs #8355 add changelog	2025-01-07 07:30:44 +01:00
Jon Elias	5c839b2dfa	Merge branch 'dev' into 8246-ZoneAddressFk	2025-01-07 06:22:27 +00:00
Alex Moreno	3b0c31f68c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-01-07 07:20:30 +01:00
Alex Moreno	266eccb814	Merge pull request '8197-perf_vnTableInside' (!1175) from 8197-perf_vnTableInside into test ... Reviewed-on: #1175 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2025-01-07 06:17:43 +00:00
Alex Moreno	d23e077af0	fix: refs #8197 mapKey	2025-01-07 07:15:40 +01:00
Jon Elias	b0cb3597de	feat: refs #8246 added new field in list	2025-01-07 07:11:04 +01:00
Alex Moreno	17db5ac882	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-01-07 07:02:04 +01:00
Alex Moreno	940e67b963	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 8197-perf_vnTableInside	2025-01-07 07:01:51 +01:00
Alex Moreno	d0e73caefd	Merge pull request 'fix: refs #8197 redirection' (!1170) from 8197-perf_redirection into test ... Reviewed-on: #1170 Reviewed-by: Pablo Natek <pablone@verdnatura.es> Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2025-01-07 06:01:34 +00:00
Alex Moreno	af7c6a0aaf	test: refs #8197 fix e2e	2025-01-06 18:59:48 +01:00
Alex Moreno	1a8368c4ce	fix(VnDmsList): refs #8197 add mapKey	2025-01-06 18:31:19 +01:00
Alex Moreno	cc4295e722	feat: refs #8197 keepData in VnSection	2025-01-03 15:40:19 +01:00
Alex Moreno	f3835a1d83	fix: refs #8197 vnPaginate when change :id	2025-01-03 15:31:00 +01:00
Alex Moreno	7fe2dd9ca7	Merge branch 'test' into 8197-perf_redirection	2025-01-03 12:50:59 +00:00
Alex Moreno	64e8eec854	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-01-03 13:45:16 +01:00