27037 Commits

All Branches

Search

Author	SHA1	Message	Date
Guillermo Bonet	cba381ce2f	feat: refs #8244 Refactor	2025-02-18 13:52:27 +01:00
Alex Moreno	728e6e921a	build: init version	2025-02-18 13:38:46 +01:00
Alex Moreno	f316349ac2	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-02-18 13:38:21 +01:00
Alex Moreno	7ec29d1972	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-02-18 13:38:10 +01:00
Alex Moreno	40492d6489	Merge pull request '8627-devToTest' (!3474) from 8627-devToTest into test ... Reviewed-on: #3474 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2025-02-18 12:33:29 +00:00
Guillermo Bonet	96cba1f24f	feat: refs #8244 Last changes	2025-02-18 13:21:29 +01:00
Guillermo Bonet	a8469b403c	Merge branch 'dev' into 8244-floricode	2025-02-18 12:11:35 +00:00
Guillermo Bonet	bf1770dcc5	feat: refs #8244 Floricode api	2025-02-18 13:05:57 +01:00
Javi Gallego	26af667727	Merge branch 'dev' into 7937-claimAgile	2025-02-18 12:53:53 +01:00
Javi Gallego	fd53142bff	fix: refs #7937 update claimDestination and regularizeClaim methods for address handling	2025-02-18 12:53:43 +01:00
Jon Elias	0f0504e590	Merge pull request '#8555: Added new filter field' (!3434) from 8555-AddNewField into dev ... Reviewed-on: #3434 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-18 11:46:12 +00:00
Jon Elias	6118154ef9	Merge branch 'dev' into 8555-AddNewField	2025-02-18 11:44:01 +00:00
Jon Elias	5a1c826f15	Merge pull request '#8606: Show correct text of duplicate entry error' (!3461) from 8606-FixZoneModule into dev ... Reviewed-on: #3461 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-02-18 11:29:46 +00:00
Jon Elias	16bb716abd	Merge branch 'dev' into 8606-FixZoneModule	2025-02-18 10:36:49 +00:00
Juan Ferrer	6162cbe2c6	fix: refs #4409 t.isRaid	2025-02-18 11:06:41 +01:00
Alex Moreno	dc989cb075	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8627-devToTest	2025-02-18 10:35:00 +01:00
Jorge Penadés	e29e5e28ed	Merge pull request 'fix: refs #8388 update booking status in toUnbook method' (!3462) from 8388-fixUnbook into dev ... Reviewed-on: #3462 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-18 09:31:22 +00:00
Alex Moreno	2386874a96	fix: refs #8627 add claim in getSales	2025-02-18 10:28:00 +01:00
Javi Gallego	d974942ca3	Merge branch 'dev' into 7937-claimAgile	2025-02-18 10:17:32 +01:00
Alex Moreno	06c123d7f2	fix: refs #8627 ticket isTaxDataChecked	2025-02-18 10:15:28 +01:00
Alex Moreno	a8c03548d9	fix: refs #8627 update stateFk assignment to use code instead of id	2025-02-18 09:51:08 +01:00
Carlos Andrés	5488a229c1	Merge pull request 'fix: priceOptimum error' (!3471) from PriceOptimum-error into master ... Reviewed-on: #3471 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-18 08:50:27 +00:00
Alex Moreno	664ba03425	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-02-18 09:26:30 +01:00
Alex Moreno	dd8ca1eed2	Merge pull request 'build: refs #8622 dump db' (!3473) from 8622-dump into master ... Reviewed-on: #3473 Reviewed-by: Jon Elias <jon@verdnatura.es>	2025-02-18 08:26:18 +00:00
Javi Gallego	0b7bcd9e33	Merge branch 'dev' into 7937-claimAgile	2025-02-18 09:19:02 +01:00
Alex Moreno	08b4d0a4fa	build: refs #8622 dump db	2025-02-18 09:16:31 +01:00
Alex Moreno	f83055057e	fix: expeditionTruck use editorFk	2025-02-18 09:14:08 +01:00
Alex Moreno	ca8bc43262	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-02-18 08:53:24 +01:00
Alex Moreno	61df9a0f79	Merge pull request '8622-testToMaster' (!3470) from 8622-testToMaster into master ... Reviewed-on: #3470 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2025-02-18 07:52:22 +00:00
Alex Moreno	669b7cd67f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-02-18 08:45:19 +01:00
Alex Moreno	6e4667a563	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-02-18 08:45:11 +01:00
Alex Moreno	7d08c1796a	fix: update ticket_setState procedure to include created timestamp in ticketTracking insert	2025-02-18 08:44:07 +01:00
Juan Ferrer	e9244c8538	Merge branch 'dev' into 4409-binlog	2025-02-18 08:33:22 +01:00
Juan Ferrer	5a5da0a863	fix: refs #6695 Code refactor	2025-02-17 19:46:14 +01:00
Juan Ferrer	d6c8d96d52	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-02-17 19:40:14 +01:00
Juan Ferrer	17410202ad	fix: refs #6695 Code refactor	2025-02-17 19:40:12 +01:00
Javi Gallego	a30f12dd27	Merge branch 'dev' into 7937-claimAgile	2025-02-17 19:16:16 +01:00
Carlos Andrés	a73199e70b	fix: priceOptimum error	2025-02-17 18:52:31 +01:00
PAU ROVIRA ROSALENY	f687ad35fd	Merge pull request 'feat: #8497 added availabled on travel module' (!3469) from 8497-travelAvailabled into dev ... Reviewed-on: #3469 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-17 15:11:50 +00:00
Ivan Mas	48a28045fd	Merge branch 'dev' into 8558-futureTicketsClaims	2025-02-17 14:49:27 +00:00
Juan Ferrer	fbc185fe00	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-02-17 15:48:11 +01:00
Juan Ferrer	2d765913ff	fix: refs #6695 Code refactor	2025-02-17 15:48:09 +01:00
Javier Segarra	7e2129c94f	Merge pull request 'fix: getSuggestedTickets' (!3454) from fix_getSuggestedTickets_byFixtures into dev ... Reviewed-on: #3454 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-17 14:41:39 +00:00
Javier Segarra	dbd298b7d8	Merge branch 'dev' into fix_getSuggestedTickets_byFixtures	2025-02-17 14:39:01 +00:00
Ivan Mas	60f31178cf	Merge branch 'dev' into 8558-futureTicketsClaims	2025-02-17 14:17:31 +00:00
Ivan Mas	0088460e63	feat: refs #8558 requested modifications	2025-02-17 15:15:11 +01:00
Guillermo Bonet	1b0da71c9d	feat: refs #8244 Floricode api	2025-02-17 15:03:23 +01:00
PAU ROVIRA ROSALENY	2bac7cbd09	Merge branch 'dev' into 8497-travelAvailabled	2025-02-17 13:51:17 +00:00
PAU ROVIRA ROSALENY	e7cc754f53	feat: refs #8497 added availabled on travel module	2025-02-17 14:50:22 +01:00
Alex Moreno	e4c1ed1d5c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-02-17 14:50:09 +01:00