26857 Commits

All Branches

Search

Author	SHA1	Message	Date
Javier Segarra	0be1f7bf49	Merge branch 'dev' into fix_ticketNegative	2025-02-18 12:31:47 +01:00
Javier Segarra	87f0712eb0	feat: claimManager	2025-02-18 12:31:38 +01:00
Javier Segarra	2719a9dea6	perf: update state ticket	2025-02-18 12:31:23 +01: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
Javier Segarra	62cb5d0d57	Merge branch 'dev' into fix_ticketNegative	2025-02-18 10:42:57 +00:00
Jon Elias	16bb716abd	Merge branch 'dev' into 8606-FixZoneModule	2025-02-18 10:36:49 +00: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
Javier Segarra	1d9a6b5336	Merge branch 'dev' into fix_ticketNegative	2025-02-18 08:26:55 +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
Jon Elias	d57d57b8f4	Merge branch 'dev' into fix_ticketNegative	2025-02-18 08:17:35 +00: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	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
Javier Segarra	f95da6d5de	Merge branch 'dev' into fix_ticketNegative	2025-02-17 17:43:02 +00: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
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
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
Alex Moreno	c5cd52e59c	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-02-17 14:49:17 +01:00
Alex Moreno	97198591f9	build: add build-essential in back dockerfile	2025-02-17 14:01:41 +01:00
Javier Segarra	44a3059e91	fix: replace colour by inkFk	2025-02-17 13:36:46 +01:00
Pablo Natek	38fa5cb823	Merge pull request 'fix(item_getBalance): refs #8408 alias for shipped field' (!3468) from 8408-Disponible-por-zonas-y-horas into dev ... Reviewed-on: #3468 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2025-02-17 12:18:25 +00:00
Pako Natek	991ed813e3	Merge branch 'dev' into 8408-Disponible-por-zonas-y-horas	2025-02-17 12:15:48 +00:00
Pako Natek	bd1a4b35aa	fix(item_getBalance): refs #8408 alias for shipped field	2025-02-17 13:12:22 +01:00
Alex Moreno	2e36d9b116	Merge pull request 'feat: refs #6695 add Dockerfile for MariaDB and update Jenkinsfile for database build stage' (!3464) from 6695-save_builds_and_Db into dev ... Reviewed-on: #3464 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2025-02-17 12:04:23 +00:00
Juan Ferrer	9e564a951a	Merge branch '6695-save_builds_and_Db' of https://gitea.verdnatura.es/verdnatura/salix into 6695-save_builds_and_Db	2025-02-17 13:00:34 +01:00
Juan Ferrer	40ed75450d	ci: refs #6695 Jenkinsfile code refactor	2025-02-17 13:00:32 +01:00
Alex Moreno	2d7c677f0a	Merge branch 'dev' into 6695-save_builds_and_Db	2025-02-17 11:57:55 +00:00
Juan Ferrer	19df0d3cb0	ci: refs #6695 Jenkinsfile debug code removed	2025-02-17 12:55:48 +01:00
Juan Ferrer	939181bd79	ci: refs #6695 Jenkinsfile fixes	2025-02-17 12:50:22 +01:00
Carlos Andrés	52c22608a5	Actualizar db/routines/vn/procedures/productionControl.sql	2025-02-17 11:38:48 +00:00
Juan Ferrer	b7342eace2	ci: refs #6695 Jenkinsfile fixes	2025-02-17 12:38:06 +01:00
Juan Ferrer	45e8a0bd8b	ci: refs #6695 Jenkinsfile fixes	2025-02-17 12:34:00 +01:00
Carlos Andrés	603ab33526	Merge pull request 'fix: refs #8605 update French email template for invoice notifications' (!3457) from 8605-template-invoice into master ... Reviewed-on: #3457 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-17 11:26:08 +00:00
Juan Ferrer	2e4fb91d77	ci: refs #6695 Jenkinsfile fixes	2025-02-17 12:20:36 +01:00
Juan Ferrer	2d94c8df39	ci: refs #6695 Jenkinsfile fixes	2025-02-17 12:17:49 +01:00
Juan Ferrer	7e7ee1ff12	ci: refs #6695 Jenkinsfile fixes	2025-02-17 11:33:56 +01:00
Javier Segarra	f7d953d392	fix: item_getLack	2025-02-17 11:33:07 +01:00