26772 Commits

All Branches

Search

Author	SHA1	Message	Date
Guillermo Bonet	28deadfbad	fix: refs #8573 version	2025-02-14 10:37:08 +01:00
Alex Moreno	8110e88aa7	fix: vnUser, default false	2025-02-14 08:29:55 +01:00
Ivan Mas	9000becf07	Merge pull request 'refactor: refs #8573 add fk to expedition.hostFk' (!3447) from 8573-addFkExpeditionHost into dev ... Reviewed-on: #3447 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2025-02-14 07:06:21 +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
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
Carlos Andrés	536203e0a1	Merge pull request 'fix: facturacion por consignatario en el cierre nocturno y unificación de backs' (!3453) from Hotfix-cierre-facturacion into master ... Reviewed-on: #3453 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-13 16:37:00 +00:00
Ivan Mas	13a76e5c70	Merge branch 'dev' into 8573-addFkExpeditionHost	2025-02-13 15:43:56 +00:00
Ivan Mas	caa921020d	refactor: refs #8573 update before alter table	2025-02-13 16:41:29 +01: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
Pako Natek	86091571cd	Merge pull request 'fix(item_getBalance): refs #8408 availabled field prevails over landed' (!3449) from 8408-Disponible-por-zonas-y-horas into dev ... Reviewed-on: #3449 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-13 12:39:29 +00: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	cd258eb44e	Merge pull request 'fix: refs #6553 remove business' (!3451) from 6553-warnFixBusinessSummary into test ... Reviewed-on: #3451 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-13 11:14:15 +00:00
Jorge Penadés	e99fbca255	Merge pull request 'feat: refs #8571 enhance email formatting in sendToSupport function with structured HTML table' (!3445) from 8571-hotfix-notShowToken into master ... Reviewed-on: #3445 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-13 11:01:37 +00:00
Jorge Penadés	fa12debcd7	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 8571-hotfix-notShowToken	2025-02-13 11:59:36 +01:00
Carlos Satorres	1b7026fa00	fix: refs #6553 remove business	2025-02-13 10:46:48 +01:00
Pablo Natek	4b7c20075b	Merge pull request 'feat: refs #6897 add search method and enhance ACL permissions for Entry model' (!3448) from 6897-addItemSearch into dev ... Reviewed-on: #3448 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-13 07:59:58 +00:00
Pako Natek	3a1849326b	fix(item_getBalance): refs #8408 availabled field prevails over landed ... Refs: #8408	2025-02-13 08:41:13 +01:00
Pako Natek	d773aec0f5	Merge pull request 'feat(productionControl and collection_new): refs #8575 new itempackingtype a' (!3444) from 8575-itemPackingType-Altillo into dev ... Reviewed-on: #3444 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-13 06:45:37 +00:00
Pako Natek	317c152c66	Merge branch 'dev' into 8575-itemPackingType-Altillo	2025-02-13 06:41:43 +00: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
Javier Segarra	0b8a54d057	Merge pull request 'Fix TicketNegative' (!3446) from fix_ticketNegative into dev ... Reviewed-on: #3446 Reviewed-by: Jon Elias <jon@verdnatura.es>	2025-02-12 15:43:59 +00: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
Guillermo Bonet	5543da2c80	Merge branch 'master' into test	2025-02-12 14:37:10 +01:00
Guillermo Bonet	ef9ca5f56c	Merge pull request 'refactor: refs #6944 Update ticket_setState to improve state change logic and user tracking' (!3439) from 6944-stateNoRepeat into master ... Reviewed-on: #3439 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-12 13:36:14 +00:00
Carlos Andrés	65a4967d46	fix: update maxShipped to use toDate in closeAll method	2025-02-12 14:16:43 +01:00
Jorge Penadés	3754ede42d	feat: refs #8571 enhance email formatting in sendToSupport function with structured HTML table	2025-02-12 14:15:53 +01:00
Guillermo Bonet	ba3909a984	refactor: refs #6944 Requested changes	2025-02-12 14:13:39 +01:00
Pako Natek	b95db2eff1	feat(productionControl and collection_new): refs #8575 new itempackingtype a ... Refs: #8575	2025-02-12 13:45:07 +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
Carlos Andrés	fad95f2cf9	Merge pull request 'hotFix_daily_addressInvoice_2' (!3441) from hotFix_daily_addressInvoice_2 into test ... Reviewed-on: #3441 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-12 11:22:08 +00: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
Guillermo Bonet	e7c027a8b1	refactor: refs #6944 Update ticket_setState to improve state change logic and user tracking	2025-02-12 10:06:48 +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	8d0fec4ffd	Merge pull request 'feat: refs #6897 add EntryConfig model and enhance entry filtering with new parameters' (!3366) from 6897-refactorEntryBuyList into dev ... Reviewed-on: #3366 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-12 06:37:43 +00:00
Pablo Natek	c0b1f3337c	Merge branch 'dev' into 6897-refactorEntryBuyList	2025-02-11 15:50:28 +00:00
Pablo Natek	f347d9668f	refactor: refs #6897 improve variable scope and query parameters in recalcEntryPrices.js	2025-02-11 16:50:00 +01:00
Carlos Satorres	798d8a514e	Merge pull request 'fix: hotfix delivery-note' (!3437) from hotfix-producerPdf into master ... Reviewed-on: #3437 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-11 15:13:27 +00:00
Carlos Satorres	b49df364bf	Merge branch 'master' into hotfix-producerPdf	2025-02-11 14:58:16 +00:00
Carlos Satorres	92232b34ce	fix: hotfix delivery-note	2025-02-11 15:55:08 +01:00
Alex Moreno	3fbd740a2b	fix: address invoice daily	2025-02-11 14:31:26 +01:00
Guillermo Bonet	f682e3cfe6	Merge branch 'test' into dev	2025-02-11 13:26:18 +01:00
Guillermo Bonet	0a33e05bff	Merge branch 'master' into test	2025-02-11 13:26:02 +01:00