6428 Commits

Author	SHA1	Message	Date
Vicent Llopis	b4e04fcdad	refs #5275 feat: colorear fechas	2023-03-28 14:40:14 +02:00
Alexandre Riera	69be91b964	refs #5184 fix back test, added e2e	2023-03-28 13:45:26 +02:00
Alexandre Riera	695444f6ae	refs #5184 back and front tests added	2023-03-28 11:34:14 +02:00
Vicent Llopis	fb1b39da17	refs #5275 fix: al añadir artículo desde cero se muestra el nombre y se establecen las fechas por defecto	2023-03-28 10:30:02 +02:00
Carlos Satorres	809c24f6cf	Merge branch '5250-observacionesWorker' of https://gitea.verdnatura.es/verdnatura/salix into 5250-observacionesWorker	2023-03-28 10:07:18 +02:00
Carlos Satorres	564165dc0f	refs #5250 Self.validatesPresenceOf	2023-03-28 10:07:14 +02:00
Vicent Llopis	06ac8f9910	refs #5275 fix: si tenia valor el minPrice el checkbox siempre se marcaba. El checkbox no funcionaba cuando le pulsabas	2023-03-28 09:41:39 +02:00
Alexandre Riera	05caf0c6d8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar	2023-03-28 08:26:11 +02:00
Alexandre Riera	87d0dc3cec	refs #5092 changed name to negative bases	2023-03-28 08:25:41 +02:00
Alexandre Riera	6f2de903bc	refs #5184 working on search panel	2023-03-27 14:29:22 +02:00
Alexandre Riera	8b4121e021	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5206-travel-buscadorLateral	2023-03-27 08:38:35 +02:00
Alexandre Riera	39af68c3dc	Merge branch 'dev' into 5056-gestion-vagones	2023-03-27 05:39:22 +00:00
Carlos Satorres	b199ca4a6e	Merge branch 'dev' into 5250-observacionesWorker	2023-03-24 11:48:31 +00:00
Carlos Satorres	c68c78cc5b	refs #5250 solucion error WorkerObserv	2023-03-24 12:11:42 +01:00
Vicent Llopis	a32dea0acd	Merge branch 'dev' into 5395-travel.extra-community	2023-03-24 11:00:22 +00:00
Vicent Llopis	f689d35100	refs #5410 fix test	2023-03-24 10:05:17 +01:00
Joan Sanchez	00a0f88dc4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-03-24 10:03:23 +01:00
Joan Sanchez	e67a40714c	Claim log hotfix	2023-03-24 09:59:55 +01:00
Vicent Llopis	6c75853ce6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5410-client.defaulter_getChecked	2023-03-24 09:43:13 +01:00
Carlos Satorres	fa78649607	refs #5439 url filter	2023-03-24 08:54:03 +01:00
Vicent Llopis	5784f05fd4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5395-travel.extra-community	2023-03-24 08:34:04 +01:00
Alexandre Riera	0baccc4745	refs #5206 fix tests front	2023-03-24 08:25:37 +01:00
Alexandre Riera	8f2398bc8c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5206-travel-buscadorLateral	2023-03-24 08:12:50 +01:00
Vicent Llopis	92aed3eac1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5331-monitor.tickets_actualizarFiltro	2023-03-24 08:11:35 +01:00
Vicent Llopis	a45308c6a5	refs #5342 fix: testFront	2023-03-24 07:58:27 +01:00
Vicent Llopis	0f6092483c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5331-monitor.tickets_actualizarFiltro	2023-03-24 07:51:31 +01:00
Alexandre Riera	24d032910a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5206-travel-buscadorLateral	2023-03-23 14:58:31 +01:00
Vicent Llopis	afdfe5e3f3	refs #5331 al filtrar por 'Pendiente' no muestra los estados 'Previa x'	2023-03-23 14:55:19 +01:00
Vicent Llopis	2513377add	Merge branch 'dev' into 5342-monitor.tickets_isFragile	2023-03-23 13:38:08 +00:00
Joan Sanchez	ea50da8a19	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-03-23 14:33:10 +01:00
Carlos Satorres	36af9d45e7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5439-newFilterEnPeticionesDeCompra	2023-03-23 11:56:40 +01:00
Vicent Llopis	805df64bb2	fallo cantidad reclamados	2023-03-23 10:54:04 +01:00
Alexandre Riera	c6fc2dee24	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5206-travel-buscadorLateral	2023-03-23 10:53:11 +01:00
Alexandre Riera	4e5364dc0b	refs #5036 fix tests logs	2023-03-23 10:05:02 +01:00
Vicent Llopis	46e61543a8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5342-monitor.tickets_isFragile	2023-03-23 09:29:03 +01:00
Carlos Satorres	79c42384ee	refs #5439 role actualizado	2023-03-23 08:26:06 +01:00
Joan Sanchez	7b5e0bae8e	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-03-23 08:20:33 +01:00
Carlos Satorres	3fd1e7a086	refs #5439 se elimina el filtro de fecha añadido	2023-03-22 15:41:36 +01:00
Joan Sanchez	fcd422eb49	added relation	2023-03-22 14:55:54 +01:00
Carlos Satorres	1ab8570ed3	Merge branch 'dev' into 5425-modCamposBasicos(pesoycaja)	2023-03-22 13:28:07 +00:00
Carlos Satorres	b2cc79a98e	Merge branch 'dev' into 5432-propiedadesBotonMas	2023-03-22 13:24:32 +00:00
Vicent Llopis	27bb50ad12	refs #5342 esta tabla ya se borra en el proc	2023-03-22 12:17:48 +01:00
Alexandre Riera	60eabbf7a0	Merge branch 'test' into hotfix-added-grabUser-logs	2023-03-22 10:37:57 +00:00
Alexandre Riera	81472a5e50	removed duplicated log	2023-03-22 11:36:28 +01:00
Alexandre Riera	59c3ef23de	grabUser added	2023-03-22 11:03:13 +01:00
Vicent Llopis	d276c7b611	refs #5342 unificados proc x_getWarnings	2023-03-22 10:57:18 +01:00
Vicent Llopis	2559be8230	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5342-monitor.tickets_isFragile	2023-03-22 10:29:21 +01:00
Carlos Satorres	fde854f5c2	refs #5250 campo de notes	2023-03-22 10:21:15 +01:00
Vicent Llopis	18afcbabc9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5395-travel.extra-community	2023-03-22 10:20:55 +01:00
Vicent Llopis	1b1bca28bd	refs #5410 add frontTest	2023-03-22 10:13:59 +01:00
Vicent Llopis	bf38098e5c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5410-client.defaulter_getChecked	2023-03-22 09:31:08 +01:00
Alexandre Riera	700151b500	refs #5092 amount <> 0	2023-03-22 08:18:56 +01:00
Alexandre Riera	ce67132d7d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5056-gestion-vagones	2023-03-22 07:21:20 +01:00
Vicent Llopis	41c79263c4	refs #5410 feat: envia email cuando se añade una nota	2023-03-21 14:53:36 +01:00
Joan Sanchez	d209b35071	Merge pull request 'refs #5423 añadido 3r decimal' (!1392) from #5423-tercerDecimalCoste into dev ... Reviewed-on: #1392 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-21 10:22:37 +00:00
Alexandre Riera	1198ad3b01	refs #5056 wagonType backs and test	2023-03-21 10:44:00 +01:00
Joan Sanchez	3a922b453f	Merge branch 'dev' into 5241-virtual_pos	2023-03-21 09:10:34 +00:00
Joan Sanchez	12a9ff599b	Updated unit test	2023-03-21 10:05:27 +01:00
Joan Sanchez	3881e435f4	Renamed method	2023-03-21 09:55:45 +01:00
Vicent Llopis	46a6a5fc63	refs #5203 refactor: se le pasan los argumentos directamente y se corrige la transaccion	2023-03-21 08:51:30 +01:00
Carlos Satorres	1bc3103d9f	refs #5439 filtro comercial	2023-03-21 08:44:28 +01:00
Joan Sanchez	634db7c7fc	refactor(getTransactions): lilium customer transactions	2023-03-20 23:09:17 +01:00
Carlos Satorres	da05140635	Merge branch '#5423-tercerDecimalCoste' of https://gitea.verdnatura.es/verdnatura/salix into #5423-tercerDecimalCoste	2023-03-20 15:14:11 +01:00
Carlos Satorres	306573b1bf	refs #5439 campos fecha y salesperson	2023-03-20 15:11:55 +01:00
Carlos Satorres	f0f2a8c731	refs #5432 quitar comentario	2023-03-20 13:41:32 +01:00
Carlos Satorres	a670795f9d	refs #5432 mod ng-show, add tooltip and disabled	2023-03-20 13:22:21 +01:00
Carlos Satorres	78d8bbd82a	refs #5423 tercer decimal en entrada	2023-03-20 10:44:44 +01:00
Alexandre Riera	61a0d8bcb2	refs #5092 showing clients with multiple negative bases	2023-03-20 10:15:18 +01:00
Alexandre Riera	a94e47e622	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar	2023-03-20 09:54:02 +01:00
Carlos Satorres	9e42ab52ce	refs #5425 modificación usuario	2023-03-17 09:32:20 +01:00
Robert Ferrús	1d697e1ac5	refs #4357 add operator model	2023-03-17 08:46:01 +01:00
Carlos Satorres	9565bb33f2	refs #5425 modificacion de los campos	2023-03-16 14:12:54 +01:00
Vicent Llopis	6d04933fe0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5395-travel.extra-community	2023-03-16 14:01:19 +01:00
Vicent Llopis	5794ae5130	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5410-client.defaulter_getChecked	2023-03-16 13:55:54 +01:00
Vicent Llopis	bc47fc35d6	refs #5410 feat: añadido filtro a las columnas created y defaulterSinced	2023-03-16 13:55:21 +01:00
Alexandre Riera	a8f92b151d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5056-gestion-vagones	2023-03-16 10:38:04 +01:00
Vicent Llopis	2f2d65bfd6	refs #5342 feat: añadido icono en los tickets que tengan sales fragiles	2023-03-16 10:33:24 +01:00
Alexandre Riera	668fa73386	refs #4632 deleted return in definition	2023-03-16 10:32:00 +01:00
Alexandre Riera	60162fe71f	refs #4632 removed return	2023-03-16 10:30:53 +01:00
Carlos Satorres	aadb796adf	Merge branch 'dev' into #5423-tercerDecimalCoste	2023-03-16 09:12:56 +00:00
Alexandre Riera	3f356335db	refs #5092 added popovers	2023-03-16 09:47:58 +01:00
Alexandre Riera	c46e15c8e4	refs #5092 changed section name	2023-03-16 09:35:00 +01:00
Alexandre Riera	0b4a6874d1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar	2023-03-16 09:16:50 +01:00
Alexandre Riera	c0094d8047	Merge branch '4632-guardarFirmas-salix' of https://gitea.verdnatura.es/verdnatura/salix into 4632-guardarFirmas-salix	2023-03-16 09:07:21 +01:00
Alexandre Riera	a0be5c50fc	refs #4632 changed packed from boxed	2023-03-16 09:07:19 +01:00
Alexandre Riera	f037575428	Merge branch 'dev' into 4632-guardarFirmas-salix	2023-03-16 08:06:17 +00:00
Alexandre Riera	6e2269b428	refs #4632 removed alert level id from code	2023-03-16 09:04:57 +01:00
Carlos Satorres	70beaf9b6c	refs #5423 añadido 3r decimal	2023-03-16 09:03:16 +01:00
Alexandre Riera	a99bd2577a	refs #4632 changed route from TicketDms to Ticket	2023-03-16 08:24:34 +01:00
Alexandre Riera	387576d63a	Merge branch 'dev' into 5036-regularizar-historicos	2023-03-16 06:42:39 +00:00
Joan Sanchez	8fda595c2e	Merge pull request '4856-worker.time-control' (!1375) from 4856-worker.time-control into dev ... Reviewed-on: #1375 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-16 06:39:00 +00:00
Joan Sanchez	d373d80b12	Merge pull request '5120-reports_loopback' (!1389) from 5120-reports_loopback into dev ... Reviewed-on: #1389 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-16 06:34:02 +00:00
Vicent Llopis	a87e0c52d2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control	2023-03-16 07:32:04 +01:00
Joan Sanchez	a8049c5b2c	Merge pull request '5380-m3/itemMaxSize' (!1377) from 5380-m3/itemMaxSize into dev ... Reviewed-on: #1377 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-03-16 06:28:03 +00:00
Joan Sanchez	e911f7a127	Merge pull request '4980-travel.extra-community_filterToReport' (!1391) from 4980-travel.extra-community_filterToReport into dev ... Reviewed-on: #1391 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-16 06:27:33 +00:00
Joan Sanchez	d9296c139d	Merge pull request 'fix: autocompletar el switf/bic' (!1388) from 5352-worker.create_swift/bic into dev ... Reviewed-on: #1388 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-16 06:25:18 +00:00
Joan Sanchez	1f52326091	Merge pull request 'feat(print): added reusable pdf print functions' (!1390) from 5182-print_publish into dev ... Reviewed-on: #1390 Reviewed-by: Alexandre Riera <alexandre@verdnatura.es> Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-03-16 06:22:45 +00:00
Joan Sanchez	4f0ad00a6f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-03-16 07:20:18 +01:00
Joan Sanchez	596a017cfd	Don't throw error on file unlink	2023-03-16 07:18:29 +01:00
Joan Sanchez	0d5272de30	Merge branch 'dev' into 5182-print_publish	2023-03-15 15:05:43 +00:00