24498 Commits

All Branches

Search

Author	SHA1	Message	Date
Jon Elias	2fbf8478c0	Merge pull request '#7884 added new filter field' (!2981) from 7884-AddLabelerField into dev ... Reviewed-on: #2981 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-02 05:04:17 +00:00
Jon Elias	2267b2c6b1	Merge branch 'dev' into 7884-AddLabelerField	2024-10-02 04:55:56 +00:00
Pablo Natek	48c387be75	Merge pull request 'refactor: refs #7404 deprecated stockBuyed' (!3046) from 7404-deprecateStockBuyedAndRelatedProcs into dev ... Reviewed-on: #3046 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-01 13:57:53 +00:00
Javi Gallego	40512ca67e	feat: existingRefund without ticketRefunds	2024-10-01 15:49:51 +02:00
Jon Elias	d73f790221	Merge branch 'dev' into 7884-AddLabelerField	2024-10-01 13:10:19 +00:00
Jon Elias	b7b5334a99	refactor: refs #7884 modified filter	2024-10-01 15:08:42 +02:00
Pablo Natek	c6a823e6aa	Merge branch 'dev' into 7404-deprecateStockBuyedAndRelatedProcs	2024-10-01 13:05:54 +00:00
Pablo Natek	435fec03da	refactor: refs #7404 deprecated stockBuyed	2024-10-01 15:05:02 +02:00
Guillermo Bonet	e2d30ef933	Merge pull request 'fix: refs #7935 Fix boolens' (!3044) from 7935-fixBool into dev ... Reviewed-on: #3044 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-01 10:48:36 +00:00
Guillermo Bonet	0525081c52	Merge branch 'dev' into 7935-fixBool	2024-10-01 10:46:48 +00:00
Javi Gallego	aba70f4a82	Merge pull request 'feat: refs #6722 fixtures' (!3027) from 9722-travelThermographTrigger into dev ... Reviewed-on: #3027 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-01 10:41:20 +00:00
Carlos Satorres	5c3d1ca531	Merge pull request 'feat: refs #7354 deleted code and redirect to Lilium' (!2906) from 7354_ZoneMigration_End into dev ... Reviewed-on: #2906 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-01 10:32:45 +00:00
Carlos Satorres	9b41b3e54b	Merge branch 'dev' into 7354_ZoneMigration_End	2024-10-01 10:31:19 +00:00
Javi Gallego	4c9a199418	Merge branch 'dev' into 9722-travelThermographTrigger	2024-10-01 12:29:55 +02:00
Alex Moreno	f54a9a1348	fix(fixtures): revert bad merge master to test	2024-10-01 12:27:16 +02:00
Carlos Satorres	48ade26595	Merge branch 'dev' into 7354_ZoneMigration_End	2024-10-01 10:20:59 +00:00
Javi Gallego	863c9ec068	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-10-01 12:19:53 +02:00
Javi Gallego	6685ade299	fix: getSimilar daysInforward	2024-10-01 12:19:51 +02:00
Carlos Satorres	ca8cffff94	Merge branch 'dev' into 7354_ZoneMigration_End	2024-10-01 09:37:19 +00:00
Alex Moreno	c2e89002cd	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-10-01 11:31:47 +02:00
Guillermo Bonet	19dcedbce5	fix: refs #7935 Fix boolens	2024-10-01 11:31:35 +02:00
Alex Moreno	f916509b86	fix(StockBought): revert bad merge master to test	2024-10-01 11:30:34 +02:00
Guillermo Bonet	45e87a5d94	Merge branch 'test' into dev	2024-10-01 08:53:10 +02:00
Guillermo Bonet	2b4504c954	Merge branch 'master' into test	2024-10-01 08:52:41 +02:00
Guillermo Bonet	452324191c	fix: refs #7759 Changed definer	2024-10-01 08:51:03 +02:00
Sergio De la torre	3ccc0c9b32	Merge pull request 'fix: refs #6868 handleUser addIsOnReservationMode' (!3042) from 6868-HandleUser into test ... Reviewed-on: #3042 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-01 05:47:04 +00:00
Sergio De la torre	d5db317259	Merge pull request 'fix: refs #5320 withoutHaving' (!3033) from 5320-RefactorCollectionGetTickets into master ... Reviewed-on: #3033 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-01 05:11:18 +00:00
Sergio De la torre	b4a2be660d	fix: refs #6868 handleUser addIsOnReservationMode	2024-10-01 07:08:11 +02:00
Javi Gallego	fbba2e3fea	fix: option Error	2024-09-30 15:52:18 +02:00
Javi Gallego	329920389d	fix: option Error	2024-09-30 15:49:46 +02:00
Javi Gallego	36e1cfd51a	fix: myOptions error	2024-09-30 15:47:50 +02:00
Alex Moreno	61f806b0c9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-09-30 14:40:35 +02:00
Alex Moreno	75d0c298a1	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-09-30 14:38:17 +02:00
Alex Moreno	568a77aa19	Merge pull request 'feat(ClaimBeginning): throw error when quantity claimed is greater than quantity of line' (!3031) from hotFix_claimBeginning_quantity into master ... Reviewed-on: #3031 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-30 12:05:13 +00:00
Pako Natek	de3d7fc925	Merge pull request 'feat(collection_new): refs #8058 urgent state' (!3038) from 8058-Tickets-Urgentes into dev ... Reviewed-on: #3038 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-09-30 12:01:16 +00:00
Pako Natek	54d9125c21	feat(collection_new): refs #8058 urgent state ... Urgent tickets will be priorized as asigned ones Refs: #8058	2024-09-30 13:49:06 +02:00
Jon Elias	c4f26094d5	fix: refs #7884 fixed filter	2024-09-30 12:46:41 +02:00
Pako Natek	477c7f7903	Merge pull request 'fix: refs #8030 buyer prefers to add multiple zoneGeoFk' (!3037) from 8030-newPriceComponent into dev ... Reviewed-on: #3037 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-09-30 10:30:47 +00:00
Pako Natek	e6e7876fb1	Merge branch 'dev' into 8030-newPriceComponent	2024-09-30 10:26:54 +00:00
Jon Elias	eacc2d5d2a	Merge branch '7884-AddLabelerField' of https://gitea.verdnatura.es/verdnatura/salix into 7884-AddLabelerField	2024-09-30 12:07:56 +02:00
Jon Elias	c680c4a059	refactor: refs #7884 modified sql	2024-09-30 12:07:55 +02:00
Pako Natek	2962bd13c7	fix: refs #8030 buyer prefers to add multiple zoneGeoFk ... Instead of choosing the deepest zoneGeo, buyer wants all to be merged Refs: #8030	2024-09-30 11:59:22 +02:00
Sergio De la torre	a0a8a22ab0	fix: refs #5320 withoutHaving	2024-09-30 11:13:12 +02:00
Pako Natek	de93e477f8	Merge pull request 'feat(previaDelta): refs #8030 new algorithym for coincident records' (!3036) from 8030-newPriceComponent into dev ... Reviewed-on: #3036 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-09-30 08:32:44 +00:00
Pako Natek	1e64028b02	Merge branch 'dev' into 8030-newPriceComponent	2024-09-30 08:25:27 +00:00
Pako Natek	25680994dd	feat(previaDelta): refs #8030 new algorithym for coincident records ... when many records target the same zoneGeoFk, the deepest must be chosen Refs: #8030	2024-09-30 10:24:45 +02:00
Sergio De la torre	a9b083a044	fix: refs #5320 withoutHaving	2024-09-30 09:39:35 +02:00
Robert Ferrús	2d289bc8ac	Merge pull request 'feat: refs #7981 deprecated showAgencyName' (!3016) from 7981-showAgencyName into dev ... Reviewed-on: #3016 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-09-30 06:35:23 +00:00
Robert Ferrús	e6d950e33f	Merge branch 'dev' into 7981-showAgencyName	2024-09-30 06:31:27 +00:00
Sergio De la torre	1f5c0d3e94	fix: refs #5320 withoutHaving	2024-09-30 08:25:40 +02:00