26925 Commits

All Branches

Search

Author	SHA1	Message	Date
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
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
Javi Gallego	0b7bcd9e33	Merge branch 'dev' into 7937-claimAgile	2025-02-18 09:19:02 +01: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
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
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
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
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
Javi Gallego	a04ddfdee3	Merge branch 'dev' into 7937-claimAgile	2025-02-17 14:21:56 +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