25531 Commits

All Branches

Search

Author	SHA1	Message	Date
Pako Natek	de3d7fc925	Merge pull request 'feat(collection_new): refs #8058 urgent state' (!3038) from 8058-Tickets-Urgentes into dev ... Reviewed-on: #3038 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-09-30 12:01:16 +00:00
Pako Natek	54d9125c21	feat(collection_new): refs #8058 urgent state ... Urgent tickets will be priorized as asigned ones Refs: #8058	2024-09-30 13:49:06 +02:00
Jon Elias	c4f26094d5	fix: refs #7884 fixed filter	2024-09-30 12:46:41 +02:00
Pako Natek	477c7f7903	Merge pull request 'fix: refs #8030 buyer prefers to add multiple zoneGeoFk' (!3037) from 8030-newPriceComponent into dev ... Reviewed-on: #3037 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-09-30 10:30:47 +00:00
Pako Natek	e6e7876fb1	Merge branch 'dev' into 8030-newPriceComponent	2024-09-30 10:26:54 +00:00
Jon Elias	eacc2d5d2a	Merge branch '7884-AddLabelerField' of https://gitea.verdnatura.es/verdnatura/salix into 7884-AddLabelerField	2024-09-30 12:07:56 +02:00
Jon Elias	c680c4a059	refactor: refs #7884 modified sql	2024-09-30 12:07:55 +02:00
Pako Natek	2962bd13c7	fix: refs #8030 buyer prefers to add multiple zoneGeoFk ... Instead of choosing the deepest zoneGeo, buyer wants all to be merged Refs: #8030	2024-09-30 11:59:22 +02:00
Sergio De la torre	a0a8a22ab0	fix: refs #5320 withoutHaving	2024-09-30 11:13:12 +02:00
Pako Natek	de93e477f8	Merge pull request 'feat(previaDelta): refs #8030 new algorithym for coincident records' (!3036) from 8030-newPriceComponent into dev ... Reviewed-on: #3036 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-09-30 08:32:44 +00:00
Pako Natek	1e64028b02	Merge branch 'dev' into 8030-newPriceComponent	2024-09-30 08:25:27 +00:00
Pako Natek	25680994dd	feat(previaDelta): refs #8030 new algorithym for coincident records ... when many records target the same zoneGeoFk, the deepest must be chosen Refs: #8030	2024-09-30 10:24:45 +02:00
Pablo Natek	751c0ee39e	Merge branch 'dev' into 7404-roundDetailVolume	2024-09-30 08:17:22 +00:00
Pablo Natek	e7d07e496e	fix: refs #7404 add rounding to volume detail	2024-09-30 10:16:45 +02:00
Sergio De la torre	a9b083a044	fix: refs #5320 withoutHaving	2024-09-30 09:39:35 +02:00
Robert Ferrús	2d289bc8ac	Merge pull request 'feat: refs #7981 deprecated showAgencyName' (!3016) from 7981-showAgencyName into dev ... Reviewed-on: #3016 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-09-30 06:35:23 +00:00
Robert Ferrús	e6d950e33f	Merge branch 'dev' into 7981-showAgencyName	2024-09-30 06:31:27 +00:00
Sergio De la torre	1f5c0d3e94	fix: refs #5320 withoutHaving	2024-09-30 08:25:40 +02:00
Pako Natek	c2aa33bf3c	Merge pull request 'feat(priceDelta): refs #8030 new field zoneGeoFk' (!3032) from 8030-newPriceComponent into dev ... Reviewed-on: #3032 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-09-30 06:25:05 +00:00
Pablo Natek	f7e13e8ac9	Merge branch 'dev' into 8030-newPriceComponent	2024-09-30 06:21:51 +00:00
Pako Natek	95601b139b	feat(priceDelta): refs #8030 new field zoneGeoFk ... Buyers need zone restriction field for the new component bonus Refs: #8030	2024-09-30 08:15:57 +02:00
Alex Moreno	dbbd2c7947	feat(ClaimBeginning): throw error when quantity claimed is greater than quantity of line	2024-09-30 08:04:01 +02:00
Pablo Natek	1f5c644e0f	Merge pull request 'Revert "Merge pull request '7404-stockBuyed' (!2836) from 7404-stockBuyed into dev"' (!3030) from 7404-revert-commit into test ... Reviewed-on: #3030 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-30 05:16:58 +00:00
Javier Segarra	35e4c0e76b	Merge branch 'test' into 7404-revert-commit	2024-09-27 11:01:40 +00:00
Pako Natek	488427ec97	Merge pull request 'feat(components): refs #8030 new component bonus' (!3028) from 8030-master-HotFix-PriceDelta into master ... Reviewed-on: #3028 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-27 10:04:31 +00:00
Pako Natek	bc2ed26fc3	Merge branch 'master' into 8030-master-HotFix-PriceDelta	2024-09-27 10:02:20 +00:00
Pablo Natek	f858674c8a	Revert "Merge pull request '7404-stockBuyed' (!2836) from 7404-stockBuyed into dev" ... This reverts commit f6c5f41d44, reversing changes made to 5ee5da24e1.	2024-09-27 12:01:54 +02:00
Carlos Andrés	4156a0f0fe	Merge pull request 'fix: refs #7779 refactor collection' (!3021) from 7779-refactor-collection into dev ... Reviewed-on: #3021 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Pako Natek <pako@verdnatura.es>	2024-09-27 09:29:36 +00:00
Robert Ferrús	a7c858dbba	Merge branch 'dev' into 7981-showAgencyName	2024-09-27 08:13:35 +00:00
Sergio De la torre	c89a517593	Merge pull request 'fix: refs #5890 recovery ItemShelving_afterInsert' (!3022) from 5890-ItemShelving into master ... Reviewed-on: #3022 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-27 06:45:15 +00:00
Jon Elias	b547858820	perf: refs #7010 showing field correctly	2024-09-27 08:28:12 +02:00
Pako Natek	86e421f21c	Merge branch 'master' into 8030-master-HotFix-PriceDelta	2024-09-27 05:47:30 +00:00
Carlos Andrés	5270db2abe	fix: refs #7779 refactor collection	2024-09-26 17:53:54 +02:00
Carlos Andrés	0ad1d838d9	fix: refs #7779 refactor collection	2024-09-26 17:44:29 +02:00
Pako Natek	52b25f53b1	Merge pull request '8030-testPriceDelta' (!3026) from 8030-testPriceDelta into test ... Reviewed-on: #3026 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-26 15:32:23 +00:00
Jorge Penadés	f3bf0b7432	feat: refs #7874 validate required field	2024-09-26 17:20:50 +02:00
Javi Gallego	6b4b5f2338	fix: e2e not necesary	2024-09-26 16:26:50 +02:00
Jorge Penadés	20e894257d	fix: refs #7874 rollback	2024-09-26 16:07:14 +02:00
Javi Gallego	f68ed48081	feat: refs #9722 testFixed	2024-09-26 15:25:51 +02:00
Javi Gallego	c825191823	feat: refs #9722 fixtures	2024-09-26 15:22:40 +02:00
Pako Natek	0edae3c144	Merge branch 'test' into 8030-testPriceDelta	2024-09-26 12:57:29 +00:00
Javier Segarra	f462a9889d	Merge pull request 'fix: use params.q' (!3025) from use_params_q into master ... Reviewed-on: #3025 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-26 12:41:57 +00:00
Javier Segarra	7dab6b36eb	Merge branch 'master' into use_params_q	2024-09-26 12:40:47 +00:00
Javier Segarra	640d9ad9f7	fix(salix): use params.sq	2024-09-26 12:38:27 +00:00
Javier Segarra	5123dcd164	Merge pull request '#8052 - Use params.q as table filter in lilium' (!3023) from use_params_q into master ... Reviewed-on: #3023 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-26 12:33:27 +00:00
Javier Segarra	4f16df523e	perf(salix): use params.q as table filter in lilium	2024-09-26 12:14:02 +00:00
Javier Segarra	c83f44a455	perf(salix): use params.q as table filter in lilium	2024-09-26 12:12:33 +00:00
Jon Elias	4ebda1a06f	feat: refs #7010 added filter fields to show packing type field in ticket list	2024-09-26 14:06:45 +02:00
Javier Segarra	989589afd7	feat(salix): use params.q as table filter in lilium	2024-09-26 11:18:05 +00:00
Carlos Andrés	0851c6fb97	fix: refs #7779 refactor collection	2024-09-26 12:48:18 +02:00