26821 Commits

All Branches

Search

Author	SHA1	Message	Date
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
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
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
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
Javi Gallego	7001076974	refactor: refs #7937 remove pickupAgencyFk and related constraints; update claimConfig and tests	2025-02-17 09:05:34 +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
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
Guillermo Bonet	309a287748	Merge branch 'test' into dev	2025-02-14 12:08:43 +01:00
Guillermo Bonet	d9e177d6b4	Merge pull request 'feat: refs #8227 Update roadmap triggers to manage eta adjustments and prevent recursive calls' (!3428) from 8227-roadmapChanges into test ... Reviewed-on: #3428 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-14 10:54:18 +00:00
Guillermo Bonet	aca49505bd	Merge branch 'test' into 8227-roadmapChanges	2025-02-14 10:52:40 +00:00
Guillermo Bonet	28deadfbad	fix: refs #8573 version	2025-02-14 10:37:08 +01:00
Guillermo Bonet	d6f08d7e27	feat: refs #8227 update roadmap triggers and views, remove obsolete trigger and column	2025-02-14 10:04:04 +01:00
Alex Moreno	8110e88aa7	fix: vnUser, default false	2025-02-14 08:29:55 +01:00
Ivan Mas	9000becf07	Merge pull request 'refactor: refs #8573 add fk to expedition.hostFk' (!3447) from 8573-addFkExpeditionHost into dev ... Reviewed-on: #3447 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2025-02-14 07:06:21 +00:00
Ivan Mas	5a37bd332e	Merge branch 'dev' into 8573-addFkExpeditionHost	2025-02-14 06:55:47 +00:00
Alex Moreno	44ed6254c3	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-02-14 07:02:45 +01:00
Carlos Andrés	4e9bcf530b	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-02-13 18:59:26 +01:00
Carlos Andrés	b06ffdff52	Actualizar modules/ticket/back/methods/ticket/closeAll.js	2025-02-13 16:42:20 +00:00
Carlos Andrés	536203e0a1	Merge pull request 'fix: facturacion por consignatario en el cierre nocturno y unificación de backs' (!3453) from Hotfix-cierre-facturacion into master ... Reviewed-on: #3453 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-13 16:37:00 +00:00
Ivan Mas	13a76e5c70	Merge branch 'dev' into 8573-addFkExpeditionHost	2025-02-13 15:43:56 +00:00
Ivan Mas	caa921020d	refactor: refs #8573 update before alter table	2025-02-13 16:41:29 +01:00
Carlos Andrés	7f32a10c06	fix: facturacion por consignatario en el cierre nocturno y unificación de backs	2025-02-13 15:22:37 +01:00
Guillermo Bonet	845ce8d6d8	feat: refs #8227 Minor changes	2025-02-13 14:36:09 +01:00
Guillermo Bonet	4042679c9b	feat: refs #8227 Grants	2025-02-13 14:12:44 +01:00