6170 Commits

Author	SHA1	Message	Date
Javi Gallego	06d06d7b1a	Merge pull request '3505-closureTests' (!2970) from 3505-closureTests into dev ... Reviewed-on: #2970 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-17 13:09:18 +00:00
Pablo Natek	ad6fcc0d36	Merge branch 'dev' into 7404-stockBuyed	2024-09-17 11:57:54 +00: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
Guillermo Bonet	88f434435b	Merge branch 'test' into dev	2024-09-17 08:42:34 +02:00
Guillermo Bonet	1cbba0b52f	Merge branch 'master' into test	2024-09-17 08:42:02 +02:00
Guillermo Bonet	2980b2da51	fix: refs #7759 Added more grants for vn user	2024-09-17 08:41:52 +02:00
Javi Gallego	361d60a8a8	Merge pull request 'feat: refs #7956 itemGetSimilar' (!2945) from 7956-itemGetSimilar into dev ... Reviewed-on: #2945 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-09-17 05:28:48 +00:00
Javi Gallego	06efa8be94	Merge branch 'dev' into 3505-closureTests	2024-09-17 07:12:01 +02:00
Carlos Andrés	faf963ba52	fix: refs #7760 tmp.ticketIPT	2024-09-16 15:11:51 +02:00
Carlos Andrés	1d42f58c39	fix: refs #7760 tmp.ticketIPT	2024-09-16 15:09:34 +02:00
Carlos Andrés	2e03fe8193	fix: refs #7760 tmp.ticketIPT	2024-09-16 14:41:29 +02: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
Carlos Andrés	33540063f4	fix: refs #7760 tmp.ticketIPT	2024-09-16 14:17:51 +02:00
Carlos Andrés	e7343b7e25	fix: refs #7760 tmp.ticketIPT	2024-09-16 14:16:48 +02:00
Javi Gallego	e4a74ba0e9	feat: refs #3505 testBack closure	2024-09-16 13:24:33 +02:00
Jon Elias	3aebe88593	Merge branch 'dev' into 6346-WagonToCard	2024-09-16 11:04:27 +00:00
Sergio De la torre	c33740e36e	fix: refs #6861 itemShelvingSale debug	2024-09-16 13:00:20 +02: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
Javi Gallego	d7679fcb50	feat: refs #7977 muestra las facturas sin vencimientos tambien	2024-09-16 09:01:47 +02:00
Pablo Natek	cc1cd0563f	feat: refs #7404 fixtures and translates	2024-09-16 09:00:46 +02:00
Pako Natek	6983a2fbd9	fix: refs #7969 no agency restriction removed	2024-09-16 08:38:06 +02:00
Pako Natek	390b8271c2	fix: root instead of vn	2024-09-16 08:20:17 +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	4ba8565006	Merge branch 'dev' into Hotfix-WagonSQL	2024-09-13 09:31:09 +00:00
Jon Elias	f1f0f5920c	fix: refs #6346 fixed SQL	2024-09-13 11:29:05 +02:00
Ivan Mas	d7336b93df	Merge branch 'dev' into 7923-DeleteLogifloraFunctions	2024-09-13 08:49:11 +00: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	630e9cec1e	Merge pull request 'test' (!2958) from test into dev ... Reviewed-on: #2958 Reviewed-by: Robert Ferrús <robert@verdnatura.es>	2024-09-13 05:41:50 +00:00
Sergio De la torre	1ef9cc0458	Merge pull request 'master' (!2957) from master into test ... Reviewed-on: #2957 Reviewed-by: Robert Ferrús <robert@verdnatura.es>	2024-09-13 05:39:45 +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	a0bfc20595	revision	2024-09-12 14:34:19 +02:00
Pako Natek	b1027f454b	locallyTested	2024-09-12 14:13:17 +02:00