25735 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	2cd1991a96	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-12-17 10:28:26 +01:00
Alex Moreno	21f4e2aad7	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-12-17 10:26:27 +01:00
Guillermo Bonet	db2a102a88	Merge pull request 'refactor: refs #8262 Deprecated inventoryFailure' (!3311) from 8262-byeInventoryFailure into dev ... Reviewed-on: #3311 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-12-17 06:17:19 +00:00
Guillermo Bonet	4f4eb389c9	Merge pull request 'feat: refs #8218 Added time and code in mistakeType' (!3310) from 8218-workerMistake into dev ... Reviewed-on: #3310 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-12-17 06:15:29 +00:00
Carlos Satorres	26b0ea647d	refactor: change translation	2024-12-17 07:01:44 +01:00
Alex Moreno	863f204247	fix(deleteZone): contrary condition	2024-12-16 14:12:43 +01:00
Juanjo Breso	8166414678	Merge pull request 'fix: refs #8174 pasar a char el PIN' (!3312) from 8174-hotfix into dev ... Reviewed-on: #3312 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-12-16 12:59:30 +00:00
Juanjo Breso	6a3cbed3dd	fix: refs #8174 fix	2024-12-16 13:47:36 +01:00
Juanjo Breso	5a7ac8dcb3	fix: refs #8174 fix	2024-12-16 13:44:58 +01:00
Juanjo Breso	48064d6393	fix: refs #8174 fix	2024-12-16 13:35:50 +01:00
Juanjo Breso	de69a8db1d	fix: refs#8174 fix	2024-12-16 13:01:00 +01:00
Juanjo Breso	11db90c67c	fix: refs#8174 fix	2024-12-16 12:48:43 +01:00
Juanjo Breso	deb1b68c49	fix: refs#8174 fix	2024-12-16 12:47:47 +01:00
Juanjo Breso	7232bfb7a6	fix: 8174 pasar PIN a CHAR	2024-12-16 12:42:08 +01:00
Juanjo Breso	d03a2ced04	fix: refs8174 pasar a char el PIN	2024-12-16 12:30:35 +01:00
Guillermo Bonet	fda2c5725a	refactor: refs #8262 Deprecated inventoryFailure	2024-12-16 12:23:02 +01:00
Carlos Satorres	f9434871d8	Merge pull request 'fix: refs #7028 fix confirm deny' (!3290) from 7028-itemRequestConfDeny into dev ... Reviewed-on: #3290 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-16 10:59:55 +00:00
Carlos Satorres	5f43c0440c	fix: refs #7028 requesterId fix salesPerson	2024-12-16 11:58:21 +01:00
Carlos Satorres	576641d09d	fix: refs #7028 requesterId fix	2024-12-16 11:55:01 +01:00
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
Guillermo Bonet	5346dd845e	feat: refs #8218 Added time and code in mistakeType	2024-12-16 11:40:57 +01: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
Carlos Satorres	72f369dc49	Merge pull request 'fix: hotfix createAbsence' (!3308) from hotfix-6924createAbsence2 into master ... Reviewed-on: #3308 Reviewed-by: Jon Elias <jon@verdnatura.es>	2024-12-16 07:18:05 +00:00
Carlos Satorres	b14268ef1b	fix: hotfix createAbsence	2024-12-16 08:15:14 +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