25531 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Jorge Penadés	d1529c808e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType	2024-09-26 09:09:07 +02:00
Jorge Penadés	7c23acde64	feat: refs #7874 add observationTypeFk col	2024-09-26 09:08:42 +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
Jorge Penadés	0cd20503d2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType	2024-09-25 12:52:16 +02:00
Sergio De la torre	8f63118550	fix: refs #6861 updateAvailable	2024-09-25 12:24:00 +02:00
Jorge Penadés	3e270befa5	chore: refs #7874 refactor table	2024-09-25 12:19:12 +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
Jorge Penadés	ddebd31648	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType	2024-09-25 10:57:53 +02:00
Jorge Penadés	1c42303a75	chore: refs #7207 drop useless relation	2024-09-25 09:18:10 +02:00
Jorge Penadés	eb0f8ec23c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7207-showPbx	2024-09-25 08:59:22 +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
Sergio De la torre	98f33807dd	fix: updateAvailable refs #6861	2024-09-24 16:48:48 +02:00
Jorge Penadés	16b059a14a	refactor: refs #7207 tab	2024-09-24 15:49:45 +02:00
Jorge Penadés	02e837ebb6	feat: refs #7207 add queue on department change	2024-09-24 15:43:33 +02:00
Jorge Penadés	0f8db9ee7e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7207-showPbx	2024-09-24 14:38:58 +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