22988 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Andrés	a0308d281a	Merge pull request 'test-dev' (!2734) from test into dev ... Reviewed-on: #2734 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-16 13:17:48 +00:00
Carlos Andrés	3e76fa4258	Merge pull request 'fix: ticket_setProblemTooLittleItemCost ticket_setRisk refs#7213' (!2745) from fix-ticket_setRisk-ticket_setProblemTooLittleItemCost into test ... Reviewed-on: #2745 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-16 13:16:21 +00:00
Carlos Andrés	2181664c25	fix: ticket_setProblemTooLittleItemCost ticket_setRisk refs#7213	2024-07-16 15:14:10 +02: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
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
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
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
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
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
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
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
Alex Moreno	aa3fbf0cb4	Merge branch 'master' into hotFix_workerNew_countryFk	2024-07-15 05:05:18 +00:00
Sergio De la torre	806dc40eb9	Merge branch 'master' into 6861_reservas_gettickets	2024-07-15 05:05:17 +00:00
Carlos Andrés	67b19ee4ca	hotfix: packaging ticket 199070	2024-07-14 09:08:14 +02:00
Javier Segarra	0ca4bffaf0	Perf: improve condition days filter	2024-07-13 18:07:46 +00:00
Javier Segarra	1d23554508	perf(ssalix): refs #7648 remove default value	2024-07-12 20:52:52 +02:00
Javier Segarra	5dcabd687e	feat(ssalix): refs #7648 clean test !entry.filter	2024-07-12 20:52:26 +02:00
Javier Segarra	c70824535a	feat(ssalix): refs #7648 clean fixtures	2024-07-12 20:52:00 +02:00
Javier Segarra	bedff9f290	Merge branch 'dev' into 7648_myEntries_filter	2024-07-12 20:24:25 +02:00
Carlos Andrés	49183c79f1	feat: Turn issues into calculated columns refs#7213	2024-07-12 16:47:24 +02:00
Guillermo Bonet	dcde6bb37a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-07-12 14:04:50 +02:00
Guillermo Bonet	1e264c2102	fix: refs #7704 Warehouse priority	2024-07-12 14:04:49 +02:00
Carlos Andrés	97e5bd7a31	Merge pull request 'hotfix: packaging ticket 199070' (!2727) from Hotfix-packaging-ticket-199070 into master ... Reviewed-on: #2727 Reviewed-by: Pako Natek <pako@verdnatura.es>	2024-07-12 11:36:40 +00:00
Sergio De la torre	cb107215b6	feat itemShelvingSale refs #6861	2024-07-12 13:14:00 +02:00
Carlos Andrés	d2e482d7cd	hotfix: packaging ticket 199070	2024-07-12 12:13:21 +02:00
Carlos Andrés	66959dd388	hotfix: packaging ticket 199070	2024-07-12 12:10:43 +02:00
Alex Moreno	896d273da8	fix(worker_new): fix countryFk	2024-07-12 12:06:37 +02:00
Robert Ferrús	58f8b4f714	Merge pull request 'feat: refs #7670 addSale' (!2679) from 7670-addSaleRenewPrice into dev ... Reviewed-on: #2679 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-12 09:46:33 +00:00
Robert Ferrús	4da811cba6	Merge branch 'dev' into 7670-addSaleRenewPrice	2024-07-12 08:50:48 +00:00
Guillermo Bonet	323d26f226	Fix	2024-07-12 10:37:39 +02:00