24549 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Robert Ferrús	bdef639f78	Merge branch 'dev' into 7964-entry_getCommission	2024-09-16 10:29:26 +00:00
Jorge Penadés	f1a8e206b5	Merge pull request '#7828 makeCorrectCalls' (!2955) from 7828-makeCorrectCalls into dev ... Reviewed-on: #2955 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-16 10:26:49 +00:00
Robert Ferrús	7540526b9b	feat: refs #7964 entry_beforeUpdate	2024-09-16 12:26:29 +02:00
Jorge Penadés	0a0701f7c2	Merge branch 'dev' into 7828-makeCorrectCalls	2024-09-16 10:24:36 +00:00
Pablo Natek	e62e7fd798	Merge branch '7404-stockBuyed' of https://gitea.verdnatura.es/verdnatura/salix into 7404-stockBuyed	2024-09-16 12:17:52 +02:00
Pablo Natek	1f1da689d4	fix: refs #7404 remove console log	2024-09-16 12:17:51 +02:00
Pablo Natek	88962b051f	Merge branch 'dev' into 7404-stockBuyed	2024-09-16 10:13:13 +00:00
Pablo Natek	138640f991	fix: refs #7404 update test to match new fixtures for travel by continent	2024-09-16 12:05:36 +02:00
Guillermo Bonet	51cabd06a4	refactor: refs #7562 Deleted deprecated objects	2024-09-16 10:44:04 +02:00
Javi Gallego	be95162d1a	Merge pull request 'feat: refs #7977 muestra las facturas sin vencimientos tambien' (!2964) from 7977-supplierStatement into dev ... Reviewed-on: #2964 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-09-16 07:10:46 +00: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	eb098b41ba	Merge pull request 'fix: refs #7969 no agency restriction removed' (!2963) from 7969-hotFixplantTray3 into master ... Reviewed-on: #2963 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-09-16 06:41:37 +00:00
Pako Natek	f3988fd3a9	Merge branch 'master' into 7969-hotFixplantTray3	2024-09-16 06:40:03 +00:00
Pako Natek	6983a2fbd9	fix: refs #7969 no agency restriction removed	2024-09-16 08:38:06 +02:00
Pako Natek	51a770960c	Merge pull request 'fix: refs #7969 fix on collectionNew' (!2962) from 7969-hotFixplatTray2 into master ... Reviewed-on: #2962 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-09-16 06:23:14 +00: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	5489a5edbc	Merge branch 'test' into dev	2024-09-16 07:16:33 +02:00
Guillermo Bonet	2e34f1bbe6	Merge branch 'master' into test	2024-09-16 07:16:13 +02:00
Guillermo Bonet	d3dc77d3ee	Merge pull request 'fix: refs #7644 Update in print method' (!2961) from 7644-updateInPrint into master ... Reviewed-on: #2961 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-16 05:11:45 +00:00
Guillermo Bonet	635eb405a2	fix: refs #7644 Update in print method	2024-09-13 14:53:44 +02:00
Guillermo Bonet	6f1d962db2	fix: refs #7644 Update in print method	2024-09-13 14:39:47 +02:00
Guillermo Bonet	63dde3dd78	fix: refs #7819 Version	2024-09-13 14:13:14 +02:00
Ivan Mas	dc57c68421	Merge pull request 'feat: refs #7819 Delete obsolete objects' (!2911) from 7819-Delete_obsolete_objects into dev ... Reviewed-on: #2911 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-09-13 12:02:15 +00: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	8fce0d969b	Merge pull request 'refactor: refs #7923 Delete Logiflora functions' (!2954) from 7923-DeleteLogifloraFunctions into dev ... Reviewed-on: #2954 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-13 08:53:48 +00:00
Ivan Mas	d7336b93df	Merge branch 'dev' into 7923-DeleteLogifloraFunctions	2024-09-13 08:49:11 +00:00
Javier Segarra	0d47d58b71	Merge branch '7677_vnLocation_perf' of https: refs #7677//gitea.verdnatura.es/verdnatura/salix into 7677_vnLocation_perf	2024-09-13 09:45:09 +02:00
Javier Segarra	6f18b8a719	Merge branch 'dev' into 7677_vnLocation_perf	2024-09-13 07:28:45 +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	67b901e573	Merge pull request '#6346 new WagonType section' (!2778) from 6346-FixWagonModule into dev ... Reviewed-on: #2778 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-13 06:16:08 +00:00
Jon Elias	99bd20bc05	Merge branch 'dev' into 6346-FixWagonModule	2024-09-13 06:13:26 +00:00
Jon Elias	f15df1ef66	Merge pull request 'Hotfix: fixed balance create amount field' (!2950) from Hotfix-BalanceDialog into master ... Reviewed-on: #2950 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-13 06:06:37 +00:00
Jon Elias	fb7bf5b4eb	Merge branch 'master' into Hotfix-BalanceDialog	2024-09-13 06:05:17 +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	e80fe1d0dc	feat: refs #6868 refs# 6868 handleUser	2024-09-13 07:10:47 +02:00
Sergio De la torre	2d4e667009	feat: refs #6868 refs# 6868 handleUser	2024-09-13 07:02:30 +02: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