17337 Commits

All Branches

Search

Author	SHA1	Message	Date
Pau	b1de5bc94e	refs #5174, fix banch being created from another branch and not from dev	2023-01-27 10:06:46 +01:00
Alexandre Riera	0f1f671b84	Merge branch 'dev' into 5077-horaEnvio-ticketBasicData	2023-01-27 09:06:08 +00:00
Alexandre Riera	35157207dd	refs #5077 hours set 00:00:00 only when date change	2023-01-27 10:05:03 +01:00
Joan Sanchez	9bf4cd5cff	Merge branch 'dev' into 4480-vnUser	2023-01-27 08:20:32 +00:00
Vicent Llopis	ce1bdaec17	Merge pull request '4925-item.tags' (!1241) from 4925-item.tags into dev ... Reviewed-on: #1241 Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-01-27 08:16:00 +00:00
Alex Moreno	7d9e7d93e5	Merge branch 'dev' into 4925-item.tags	2023-01-27 08:12:32 +00:00
Vicent Llopis	2c9445293a	Merge pull request '4860-route.index_downloadZip' (!1259) from 4860-route.index_downloadZip into dev ... Reviewed-on: #1259 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-01-27 08:12:04 +00:00
Vicent Llopis	7bcddf73c6	Merge branch 'dev' into 4860-route.index_downloadZip	2023-01-27 08:07:19 +00:00
Joan Sanchez	0a0cca0585	Set client bcrypt password	2023-01-27 09:06:23 +01:00
Alexandre Riera	014bee3056	Merge pull request 'hotfix viewReceipt clientBalance' (!1272) from hotfix-viewReceipt-clientBalance into master ... Reviewed-on: #1272	2023-01-27 08:06:14 +00:00
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
Alexandre Riera	355c9d855d	Merge branch 'dev' into 5036-regularizar-historicos	2023-01-27 07:59:49 +00: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	a12f629690	refs #5036 corrections	2023-01-27 08:52:33 +01: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
Alexandre Riera	d69b204c4c	refs #5036 loggable refactored, tests fixed	2023-01-26 15:49:30 +01:00
Alexandre Riera	28de2e8ba4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos	2023-01-26 15:48:40 +01: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
Vicent Llopis	f7fa082294	refator: name endpoint	2023-01-26 13:49:09 +01:00
Vicent Llopis	67127554f9	feat: solo muestra los clientes con error y muestra los datos de manera distinta	2023-01-26 13:12:53 +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
Vicent Llopis	0ba95bd163	feat: mostrar error	2023-01-26 09:25:52 +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
Pau	ef6b06e147	added logs	2023-01-25 14:44:00 +01:00
Joan Sanchez	12cf79ab39	Updated e2e	2023-01-25 14:14:55 +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
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
Alexandre Riera	b72cce9d06	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos	2023-01-25 08:56:07 +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