26834 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Juan Ferrer	64eefa95f5	ci: refs #6695 Jenkinsfile fixes	2025-02-17 11:32:38 +01:00
Juan Ferrer	8b05bfb59f	ci: refs #6695 Jenkinsfile fixes	2025-02-17 11:31:10 +01:00
Juan Ferrer	034c76c05f	Merge branch '6695-save_builds_and_Db' of https: refs #6695//gitea.verdnatura.es/verdnatura/salix into 6695-save_builds_and_Db	2025-02-17 11:29:50 +01:00
Pablo Natek	e0c2a497d2	Merge pull request 'fix: refs #6897 change user field to nickname in getStockBought method' (!3465) from 6897-fixE2eAndStockBought into dev ... Reviewed-on: #3465 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-02-17 10:29:27 +00:00
Juan Ferrer	8387dad3d8	ci: refs #6695 Docker build changes	2025-02-17 11:28:01 +01:00
Alex Moreno	bfddbfaa22	fix: refs #6695 update Jenkinsfile and docker-compose.yml for environment variable usage	2025-02-17 10:54:38 +01:00
Pablo Natek	3093f8aef8	fix: refs #6897 change user field to nickname in getStockBought method	2025-02-17 10:50:21 +01:00
Javier Segarra	2bed2d63bc	Merge branch 'dev' into fix_ticketNegative	2025-02-17 09:21:55 +01:00
Alex Moreno	4aa56a71cb	refactor: refs #6695 uncommnet	2025-02-17 08:56:55 +01:00
Alex Moreno	8ef13e3d9c	feat: refs #6695 add Dockerfile for MariaDB and update Jenkinsfile for database build stage	2025-02-17 08:34:04 +01:00
Alex Moreno	b4bcfb2886	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-02-17 07:55:13 +01:00
Javier Segarra	5f123d45f2	test: fix itemLack	2025-02-16 03:20:20 +01:00
Javier Segarra	7dd2cf80c0	Merge branch 'dev' into fix_ticketNegative	2025-02-16 03:17:43 +01:00
Javier Segarra	d6499175ad	fix: minor bugs	2025-02-16 03:17:31 +01:00
Alex Moreno	05af629a62	build: empty commit	2025-02-14 14:32:15 +01:00
Guillermo Bonet	c79867188a	Merge branch 'test' into dev	2025-02-14 12:36:24 +01:00
Guillermo Bonet	dce263992e	fix: refs #8227 Roadmap columns	2025-02-14 12:36:06 +01:00
Carlos Andrés	a874b96c5e	revert a119d9f7fb ... revert feat: invoiceIn move deductible field from head to lines	2025-02-14 11:32:45 +00:00
Carlos Andrés	a119d9f7fb	feat: invoiceIn move deductible field from head to lines	2025-02-14 12:29:56 +01:00
Carlos Andrés	1d21ae378d	fix: refs #8605 update French email template for invoice notifications	2025-02-14 12:20:33 +01:00
Guillermo Bonet	309a287748	Merge branch 'test' into dev	2025-02-14 12:08:43 +01:00