8254 Commits

All Branches

Search

Author	SHA1	Message	Date
Javier Segarra	8b7337f9ee	fix: vnlocation	2025-01-14 08:37:10 +01:00
Alex Moreno	bce40834a5	Merge pull request '8389-testToMaster' (!1207) from 8389-testToMaster into master ... Reviewed-on: #1207 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2025-01-14 06:32:35 +00:00
Alex Moreno	099ea793bd	fix: refs #8389 minor bugs	2025-01-14 07:29:44 +01:00
Alex Moreno	dbafd5d689	build: refs #8389 changelog	2025-01-13 15:24:20 +01:00
Alex Moreno	5a58012f80	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2025-01-13 14:49:02 +01:00
Jon Elias	07ecd93fe0	Merge pull request 'Warmfix: Redirect to TicketSales when confirming lines' (!1203) from Warmfix-OrderProblems into test ... Reviewed-on: #1203 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-13 13:33:35 +00:00
Jorge Penadés	a32ec49efd	Merge pull request 'fix: refs #8110 prevent form submit' (!1205) from 8110-hotfix-solveConflicts into master ... Reviewed-on: #1205 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-13 11:25:23 +00:00
Jorge Penadés	ac589a8626	fix: refs #8110 prevent form submit	2025-01-13 12:21:33 +01:00
Jon Elias	a9ac5106cf	Merge branch 'test' into Warmfix-OrderProblems	2025-01-13 10:56:32 +00:00
Jon Elias	5272e5aaae	fix: redirect to sales when confirming lines	2025-01-13 11:53:55 +01:00
Alex Moreno	d761af6537	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2025-01-13 10:23:27 +01:00
Pablo Natek	8ce4fc38e2	Merge pull request 'feat: add decimal places for longitude and latitude inputs in CustomerAddressEdit' (!1199) from fixDecimalP into master ... Reviewed-on: #1199 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2025-01-13 07:03:16 +00:00
Pablo Natek	fb5d76737d	feat: add decimal places for longitude and latitude inputs in CustomerAddressEdit	2025-01-13 08:01:05 +01:00
Carlos Satorres	db67b8f01a	Merge pull request 'fix: fix confirmRequest' (!1191) from hotfix-7283itemRequestConfirm into master ... Reviewed-on: #1191 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-09 11:53:15 +00:00
Carlos Satorres	2837d2e5af	Merge branch 'master' into hotfix-7283itemRequestConfirm	2025-01-09 11:51:37 +00:00
Alex Moreno	288919f695	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2025-01-09 10:11:56 +01:00
Alex Moreno	45365ba933	Merge pull request 'hotFix: refs #8264 parallelism' (!1182) from 8264-hotFix_globalInvoicing_paralellism into master ... Reviewed-on: #1182 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>	2025-01-09 09:11:37 +00:00
Alex Moreno	3a7f46856a	Merge branch 'master' into 8264-hotFix_globalInvoicing_paralellism	2025-01-09 09:10:19 +00:00
Alex Moreno	e36e9b5617	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2025-01-09 09:54:15 +01:00
Carlos Satorres	135266a300	Merge branch 'master' into hotfix-7283itemRequestConfirm	2025-01-09 08:54:09 +00:00
Carlos Satorres	5882ee8463	fix: fix confirmRequest	2025-01-09 09:44:37 +01:00
Alex Moreno	f45612f058	Merge pull request 'perf_redirectTransition' (!1178) from perf_redirectTransition into test ... Reviewed-on: #1178 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2025-01-09 08:16:53 +00:00
Alex Moreno	f668a4bac4	Merge branch 'test' into perf_redirectTransition	2025-01-09 08:00:57 +00:00
Alex Moreno	3f167ffd3a	fix: hotFix if not date return null/undefined	2025-01-09 09:00:29 +01:00
Javi Gallego	bd09090e11	fix: update button sizes in ExtraCommunity.vue for better visibility	2025-01-09 08:47:18 +01:00
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