24396 Commits

All Branches

Search

Author	SHA1	Message	Date
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
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
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	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
Sergio De la torre	98f33807dd	fix: updateAvailable refs #6861	2024-09-24 16:48:48 +02:00
Pako Natek	171033f870	Merge pull request 'fix: refs #8030 new table version' (!3014) from 8030-newPriceComponent into dev ... Reviewed-on: #3014 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-24 12:25:35 +00:00
Pako Natek	ac1d2ee48b	Merge branch 'dev' into 8030-newPriceComponent	2024-09-24 12:05:25 +00:00
Pako Natek	64376b7503	fix: refs #8030 new table version	2024-09-24 14:04:29 +02:00
Pako Natek	b82b3bd004	Merge pull request 'feat: refs #8030 new fields for vn.priceDelta' (!3013) from 8030-newPriceComponent into dev ... Reviewed-on: #3013 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-09-24 11:59:52 +00:00
Pako Natek	785778e58a	fix: refs #8030 database selected for grant	2024-09-24 13:56:41 +02:00
Pako Natek	e33429f474	fix: refs #8030 grant actions to buyer	2024-09-24 13:53:24 +02:00
Pako Natek	142ee2b96f	Merge branch 'dev' into 8030-newPriceComponent	2024-09-24 11:04:54 +00:00
Pako Natek	7a343d60e6	feat: refs #8030 new fields for vn.priceDelta	2024-09-24 13:04:03 +02:00
Jon Elias	ae039d6ce2	Merge branch 'dev' into 7356-FixTicketWeekly	2024-09-24 10:51:25 +00:00
Pako Natek	0822996f20	Merge pull request '8030-newPriceComponent' (!3012) from 8030-newPriceComponent into dev ... Reviewed-on: #3012 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-09-24 10:39:04 +00:00
Pako Natek	403637dd8c	Merge branch 'dev' into 8030-newPriceComponent	2024-09-24 10:37:44 +00:00
Alex Moreno	63a4cb1847	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-09-24 12:25:41 +02:00
Alex Moreno	4ed6f35912	build: init version 24.42	2024-09-24 12:24:56 +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
Pako Natek	ed656836b1	Merge branch 'dev' into 8030-newPriceComponent	2024-09-24 10:06:38 +00:00
Pako Natek	f6e1880634	fix: refs #8030 test change	2024-09-24 12:06:08 +02:00
Pako Natek	7e449c5716	fix: refs #8030 bugs	2024-09-24 11:54:12 +02: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
Jon Elias	d221611382	Merge branch 'dev' into 7356-FixTicketWeekly	2024-09-24 09:33:47 +00:00
Pablo Natek	d608b3b9c8	Merge pull request '7404-fixStockBought' (!3004) from 7404-fixStockBought into dev ... Reviewed-on: #3004 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-24 09:32:49 +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
Pako Natek	47f4b2f3d4	Merge pull request 'fix: refs #8030 little bugs' (!3011) from 8030-newPriceComponent into dev ... Reviewed-on: #3011 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-24 09:08:33 +00:00
Pako Natek	1dbf29ccd1	Merge branch 'dev' into 8030-newPriceComponent	2024-09-24 09:00:57 +00:00
Pako Natek	1be5fced3c	fix: refs #8030 little bugs	2024-09-24 10:59:15 +02:00
Pako Natek	5c4849b60d	Merge pull request '8030-newPriceComponent' (!3010) from 8030-newPriceComponent into dev ... Reviewed-on: #3010 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-24 08:43:58 +00:00
Pako Natek	a39b28f1a8	Merge branch '8030-newPriceComponent' of https://gitea.verdnatura.es/verdnatura/salix into 8030-newPriceComponent	2024-09-24 10:39:28 +02:00
Pako Natek	5c8f42a3ae	fix: refs #8030 redmine revision updates ... Changes recomended by the reviewer Refs: #8030	2024-09-24 10:38:56 +02:00
Pako Natek	91801b1979	fix: refs #8030 redmine revision updates ... Changes recomended by the reviewer Refs: #8030	2024-09-24 10:27:27 +02:00
Pako Natek	fb7208d898	fix: refs #8030 warehouse filter ... Warehouse is also needed to make the filter Refs: #8030	2024-09-24 09:05:30 +02:00
Pablo Natek	f9b37541eb	Merge branch '7404-fixStockBought' of https://gitea.verdnatura.es/verdnatura/salix into 7404-fixStockBought	2024-09-24 08:55:47 +02:00
Pablo Natek	a5f3dbc15a	fix: refs #7404 last entries spec	2024-09-24 08:55:24 +02:00
Pako Natek	acabd3e154	feat(catalog_componentCalculate): refs #8030 new component improved ... The procedure has now the component "bonus", a special price increasing for a group of items Refs: #8030	2024-09-24 08:50:34 +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
Pablo Natek	bfd52b8773	Merge branch 'dev' into 7404-fixStockBought	2024-09-24 05:31:34 +00:00