24525 Commits

All Branches

Search

Author	SHA1	Message	Date
Robert Ferrús	47ed9a8f4e	Merge pull request 'test' (!3056) from test into dev ... Reviewed-on: #3056 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-10-02 09:22:26 +00:00
Robert Ferrús	e51dd897c3	Merge pull request 'master' (!3055) from master into test ... Reviewed-on: #3055 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-10-02 09:13:09 +00:00
Guillermo Bonet	c15b4f1bdf	Merge pull request 'feat: ref#7902 Triggers vn.ticketRefund to control deleted tickets' (!2908) from 7902-Trigger-ticketRefund-para-no-añadir-ticket-eliminado into dev ... Reviewed-on: #2908 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-10-02 07:10:31 +00:00
Guillermo Bonet	26a9e8ca50	Merge branch '7902-Trigger-ticketRefund-para-no-añadir-ticket-eliminado' of https://gitea.verdnatura.es/verdnatura/salix into 7902-Trigger-ticketRefund-para-no-añadir-ticket-eliminado	2024-10-02 09:09:05 +02:00
Guillermo Bonet	b556903d6d	feat: refs #7902 Changed definer and throw msg	2024-10-02 09:09:04 +02:00
Guillermo Bonet	2baf433d1a	Merge branch 'dev' into 7902-Trigger-ticketRefund-para-no-añadir-ticket-eliminado	2024-10-02 07:07:48 +00:00
Guillermo Bonet	9ba017d352	feat: refs #7902 Changed definer and throw msg	2024-10-02 09:06:21 +02:00
Robert Ferrús	617c44a178	Merge pull request '#8012 -packagingIsActive' (!3049) from 8012-packagingIsActive into master ... Reviewed-on: #3049 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-10-02 06:45:49 +00:00
Robert Ferrús	c3c386046d	Merge branch 'master' into 8012-packagingIsActive	2024-10-02 06:34:14 +00:00
Robert Ferrús	4ad070ab66	feat: refs #8012 cubos	2024-10-02 08:26:38 +02:00
Pako Natek	34f1a43f1e	Merge pull request 'feat: refs #8030 new field vn.priceDelta.zoneGeoFk' (!3050) from 8030-master-HotFix-PriceDelta into master ... Reviewed-on: #3050 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-10-02 06:04:19 +00:00
Pako Natek	16d1dc3c11	Merge branch 'master' into 8030-master-HotFix-PriceDelta	2024-10-02 06:02:44 +00:00
Robert Ferrús	a3d79f3c56	feat: refs #8012 format	2024-10-02 07:59:00 +02:00
Robert Ferrús	0dd9be96dd	feat: refs #8012 restore	2024-10-02 07:54:57 +02:00
Pako Natek	6c31c85d72	Merge pull request '8030-testPriceDelta' (!3048) from 8030-testPriceDelta into test ... Reviewed-on: #3048 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-10-02 05:54:23 +00:00
Robert Ferrús	6e4244866c	feat: refs #8012 create column	2024-10-02 07:53:53 +02:00
Pako Natek	d87f940fff	Merge branch 'test' into 8030-testPriceDelta	2024-10-02 05:40:48 +00:00
Pako Natek	02ef314ed9	feat: refs #8030 new field vn.priceDelta.zoneGeoFk	2024-10-02 07:40:26 +02:00
Pako Natek	7d3c2a4a1c	fix: refs #8030 schema missing in zoneGeo table	2024-10-02 07:36:04 +02:00
Pako Natek	3c89d1e5e0	fix: refs #8030 foreign key zoneGeo	2024-10-02 07:34:57 +02:00
Pako Natek	a48843a5cf	feat: refs #8030 new field vn.priceDelta.zoneGeoFk	2024-10-02 07:30:49 +02:00
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	1cf14035d5	feat: existingRefund without ticketRefund	2024-10-01 15:51:30 +02: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
Javi Gallego	d31340ff25	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-10-01 12:22:36 +02:00
Javi Gallego	fe741fa7e1	fix: getSimilar daysInForward	2024-10-01 12:22:33 +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