26925 Commits

All Branches

Search

Author	SHA1	Message	Date
Javier Segarra	176475a7a7	feat: update date	2025-02-23 10:02:11 +01:00
Javier Segarra	c8253aa0ff	Merge branch 'dev' into fix_ticketNegative	2025-02-22 13:42:26 +01:00
Javi Gallego	532b430d2b	Merge pull request '7937-claimAgile' (!3429) from 7937-claimAgile into dev ... Reviewed-on: #3429 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-21 13:58:36 +00:00
Alex Moreno	d1053642e9	Merge branch 'dev' into 7937-claimAgile	2025-02-21 13:16:49 +00:00
Javi Gallego	4dcd3f0d76	Merge pull request 'refactor: refs #7764 add role assignment for supplier during user creation' (!3481) from 7764-createClienteAsSupplier into dev ... Reviewed-on: #3481 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-02-21 13:00:59 +00:00
Javier Segarra	a410432365	Merge branch 'dev' into 7764-createClienteAsSupplier	2025-02-21 12:17:20 +00:00
PAU ROVIRA ROSALENY	63568696e2	Merge pull request 'fix: #8612 handled duplicate code error in shelving & parking' (!3476) from 8612-shelvinge2e into dev ... Reviewed-on: #3476 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-02-21 11:59:53 +00:00
Javi Gallego	a15cf04a4c	refactor: refs #7764 include options parameter in role retrieval for user creation tests	2025-02-21 12:53:08 +01:00
PAU ROVIRA ROSALENY	5d964c4e52	Merge branch 'dev' into 8612-shelvinge2e	2025-02-21 10:58:14 +00:00
Javier Segarra	273a1244fb	Merge branch 'dev' into fix_ticketNegative	2025-02-21 11:57:50 +01:00
Javi Gallego	63a36139c2	refactor: refs #7937 update test descriptions to English for clarity in importToNewRefundTicket specs	2025-02-21 11:12:13 +01:00
Guillermo Bonet	2059b8eaa6	fix: refs #7759 mockDate and increased myt version	2025-02-21 10:48:05 +01:00
Guillermo Bonet	c80e6f3240	fix: refs #7759 mockDate and increased myt version	2025-02-21 10:38:28 +01:00
Javi Gallego	6f5a966c55	refactor: refs #7764 add role assignment for supplier during user creation	2025-02-21 10:32:14 +01:00
Javier Segarra	e3000e7988	Merge branch 'dev' into 8612-shelvinge2e	2025-02-20 20:41:58 +00:00
Juan Ferrer	c74714a825	ci(db): refs #6695 Allow 0.0.0.0	2025-02-20 17:20:04 +00:00
Javi Gallego	5eb981165e	refactor: refs #7937 improve transaction handling in report_print procedure and enhance claimEnd filter	2025-02-20 15:02:19 +01:00
PAU ROVIRA ROSALENY	69e63fd6d0	Merge branch 'dev' into 8612-shelvinge2e	2025-02-20 12:00:51 +00:00
PAU ROVIRA ROSALENY	9f391bba27	fix: refs #8612 changed translations	2025-02-20 13:00:00 +01:00
Javi Gallego	25ad28d019	Merge branch 'dev' into 7937-claimAgile	2025-02-20 11:21:43 +01:00
Javi Gallego	e18e51aa92	refactor: refs #7937 improve error handling and transaction management in report_print procedure	2025-02-20 11:20:47 +01:00
Guillermo Bonet	009eae44ef	refactor: refs #7759 Update SQL permissions for 'vn' user to include DROP and clarify comments	2025-02-20 08:57:00 +01:00
Guillermo Bonet	59f243136d	refactor: refs #7759 deprecate unused columns and tables in user and vn schemas	2025-02-20 08:48:49 +01:00
Guillermo Bonet	bf83c9b460	Merge branch 'test' into dev	2025-02-20 07:49:51 +01:00
Guillermo Bonet	c254f31da2	Merge branch 'master' into test	2025-02-20 07:49:39 +01:00
Guillermo Bonet	f414ababb2	fix: refs #8227 Added localPalletM3	2025-02-20 07:29:38 +01:00
Carlos Satorres	1bf8acafa0	Merge pull request 'fix: fix operator' (!3460) from fix-workerSection2 into dev ... Reviewed-on: #3460 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-19 15:27:28 +00:00
Carlos Satorres	4c0169aba3	Merge branch 'dev' into fix-workerSection2	2025-02-19 15:19:56 +00:00
PAU ROVIRA ROSALENY	60a70ab770	Merge branch 'dev' into 8612-shelvinge2e	2025-02-19 11:54:21 +00:00
PAU ROVIRA ROSALENY	ff3268b6e9	fix: refs #8612 handled duplicate code error in shelving & parking	2025-02-19 12:53:29 +01:00
Javi Gallego	9e64e4224a	Merge branch 'dev' into 7937-claimAgile	2025-02-19 12:52:27 +01:00
Javi Gallego	ed61d6488d	feat: refs #7937 add shelvingFk to claimEnd table and update related models and queries	2025-02-19 12:52:06 +01:00
Ivan Mas	b42f5885bf	Merge pull request 'feat: refs #8558 modify claim_beforeInsert' (!3463) from 8558-futureTicketsClaims into dev ... Reviewed-on: #3463 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2025-02-19 11:31:53 +00:00
Ivan Mas	c61ea07b6a	Merge branch 'dev' into 8558-futureTicketsClaims	2025-02-19 11:30:08 +00:00
Carlos Andrés	b8a216444c	Actualizar db/routines/cache/procedures/available_refresh.sql	2025-02-18 13:11:27 +00: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
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
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
Alex Moreno	dc989cb075	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8627-devToTest	2025-02-18 10:35:00 +01:00