10915 Commits

Author	SHA1	Message	Date
Alex Moreno	dc989cb075	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8627-devToTest	2025-02-18 10:35:00 +01:00
Jorge Penadés	e29e5e28ed	Merge pull request 'fix: refs #8388 update booking status in toUnbook method' (!3462) from 8388-fixUnbook into dev ... Reviewed-on: #3462 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-18 09:31:22 +00:00
Alex Moreno	2386874a96	fix: refs #8627 add claim in getSales	2025-02-18 10:28:00 +01:00
Alex Moreno	06c123d7f2	fix: refs #8627 ticket isTaxDataChecked	2025-02-18 10:15:28 +01:00
Alex Moreno	a8c03548d9	fix: refs #8627 update stateFk assignment to use code instead of id	2025-02-18 09:51:08 +01:00
PAU ROVIRA ROSALENY	f687ad35fd	Merge pull request 'feat: #8497 added availabled on travel module' (!3469) from 8497-travelAvailabled into dev ... Reviewed-on: #3469 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-17 15:11:50 +00:00
Javier Segarra	dbd298b7d8	Merge branch 'dev' into fix_getSuggestedTickets_byFixtures	2025-02-17 14:39:01 +00:00
PAU ROVIRA ROSALENY	e7cc754f53	feat: refs #8497 added availabled on travel module	2025-02-17 14:50:22 +01:00
Pablo Natek	e0c2a497d2	Merge pull request 'fix: refs #6897 change user field to nickname in getStockBought method' (!3465) from 6897-fixE2eAndStockBought into dev ... Reviewed-on: #3465 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-02-17 10:29:27 +00:00
Pablo Natek	3093f8aef8	fix: refs #6897 change user field to nickname in getStockBought method	2025-02-17 10:50:21 +01:00
Jorge Penadés	f9d1a8c0c2	fix: refs #8388 update booking status in toUnbook method	2025-02-14 14:23:43 +01:00
Guillermo Bonet	c79867188a	Merge branch 'test' into dev	2025-02-14 12:36:24 +01:00
Guillermo Bonet	dce263992e	fix: refs #8227 Roadmap columns	2025-02-14 12:36:06 +01:00
Carlos Andrés	a874b96c5e	revert a119d9f7fb ... revert feat: invoiceIn move deductible field from head to lines	2025-02-14 11:32:45 +00:00
Carlos Andrés	a119d9f7fb	feat: invoiceIn move deductible field from head to lines	2025-02-14 12:29:56 +01:00
Javier Segarra	609060f100	Merge branch 'dev' into fix_getSuggestedTickets_byFixtures	2025-02-14 08:45:27 +00:00
Ivan Mas	5a37bd332e	Merge branch 'dev' into 8573-addFkExpeditionHost	2025-02-14 06:55:47 +00:00
Alex Moreno	44ed6254c3	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-02-14 07:02:45 +01:00
Javier Segarra	9dd3f7198c	fix: getSuggestedTickets	2025-02-13 22:56:43 +01:00
Carlos Andrés	4e9bcf530b	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-02-13 18:59:26 +01:00
Carlos Andrés	b06ffdff52	Actualizar modules/ticket/back/methods/ticket/closeAll.js	2025-02-13 16:42:20 +00:00
Ivan Mas	13a76e5c70	Merge branch 'dev' into 8573-addFkExpeditionHost	2025-02-13 15:43:56 +00:00
Carlos Andrés	7f32a10c06	fix: facturacion por consignatario en el cierre nocturno y unificación de backs	2025-02-13 15:22:37 +01:00
Carlos Andrés	b2071994da	fix: update closeAll method to improve date handling and ticket selection logic	2025-02-13 13:28:14 +01:00
Carlos Satorres	1b7026fa00	fix: refs #6553 remove business	2025-02-13 10:46:48 +01:00
Pablo Natek	514ddf1045	feat: refs #6897 add search method and enhance ACL permissions for Entry model	2025-02-12 19:40:22 +01:00
Ivan Mas	f12c47cdf8	Merge branch 'dev' into 8573-addFkExpeditionHost	2025-02-12 16:11:53 +00:00
Ivan Mas	5404f895b2	refactor: refs #8573 add fk to expedition.hostFk	2025-02-12 17:08:45 +01:00
Jon Elias	307c8d92df	Merge branch 'dev' into fix_ticketNegative	2025-02-12 15:30:09 +00:00
Javier Segarra	f631aa1314	fix: remotMethodCtx	2025-02-12 16:26:01 +01:00
Guillermo Bonet	8959eb21f6	Merge branch 'test' into dev	2025-02-12 14:37:34 +01:00
Carlos Andrés	65a4967d46	fix: update maxShipped to use toDate in closeAll method	2025-02-12 14:16:43 +01:00
Carlos Andrés	9785ab5a7d	feat: enhance ticket closure process with error handling and email notifications	2025-02-12 13:23:57 +01:00
Carlos Andrés	b40981aa03	feat: enhance ticket closure process with error handling and email notifications	2025-02-12 13:18:18 +01:00
Alex Moreno	5d155ef6bd	Merge branch 'test' into hotFix_daily_addressInvoice_2	2025-02-12 11:17:27 +00:00
Carlos Andrés	1c9417556b	feat: enhance ticket closure process with error handling and email notifications	2025-02-12 12:13:23 +01:00
Javi Gallego	1c8ad94ab8	fix: update SQL fixture values and enhance getVideoList method with transaction handling	2025-02-12 09:51:56 +01:00
Pablo Natek	f347d9668f	refactor: refs #6897 improve variable scope and query parameters in recalcEntryPrices.js	2025-02-11 16:50:00 +01:00
Alex Moreno	3fbd740a2b	fix: address invoice daily	2025-02-11 14:31:26 +01:00
Pablo Natek	454fbcb7ce	Merge branch 'dev' of https: refs #6897//gitea.verdnatura.es/verdnatura/salix into 6897-refactorEntryBuyList	2025-02-11 12:38:42 +01:00
Pablo Natek	6110295cc2	fix: refs #6897 update entry_clone method to return newEntryId instead of result	2025-02-10 11:40:54 +01:00
Pablo Natek	2f0cd27ed8	Merge branch 'dev' of https: refs #6897//gitea.verdnatura.es/verdnatura/salix into 6897-refactorEntryBuyList	2025-02-09 18:26:52 +01:00
Javier Segarra	e748c3ea68	feat: refs #6321 minor changes	2025-02-07 22:40:00 +01:00
Javier Segarra	fce6b13d2d	Merge branch 'dev' into 6321_negative_tickets	2025-02-07 16:19:58 +01:00
Guillermo Bonet	d7a25b06bf	Merge branch 'test' into dev	2025-02-07 15:05:41 +01:00
Guillermo Bonet	8261b35559	Merge branch 'master' into test	2025-02-07 15:05:20 +01:00
Guillermo Bonet	b56468d3aa	fix: refs #7024 Test	2025-02-07 15:05:04 +01:00
Guillermo Bonet	ec3210a5c0	Merge branch 'test' into dev	2025-02-07 14:28:28 +01:00
Guillermo Bonet	b1d2441d2e	Merge branch 'master' into test	2025-02-07 14:27:56 +01:00
Jon Elias	516f409ae5	Merge branch 'dev' into Hotfix-FixedPriceNameFilter	2025-02-07 12:42:20 +00:00