24132 Commits

All Branches

Search

Author	SHA1	Message	Date
Jon Elias	8b7beb7247	Merge branch 'dev' into Hotfix-WagonSQL	2024-09-16 06:20:16 +00: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
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
Sergio De la torre	93e7163858	feat: refs #6868 refs# 6868 handleUser	2024-09-12 17:09:27 +02:00
Guillermo Bonet	3d598a4ec4	fix: refs #7952 Version	2024-09-12 14:57:19 +02:00
Pako Natek	bd47420e82	Merge pull request 'locallyTested' (!2956) from 7969-hasPlantTray into dev ... Reviewed-on: #2956 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-09-12 12:46:43 +00: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
Alex Moreno	ccfff69e90	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-09-12 13:26:11 +02:00
Alex Moreno	1abf6a14f9	fix: workerDms filter workerFk	2024-09-12 13:26:09 +02:00
Ivan Mas	8a1677f4e9	Merge branch 'dev' into 7923-DeleteLogifloraFunctions	2024-09-12 11:25:45 +00:00
Ivan Mas	1c1ce485b3	Merge pull request 'refactor: refs #7952 Deprecate creditInsurance.creditClassification' (!2951) from 7952-DeprecateCreditInsurance.creditClassification into dev ... Reviewed-on: #2951 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-12 11:25:16 +00:00
Ivan Mas	e47dfa7f5b	Merge branch 'dev' into 7952-DeprecateCreditInsurance.creditClassification	2024-09-12 11:21:57 +00:00
Guillermo Bonet	6b6eea78da	feat: refs #7562 myt version increased to 1.6.11	2024-09-12 13:21:01 +02:00
Ivan Mas	4f9eb865d0	Merge branch 'dev' into 7952-DeprecateCreditInsurance.creditClassification	2024-09-12 10:27:27 +00:00
Ivan Mas	37900daf9e	Merge branch 'dev' into 7923-DeleteLogifloraFunctions	2024-09-12 10:19:51 +00:00
Guillermo Bonet	2f6a80a746	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-09-12 11:02:42 +02:00
Guillermo Bonet	b6cba2325a	feat: refs #7562 myt version increased to 1.6.10	2024-09-12 11:02:41 +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
Alex Moreno	9435ce8c5b	Merge pull request '7182-workerDms_optimization' (!2946) from 7182-workerDms_optimization into dev ... Reviewed-on: #2946 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>	2024-09-12 07:28:07 +00: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
Guillermo Bonet	f46b3122a6	Merge pull request 'refactor: refs #7895 workerDocument to workerDms' (!2953) from 7895-workerDms into dev ... Reviewed-on: #2953 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-12 05:39:41 +00:00
Jon Elias	0100e03562	Merge branch '6346-FixWagonModule' of https://gitea.verdnatura.es/verdnatura/salix into 6346-FixWagonModule	2024-09-12 07:36:57 +02: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
Ivan Mas	0feb44e404	refactor: refs #7923 Delete Logiflora functions	2024-09-11 15:07:37 +02:00