14649 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	a74fb31b5b	fix: vn.time	2023-01-30 15:15:27 +01:00
Alexandre Riera	5a72398393	Merge branch 'dev' into 5074-ticketBalance-null	2023-01-30 14:01:17 +00:00
Alex Moreno	c990b9a564	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-01-30 14:37:24 +01:00
Vicent Llopis	e3504da800	Merge pull request 'fix: test e2e' (!1276) from fix_e2e_item.tags into dev ... Reviewed-on: #1276 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-01-30 13:36:08 +00:00
Vicent Llopis	e0dcbb6f2b	fix backTest	2023-01-30 14:32:39 +01:00
Vicent Llopis	a1e86f2bd6	Merge branch 'dev' into fix_e2e_item.tags	2023-01-30 13:28:50 +00:00
Alex Moreno	d2b21d401a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-01-30 14:27:22 +01:00
Joan Sanchez	8969882793	Removed where property dependency	2023-01-30 14:13:38 +01:00
Alexandre Riera	c3346ebb93	Merge branch 'dev' into 5074-ticketBalance-null	2023-01-30 12:35:07 +00:00
Alexandre Riera	9cb363e4e5	refs #5074 deleted null in reference	2023-01-30 13:34:08 +01:00
Pau	8580851b5b	refs #5148 @0:30h change style to pre-line	2023-01-30 13:32:09 +01:00
Vicent Llopis	0d044b3a73	Merge branch 'dev' into fix_e2e_item.tags	2023-01-30 11:51:10 +00:00
Pau	87d4964438	Merge pull request 'closes #5146 decimals on supplier agency term' (!1279) from 5146-supplier.agency.term-decimal into dev ... Reviewed-on: #1279 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-01-30 11:49:09 +00:00
Juan Ferrer	109556ae2e	refs #5122 Hotfix: Basic implementation for payment confirmation	2023-01-30 12:39:47 +01:00
Alexandre Riera	c08836a1d1	refs #5077 changelog	2023-01-30 12:38:29 +01:00
Vicent Llopis	ce96249389	falla primer test de back	2023-01-30 12:38:23 +01:00
Alexandre Riera	f7a65cfa6e	refs #5072 changelog	2023-01-30 12:35:09 +01:00
Pau	1404a276a0	Merge branch 'dev' into 5146-supplier.agency.term-decimal	2023-01-30 11:34:39 +00:00
Alexandre Riera	a43f2cd35f	refs #5138 changelog	2023-01-30 12:31:17 +01:00
Alexandre Riera	03d75c5b72	refs #4927 changelog modified	2023-01-30 12:25:57 +01:00
Vicent Llopis	c13f0109be	Merge branch 'dev' into fix_e2e_item.tags	2023-01-30 11:22:16 +00:00
Alexandre Riera	e507729df9	Merge branch '4927-permitir-razonSocial-duplicada' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada	2023-01-30 12:22:04 +01:00
Alexandre Riera	8119b301c5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada	2023-01-30 12:21:54 +01:00
Alexandre Riera	77742d94d7	refs #5138 summary changed like route/tickets	2023-01-30 12:19:11 +01:00
Alexandre Riera	39835069f9	Merge pull request 'fixes #5088 client.balance quitar texto en balance' (!1280) from 5088-quitar-texto-clientBalance into dev ... Reviewed-on: #1280 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-01-30 11:13:27 +00:00
Alexandre Riera	46ee12de6d	refs #5088 text deleted	2023-01-30 09:45:10 +01:00
Pau	29b5c7cc5a	Merge branch 'dev' into 4797-lilium-worker-notifications	2023-01-30 08:03:54 +00:00
Pau	cf64de39f9	refs #5146 @1h add step to vn-inputs	2023-01-30 09:01:20 +01:00
Alexandre Riera	fbf252b634	refs #5072 template strings	2023-01-30 08:31:56 +01:00
Alexandre Riera	7e5f50e637	refs #5072 email validation added	2023-01-30 08:30:39 +01:00
Alex Moreno	3d6ec3c033	Merge pull request 'refactor(recover-password): recovery password label' (!1277) from hotFix_recovery-email_label into master ... Reviewed-on: #1277	2023-01-30 07:02:59 +00:00
Alex Moreno	4e65e88621	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-01-30 07:56:12 +01:00
Alex Moreno	788ebd4133	refactor(recover-password): recovery password label	2023-01-30 07:50:37 +01:00
Vicent Llopis	79bf1739ba	fix: backTest	2023-01-27 13:52:14 +01:00
Vicent Llopis	29c6ca35ff	fix: test e2e	2023-01-27 13:39:19 +01:00
Alexandre Riera	36a0b0b8f9	Merge branch 'dev' into 4927-permitir-razonSocial-duplicada	2023-01-27 10:09:35 +00:00
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
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
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
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