14874 Commits

All Branches

Search

Author	SHA1	Message	Date
Alexandre Riera	14b5a44446	Merge pull request 'hotfix instanceLog css' (!1269) from hotfix-instance-log-css into test ... Reviewed-on: #1269 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-01-25 09:18:18 +00:00
Vicent Llopis	77340c8459	refactor: html	2023-01-25 10:14:37 +01:00
Alex Moreno	d77730dd47	fix: mockedDate in e2e	2023-01-25 10:10:25 +01:00
Vicent Llopis	6ea1415895	refactor: traducciones	2023-01-25 09:46:08 +01:00
Vicent Llopis	4a73e4ae5c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing	2023-01-25 09:24:55 +01:00
Vicent Llopis	f22f045444	refactor: add css	2023-01-25 08:27:39 +01:00
Vicent Llopis	06b4e03320	feat: muestra en número de clientes en vez de su id	2023-01-25 08:15:50 +01:00
Alex Moreno	eb59efbb85	refactor(front): use vn-loopback/boot/date	2023-01-24 15:12:16 +01:00
Alex Moreno	1f52d04d4e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-01-24 15:01:26 +01:00
Vicent Llopis	5a70fd4779	fix: las peticiones no colisionan	2023-01-24 14:45:35 +01:00
Alexandre Riera	d06ed159bf	Merge branch 'hotfix-instance-log-css' of https://gitea.verdnatura.es/verdnatura/salix into hotfix-instance-log-css	2023-01-24 14:38:28 +01:00
Alexandre Riera	6c435e095f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into hotfix-instance-log-css	2023-01-24 14:38:21 +01:00
Alexandre Riera	96da1140c9	Merge branch 'test' into hotfix-instance-log-css	2023-01-24 13:38:11 +00:00
Alexandre Riera	1e89352446	hotfix instanceLog css	2023-01-24 14:37:08 +01:00
Vicent Llopis	61b0aa079a	refactor	2023-01-24 12:40:43 +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
Pau	a2150b8b08	change test to adhere to the fixtures	2023-01-24 10:15:32 +01:00
Pau	c13bffcc57	refs #4797 @1h requested changes	2023-01-24 10:11:16 +01:00
Joan Sanchez	869cd39df3	Merge branch 'test' into TEST_2952-ticket.sale-tracking	2023-01-24 08:57:26 +00:00
Vicent Llopis	facaee6f95	feat: añadido contador y porcetaje	2023-01-24 09:45:52 +01:00
Pau	be44e16ffc	Merge branch '4797-lilium-worker-notifications' of https://gitea.verdnatura.es/verdnatura/salix into 4797-lilium-worker-notifications	2023-01-24 08:20:50 +01:00
Pau	dfa3022949	Merge branch 'dev' into 4797-lilium-worker-notifications	2023-01-24 08:20:45 +01:00
Vicent Llopis	1154179ddf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing	2023-01-24 08:11:46 +01: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
Pau	4228c1e49c	change c.fi to s.nif	2023-01-24 08:02:42 +01:00
Vicent Llopis	092501f0ef	actualizado changelof	2023-01-23 21:29:48 +01:00
Alex Moreno	4a06b8e8a9	fix: import date.js and fix e2e	2023-01-23 15:16:42 +01:00
Vicent Llopis	9eb65507b5	fix: elimino this.model.refresh que siempre daba fallo	2023-01-23 14:43:31 +01:00
Alex Moreno	fe656aa125	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-01-23 14:10:20 +01:00
Alexandre Riera	07d3fef8f0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada	2023-01-23 13:44:19 +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
Vicent Llopis	5a19e5801f	fix: enabled button when an error occurs	2023-01-23 11:50:54 +01: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
Alex Moreno	bd0f4d89f8	Merge branch '5043-mock_Date' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-01-23 08:07:45 +01:00
Alex Moreno	8a844917ce	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-01-23 08:07:14 +01: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
Pau	b446f5cf5f	Merge branch 'dev' into 5063-item-module-doPhoto	2023-01-23 07:21:53 +01:00
Pau	8445c89070	Merge branch 'dev' into 4797-lilium-worker-notifications	2023-01-23 06:05:21 +00: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