23424 Commits

All Branches

Search

Author	SHA1	Message	Date
Pako Natek	dcdbb0bf93	Merge branch 'dev' into 7836-futureEntries	2024-08-05 12:29:30 +00:00
Pako Natek	be5859b8cf	prototipo	2024-08-05 14:28:29 +02:00
Guillermo Bonet	ea65a13cfb	Merge branch 'test' into dev	2024-08-05 12:59:44 +02:00
Guillermo Bonet	d6e09fcfc9	Merge branch 'master' into test	2024-08-05 12:59:37 +02:00
Guillermo Bonet	91253cc807	fix: refs #7835 transferSales	2024-08-05 12:57:38 +02:00
Guillermo Bonet	fa3a7aa931	refactor: refs #7820 Deprecated silexACL	2024-08-05 12:49:04 +02:00
Guillermo Bonet	967443b427	fix: refs #7834 expeditionScan_Put	2024-08-05 12:26:16 +02:00
Guillermo Bonet	21423d3b48	Merge branch 'test' into dev	2024-08-05 12:00:01 +02:00
Guillermo Bonet	d5a8e32b52	Merge branch 'master' into test	2024-08-05 11:59:46 +02:00
Guillermo Bonet	df672a22eb	Merge pull request 'feat: refs #7644 Optimized entry labels report' (!2831) from 7644-buyLabelChunk into master ... Reviewed-on: #2831 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-08-05 09:53:33 +00:00
Guillermo Bonet	32b48a7bb6	feat: refs #7644 Fix	2024-08-05 11:48:02 +02:00
Guillermo Bonet	760a1debca	feat: refs #7644 Requested changes	2024-08-05 11:44:20 +02:00
Guillermo Bonet	ab446b54ed	feat: refs #7644 Optimized entry labels report	2024-08-05 11:29:35 +02:00
Carlos Andrés	e1dc7a3cb9	Merge pull request 'Hotfix changes whit conficts merged incorrectly' (!2829) from Hotfix-changes-whit-conficts-merged-incorrectly into master ... Reviewed-on: #2829 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-08-02 12:16:03 +00:00
Carlos Andrés	f431d6c37f	Hotfix changes whit conficts merged incorrectly	2024-08-02 13:45:58 +02:00
Guillermo Bonet	abd8bc9639	fix: refs #6453 order_confirmWithUser	2024-08-02 12:20:50 +02:00
Guillermo Bonet	ae9472e092	Merge pull request 'refactor: refs #6453 order_confirmWithUser' (!2694) from 6453-orderConfirm into dev ... Reviewed-on: #2694 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-02 10:14:58 +00:00
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
Guillermo Bonet	b56260af36	feat: refs #6453 Requested changes	2024-08-02 07:58:45 +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
Jon Elias	6620a1d119	Merge branch 'dev' into Worker_Migration	2024-08-01 11:56:06 +00:00
Jon Elias	ed283cac46	feat: deleted worker module code & redirect to Lilium	2024-08-01 13:15:11 +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