26746 Commits

All Branches

Search

Author	SHA1	Message	Date
Javier Segarra	81e941db4e	fix: replace arg id by itemFk	2025-02-13 10:07:01 +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
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
Guillermo Bonet	ba3909a984	refactor: refs #6944 Requested changes	2025-02-12 14:13:39 +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
Guillermo Bonet	a387e3ae92	feat: refs #7162 Add packages and packagesList to ticket_doCmr procedure	2025-02-11 13:25:30 +01:00
Pablo Natek	96248132a1	refactor: refs #6897 sql fixture data for improved readability and consistency	2025-02-11 13:02:50 +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
Javier Segarra	5df24d0e70	Merge pull request '#6321 - Negative tickets' (!1945) from 6321_negative_tickets into dev ... Reviewed-on: #1945 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-11 08:45:32 +00:00
Javier Segarra	095e561c82	Merge branch 'dev' into 6321_negative_tickets	2025-02-11 08:43:21 +00:00
Pako Natek	0bd345b6de	Merge pull request '8408-Disponible-por-zonas-y-horas' (!3432) from 8408-Disponible-por-zonas-y-horas into dev ... Reviewed-on: #3432 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-11 07:50:15 +00:00
Pako Natek	b4fe620f2e	Merge branch 'dev' into 8408-Disponible-por-zonas-y-horas	2025-02-11 07:47:16 +00:00
Pako Natek	5a8f7b2c1a	Merge branch '8408-Disponible-por-zonas-y-horas' of https://gitea.verdnatura.es/verdnatura/salix into 8408-Disponible-por-zonas-y-horas	2025-02-11 08:46:26 +01:00
Pako Natek	fbf56ff0cf	fix(available_refresh): refs #8408 more availabled cases ... refs#8408	2025-02-11 08:46:24 +01:00
Pablo Natek	5ab45831e7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6897-refactorEntryBuyList	2025-02-11 08:19:31 +01:00
Pako Natek	cdb91c06c2	Merge pull request '8408-Disponible-por-zonas-y-horas' (!3431) from 8408-Disponible-por-zonas-y-horas into dev ... Reviewed-on: #3431 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-11 07:16:38 +00:00
Pako Natek	1a92a00cce	Merge branch 'dev' into 8408-Disponible-por-zonas-y-horas	2025-02-11 07:12:25 +00:00
Pako Natek	5d674139fa	Merge branch '8408-Disponible-por-zonas-y-horas' of https://gitea.verdnatura.es/verdnatura/salix into 8408-Disponible-por-zonas-y-horas	2025-02-10 14:00:36 +01:00
Pako Natek	ec5ef3d7f8	fix(item_getStock): refs #8408 field availabled used for itementryin selection ... Refs: #8408	2025-02-10 14:00:34 +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
Pako Natek	4d5d38592f	Merge pull request 'feat(catalog_calculate): refs #8408 new concept availabled' (!3425) from 8408-Disponible-por-zonas-y-horas into dev ... Reviewed-on: #3425 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-10 06:47:01 +00:00
Pako Natek	f7f221e2bc	Merge branch 'dev' into 8408-Disponible-por-zonas-y-horas	2025-02-10 06:36:15 +00:00
Pako Natek	17749b0ced	Merge branch '8408-Disponible-por-zonas-y-horas' of https://gitea.verdnatura.es/verdnatura/salix into 8408-Disponible-por-zonas-y-horas	2025-02-10 07:34:19 +01:00
Pako Natek	b60f251c56	fix(catalog_calculate): refs #8408 remove comments ... resf#8408	2025-02-10 07:34:15 +01:00
Guillermo Bonet	0ecf1f281a	Merge branch 'test' into dev	2025-02-10 07:27:04 +01:00
Guillermo Bonet	a002168f61	Merge branch 'master' into test	2025-02-10 07:26:53 +01:00
Guillermo Bonet	50a295d495	fix: refs #7162 Update JOIN condition for agencyMode in ticket_doCmr	2025-02-10 07:25:39 +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
Pablo Natek	6ea4e3096e	feat: refs #6897 add maxLockTime parameter to entryConfig insert statement	2025-02-09 18:24:39 +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