13583 Commits

All Branches

Search

Author	SHA1	Message	Date
Pau	65f82c8fc1	Merge branch 'dev' into 4557-duplicate-tickets-in-routes	2022-11-25 06:05:05 +00:00
Vicent Llopis	82cc2b1208	Merge pull request 'DEV_fix_closeTicket' (!1173) from DEV_fix_closeTicket into dev ... Reviewed-on: #1173 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-24 13:29:42 +00:00
Vicent Llopis	e34fb3e4db	Merge branch 'dev' into DEV_fix_closeTicket	2022-11-24 12:59:29 +00:00
Joan Sanchez	0f40aa3e27	Merge pull request 'refs #4844' (!1175) from 4844-traduccion into dev ... Reviewed-on: #1175 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2022-11-24 12:49:53 +00:00
Vicent Llopis	d233286a3f	Merge branch 'dev' into DEV_fix_closeTicket	2022-11-24 12:44:37 +00:00
Vicent Llopis	9517063853	Merge pull request 'fixes #4682-searchbar_filter' (!1164) from 4682-searchbar_filter into dev ... Reviewed-on: #1164 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-24 12:44:19 +00:00
Pau	001c3ec2ac	requested changes	2022-11-24 12:06:13 +01:00
Vicent Llopis	20d0d053ac	Merge branch 'dev' into 4682-searchbar_filter	2022-11-24 11:03:23 +00:00
Vicent Llopis	8e74ddf267	Merge pull request 'fixes #4793-models_translation' (!1148) from 4793-models_translation into dev ... Reviewed-on: #1148 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-24 11:03:08 +00:00
Vicent Llopis	74e8789439	Merge branch 'dev' into 4793-models_translation	2022-11-24 10:54:40 +00:00
Pau	37a7a12f87	requested change	2022-11-24 11:47:32 +01:00
Pau	8e6d0bd6b0	Merge pull request 'fixes #4457 hasInvoiceElectronic-para-cliente' (!1116) from 4457-hasInvoiceElectronic-para-cliente into dev ... Reviewed-on: #1116 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-24 09:45:43 +00:00
Vicent Llopis	b8c6734798	Merge branch 'dev' into 4793-models_translation	2022-11-24 09:40:43 +00:00
Pau	f74b257d75	Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente	2022-11-24 09:27:49 +00:00
Pau	c17435f6c4	Merge pull request 'closes #4789 hasInvoice on ticket searchbar' (!1153) from 4789-search-ticket-without-invoice into dev ... Reviewed-on: #1153 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-24 09:27:18 +00:00
Pau	6a30074a6a	Merge branch 'dev' into 4789-search-ticket-without-invoice	2022-11-24 09:23:00 +00:00
Vicent Llopis	927b5a63ec	Merge branch 'dev' into 4793-models_translation	2022-11-24 09:14:01 +00:00
Alexandre Riera	a2e08c5907	Merge pull request 'fixes #4547 check compensation and tests' (!1161) from 4547-fix-compensation into dev ... Reviewed-on: #1161 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-24 08:48:40 +00:00
Alexandre Riera	5124b3b681	Merge branch 'dev' into 4547-fix-compensation	2022-11-24 08:42:09 +00:00
Alexandre Riera	e3831cc1e3	Merge pull request 'fixes #3949 invoiceIn basic-data añadir campo docFk' (!1172) from 3949-invoiceIn-add-docFk into dev ... Reviewed-on: #1172 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-24 08:40:35 +00:00
Alexandre Riera	23cf2d9aaf	Merge branch 'dev' into 3949-invoiceIn-add-docFk	2022-11-24 08:33:39 +00:00
Vicent Llopis	7ccf37c079	Merge branch 'dev' into 4793-models_translation	2022-11-24 08:08:56 +00:00
Alex Moreno	7651dcb473	feat: resetPasswordRequest use more params	2022-11-23 14:43:18 +01:00
Alex Moreno	30a25664de	out-layout component	2022-11-23 13:49:50 +01:00
Vicent Llopis	7f89899d6c	fix: closeTicket	2022-11-23 12:54:52 +01:00
Alexandre Riera	164b797ab8	front and e2e tests done	2022-11-23 11:09:32 +01:00
Vicent Llopis	9a47b2fea4	Merge branch 'dev' into 4682-searchbar_filter	2022-11-23 10:00:27 +00:00
Vicent Llopis	f313a53cde	refactor: cambiadas fixtures, backTest y traducciones	2022-11-23 10:56:55 +01:00
Vicent Llopis	6a2af344aa	feat: antes de bloquear comprobar que no existe un bloqueo previo	2022-11-23 10:41:32 +01:00
Vicent Llopis	9cfab2b3f4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block	2022-11-23 10:23:17 +01:00
Vicent Llopis	bf782c3782	fix: añadido esquema account	2022-11-23 10:09:09 +01:00
Vicent Llopis	e854fd248e	feat: add checkInBox	2022-11-23 10:08:58 +01:00
Pau	a8520f851c	Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente	2022-11-23 08:28:07 +00:00
Pau	ad38f50ae3	Merge branch '4457-hasInvoiceElectronic-para-cliente' of https://gitea.verdnatura.es/verdnatura/salix into 4457-hasInvoiceElectronic-para-cliente	2022-11-23 08:55:46 +01:00
Pau	ade2e777d6	refs #4457 @30min requested changes	2022-11-23 08:55:44 +01:00
Pau	c02be35e1c	Merge pull request 'closes #4511 kkear-expedition.itemFk' (!1146) from 4511-kkear-expedition.itemFk into dev ... Reviewed-on: #1146 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-23 07:37:28 +00:00
Pau	88db9c0d80	Merge branch '4789-search-ticket-without-invoice' of https://gitea.verdnatura.es/verdnatura/salix into 4789-search-ticket-without-invoice	2022-11-23 08:25:20 +01:00
Pau	4c4e0e109d	refactor test to use toBeGreaterThan	2022-11-23 08:25:15 +01:00
Alex Moreno	0f8eca4700	fix: e2e	2022-11-23 08:23:58 +01:00
Vicent Llopis	ccce6af021	fix: add translations	2022-11-23 07:57:27 +01:00
Pablo Natek	83ed79569a	refs #4844	2022-11-22 20:45:18 +01:00
Alex Moreno	314e98b838	fix: nested router	2022-11-22 14:57:52 +01:00
Pau	51d3091a40	Merge branch 'dev' into 4511-kkear-expedition.itemFk	2022-11-22 13:45:03 +00:00
Pau	bb640da8f0	Merge branch 'dev' into 4789-search-ticket-without-invoice	2022-11-22 13:44:23 +00:00
Vicent Llopis	df4acb70a3	feat: add backTest	2022-11-22 14:43:21 +01:00
Vicent Llopis	e0ba7d523c	refacfor: add ctx	2022-11-22 14:43:15 +01:00
Alex Moreno	660648e01f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-22 14:35:25 +01:00
Alexandre Riera	8613b196d8	Merge branch 'dev' into 4547-fix-compensation	2022-11-22 13:31:04 +00:00
Vicent Llopis	32f28e91b5	feat: sistema de bloque para ficheros mdb	2022-11-22 14:29:42 +01:00
Alexandre Riera	d7843f3298	Merge branch '4547-fix-compensation' of https://gitea.verdnatura.es/verdnatura/salix into 4547-fix-compensation	2022-11-22 14:24:55 +01:00