24484 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Jorge Penadés	edccd95fa1	fix: refs #7828 rollback	2024-09-12 10:29:03 +02:00
Jorge Penadés	b2bc095caa	fix: refs #7828 rollback	2024-09-12 10:28:29 +02: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
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
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
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
Javier Segarra	504e2f0ed2	Merge branch 'dev' into 7956-itemGetSimilar	2024-09-11 17:42:05 +00:00
Ivan Mas	0feb44e404	refactor: refs #7923 Delete Logiflora functions	2024-09-11 15:07:37 +02:00
Carlos Satorres	757cd78cfc	fix: refs #7354 fix files	2024-09-11 14:42:21 +02:00
Guillermo Bonet	728c40916c	refactor: refs #7895 workerDocument to workerDms	2024-09-11 14:38:58 +02:00
Sergio De la torre	99761c97e8	Merge pull request '6861-availableReserve' (!2952) from 6861-availableReserve into master ... Reviewed-on: #2952 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-09-11 12:38:14 +00:00
Guillermo Bonet	956058c10c	Merge branch 'test' into dev	2024-09-11 14:19:51 +02:00
Guillermo Bonet	8518351790	Merge branch 'master' into test	2024-09-11 14:19:37 +02:00
Jon Elias	eab0a7d914	Merge branch 'master' into Hotfix-BalanceDialog	2024-09-11 12:19:13 +00:00
Guillermo Bonet	889f3bdab4	fix: refs #7213 risk F11	2024-09-11 14:12:07 +02:00
Sergio De la torre	7e06c2ab37	fix: available refs #6861	2024-09-11 13:57:03 +02:00
Carlos Satorres	f696c4043d	Merge branch 'dev' of https: refs #7354//gitea.verdnatura.es/verdnatura/salix into 7354_ZoneMigration_End	2024-09-11 13:47:30 +02:00
Ivan Mas	d15be5100d	refactor: refs #7952 Deprecate creditInsurance.creditClassification	2024-09-11 13:42:04 +02:00
Jon Elias	e5161fe9e2	fix: fixed balanceDialog amount field	2024-09-11 13:26:40 +02:00
Sergio De la torre	db7d5c5e52	fix: available refs #6861	2024-09-11 13:18:09 +02:00
Guillermo Bonet	6b5f59a09b	Merge branch 'test' into dev	2024-09-11 12:54:27 +02:00
Guillermo Bonet	4c6aba96e5	Merge branch 'master' into test	2024-09-11 12:54:16 +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
Sergio De la torre	87182abf7e	fix: available refs #6861	2024-09-11 12:47:51 +02:00
Guillermo Bonet	07f7f87c28	Merge pull request 'fix: refs #7213 change rounding problems' (!2943) from 7213-changeRoundingProblem into master ... Reviewed-on: #2943 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-09-11 10:32:59 +00:00
Guillermo Bonet	011c16180d	fix: refs #7213 buyUltimate	2024-09-11 12:31:16 +02:00
Javier Segarra	ace4e6975d	Merge pull request 'refs #6156 new field' (!1718) from 6156-advanceTicketsNewField into dev ... Reviewed-on: #1718 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-11 10:27:05 +00:00
Guillermo Bonet	2a41fc6fc4	Merge branch 'dev' into 6727-logClean	2024-09-11 09:25:52 +00:00
Javi Gallego	10f7583587	feat: refs #7956 sin AS	2024-09-11 11:22:22 +02:00
Sergio De la torre	037e3fab23	Merge pull request 'fix: debugAdd refs #6861' (!2944) from 6861_debugAdd_hotFix into master ... Reviewed-on: #2944 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-09-11 09:02:18 +00:00
Alex Moreno	17fecf6dcb	Merge branch '7182-workerDms_optimization' of https://gitea.verdnatura.es/verdnatura/salix into 7182-workerDms_optimization	2024-09-11 10:31:44 +02:00
Alex Moreno	c21da8d258	fix: refs #7182 function name	2024-09-11 10:31:43 +02:00
Alex Moreno	e062088f1e	Merge branch 'dev' into 7182-workerDms_optimization	2024-09-11 08:29:38 +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
Carlos Andrés	ad8f27ea81	fix: refs #7213 change rounding problems	2024-09-11 10:15:37 +02:00
Jorge Penadés	d699d9f60c	Merge pull request '#7663 setWeight' (!2817) from 7663-setWeight into dev ... Reviewed-on: #2817 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-11 07:40:31 +00:00
Jorge Penadés	2ee0c93e24	chore: refs #7663 fix test	2024-09-11 09:35:26 +02:00
Jorge Penadés	249646236a	Merge branch '7663-setWeight' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight	2024-09-11 09:30:31 +02:00