1191 Commits

Author	SHA1	Message	Date
Guillermo Bonet	7f9cd1e0d9	Merge pull request 'feat: refs #7893 Created waste_addSalesLauncher' (!2972) from 7893-waste_addSales into dev ... Reviewed-on: #2972 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-18 05:40:17 +00:00
Pablo Natek	ad6fcc0d36	Merge branch 'dev' into 7404-stockBuyed	2024-09-17 11:57:54 +00:00
Guillermo Bonet	a3022a7379	Merge branch 'dev' into 7893-waste_addSales	2024-09-17 10:35:27 +00:00
Guillermo Bonet	fa5ace677c	refactor: refs #7893 Requested changes	2024-09-17 12:35:08 +02:00
Jon Elias	eb083d6d2b	Merge branch 'dev' into 6346-WagonToCard	2024-09-17 09:07:26 +00:00
Jon Elias	c8315714d4	Merge branch 'dev' into Hotfix-WagonSQL	2024-09-17 09:05:17 +00:00
Pablo Natek	d308f185bc	Merge branch 'dev' into 7404-stockBuyed	2024-09-17 08:11:17 +00:00
Alex Moreno	cabc9660d6	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-09-16 14:27:08 +02:00
Alex Moreno	8803ae0534	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-09-16 14:25:27 +02:00
Guillermo Bonet	51da7ae063	feat: refs #7893 Created waste_addSalesLauncher	2024-09-16 13:33:53 +02:00
Jon Elias	3aebe88593	Merge branch 'dev' into 6346-WagonToCard	2024-09-16 11:04:27 +00:00
Jon Elias	9aff118b6e	feat: refs #6346 added script for wagons	2024-09-16 13:00:11 +02:00
Guillermo Bonet	0d7953a869	Merge branch 'dev' into 7912-wasteChanges	2024-09-16 10:33:23 +00:00
Guillermo Bonet	5c7a537275	feat: refs #7912 Added new waste types	2024-09-16 12:32:52 +02:00
Jorge Penadés	0a0701f7c2	Merge branch 'dev' into 7828-makeCorrectCalls	2024-09-16 10:24:36 +00:00
Pablo Natek	88962b051f	Merge branch 'dev' into 7404-stockBuyed	2024-09-16 10:13:13 +00:00
Guillermo Bonet	51cabd06a4	refactor: refs #7562 Deleted deprecated objects	2024-09-16 10:44:04 +02:00
Pablo Natek	8f4f2d2d15	Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix into 7404-stockBuyed	2024-09-16 09:06:04 +02:00
Jon Elias	8b7beb7247	Merge branch 'dev' into Hotfix-WagonSQL	2024-09-16 06:20:16 +00:00
Pako Natek	6cbf25dee5	fix: refs #7969 fix on collectionNew	2024-09-16 08:10:58 +02:00
Guillermo Bonet	63dde3dd78	fix: refs #7819 Version	2024-09-13 14:13:14 +02:00
Ivan Mas	dc5691fce7	Merge branch 'dev' into 7819-Delete_obsolete_objects	2024-09-13 11:49:28 +00:00
Jon Elias	8d050a8e08	Merge branch 'dev' into Hotfix-WagonSQL	2024-09-13 11:07:55 +00:00
Sergio De la torre	11193bebe6	Merge pull request '6868_createLogin' (!2598) from 6868_createLogin into dev ... Reviewed-on: #2598 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-13 09:43:31 +00:00
Jon Elias	f1f0f5920c	fix: refs #6346 fixed SQL	2024-09-13 11:29:05 +02:00
Jorge Penadés	2dc55a706c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7828-makeCorrectCalls	2024-09-13 09:20:57 +02:00
Alex Moreno	bbb3889154	fix: sql wagonTypeTray	2024-09-13 08:54:03 +02:00
Alex Moreno	ebbc143152	fix: sql wagonTypeTray	2024-09-13 08:29:41 +02:00
Jon Elias	99bd20bc05	Merge branch 'dev' into 6346-FixWagonModule	2024-09-13 06:13:26 +00:00
Sergio De la torre	05b6c75a19	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6868_createLogin	2024-09-13 07:02:15 +02:00
Guillermo Bonet	3d598a4ec4	fix: refs #7952 Version	2024-09-12 14:57:19 +02:00
Pako Natek	b1027f454b	locallyTested	2024-09-12 14:13:17 +02:00
Jorge Penadés	36d8e88ac3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7828-makeCorrectCalls	2024-09-12 13:10:56 +02:00
Ivan Mas	4f9eb865d0	Merge branch 'dev' into 7952-DeprecateCreditInsurance.creditClassification	2024-09-12 10:27:27 +00:00
Jorge Penadés	74fafdf330	fix: refs #7828 filter mail access	2024-09-12 10:27:18 +02:00
Guillermo Bonet	fcfef2a970	Merge pull request 'refactor: refs #7900 Deleted sectorProdPriority column' (!2941) from 7900-sectorProdPriority into dev ... Reviewed-on: #2941 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-09-12 08:21:32 +00:00
Guillermo Bonet	bb97ccb6bb	Merge pull request 'feat: refs #7562 Created deleteDeprecatedObjects' (!2627) from 7562-deleteDeprecatedObjects into dev ... Reviewed-on: #2627 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-09-12 08:08:16 +00:00
Jorge Penadés	6f81ca08db	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7828-makeCorrectCalls	2024-09-12 09:55:03 +02:00
Jorge Penadés	f1f10d1367	refactor: refs #7828 wip	2024-09-12 09:15:07 +02:00
Guillermo Bonet	6075ec6518	feat: refs #7562 Requested changes	2024-09-12 09:06:03 +02:00
Jon Elias	d36ce6bf99	Merge branch 'dev' into 6346-FixWagonModule	2024-09-12 05:43:17 +00:00
Jon Elias	a73bdfe18f	Merge branch 'dev' of https: refs #6346//gitea.verdnatura.es/verdnatura/salix into 6346-FixWagonModule	2024-09-12 07:36:55 +02:00
Guillermo Bonet	728c40916c	refactor: refs #7895 workerDocument to workerDms	2024-09-11 14:38:58 +02:00
Ivan Mas	d15be5100d	refactor: refs #7952 Deprecate creditInsurance.creditClassification	2024-09-11 13:42:04 +02:00
Guillermo Bonet	479fc02245	Merge pull request 'feat: refs #6727 Added util logClean' (!2602) from 6727-logClean into dev ... Reviewed-on: #2602 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-09-11 10:48:02 +00:00
Guillermo Bonet	2a41fc6fc4	Merge branch 'dev' into 6727-logClean	2024-09-11 09:25:52 +00:00
Pablo Natek	842c98edfc	Merge branch 'dev' into 6156-advanceTicketsNewField	2024-09-11 08:22:24 +00:00
Pablo Natek	92f305b9fd	fix: refs #6156 proc and version	2024-09-11 10:19:55 +02:00
Jorge Penadés	558ab6eba2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight	2024-09-11 09:30:18 +02:00
Sergio De la torre	b492a1e6a8	feat: refs #6868 refs# 6868 handleUser	2024-09-11 08:05:26 +02:00