7586 Commits

Author	SHA1	Message	Date
Juan Ferrer	053d90b76a	fix: refs #4409 Parallel sync	2025-02-19 14:07:02 +01:00
Juan Ferrer	6001f416d0	fix: refs #4409 First sync working version	2025-02-19 12:56:42 +01:00
Javi Gallego	9e64e4224a	Merge branch 'dev' into 7937-claimAgile	2025-02-19 12:52:27 +01:00
Javi Gallego	ed61d6488d	feat: refs #7937 add shelvingFk to claimEnd table and update related models and queries	2025-02-19 12:52:06 +01:00
Ivan Mas	c61ea07b6a	Merge branch 'dev' into 8558-futureTicketsClaims	2025-02-19 11:30:08 +00:00
Juan Ferrer	72a651afa5	fix: refs #4409 vn.buyOut sequence	2025-02-18 19:34:38 +01:00
Juan Ferrer	bd8af6172d	fix: refs #4409 Default life value	2025-02-18 16:20:09 +01:00
Juan Ferrer	e98cc7daf2	fix: refs #4409 First working version	2025-02-18 15:58:38 +01:00
Carlos Andrés	b8a216444c	Actualizar db/routines/cache/procedures/available_refresh.sql	2025-02-18 13:11:27 +00:00
Alex Moreno	7ec29d1972	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-02-18 13:38:10 +01:00
Javi Gallego	fd53142bff	fix: refs #7937 update claimDestination and regularizeClaim methods for address handling	2025-02-18 12:53:43 +01:00
Juan Ferrer	6162cbe2c6	fix: refs #4409 t.isRaid	2025-02-18 11:06:41 +01:00
Javi Gallego	d974942ca3	Merge branch 'dev' into 7937-claimAgile	2025-02-18 10:17:32 +01:00
Carlos Andrés	5488a229c1	Merge pull request 'fix: priceOptimum error' (!3471) from PriceOptimum-error into master ... Reviewed-on: #3471 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-18 08:50:27 +00:00
Alex Moreno	664ba03425	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-02-18 09:26:30 +01:00
Javi Gallego	0b7bcd9e33	Merge branch 'dev' into 7937-claimAgile	2025-02-18 09:19:02 +01:00
Alex Moreno	08b4d0a4fa	build: refs #8622 dump db	2025-02-18 09:16:31 +01:00
Alex Moreno	f83055057e	fix: expeditionTruck use editorFk	2025-02-18 09:14:08 +01:00
Alex Moreno	669b7cd67f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-02-18 08:45:19 +01:00
Alex Moreno	6e4667a563	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-02-18 08:45:11 +01:00
Alex Moreno	7d08c1796a	fix: update ticket_setState procedure to include created timestamp in ticketTracking insert	2025-02-18 08:44:07 +01:00
Juan Ferrer	e9244c8538	Merge branch 'dev' into 4409-binlog	2025-02-18 08:33:22 +01:00
Juan Ferrer	17410202ad	fix: refs #6695 Code refactor	2025-02-17 19:40:12 +01:00
Javi Gallego	a30f12dd27	Merge branch 'dev' into 7937-claimAgile	2025-02-17 19:16:16 +01:00
Carlos Andrés	a73199e70b	fix: priceOptimum error	2025-02-17 18:52:31 +01:00
Ivan Mas	48a28045fd	Merge branch 'dev' into 8558-futureTicketsClaims	2025-02-17 14:49:27 +00:00
Javier Segarra	dbd298b7d8	Merge branch 'dev' into fix_getSuggestedTickets_byFixtures	2025-02-17 14:39:01 +00:00
Ivan Mas	60f31178cf	Merge branch 'dev' into 8558-futureTicketsClaims	2025-02-17 14:17:31 +00:00
Ivan Mas	0088460e63	feat: refs #8558 requested modifications	2025-02-17 15:15:11 +01:00
Javi Gallego	a04ddfdee3	Merge branch 'dev' into 7937-claimAgile	2025-02-17 14:21:56 +01:00
Pako Natek	991ed813e3	Merge branch 'dev' into 8408-Disponible-por-zonas-y-horas	2025-02-17 12:15:48 +00:00
Pako Natek	bd1a4b35aa	fix(item_getBalance): refs #8408 alias for shipped field	2025-02-17 13:12:22 +01:00
Alex Moreno	2d7c677f0a	Merge branch 'dev' into 6695-save_builds_and_Db	2025-02-17 11:57:55 +00:00
Carlos Andrés	52c22608a5	Actualizar db/routines/vn/procedures/productionControl.sql	2025-02-17 11:38:48 +00: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
Javi Gallego	7001076974	refactor: refs #7937 remove pickupAgencyFk and related constraints; update claimConfig and tests	2025-02-17 09:05:34 +01:00
Alex Moreno	8ef13e3d9c	feat: refs #6695 add Dockerfile for MariaDB and update Jenkinsfile for database build stage	2025-02-17 08:34:04 +01:00
Ivan Mas	472e52bc8c	feat: refs #8558 use shipped	2025-02-14 15:03:58 +01:00
Ivan Mas	9cf6f8f031	feat: refs #8558 modify claim_beforeInsert	2025-02-14 14:50:39 +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
Guillermo Bonet	309a287748	Merge branch 'test' into dev	2025-02-14 12:08:43 +01:00
Guillermo Bonet	aca49505bd	Merge branch 'test' into 8227-roadmapChanges	2025-02-14 10:52:40 +00:00
Juan Ferrer	c954ebbb5d	feat: refs #4409 Small code fixes	2025-02-14 11:34:35 +01:00
Juan Ferrer	a615174d62	feat: refs #4409 buyLot_refresh INSERT IGNORE fix	2025-02-14 10:46:29 +01:00
Guillermo Bonet	28deadfbad	fix: refs #8573 version	2025-02-14 10:37:08 +01:00
Juan Ferrer	53059f5bb5	feat: refs #4409 buyLot and buyLot refresh fixes	2025-02-14 10:21:02 +01:00
Guillermo Bonet	d6f08d7e27	feat: refs #8227 update roadmap triggers and views, remove obsolete trigger and column	2025-02-14 10:04:04 +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
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
Guillermo Bonet	845ce8d6d8	feat: refs #8227 Minor changes	2025-02-13 14:36:09 +01:00
Guillermo Bonet	4042679c9b	feat: refs #8227 Grants	2025-02-13 14:12:44 +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
Guillermo Bonet	bd53f7367c	Merge branch 'test' into 8227-roadmapChanges	2025-02-13 08:34:20 +00:00
Guillermo Bonet	92ab3648e7	feat: refs #8227 Fix tests	2025-02-13 09:22:45 +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	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	5404f895b2	refactor: refs #8573 add fk to expedition.hostFk	2025-02-12 17:08:45 +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	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
Alex Moreno	5d155ef6bd	Merge branch 'test' into hotFix_daily_addressInvoice_2	2025-02-12 11:17:27 +00: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
Juan Ferrer	3adc155b74	feat: refs #4409 buyLot and buyLot refresh refactor and fixes	2025-02-12 07:57:31 +01:00
Pablo Natek	c0b1f3337c	Merge branch 'dev' into 6897-refactorEntryBuyList	2025-02-11 15:50:28 +00: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	095e561c82	Merge branch 'dev' into 6321_negative_tickets	2025-02-11 08:43:21 +00: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	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
Javi Gallego	4f6917ce4c	Merge branch 'dev' into 7937-claimAgile	2025-02-10 13:17:21 +01:00
Javi Gallego	afef9f4025	feat: refs #7937 add initial state 'Recogido' to state table with relevant attributes	2025-02-10 13:14:57 +01:00
Guillermo Bonet	75b6867be8	feat: refs #8227 Minor change	2025-02-10 13:06:05 +01:00
Guillermo Bonet	e19e50de14	feat: refs #8227 Update roadmap triggers to manage eta adjustments and prevent recursive calls	2025-02-10 13:04:23 +01:00
Pako Natek	f7f221e2bc	Merge branch 'dev' into 8408-Disponible-por-zonas-y-horas	2025-02-10 06:36:15 +00: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