24371 Commits

All Branches

Search

Author	SHA1	Message	Date
Javi Gallego	329920389d	fix: option Error	2024-09-30 15:49:46 +02:00
Alex Moreno	75d0c298a1	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-09-30 14:38:17 +02:00
Alex Moreno	568a77aa19	Merge pull request 'feat(ClaimBeginning): throw error when quantity claimed is greater than quantity of line' (!3031) from hotFix_claimBeginning_quantity into master ... Reviewed-on: #3031 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-30 12:05:13 +00: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
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
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
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
Sergio De la torre	08cb1241bf	fix: refs #5890 recovery ItemShelving_afterInsert	2024-09-26 11:53:33 +02: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
Sergio De la torre	8f63118550	fix: refs #6861 updateAvailable	2024-09-25 12:24:00 +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
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
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
Sergio De la torre	98f33807dd	fix: updateAvailable refs #6861	2024-09-24 16:48:48 +02:00
Alex Moreno	45a016065d	Merge pull request 'feat(travelFilter): add daysOnward' (!3008) from hotFix_travelList_daysOnward into test ... Reviewed-on: #3008 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>	2024-09-24 10:21:54 +00:00
Alex Moreno	9106171b92	Merge branch 'test' into hotFix_travelList_daysOnward	2024-09-24 09:39:21 +00:00
Alex Moreno	7dae387b7f	Merge pull request '8032-devToTest_2440' (!3009) from 8032-devToTest_2440 into test ... Reviewed-on: #3009 Reviewed-by: Jon Elias <jon@verdnatura.es>	2024-09-24 09:34:47 +00:00
Alex Moreno	afbf084535	Merge branch 'test' into 8032-devToTest_2440	2024-09-24 09:29:38 +00:00
Alex Moreno	ae97c8a035	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-09-24 11:29:09 +02:00
Alex Moreno	76e545d488	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into hotFix_travelList_daysOnward	2024-09-24 08:35:30 +02:00
Sergio De la torre	ea06afb361	Merge pull request 'fix: hotFix backLimit refs #6964' (!3003) from 6964-ListItemNewer into master ... Reviewed-on: #3003 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-24 05:17:02 +00:00
Alex Moreno	882f1eb7c2	feat(travelFilter): add daysOnward	2024-09-23 15:30:10 +02:00
Robert Ferrús	2a3dcbe71a	Merge pull request 'feat: refs #8000 add column' (!3005) from 8000-zoneAddColumn into master ... Reviewed-on: #3005 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-23 11:23:03 +00:00
Ivan Mas	f4de066d16	Merge pull request 'refactor: refs #7725 deprecate worker.isF11Allowed' (!3002) from 7725-refactorIsF11Allowed into dev ... Reviewed-on: #3002 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-23 10:26:41 +00:00
Robert Ferrús	a61d2ceb56	Merge branch 'master' into 8000-zoneAddColumn	2024-09-23 10:26:19 +00:00
Javier Segarra	21cc899e99	Merge pull request 'HOTFIX: Administrative role ACL' (!3006) from hotfix_administrativeACL into master ... Reviewed-on: #3006 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-23 10:17:18 +00:00
Javier Segarra	4689681618	fix(salix): add administrative ACLs	2024-09-23 12:07:06 +02:00
Robert Ferrús	31d5a7a635	feat: refs #8000 add column	2024-09-23 11:53:27 +02:00
Robert Ferrús	c0cc25219f	Merge pull request 'feat: refs #8000 refs #8000 catalog_calculate itemMaxLength' (!2992) from 8000-catalog_calculate into master ... Reviewed-on: #2992 Reviewed-by: Pako Natek <pako@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-23 09:11:10 +00:00
Robert Ferrús	b34e8a7b7e	Merge branch 'master' into 8000-catalog_calculate	2024-09-23 08:18:49 +00:00
Pablo Natek	cd545c0001	Merge pull request 'fix(shelving_clean): less time por shelving removal' (!2988) from fixShelvingClean into master ... Reviewed-on: #2988 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-09-23 08:05:09 +00:00
Sergio De la torre	c6d5e2f292	fix: hotFix backLimit refs #6964	2024-09-23 08:09:24 +02:00
Robert Ferrús	e0e3201f78	Merge branch 'master' into 8000-catalog_calculate	2024-09-23 05:37:43 +00:00
Ivan Mas	06f8f8e95e	refactor: refs #7725 deprecate worker.isF11Allowed	2024-09-22 08:39:19 +02:00