23333 Commits

All Branches

Search

Author	SHA1	Message	Date
Guillermo Bonet	6acba08a91	Merge branch 'test' into dev	2024-08-02 12:08:40 +02:00
Guillermo Bonet	f6db62945d	Merge branch 'master' into test	2024-08-02 12:08:22 +02:00
Guillermo Bonet	dead585a1b	Merge pull request 'fix: refs #7812 Added orders in item_getMinacum' (!2810) from 7812-radarOrder into master ... Reviewed-on: #2810 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-08-02 10:01:55 +00:00
Guillermo Bonet	afb2f8d111	Merge branch 'test' into dev	2024-08-02 11:50:26 +02:00
Guillermo Bonet	4c67daedec	Merge branch 'master' into test	2024-08-02 11:50:16 +02:00
Carlos Andrés	69d4c8bd6e	Merge pull request 'fix: refs #7829 Error al calcular problemas de componentes' (!2828) from 7829-Error-calcular-problemas-componentes into master ... Reviewed-on: #2828 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-08-02 09:45:06 +00:00
Carlos Andrés	29a50caaca	fix: refs #7829 Error al calcular problemas de componentes	2024-08-02 11:43:30 +02:00
Carlos Andrés	ddd5e4ffa4	fix: refs #7829 Error al calcular problemas de componentes	2024-08-02 10:28:50 +02:00
Guillermo Bonet	879d48eb27	Merge branch 'test' into dev	2024-08-02 10:00:35 +02:00
Guillermo Bonet	01df29b47c	Merge branch 'master' into test	2024-08-02 10:00:12 +02:00
Guillermo Bonet	97c1f8b321	Merge pull request 'feat: refs #7382 Changes' (!2826) from 7382-invoiceInBooking into master ... Reviewed-on: #2826 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-08-02 07:54:48 +00:00
Guillermo Bonet	d852d16ae4	feat: refs #7382 Changes	2024-08-02 08:11:38 +02:00
Alex Moreno	20caa5d9a1	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-08-01 14:11:00 +02:00
Robert Ferrús	619dd2fbe8	Merge pull request 'master' (!2823) from master into test ... Reviewed-on: #2823 Reviewed-by: Robert Ferrús <robert@verdnatura.es>	2024-08-01 05:05:14 +00:00
Sergio De la torre	b75e54120d	Merge pull request 'hotFix itemShelving refs #6861' (!2821) from 6861_triggerItemShelving into master ... Reviewed-on: #2821 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-08-01 04:52:40 +00:00
Sergio De la torre	94d89f9c99	Merge branch 'master' into 6861_triggerItemShelving	2024-07-31 19:51:36 +00:00
Carlos Andrés	77f6e80066	Actualizar db/routines/vn/procedures/ticket_setRisk.sql	2024-07-31 17:38:50 +00:00
Carlos Andrés	f0598d6cf1	Merge pull request 'hotfix: getBuys add field comment Ticket 207748' (!2822) from Ticket-207748-Hotfix-getBuys-add-field-comment into master ... Reviewed-on: #2822 Reviewed-by: Pako Natek <pako@verdnatura.es>	2024-07-31 16:46:19 +00:00
Carlos Andrés	5b0dcee62d	hotfix: getBuys add field comment Ticket 207748	2024-07-31 18:41:18 +02:00
Sergio De la torre	70b931553b	hotFix itemShelving refs #6861	2024-07-31 18:14:09 +02:00
Sergio De la torre	65e9ed301f	hotFix itemShelving refs #6861	2024-07-31 18:11:03 +02:00
Carlos Andrés	ce8eba9b85	Merge pull request 'fix: refs #7213 componentLack y setRisk' (!2820) from 7213-Hotfix-calculo-problemas into master ... Reviewed-on: #2820 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-07-31 14:05:31 +00:00
Carlos Andrés	6c0aae04c0	fix: refs #7213 componentLack y setRisk	2024-07-31 14:59:12 +02:00
Carlos Andrés	77fa4dd497	fix: refs #7213 componentLack y setRisk	2024-07-31 14:38:12 +02:00
Robert Ferrús	892a0ef960	Merge pull request 'fix: refs #7818 entry_splitByShelving' (!2818) from 7818-entry_splitByShelving into master ... Reviewed-on: #2818 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-07-31 09:43:38 +00:00
Robert Ferrús	dca7900ab2	fix: refs #7818 entry_splitByShelving	2024-07-31 11:31:02 +02:00
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
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
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	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	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
Carlos Andrés	01562420d4	Actualizar db/routines/vn/procedures/itemShelvingSale_reallocate.sql	2024-07-30 10:14:15 +00:00