24678 Commits

All Branches

Search

Author	SHA1	Message	Date
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
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
Javi Gallego	6b4b5f2338	fix: e2e not necesary	2024-09-26 16:26:50 +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
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
Sergio De la torre	08cb1241bf	fix: refs #5890 recovery ItemShelving_afterInsert	2024-09-26 11:53:33 +02:00
Carlos Andrés	eb2a30f0d9	fix: refs #7779 refactor collection	2024-09-26 10:36:19 +02:00
Jorge Penadés	5e56034105	fix: refs #7323 rollback	2024-09-26 09:48:07 +02:00
Jorge Penadés	f62d11dab2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-fineTunningWorker	2024-09-26 09:17:14 +02:00
Javi Gallego	40f3b6b67a	Merge pull request '6722-thermograph' (!3019) from 6722-thermograph into dev ... Reviewed-on: #3019 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-26 06:07:38 +00:00
Sergio De la torre	a32536a70b	Merge pull request 'fix: refs #6861 updateAvailable' (!3018) from 6861-updateAvailable into master ... Reviewed-on: #3018 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-09-25 14:00:17 +00:00
Javi Gallego	6ce4ff1311	Merge branch 'dev' into 6722-thermograph	2024-09-25 13:31:12 +02:00
Javi Gallego	80c6497d3c	feat: refs #6722 traduccion	2024-09-25 13:29:11 +02:00
Javi Gallego	9ef44d8d8d	feat: refs #6722 refactor createThermograph	2024-09-25 13:23:31 +02:00
Sergio De la torre	8f63118550	fix: refs #6861 updateAvailable	2024-09-25 12:24:00 +02:00
Alex Moreno	4f97deb0c9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-09-25 12:08:16 +02:00
Alex Moreno	326c1755d6	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-09-25 12:07:57 +02:00
Alex Moreno	aadce7971b	fix: translation	2024-09-25 12:06:50 +02:00
Sergio De la torre	112aeaba91	Merge pull request 'feat: refs #7855 delete isChecked' (!3017) from 7855-BoxPicking into dev ... Reviewed-on: #3017 Reviewed-by: Robert Ferrús <robert@verdnatura.es>	2024-09-25 06:49:06 +00:00
Sergio De la torre	eb85181ea0	feat: refs #7855 delete isChecked	2024-09-25 08:43:38 +02:00
Sergio De la torre	b776788714	feat: refs #7855 delete isChecked	2024-09-25 08:35:15 +02:00
Jon Elias	26d7866ec8	Merge branch 'dev' into 7884-AddLabelerField	2024-09-25 06:02:44 +00:00
Pako Natek	beb66cce1f	feat(components): refs #8030 new component bonus ... With table vn.priceDelta, buyers set a range of items to be affected for a price increasing Refs: #8030	2024-09-25 07:43:29 +02:00
Pako Natek	2b6c604fcd	feat(components): refs #8030 new component bonus ... With table vn.priceDelta, buyers set a range of items to be affected for a price increasing Refs: #8030	2024-09-25 07:37:52 +02:00
Pako Natek	8c18bcd776	feat(components): refs #8030 new component bonus ... With table vn.priceDelta, buyers set a range of items to be affected for a price increasing Refs: #8030	2024-09-25 07:36:48 +02:00
Jon Elias	6d4614d56f	Merge pull request 'fix: refs #7356 ticket weekly filter' (!2939) from 7356-FixTicketWeekly into dev ... Reviewed-on: #2939 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-09-25 05:27:17 +00:00
Jon Elias	fe178ea396	Merge branch 'dev' into 7356-FixTicketWeekly	2024-09-25 05:24:52 +00:00
Sergio De la torre	2ba16e92fb	Merge pull request 'fix: updateAvailable refs #6861' (!3015) from 6861-ItemShelvingSaleAvailable into master ... Reviewed-on: #3015 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-09-25 04:53:47 +00:00
Robert Ferrús	3f81d624cb	feat: refs #7981 deprecated showAgencyName	2024-09-24 18:52:55 +02:00