23233 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Andrés	2181664c25	fix: ticket_setProblemTooLittleItemCost ticket_setRisk refs#7213	2024-07-16 15:14:10 +02:00
Javier Segarra	5293becb6d	Merge branch 'master' into 7648_myEntries	2024-07-16 11:52:54 +00:00
Pablo Natek	d2f022ab64	Merge branch 'dev' into 6403-feat-add-mrw-delete-on-salix	2024-07-16 11:44:54 +00:00
Pablo Natek	9e007bfb8a	fix: refs #6403 fix mrw cancel shipment return type	2024-07-16 13:43:36 +02:00
Pablo Natek	b7e84f43de	feat: refs #6403 add delete	2024-07-16 13:26:20 +02:00
Sergio De la torre	5869979c55	Merge pull request 'hotFix itemShelvingSale refs #6861' (!2742) from hotFix_reserves into master ... Reviewed-on: #2742 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-16 11:09:46 +00:00
Sergio De la torre	3f297acbd3	hotFix itemShelvingSale refs #6861	2024-07-16 13:06:04 +02:00
Javier Segarra	d558e3d9f4	test(salix): refs #7648 #7648 test travels and entries	2024-07-16 12:45:51 +02:00
Javier Segarra	8fe94772f3	feat(salix): refs #7648 #7648 buyLabels	2024-07-16 12:45:31 +02:00
Javier Segarra	6856ab0501	feat(salix): refs #7648 #7648 myEntries	2024-07-16 12:45:14 +02:00
Sergio De la torre	c086de2644	hotFix itemShelvingSale refs #6861	2024-07-16 11:38:44 +02:00
Alex Moreno	bdf9b7810c	Merge branch 'dev' into hotFix_liliumRedirection	2024-07-16 09:24:48 +00:00
Alex Moreno	3f1e340323	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-07-16 10:55:23 +02:00
Alex Moreno	4795b1ad88	Merge pull request 'fix: worker new if not has provinceFk' (!2741) from warmFix_worker_new into test ... Reviewed-on: #2741 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-07-16 08:54:51 +00:00
Alex Moreno	1cf0ab1654	Merge branch 'test' into warmFix_worker_new	2024-07-16 08:51:11 +00:00
Alex Moreno	b871615e8f	fix: worker new if not has provinceFk	2024-07-16 10:42:08 +02:00
Sergio De la torre	dbb893c723	Merge pull request 'refs newStatePartial refs #7642' (!2737) from 7642newState into test ... Reviewed-on: #2737 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-16 08:19:38 +00:00
Robert Ferrús	b1a401444e	Merge branch 'dev' into 7683-productionControlDeadlock	2024-07-16 08:19:34 +00:00
Pablo Natek	99bbb55c37	feat: refs #7297 add new columns	2024-07-16 10:02:57 +02:00
Alex Moreno	aa1db03224	build: init version 24.32	2024-07-16 09:18:52 +02:00
Alex Moreno	945f20bfcf	Merge pull request '7729-devToTest_2430' (!2739) from 7729-devToTest_2430 into test ... Reviewed-on: #2739 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-07-16 07:11:35 +00:00
Alex Moreno	8a9a74a7eb	test: fix ticket e2e	2024-07-16 09:04:58 +02:00
Robert Ferrús	b1fa47b74c	Merge pull request 'fix: refs #7722 delete sms' (!2732) from 7722-deleteSms into master ... Reviewed-on: #2732 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-16 07:04:57 +00:00
Javier Segarra	3e14d2fd48	Merge pull request '#7648 Add field for endpoint as buyLabel report' (!2738) from 7648_getBuys_fields into dev ... Reviewed-on: #2738 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-16 06:28:41 +00:00
Alex Moreno	4fa9f057de	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-07-16 07:41:21 +02:00
Javier Segarra	a0be2edc41	feat(salix): #7648 remove white line	2024-07-15 17:33:21 +00:00
Javier Segarra	ddd6c799dc	feat(salix): #7648 Add field for endpoint as buyLabel report	2024-07-15 17:32:14 +00:00
Carlos Andrés	8d61cb762b	feat: tabla config dias margen vctos. refs #7728	2024-07-15 17:53:23 +02:00
Sergio De la torre	dc5903421b	refs newStatePartial refs #7642	2024-07-15 16:21:19 +02:00
Sergio De la torre	87b0d3e8d1	refs newStatePartial refs #7642	2024-07-15 16:18:30 +02:00
Robert Ferrús	0fb882e688	feat: refs #7722 changes required	2024-07-15 14:55:11 +02:00
Robert Ferrús	8f41546829	feat: refs #7222	2024-07-15 14:25:42 +02:00
Javi Gallego	3698651306	Merge pull request 'feat: refs #7348 hasDailyInvoice field' (!2670) from 7348-client-hasDailyInvoice into dev ... Reviewed-on: #2670 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-15 12:16:31 +00:00
Robert Ferrús	0eb8a46da8	Merge branch 'master' into 7722-deleteSms	2024-07-15 11:53:12 +00:00
Pablo Natek	2baff02443	Merge pull request 'master' (!2716) from master into test ... Reviewed-on: #2716 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-15 11:40:29 +00:00
Pablo Natek	71153d0f37	Merge pull request 'fix: refs #6403 fix delivery observation' (!2733) from 6403-fix-delivery-observation into master ... Reviewed-on: #2733 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-15 11:37:52 +00:00
Pablo Natek	08ba1acc3c	fix: refs #6403 fix delivery observation	2024-07-15 13:35:24 +02:00
Robert Ferrús	685592a89c	Merge branch 'master' into 7722-deleteSms	2024-07-15 11:28:10 +00:00
Carlos Andrés	ac58b7a9e9	Merge pull request 'feat: Turn issues into calculated columns refs#7213' (!2646) from 7213-problemas-columnas into dev ... Reviewed-on: #2646 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-15 10:55:06 +00:00
Javi Gallego	f25d5c3bb5	Merge branch 'dev' into 7348-client-hasDailyInvoice	2024-07-15 10:37:53 +00:00
Sergio De la torre	31a2c3bbd1	Merge pull request 'feat itemShelvingSale refs #6861' (!2729) from 6861_reservas_gettickets into master ... Reviewed-on: #2729 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-15 10:34:40 +00:00
Robert Ferrús	c4fa37f499	Merge branch 'master' into 7722-deleteSms	2024-07-15 10:05:41 +00:00
Robert Ferrús	200a6714bb	fix: refs #7722 delete sms	2024-07-15 12:02:00 +02:00
Carlos Andrés	31f537ae28	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7213-problemas-columnas	2024-07-15 11:52:57 +02:00
Javier Segarra	87a3fb57fe	Merge pull request '#7648 - Filter entries by days' (!2722) from 7648_myEntries_filter into dev ... Reviewed-on: #2722 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-15 09:22:34 +00:00
Alex Moreno	eca89c1c4e	Merge branch 'dev' into 7348-client-hasDailyInvoice	2024-07-15 08:19:26 +00:00
Javier Segarra	199d8e0034	Merge branch '7648_myEntries_filter' of https://gitea.verdnatura.es/verdnatura/salix into 7648_myEntries_filter	2024-07-15 09:59:58 +02:00
Javier Segarra	fb8b31b397	perf: refs #7648 #7648 clean fixtures and SQL filter	2024-07-15 09:59:52 +02:00
Sergio De la torre	00a1a84205	Merge branch 'master' into 6861_reservas_gettickets	2024-07-15 06:27:52 +00:00
Carlos Satorres	88dcbc726b	Merge pull request 'fix(worker_new): fix countryFk' (!2728) from hotFix_workerNew_countryFk into master ... Reviewed-on: #2728 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-15 06:26:20 +00:00