14605 Commits

All Branches

Search

Author	SHA1	Message	Date
Vicent Llopis	eb00d98885	Merge branch 'dev' into 4925-item.tags	2023-01-27 08:01:25 +00:00
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
Vicent Llopis	fe3d81ddd3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4873-zone.delivery-day	2023-01-27 08:59:52 +01:00
Vicent Llopis	f7969c616c	fix: tiene el cuenta zonEvent.type	2023-01-27 08:59:28 +01:00
Alexandre Riera	c8c66dc272	Merge branch 'master' into hotfix-viewReceipt-clientBalance	2023-01-27 07:58:31 +00:00
Alexandre Riera	98ef87729b	Merge pull request 'hotfix delete saleChecked from vnClean' (!1271) from hotfix-delete-saleChecked-from-vnClean into master ... Reviewed-on: #1271	2023-01-27 07:51:04 +00:00
Alexandre Riera	de9098da24	Merge branch 'dev' into 5141-provincia-consignatario	2023-01-27 07:43:29 +00:00
Alexandre Riera	fccfabdcd1	hotfix viewReceipt clientBalance	2023-01-27 08:31:14 +01: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	1cc42d6784	Merge branch 'dev' into 4927-permitir-razonSocial-duplicada	2023-01-27 06:59:18 +00:00
Alexandre Riera	956b3e05f8	hotfix delete saleChecked from vnClean	2023-01-27 07:56:51 +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
Vicent Llopis	366748a136	fix: se la pasa la fecha shipped para calcular el visible y disponible	2023-01-26 14:00:29 +01:00
Joan Sanchez	3ed04211fd	Updated package version	2023-01-26 13:05:12 +01:00
Joan Sanchez	c04185aadd	Updated package version	2023-01-26 12:53:47 +01:00
Pau	3184dcd39d	requested changes	2023-01-26 08:41:12 +01:00
Vicent Llopis	51400b1c74	reactor: eliminado try y catch, y añadido finally	2023-01-26 08:19:52 +01:00
Alex Moreno	0a096bc96f	fix: updateWorkCenter	2023-01-25 15:29:01 +01:00
Vicent Llopis	caf1dcd690	feat: añadido almacén por defecto	2023-01-25 15:19:33 +01:00
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
Alex Moreno	d77730dd47	fix: mockedDate in e2e	2023-01-25 10:10:25 +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
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
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	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
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