14267 Commits

All Branches

Search

Author	SHA1	Message	Date
Alexandre Riera	daf3d4b52f	Merge pull request 'fixes #5141 Añadir Provincia del consignatario en Claim/Descriptor' (!1270) from 5141-provincia-consignatario into dev ... Reviewed-on: #1270 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-01-27 08:00:49 +00:00
Alexandre Riera	de9098da24	Merge branch 'dev' into 5141-provincia-consignatario	2023-01-27 07:43:29 +00:00
Vicent Llopis	67a64582e9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4925-item.tags	2023-01-27 08:21:30 +01:00
Alexandre Riera	b89a384671	Merge pull request 'fixes #4564 que reports maneje si el origen de datos no devuelve registros' (!1266) from 4564-report_eror-handler into dev ... Reviewed-on: #1266 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-01-27 06:46:40 +00:00
Alexandre Riera	dc528722bd	Merge branch 'dev' into 4564-report_eror-handler	2023-01-27 06:34:41 +00:00
Vicent Llopis	17b3e8c396	Merge branch 'dev' into 4860-route.index_downloadZip	2023-01-26 13:36:50 +00:00
Alexandre Riera	25f0c0d9e3	refs #5141 province added	2023-01-26 14:16:30 +01:00
Joan Sanchez	3ed04211fd	Updated package version	2023-01-26 13:05:12 +01:00
Joan Sanchez	2676e09b2b	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-01-24 12:34:00 +01:00
Alexandre Riera	1936680f49	Merge pull request 'hotfix itemName' (!1268) from hotfix-itemName into test ... Reviewed-on: #1268 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-01-24 11:29:12 +00:00
Alexandre Riera	ca7154bff1	hotfix itemName	2023-01-24 12:16:10 +01:00
Vicent Llopis	5ccee0c5e9	Merge pull request 'TEST_2952-ticket.sale-tracking' (!1262) from TEST_2952-ticket.sale-tracking into test ... Reviewed-on: #1262 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-01-24 09:36:02 +00:00
Joan Sanchez	869cd39df3	Merge branch 'test' into TEST_2952-ticket.sale-tracking	2023-01-24 08:57:26 +00:00
Vicent Llopis	ec5e2a21f7	feat: añadido icono carro	2023-01-24 08:09:35 +01:00
Vicent Llopis	084a3f0398	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4860-route.index_downloadZip	2023-01-24 08:05:18 +01:00
Vicent Llopis	092501f0ef	actualizado changelof	2023-01-23 21:29:48 +01:00
Alexandre Riera	765e4ed332	refs #4564 all reports refactored	2023-01-23 13:15:30 +01:00
Alex Moreno	78d33e2cd9	Merge pull request 'fix: typo' (!1265) from reset-password-typo into test	2023-01-23 12:12:10 +00:00
Alexandre Riera	96becec9d3	refs #4564 mixin vn-report created	2023-01-23 10:12:34 +01:00
Alexandre Riera	6e5728eead	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4564-report_eror-handler	2023-01-23 10:11:07 +01:00
Alex Moreno	6b6f27c2f2	fix: typo	2023-01-23 08:44:58 +01:00
Alex Moreno	9b0134cb1c	Merge pull request '4658-createWorker' (!1236) from 4658-createWorker into dev	2023-01-23 07:30:51 +00:00
Alex Moreno	ce06274d0a	Merge branch 'dev' into 4658-createWorker	2023-01-23 07:12:26 +00:00
Javi Gallego	07a75c4cb4	Merge pull request 'link' (!1263) from #5110-qlabel into dev ... Reviewed-on: #1263 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-01-23 06:52:53 +00:00
Joan Sanchez	052e7b3c4a	Merge branch 'dev' into #5110-qlabel	2023-01-23 06:47:02 +00:00
Alexandre Riera	ab7989911a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4564-report_eror-handler	2023-01-23 07:44:09 +01:00
Alexandre Riera	be86e7cac1	Merge pull request 'fixes #4945 Dejar de buscar por tag 'Nombre temporal'' (!1258) from 4945-dejar-buscar-tag-nombreTemporal into dev ... Reviewed-on: #1258 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-01-23 06:04:28 +00:00
Javi Gallego	30885a499e	link	2023-01-21 07:29:27 +01:00
Vicent Llopis	9523991b04	fix: mostrar descriptor worker en vez de item	2023-01-20 12:45:02 +01:00
Vicent Llopis	ab1a9389cb	fix: cambiados de donde coge el item id	2023-01-20 12:37:41 +01:00
Vicent Llopis	b1be6addd1	fix: delete unnecessary code	2023-01-20 12:16:06 +01:00
Alexandre Riera	a473d3a6f9	refs #4945 changed input-number for autocomplete	2023-01-20 12:01:13 +01:00
Alexandre Riera	199fabbb1a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4945-dejar-buscar-tag-nombreTemporal	2023-01-20 10:11:52 +01:00
Vicent Llopis	7148da7b72	feat: cuando se descarga una sola factura, no descarga el zip	2023-01-20 08:53:30 +01:00
Alex Moreno	ace7a5939e	move to changes 230401	2023-01-20 08:33:59 +01:00
Vicent Llopis	f7b314daf4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4860-route.index_downloadZip	2023-01-20 08:32:54 +01:00
Vicent Llopis	c77f1b17a6	movida sql a nueva carpeta changes	2023-01-20 08:32:18 +01:00
Alex Moreno	a674169ddb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker	2023-01-20 08:30:30 +01:00
Vicent Llopis	ef7a0508ed	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4925-item.tags	2023-01-20 08:29:42 +01:00
Alexandre Riera	a3b580e27d	refs #4945 item.relevancy comment	2023-01-20 08:01:19 +01:00
Joan Sanchez	91e27d76be	Updated version	2023-01-20 07:44:04 +01:00
Joan Sanchez	208f6f50d0	Updated package version	2023-01-20 07:43:27 +01:00
Joan Sanchez	fbbca1dc2e	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-01-20 07:42:51 +01:00
Joan Sanchez	781c751229	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-01-20 07:42:36 +01:00
Joan Sanchez	a5decd3166	Updated version	2023-01-20 07:42:15 +01:00
Joan Sanchez	9072f3696d	Merge pull request '4903-workerTimeControl_sendMail' (!1261) from 4903-workerTimeControl_sendMail into dev ... Reviewed-on: #1261 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-01-20 06:21:02 +00:00
Alexandre Riera	a8a564431a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4564-report_eror-handler	2023-01-19 11:38:34 +01:00
Vicent Llopis	dfcacdad71	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4903-workerTimeControl_sendMail	2023-01-19 08:56:39 +01:00
Vicent Llopis	921b5cf3fb	add excluded test	2023-01-19 08:54:36 +01:00
Vicent Llopis	92a9004d98	fix: borrada propiedad transaction cuando se hace commit	2023-01-19 08:54:26 +01:00