25713 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Satorres	1090a78e10	Merge branch '7028-itemRequestConfDeny' of https://gitea.verdnatura.es/verdnatura/salix into 7028-itemRequestConfDeny	2024-12-16 11:54:13 +01:00
Carlos Satorres	a6bb381b74	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7028-itemRequestConfDeny	2024-12-16 11:53:12 +01:00
Robert Ferrús	4ba8c91c1e	Merge pull request 'feat: refs #8190 entry_getCommission' (!3207) from 8190-entry_getCommission into dev ... Reviewed-on: #3207 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-12-16 10:45:13 +00:00
Carlos Satorres	692b1070e8	Merge branch 'dev' into 7028-itemRequestConfDeny	2024-12-16 10:35:47 +00:00
Robert Ferrús	d14621c2d2	Merge branch 'dev' into 8190-entry_getCommission	2024-12-16 10:34:22 +00:00
Guillermo Bonet	36705a028e	fix: refs #8174 Version	2024-12-16 11:33:18 +01:00
Robert Ferrús	e7e6c88ec5	Merge branch 'dev' into 8190-entry_getCommission	2024-12-16 10:18:53 +00:00
Carlos Satorres	1e471ac20f	fix: refs #7028 requesterId fix	2024-12-16 10:25:33 +01:00
Carlos Satorres	d620f722b5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7028-itemRequestConfDeny	2024-12-16 09:58:50 +01:00
Carlos Satorres	32d9a3ace1	fix: refs #7028 remove ifs	2024-12-16 09:57:48 +01:00
Guillermo Bonet	71fb3996cd	refactor: refs #7882 Added ACL's	2024-12-16 09:40:55 +01:00
Guillermo Bonet	d9a6e8a1c9	refactor: refs #7882 Added ACL's	2024-12-16 09:34:45 +01:00
Guillermo Bonet	d42ff07547	feat: refs #8174 Changed datatype incompatibility access	2024-12-16 09:20:27 +01:00
Carlos Satorres	e70ace613e	Merge branch '7028-itemRequestConfDeny' of https://gitea.verdnatura.es/verdnatura/salix into 7028-itemRequestConfDeny	2024-12-16 09:14:10 +01:00
Carlos Satorres	10c28b03da	Merge branch 'dev' of https: refs #7028//gitea.verdnatura.es/verdnatura/salix into 7028-itemRequestConfDeny	2024-12-16 09:14:07 +01:00
Guillermo Bonet	57c3cc8546	feat: refs #8174 Created table sim	2024-12-16 09:01:10 +01:00
Guillermo Bonet	eadffe1ed9	Merge pull request 'feat: refs #7882 Added osrmservice' (!3281) from 7882-locationiq into dev ... Reviewed-on: #3281 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-12-16 06:58:53 +00:00
Guillermo Bonet	e1db7a86f6	Merge branch 'dev' into 7882-locationiq	2024-12-16 06:16:03 +00:00
Guillermo Bonet	233f45a07a	feat: refs #7882 Reequested changes	2024-12-16 07:15:47 +01:00
Carlos Satorres	09e7ee4e43	Merge branch 'dev' into 7028-itemRequestConfDeny	2024-12-16 06:03:41 +00:00
Carlos Andrés	ec2b6dd0c2	Actualizar db/versions/11327-maroonOak/00-firstScript.sql	2024-12-13 14:55:03 +00:00
Carlos Andrés	11827207ba	Merge pull request 'feat: refs#8174 simSupplier' (!3158) from 8174-crearTablaSim into dev ... Reviewed-on: #3158 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-12-13 13:43:46 +00:00
Guillermo Bonet	3cdb6c438b	Merge branch 'test' into dev	2024-12-13 13:06:26 +01:00
Guillermo Bonet	598ef2db84	Merge branch 'master' into test	2024-12-13 13:06:14 +01:00
Guillermo Bonet	58b1426e5c	Merge pull request 'fix: refs #247552 ticket 247552 claimRatio_add' (!3300) from 247552-claimRatio_add into master ... Reviewed-on: #3300 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-12-13 12:05:50 +00:00
Guillermo Bonet	452ec3d731	fix: refs #247552 ticket 247552 claimRatio_add	2024-12-13 08:29:14 +01:00
Guillermo Bonet	00b5333ab7	feat: refs #7882 Added tests	2024-12-13 08:07:13 +01:00
Guillermo Bonet	bfad016ec4	Merge branch 'dev' into 7882-osrm	2024-12-13 07:01:42 +01:00
Carlos Andrés	20cf3e0d19	Merge pull request 'fix: refs #8087 refs#8087 errores travel_moveRaids' (!3264) from 8087-erroresTravel_moveRaid into master ... Reviewed-on: #3264 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-12-12 18:21:42 +00:00
Carlos Andrés	2467a0f953	Merge pull request 'master' (!3299) from master into test ... Reviewed-on: #3299 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-12-12 17:23:11 +00:00
Guillermo Bonet	05ba85219b	feat: refs #7882 Osrm service	2024-12-12 14:35:58 +01:00
Pablo Natek	8e61160aeb	Merge pull request 'feat: refs #7301 add inventory-config and acl' (!3230) from 7301-itemLastEntries into dev ... Reviewed-on: #3230 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-12 13:12:33 +00:00
Guillermo Bonet	95d7c7f227	Merge branch 'dev' into 7882-osrm	2024-12-12 14:06:44 +01:00
Carlos Satorres	f66b3f1cbd	Merge branch 'dev' into 7028-itemRequestConfDeny	2024-12-12 10:11:40 +00:00
JOSE ANTONIO TUBAU RODRIGUEZ	47a7fac0fe	Merge pull request '#8266 changed expedition item name' (!3297) from 8266-changeExpeditionItemName into dev ... Reviewed-on: #3297 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-12-12 10:11:30 +00:00
Carlos Satorres	dcd8b1ee15	Merge branch '7028-itemRequestConfDeny' of https://gitea.verdnatura.es/verdnatura/salix into 7028-itemRequestConfDeny	2024-12-12 11:11:24 +01:00
Carlos Satorres	cd214b3526	fix: refs #7028 fix userError	2024-12-12 11:11:22 +01:00
JOSE ANTONIO TUBAU RODRIGUEZ	03ba892581	Merge branch 'dev' into 8266-changeExpeditionItemName	2024-12-12 10:10:03 +00:00
Carlos Satorres	d35e785bee	Merge branch 'dev' into 7028-itemRequestConfDeny	2024-12-12 10:04:03 +00:00
Carlos Satorres	a14989ddcf	Merge pull request 'fix: refs #6389 saleMonitor filter' (!3130) from 6389-changesMonitor into dev ... Reviewed-on: #3130 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-12 09:26:29 +00:00
Carlos Satorres	e9d304f2ba	Merge branch '7028-itemRequestConfDeny' of https://gitea.verdnatura.es/verdnatura/salix into 7028-itemRequestConfDeny	2024-12-12 10:04:35 +01:00
Carlos Satorres	1970b9c0db	fix: refs #7028 fix tback findById	2024-12-12 10:04:31 +01:00
Carlos Satorres	43697eaba7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7028-itemRequestConfDeny	2024-12-12 09:51:08 +01:00
Carlos Satorres	9c53fe9f60	Merge branch 'dev' into 7028-itemRequestConfDeny	2024-12-12 08:49:04 +00:00
Carlos Satorres	6beb1a18cb	Merge branch 'dev' into 6389-changesMonitor	2024-12-12 08:48:08 +00:00
Carlos Satorres	423201f97b	Merge pull request 'fix: refs #8251 add eng template' (!3296) from 8251-engTemplates into dev ... Reviewed-on: #3296 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Jon Elias <jon@verdnatura.es>	2024-12-12 08:46:41 +00:00
Carlos Satorres	b3eb8334ca	Merge branch 'dev' into 7028-itemRequestConfDeny	2024-12-12 08:45:18 +00:00
Carlos Satorres	6c35634bfb	Merge branch 'dev' into 8251-engTemplates	2024-12-12 08:38:17 +00:00
Jon Elias	7fe3369c35	Merge pull request '#8219: Modified data to be equal as the updated back' (!3274) from Invoice-Out-TransferInvoice into dev ... Reviewed-on: #3274 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-12-12 08:37:50 +00:00
Carlos Satorres	6282e3105d	Merge branch 'dev' into 8251-engTemplates	2024-12-12 08:37:14 +00:00