24186 Commits

All Branches

Search

Author	SHA1	Message	Date
Pablo Natek	a286c5dde5	Merge pull request 'hotFix model itemShelving refs #7805' (!2816) from 7805_model_itemShelving into master ... Reviewed-on: #2816 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-31 08:46:53 +00:00
Jorge Penadés	388ab80f46	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight	2024-07-31 10:46:45 +02:00
Jorge Penadés	57f6c6d9a1	chore: refs #7663 WIP setWeight	2024-07-31 10:43:55 +02:00
Jon Elias	524acea70c	Merge branch 'InvoiceOut_Migration' of https://gitea.verdnatura.es/verdnatura/salix into InvoiceOut_Migration	2024-07-31 10:22:58 +02:00
Jon Elias	460b9899c0	refactor: deleted e2e & added back descriptor and summary	2024-07-31 10:22:56 +02:00
Jon Elias	1e711b63fc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into InvoiceOut_Migration	2024-07-31 09:52:13 +02:00
Guillermo Bonet	cc78355aad	fix: refs #7821 Requested changes	2024-07-31 09:26:55 +02:00
Guillermo Bonet	574529b920	Merge branch 'test' into dev	2024-07-31 09:00:31 +02:00
Guillermo Bonet	09da9129a6	Merge branch 'master' into test	2024-07-31 09:00:12 +02:00
Guillermo Bonet	cfebee86f3	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2024-07-31 08:59:36 +02:00
Guillermo Bonet	07b6d2aca9	feat: refs #7644 Added comment if has itemOriginalFk	2024-07-31 08:59:33 +02:00
Robert Ferrús	1d22dc46f0	Merge branch 'dev' into 7646-deleteColumnsProductionConfig	2024-07-31 06:20:10 +00:00
Robert Ferrús	67764f4139	Merge branch 'dev' into 7615-ticketRefundSetDeleted	2024-07-31 06:13:42 +00:00
Alex Moreno	fd00bfd175	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-07-31 08:11:21 +02:00
Alex Moreno	eb135fc7f0	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-07-31 08:11:03 +02:00
Alex Moreno	707b45f9a6	Merge pull request '7679-postCode_town_addRequireds' (!2804) from 7679-postCode_town_addRequireds into master ... Reviewed-on: #2804 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-07-31 05:43:50 +00:00
Sergio De la torre	952b7a5054	hotFix model itemShelving refs #7805	2024-07-31 07:10:38 +02:00
Sergio De la torre	3c62046277	feat workerActivity refs #6078	2024-07-31 06:43:19 +02:00
Sergio De la torre	eec7790a02	Merge pull request 'test' (!2815) from test into dev ... Reviewed-on: #2815 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-30 16:13:13 +00:00
Sergio De la torre	57b87d527a	Merge pull request 'master' (!2813) from master into test ... Reviewed-on: #2813 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-30 16:07:18 +00:00
Sergio De la torre	5bda4c86c7	Merge pull request 'hotFix getTickets refs #6861' (!2812) from 6861_getTickets_reservas into master ... Reviewed-on: #2812 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-30 15:46:36 +00:00
Sergio De la torre	59df0b3886	feat workerActivity refs #6078	2024-07-30 17:46:21 +02:00
Sergio De la torre	d97aba8e10	hotFix getTickets refs #6861	2024-07-30 17:28:55 +02:00
Carlos Andrés	a61f68cbc9	Merge pull request 'master' (!2811) from master into test ... Reviewed-on: #2811 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-07-30 14:49:38 +00:00
Guillermo Bonet	961d05ab35	fix: refs #7821 Added orders in item_getMinacum	2024-07-30 14:19:04 +02:00
Guillermo Bonet	4ef57e6869	fix: refs #7821 Added orders in item_getMinacum	2024-07-30 14:17:41 +02:00
Guillermo Bonet	057174ae6a	Merge branch 'test' into dev	2024-07-30 13:53:58 +02:00
Guillermo Bonet	80ad1f30af	fix: refs #7811 Variables pm2	2024-07-30 13:50:47 +02:00
Carlos Andrés	d9151bdf6a	Merge pull request 'hotFix reallocate iss refs #6861' (!2809) from 6861_reallocate_itemShelving into master ... Reviewed-on: #2809 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-30 11:06:50 +00:00
Sergio De la torre	9e486e4aff	hotFix reallocate iss refs #6861	2024-07-30 13:04:33 +02:00
Carlos Andrés	186fa90ef0	Merge pull request 'hotFix reallocate resfs #6861' (!2808) from 6861_imteShelving_reallocate into master ... Reviewed-on: #2808 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-30 10:41:18 +00:00
Sergio De la torre	2015256f5d	hotFix reallocate resfs #6861	2024-07-30 12:38:13 +02:00
Sergio De la torre	eaa366ff39	feat workerActivity refs #6078	2024-07-30 12:36:02 +02:00
Carlos Andrés	01562420d4	Actualizar db/routines/vn/procedures/itemShelvingSale_reallocate.sql	2024-07-30 10:14:15 +00:00
Guillermo Bonet	bcf08db6d6	Merge pull request 'refs #7531 Modify zone_getAddresses' (!2675) from 7531-Modify-zone_getAddresses into dev ... Reviewed-on: #2675 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-07-30 10:02:10 +00:00
Jon Elias	179c3c30d8	Merge branch 'dev' into InvoiceOut_Migration	2024-07-30 09:40:05 +00:00
Jon Elias	d74a04a881	feat: deleted code and redirect to Lilium	2024-07-30 11:37:41 +02:00
Carlos Andrés	4cda233424	Merge pull request '7736-Añadir-parámetro-itemFk-a-buyUltimate' (!2805) from 7736-Añadir-parámetro-itemFk-a-buyUltimate into test ... Reviewed-on: #2805 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-07-30 09:13:08 +00:00
Carlos Andrés	495bb7e36e	Merge branch 'test' into 7736-Añadir-parámetro-itemFk-a-buyUltimate	2024-07-30 10:46:00 +02:00
Guillermo Bonet	857b1e9939	Merge branch 'test' into dev	2024-07-30 10:26:33 +02:00
Guillermo Bonet	e2c3539dfc	Merge branch 'master' into test	2024-07-30 10:26:17 +02:00
Guillermo Bonet	1f80117ff7	fix: refs #6861 Column	2024-07-30 10:24:50 +02:00
Guillermo Bonet	0451e4bb2a	feat: refs #7650 Fix tests	2024-07-30 10:20:04 +02:00
Alex Moreno	f1628f26b9	Merge branch 'master' into 7679-postCode_town_addRequireds	2024-07-30 08:18:23 +00:00
Alex Moreno	b17b5a1b21	test: fix postcode filter back test	2024-07-30 10:15:09 +02:00
Guillermo Bonet	b6abcbe090	feat: refs #6453 Requested changes	2024-07-30 10:14:20 +02:00
Alex Moreno	2ac8760061	test: fix postcode filter back test	2024-07-30 10:13:32 +02:00
Jorge Penadés	c84f57ab6a	Merge pull request 'chore: refs #6989 add config model' (!2798) from 6989-showClientName into dev ... Reviewed-on: #2798 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-30 08:07:19 +00:00
Jorge Penadés	587b34f090	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6989-showClientName	2024-07-30 10:05:00 +02:00
Jorge Penadés	82c28e0399	chore: refs #7524 WIP limit call	2024-07-30 10:01:05 +02:00