6742 Commits

Author	SHA1	Message	Date
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	188e592d28	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5418-buscador-lateral-fixed-price	2023-03-27 11:20:05 +02:00
Carlos Satorres	1302665d98	refs #5436 showSucces	2023-03-27 10:00:00 +02:00
Alexandre Riera	0c8fe855ac	refs #5418 lateral search panel added, missing e2e	2023-03-27 09:11:29 +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
Joan Sanchez	a947666838	refactor(imageQueue): remplaced sharp with gm	2023-03-15 14:24:30 +01:00
Vicent Llopis	1b8ed05f71	refs #5395 feat: modificado orderBy, añadida columna importa y corregidos errores	2023-03-15 13:28:28 +01:00
Alexandre Riera	6609cce065	refs #5056 minHeightBetweenTrays	2023-03-15 12:14:58 +01:00
Alexandre Riera	f706b66efc	refs #5056 added divisible in wagonType	2023-03-15 11:57:09 +01:00
Alexandre Riera	53bca1e8a3	refs #5056 added fixtures	2023-03-15 11:36:10 +01:00
Alexandre Riera	6a2542758b	refs #5056 added fixtures	2023-03-15 10:29:44 +01:00
Vicent Llopis	38bf49c0b6	refs #5410 fix: se mantenien los checkbox marcados al paginar	2023-03-15 08:40:53 +01:00
Joan Sanchez	bdb86a432f	Merge branch '5182-print_publish' of https://gitea.verdnatura.es/verdnatura/salix into 5182-print_publish	2023-03-15 08:07:17 +01:00
Joan Sanchez	f052af92cd	Proper template name	2023-03-15 08:07:14 +01:00
Joan Sanchez	dc936fe690	Merge branch 'dev' into 5182-print_publish	2023-03-15 07:05:14 +00:00
Pablo Natek	59a87ba519	Merge branch 'dev' into 5151-claim.descriptor-2-botones-mas	2023-03-14 14:02:25 +00:00
Vicent Llopis	c51e542235	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control	2023-03-14 13:43:59 +01:00
Carlos Satorres	5f64c23495	Merge branch 'dev' into 5352-worker.create_swift/bic	2023-03-14 11:12:04 +00:00
Vicent Llopis	1047ac0b64	refs #4980 fix: la sección no estaba filtrando por el filtro por defecto	2023-03-14 10:18:59 +01:00
Vicent Llopis	50ccb61728	refactor: el report llama directamente al filtro de extra-community	2023-03-14 09:59:29 +01:00
Carlos Andrés	67f9cae2f2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing	2023-03-14 09:04:45 +01:00
Joan Sanchez	6495e016a8	Endpoints refactor	2023-03-14 08:17:46 +01:00
Vicent Llopis	29df1ba894	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5120-reports_loopback	2023-03-14 08:00:02 +01:00
Vicent Llopis	4dc9e9e590	refs #4856 refactor: make agnostic the component calendar	2023-03-14 07:44:39 +01:00
Vicent Llopis	1693907ee0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control	2023-03-14 07:41:36 +01:00
Pablo Natek	584f25dd77	Merge branch 'dev' into 5151-claim.descriptor-2-botones-mas	2023-03-13 16:24:31 +00:00
Carlos Satorres	e947672c69	Merge branch 'dev' into 5352-worker.create_swift/bic	2023-03-13 14:36:51 +00:00
Joan Sanchez	63d7dafcde	feat(print): added reusable pdf print functions ... Refs #5182	2023-03-13 15:05:19 +01:00
Joan Sanchez	b58135f611	Merge pull request '5035-tryToSolve_intermittentBackTest' (!1379) from 5035-tryToSolve_intermittentBackTest into dev ... Reviewed-on: #1379 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-13 09:37:42 +00:00
Joan Sanchez	6cc7017475	Merge branch 'dev' into 4856-worker.time-control	2023-03-13 09:22:36 +00:00
Alexandre Riera	0248c3c9e0	refs #5056 models and tables added	2023-03-13 07:34:49 +01:00
Alexandre Riera	eee4c815e7	Merge branch 'dev' into 5092-listado-ticketsSinFacturar	2023-03-13 06:10:51 +00:00
Joan Sanchez	1b984f4325	Event callback	2023-03-12 20:51:22 +01:00
Vicent Llopis	5cb28036c7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5120-reports_loopback	2023-03-10 14:25:55 +01:00
Joan Sanchez	9bc86b1617	Added missing relation	2023-03-10 13:29:11 +01:00
Pablo Natek	8a4d9bd2bf	refs #5211	2023-03-10 12:52:51 +01:00
Alexandre Riera	efcf224962	Merge branch 'dev' into 5092-listado-ticketsSinFacturar	2023-03-10 11:50:11 +00:00
Alexandre Riera	c4d6a19666	refs #5092 download as csv button	2023-03-10 12:49:20 +01:00
Alexandre Riera	874fd0656c	refs #5206 url gets params	2023-03-10 10:05:16 +01:00
Alexandre Riera	0cac62da76	Merge branch 'dev' into 5036-regularizar-historicos	2023-03-10 09:02:54 +00:00
Pablo Natek	63ccb26bf3	refs #5151	2023-03-10 08:17:10 +01:00
Vicent Llopis	b24b6d4121	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5120-reports_loopback	2023-03-10 07:46:16 +01:00
Pablo Natek	901a8ab112	refs #5151 botones	2023-03-09 14:34:06 +01:00
Carlos Satorres	5a0b567908	Merge branch 'dev' into 5380-m3/itemMaxSize	2023-03-09 13:29:06 +00:00
Carlos Satorres	08254e28bb	refs #5380 mod label max m3	2023-03-09 14:24:00 +01:00
Vicent Llopis	c105316a04	delete testBack	2023-03-09 10:05:24 +01:00
Vicent Llopis	9094c4f1cb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5035-tryToSolve_intermittentBackTest	2023-03-09 09:42:08 +01:00
Vicent Llopis	223b8f6d00	fix: intermittentBack test	2023-03-09 09:41:51 +01:00
Alexandre Riera	4f78eaa14c	Merge branch 'dev' into 4632-guardarFirmas-salix	2023-03-09 08:29:43 +00:00
Alexandre Riera	a5f6d37f0f	hotfix reload card, improved icon message	2023-03-09 09:29:11 +01:00
Alexandre Riera	2363828092	hotfix clientUnpaid	2023-03-09 08:54:03 +01:00
Alexandre Riera	7c3c3a2d66	refs #4632 added userError	2023-03-09 08:31:38 +01:00
Vicent Llopis	c46d325e23	fix: add transaction	2023-03-09 07:58:39 +01:00
Alexandre Riera	9ff920c67e	Merge branch 'dev' into 5036-regularizar-historicos	2023-03-09 06:50:33 +00:00
Carlos Satorres	7426c97479	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5380-m3/itemMaxSize	2023-03-08 15:11:55 +01:00
Vicent Llopis	e20464cc7c	update css	2023-03-08 13:14:06 +01:00
Carlos Satorres	6d7874d3ab	refs #5380 JSON modificado HTML arreglado	2023-03-08 13:12:21 +01:00
Carlos Andrés	32429a58e0	refs #5000 remove consolelog	2023-03-08 12:36:53 +01:00
Alexandre Riera	423ae85212	refs #4632 dmsRecover deprecated	2023-03-08 12:29:09 +01:00
Vicent Llopis	165dc73b33	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control	2023-03-08 12:22:29 +01:00
Vicent Llopis	79023fbfaf	feat: add backTest	2023-03-08 12:16:53 +01:00
Alexandre Riera	06dd72f30c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4632-guardarFirmas-salix	2023-03-08 12:13:48 +01:00
Vicent Llopis	f461c75af1	feat: add front test	2023-03-08 12:06:31 +01:00
Vicent Llopis	776f7783c6	refactor code	2023-03-08 12:06:20 +01:00
Vicent Llopis	0396d3707c	refator: creada ruta de back, en vez de hacer peticiones http anidadas en el front	2023-03-08 11:47:10 +01:00
Alexandre Riera	b1d5a2ba1a	Merge branch 'dev' into 5092-listado-ticketsSinFacturar	2023-03-08 10:46:16 +00:00
Joan Sanchez	4d2d75e066	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-03-08 10:19:11 +01:00
Joan Sanchez	aeb50b2c19	Removed callback syntax	2023-03-08 10:19:02 +01:00
Vicent Llopis	760690a625	fix: test front	2023-03-08 09:51:21 +01:00
Carlos Satorres	3d1f640e08	refs #5380 m3Max add and mod itemMaxSize	2023-03-08 09:19:57 +01:00
Joan Sanchez	23a15ee15c	Merge branch 'dev' into 5092-listado-ticketsSinFacturar	2023-03-08 06:50:16 +00:00
Alexandre Riera	741dd921d2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos	2023-03-08 07:48:11 +01:00
Joan Sanchez	c93d3f8846	Updated front unit test	2023-03-08 07:47:25 +01:00
Javi Gallego	bb691ccf1d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-03-08 07:45:25 +01:00
Javi Gallego	98c8cd67e5	minor bug	2023-03-08 07:45:22 +01:00
Joan Sanchez	9050c06994	Updated unit test	2023-03-08 07:44:56 +01:00
Carlos Satorres	955e55a7f4	refs #5284 new onCreateClaimAccepted y createClaim	2023-03-07 15:43:48 +01:00
Alexandre Riera	59a3ff0f7b	Merge branch 'dev' into 5036-regularizar-historicos	2023-03-07 12:10:24 +00:00
Alexandre Riera	21c7b18de9	refs #5036 make logs/querys only when grabUser is disabled	2023-03-07 13:10:02 +01:00
Joan Sanchez	3ad96b6ad7	Endpoint fixes	2023-03-07 11:55:13 +01:00
Joan Sanchez	445a0b0e1f	Claim fixes	2023-03-07 10:20:10 +01:00
Joan Sanchez	44e7abd6d3	Merge pull request 'feat(claimLog): added claim log section' (!1370) from 5340-claim_log into dev ... Reviewed-on: #1370 Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>	2023-03-07 08:28:13 +00:00
Vicent Llopis	0bda8c0ed6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing	2023-03-07 09:14:30 +01:00
Joan Sanchez	bc0a6c33c4	Merge branch 'dev' into 5187-error-permisos	2023-03-06 13:50:21 +00:00
Joan Sanchez	9f4aed7d83	Updated unit test	2023-03-06 13:44:03 +01:00
Vicent Llopis	a98bb59479	fix: test front	2023-03-06 12:47:49 +01:00
Joan Sanchez	4f091330a7	feat(claimLog): added claim log section ... Refs: #5340	2023-03-06 12:37:37 +01:00
Vicent Llopis	9e9807c4b5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control	2023-03-06 11:55:30 +01:00
Vicent Llopis	e39690c2c9	merge with dev	2023-03-06 10:21:10 +01:00
Vicent Llopis	5248fd7fcf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing	2023-03-06 10:20:57 +01:00
Alexandre Riera	b828d40464	Merge branch 'dev' into 5092-listado-ticketsSinFacturar	2023-03-06 09:13:05 +00:00
Juan Ferrer	47f1ad9a0c	Merge pull request 'master' (!1367) from master into test ... Reviewed-on: #1367	2023-03-06 08:28:29 +00:00
Alexandre Riera	f2bd0253e2	refs #5092 added unbilled tickets section	2023-03-06 09:27:53 +01:00
Javi Gallego	780572a9f2	test fixed	2023-03-06 08:14:26 +01:00
Juan Ferrer	99f8bc6bac	refs #5174 TpvTransaction.confirm code refator to improve debugging	2023-03-03 18:55:58 +01:00
Vicent Llopis	497d756af6	fix: autocompletar el switf/bic	2023-03-03 13:46:18 +01:00
Vicent Llopis	727ae1d4e0	Merge branch 'dev' into 5035-intermittent_backTest2	2023-03-03 12:11:28 +00:00
Vicent Llopis	8ac575419a	fix: no mostraba la factura rectificada correcta	2023-03-03 12:31:20 +01:00
Juan Ferrer	73c988b18e	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2023-03-03 10:57:59 +01:00
Juan Ferrer	6eaf4bdd1b	refs #5174 tpvTransaction: Añadidas columnas para depuración	2023-03-03 10:57:57 +01:00
Alexandre Riera	de0e7334df	Merge branch 'master' into hotfix-itemWaste-openOtherTab	2023-03-03 07:55:28 +00:00
Alexandre Riera	d58a5eb1ff	hotfix itemWaste	2023-03-03 08:54:55 +01:00
Joan Sanchez	37043beb68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser	2023-03-03 07:44:31 +01:00
Alexandre Riera	ed5208c9e4	refs #5206 implemented general search, missing tests	2023-03-02 15:10:17 +01:00
Vicent Llopis	7c24b940b3	feat: colorea los numeros de la semana al inicio y cada vez que canvias de mes	2023-03-02 14:55:18 +01:00
Alexandre Riera	dbe42e3bf4	refs #5206 version with plane added, needs to implement general search	2023-03-02 13:55:47 +01:00
Javi Gallego	e01fa40531	Merge branch 'dev' into 5187-error-permisos	2023-03-02 11:51:41 +01:00
Alexandre Riera	be1993cf8b	refs #5206 version with top-searcher and two fields for reference and id	2023-03-02 11:33:55 +01:00
Joan Sanchez	b8881a050c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-03-02 07:41:16 +01:00
Joan Sanchez	ee6d292d6a	Merge pull request 'fixes #5063 Añadir campo doPhoto en la ficha de Item' (!1264) from 5063-item-module-doPhoto into dev ... Reviewed-on: #1264 Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-02 06:34:45 +00:00
Joan Sanchez	8834d4d0a4	Merge pull request 'fixes #5070 route-tickets city is now a link to buscaman' (!1282) from 5070-route-tickets-link-maps into dev ... Reviewed-on: #1282 Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-02 06:33:03 +00:00
Joan Sanchez	baedb5b6ca	Merge pull request 'fixes #5202 item waste abrir en otra pestaña' (!1354) from 5202-itemWaste-openOtherTab into dev ... Reviewed-on: #1354 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-02 06:31:39 +00:00
Joan Sanchez	32b3284e40	Merge pull request 'refs #5115 transfer_sales' (!1344) from 5115-transfer_sales into dev ... Reviewed-on: #1344 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-02 06:31:20 +00:00
Joan Sanchez	84dc95621d	Merge pull request 'fixes #5149 ticket.descriptor-menu Eliminar ticket, debe comprobar que no existe un abono' (!1348) from 5149-check-ticket.refund into dev ... Reviewed-on: #1348 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-02 06:30:17 +00:00
Joan Sanchez	d819a13597	Merge pull request '5240-ticket.sale-tracking' (!1353) from 5240-ticket.sale-tracking into dev ... Reviewed-on: #1353 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-02 06:28:01 +00:00
Vicent Llopis	3051768781	WIP: 9b11987d7 feat: desaparecen los botones para las semanas que no tienen registros	2023-03-01 14:50:23 +01:00
Alexandre Riera	d62fbab3f1	refs #5070 refactor and added tests	2023-03-01 14:22:25 +01:00
Vicent Llopis	bc542d8a40	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control	2023-03-01 14:11:12 +01:00
Guillermo Bonet	707ae232a7	refs #5193 ticketCreateWithUser to ticket_add	2023-03-01 12:24:36 +01:00
Alexandre Riera	cd026d79c3	Merge branch 'master' into hotFix-itemDiary-reloadCardConditional	2023-03-01 11:22:41 +00:00
Alexandre Riera	d744cbb1a3	hotFix itemDiary reload card conditional	2023-03-01 12:22:01 +01:00
Vicent Llopis	2f9e9ada43	Merge branch 'dev' into 5240-ticket.sale-tracking	2023-03-01 10:58:49 +00:00
Alexandre Riera	48da6403fa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5070-route-tickets-link-maps	2023-03-01 11:20:24 +01:00
Carlos Andrés	6f5e25493d	invoicing test	2023-03-01 10:36:38 +01:00
Alexandre Riera	7aedbda98b	refs #5202 changed vn-tr for a	2023-03-01 10:08:51 +01:00
Vicent Llopis	4567981724	add console.log	2023-03-01 09:09:09 +01:00
Alexandre Riera	915c598c0c	fixed tests	2023-03-01 09:04:53 +01:00
Vicent Llopis	f6afed485c	add console.log	2023-03-01 08:50:30 +01:00
Vicent Llopis	07784ffbfa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5035-intermittent_backTest2	2023-03-01 08:46:26 +01:00
Alexandre Riera	2e09845dbd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5149-check-ticket.refund	2023-03-01 08:29:58 +01:00
Vicent Llopis	8a1a7d7159	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5240-ticket.sale-tracking	2023-03-01 08:20:28 +01:00
Vicent Llopis	da6e29056e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4849-supplier-isVies	2023-03-01 08:08:23 +01:00
Alexandre Riera	4d6a770b26	Merge branch 'master' into hotfix-supplier-isTrucker	2023-02-28 13:39:45 +00:00
Alexandre Riera	3dd6232d6a	hotfix isTrucker was not in the params	2023-02-28 14:39:01 +01:00
Guillermo Bonet	656685cd7e	refs #4975 Minor changes	2023-02-28 14:35:34 +01:00
Alexandre Riera	b2bf7f2727	refs #5149 fixing e2e	2023-02-28 14:29:31 +01:00
Juan Ferrer	9336d20e45	refs #4975 MdbVersion/upload fixes & code clean	2023-02-28 13:45:36 +01:00
Alexandre Riera	e9dca9211c	refs #5149 checked if ticket has refunds, added translations	2023-02-28 13:42:18 +01:00
Alexandre Riera	d5ea59e284	refs #5287 permisos añadidos	2023-02-28 12:46:48 +01:00
Alexandre Riera	96e103d76e	refs #5287 sections sorted	2023-02-28 08:37:17 +01:00
Alexandre Riera	7a04b0b3de	refs #5287 icon added	2023-02-28 08:00:18 +01:00
Alexandre Riera	94901d5b1f	refs #5287 pda section added, tests added	2023-02-28 07:49:34 +01:00
Alexandre Riera	5d9220c5c0	refs #5287 locker added	2023-02-27 08:39:46 +01:00
Alexandre Riera	76cd2d160e	Merge branch 'dev' into 5036-regularizar-historicos	2023-02-27 06:05:21 +00:00
Alexandre Riera	2a4d41cbca	refs #4632 saveSign refactored, working on tests, check if dmsRecover is needed	2023-02-24 14:41:02 +01:00
Joan Sanchez	1bc715cde5	Updated claim state field	2023-02-24 14:32:56 +01:00
Alexandre Riera	698a3396fc	refs #5063 deleted changes in item hook	2023-02-24 10:40:24 +01:00
Alexandre Riera	9da3593dff	Merge branch '5063-item-module-doPhoto' of https://gitea.verdnatura.es/verdnatura/salix into 5063-item-module-doPhoto	2023-02-24 10:37:38 +01:00
Alexandre Riera	6d6fa11da1	refs #5063 fixed front test	2023-02-24 10:37:35 +01:00
Alexandre Riera	113b37e56f	Merge branch 'dev' into 5063-item-module-doPhoto	2023-02-24 09:25:44 +00:00
Alexandre Riera	afb14044cc	refs #5063 deleted item checked in image, added front test	2023-02-24 10:25:08 +01:00
Alexandre Riera	ed7f3f5d63	Merge branch 'dev' into 5172-cliente-impagado	2023-02-24 08:34:41 +00:00
Alexandre Riera	6a65c9f0e2	Merge branch 'dev' into 5168-mostrar-instanceLog	2023-02-24 08:22:45 +00:00
Alexandre Riera	4682497df9	Merge branch 'dev' into 5168-mostrar-instanceLog	2023-02-24 08:08:20 +00:00
Alex Moreno	bd225e6824	Merge branch 'dev' into 4998-claim_photos_back	2023-02-24 07:59:28 +00:00
Joan Sanchez	788e5488ae	Merge branch 'dev' into 5115-transfer_sales	2023-02-24 07:58:26 +00:00
Alexandre Riera	6590c6f1fa	refs #5036 transferSales also transfer sale's logs	2023-02-24 08:55:04 +01:00
Joan Sanchez	fafbfed189	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-02-24 07:23:38 +01:00
Alexandre Riera	bca9e757d4	hotfix parsed description array to string	2023-02-23 15:52:47 +01:00
Carlos Andrés	ffdfd1a7e5	refs #5000 Invoicing change structure	2023-02-23 14:48:21 +01:00
Vicent Llopis	9b11987d75	feat: desaparecen los botones para las semanas que no tienen registros	2023-02-23 14:33:38 +01:00
Vicent Llopis	475bc2c255	feat: solo puede dar conforme/no confome el propio usuario	2023-02-23 14:33:16 +01:00
Robert Ferrús	1e23dfe34e	Merge branch 'dev' into 5115-transfer_sales	2023-02-23 10:00:32 +00:00
Vicent Llopis	9310e92223	refactor	2023-02-23 10:44:08 +01:00
Carlos Andrés	7f60335a91	refs #5000 Invoicing: front tests refactor & fixes	2023-02-23 09:45:15 +01:00
Carlos Andrés	4cc6485cbd	refs #5000 Invoicing RC	2023-02-23 09:25:23 +01:00
Carlos Andrés	eaa5b4530a	getMinClientId	2023-02-23 09:22:17 +01:00
Vicent Llopis	35b47c6da2	refactor code	2023-02-23 08:21:59 +01:00
Vicent Llopis	05d91ed50e	feat: actualizada interfaz	2023-02-22 15:12:25 +01:00
Alex Moreno	8597497429	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4998-claim_photos_back	2023-02-22 14:31:31 +01:00
Vicent Llopis	a93fb2c69f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control	2023-02-22 14:29:29 +01:00
Alexandre Riera	3a3dcc941b	Merge branch '5172-cliente-impagado' of https://gitea.verdnatura.es/verdnatura/salix into 5172-cliente-impagado	2023-02-22 14:24:33 +01:00
Alexandre Riera	0263a4833e	refs #5172 added changelog	2023-02-22 14:24:31 +01:00
Alexandre Riera	ca1f5480ae	refs #5235 added setClientSample(), fixed tests	2023-02-22 13:04:27 +01:00
Alexandre Riera	42b8f08a4d	refs #5168 checked sales with logs	2023-02-22 12:14:17 +01:00
Alexandre Riera	be8d19a9f8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos	2023-02-22 09:27:38 +01:00
Vicent Llopis	c8c48ea175	feat: colorar numeros de semanas segun el registro de horas	2023-02-21 15:16:28 +01:00
Joan Sanchez	3d8add4d6f	Merge branch 'dev' into 5192-db_export	2023-02-21 13:12:27 +00:00
Joan Sanchez	0d16f71fd3	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-02-21 14:10:36 +01:00
Vicent Llopis	c30242f9cc	fix: front test	2023-02-21 12:17:16 +01:00
Vicent Llopis	eda70b009b	fix: cuando haces F5 en cualquier sección que no sea Diary, te coge el warehouse por defecto	2023-02-21 11:48:56 +01:00
Vicent Llopis	432c8a9ab8	refactor: cambiados estilos de los chips	2023-02-21 10:56:46 +01:00
Joan Sanchez	58548164d2	Merge branch 'dev' into 5192-db_export	2023-02-21 09:20:30 +00:00
Joan Sanchez	4c2878e232	Updated unit tests	2023-02-21 09:48:47 +01:00
Joan Sanchez	45c4f2ff45	Updated test	2023-02-21 08:51:50 +01:00
Joan Sanchez	c9840f6985	Updated entry structure	2023-02-21 08:32:46 +01:00
Alex Moreno	cc5a867bf4	feat(claim_model): add claimDms relations	2023-02-20 15:16:19 +01:00
Alexandre Riera	063c60b4a1	Merge branch 'dev' into 5172-cliente-impagado	2023-02-20 13:58:31 +00:00
Joan Sanchez	ab6ca12862	Merge branch 'dev' into 5266-image_fixes	2023-02-20 13:15:40 +00:00
Vicent Llopis	0b240e7925	add console.log	2023-02-20 13:35:50 +01:00
Alexandre Riera	271a6d898d	Merge branch 'dev' into 5063-item-module-doPhoto	2023-02-20 12:17:03 +00:00
Alexandre Riera	04877c1425	refs #5063 refactor hook	2023-02-20 13:15:47 +01:00
Joan Sanchez	90e1136ee2	fix(image): store images with a name generated through uuid instead of url path ... Refs: #5266	2023-02-20 12:40:13 +01:00
Vicent Llopis	26d72a7b3f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5180-invoice-out_refund	2023-02-20 11:49:17 +01:00
Alexandre Riera	c7f22a10ba	refs #5063 refactored hook	2023-02-20 10:39:12 +01:00
Alexandre Riera	5c2c99e397	refs #5172 changed icon name	2023-02-20 09:44:14 +01:00
Alexandre Riera	77066b2005	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos	2023-02-20 09:20:30 +01:00
Alexandre Riera	08476fe2a6	Merge branch 'dev' into 5063-item-module-doPhoto	2023-02-17 13:30:47 +00:00
Joan Sanchez	86dd299292	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-02-17 13:33:52 +01:00
Joan Sanchez	ceab11cc41	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-02-17 13:33:34 +01:00
Vicent Llopis	39a3c8a7fa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4849-supplier-isVies	2023-02-17 13:06:30 +01:00
Vicent Llopis	853e06f523	fix: card reload automatic	2023-02-17 12:38:07 +01:00
Joan Sanchez	527caf9ca0	refactor(zerofill): deprecated zerofill and removed function ... Refs: #5207	2023-02-17 11:19:35 +01:00
Vicent Llopis	373be40986	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4849-supplier-isVies	2023-02-17 10:42:50 +01:00
Vicent Llopis	4001a75916	Merge branch 'dev' into 5180-invoice-out_refund	2023-02-17 08:57:48 +00:00
Vicent Llopis	874f459956	refactor: borrada variable innecesaria	2023-02-17 09:49:47 +01:00
Vicent Llopis	885a98457e	feat: sustido sql por loopback del report 'balance-compensation'	2023-02-17 09:11:20 +01:00
Alexandre Riera	8b088e831a	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 5194-cambios-ticketFutureAdvance	2023-02-16 14:43:51 +01:00
Vicent Llopis	b5d2d53435	fix: test back	2023-02-16 10:45:13 +01:00
Vicent Llopis	3096738b84	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5180-invoice-out_refund	2023-02-16 09:52:18 +01:00
Vicent Llopis	3dd870f7df	fix: test e2e	2023-02-16 09:44:20 +01:00
Vicent Llopis	bb2eddc462	fix: test front	2023-02-16 07:32:44 +01:00
Vicent Llopis	73ae45c2c0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5097-item.summary_available	2023-02-15 15:08:58 +01:00
Alexandre Riera	dca5ae0f72	refs #5223 added params	2023-02-15 13:14:52 +01:00
Vicent Llopis	443118a7ac	esto se debe BORRAR	2023-02-15 12:37:31 +01:00
Vicent Llopis	7439b12d98	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4849-supplier-isVies	2023-02-15 09:31:20 +01:00
Vicent Llopis	df38f30f74	se incluyen los test intermintents que estaban incluidos	2023-02-15 09:10:55 +01:00
Alexandre Riera	ea2fd59cdc	refs #5223 changed ref and email text	2023-02-14 12:41:36 +01:00
Vicent Llopis	a5a0256e44	feat: añadido parametro que indica si genera uno o multiples ticket de abono	2023-02-14 10:58:41 +01:00
Pau	6a732819ba	Merge branch 'dev' into 5063-item-module-doPhoto	2023-02-14 09:58:10 +00:00
Alexandre Riera	b1a6713a3d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4588-campo-nota-ultimo-usuario	2023-02-14 09:04:08 +01:00
Alexandre Riera	139dac0bc1	refs #4588 moved hook from entryObservation to entry	2023-02-14 08:08:48 +01:00
Alexandre Riera	e5e86de8d2	Merge branch 'dev' into 5152-ticketBasicData-stepTwo	2023-02-14 07:07:12 +00:00
Alexandre Riera	f6ec6da1c4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4588-campo-nota-ultimo-usuario	2023-02-13 13:48:12 +01:00
Alexandre Riera	bfc21a7c97	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5172-cliente-impagado	2023-02-13 13:36:58 +01:00
Alexandre Riera	4c7aae95aa	refs #5172 added default icon	2023-02-13 13:04:22 +01:00
Alexandre Riera	76ed4d2d4b	refs #5194 fixed tests	2023-02-13 10:16:28 +01:00
Vicent Llopis	4da8546bdf	Merge branch 'dev' into 2952-ticket.sale-tracking_part2	2023-02-13 07:14:28 +00:00
Alexandre Riera	a7e9e52ad4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4588-campo-nota-ultimo-usuario	2023-02-13 07:34:13 +01:00
Pau	294b4acbe2	Merge branch 'dev' into 5181-ticket.summary-recargo	2023-02-13 06:03:21 +00:00
Alexandre Riera	6cb815faaf	.	2023-02-10 10:13:41 +01:00
Alexandre Riera	4787de3df5	fixing merge	2023-02-10 09:04:49 +01:00
Alexandre Riera	a468fb2c66	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 5194-cambios-ticketFutureAdvance	2023-02-10 09:02:44 +01:00
Alexandre Riera	9dc07d88d6	fixing e2e	2023-02-10 08:56:30 +01:00
Alexandre Riera	194069c0c2	refs #5194 fixed stock, lines	2023-02-10 08:46:54 +01:00
Vicent Llopis	5b22096567	refactor: actuializada consulta par obtener los clientes a facturar. Excluido impresion pdfs de la transaccion	2023-02-09 14:57:08 +01:00
Alex Moreno	f496242fcb	fix description	2023-02-09 10:28:37 +01:00
Alex Moreno	bbf68a88a7	feat: sendEmail checkBox and docuware open clientBalanceCreate with default data	2023-02-09 10:26:55 +01:00
Joan Sanchez	ebee9144b4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-02-09 09:16:30 +01:00
Joan Sanchez	461799f137	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-02-09 08:56:30 +01:00
Vicent Llopis	222032aae7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing	2023-02-09 08:38:08 +01:00
Alexandre Riera	725b7b9bce	Merge branch 'master' into hotFix-ticketFutureAdvance-warehouse	2023-02-08 12:48:23 +00:00
Alexandre Riera	ef5b29d6f3	hotfix ticketFutureAdvance warehouse	2023-02-08 13:47:35 +01:00
Alexandre Riera	4413c8828b	refs #5152 added confirmation popup	2023-02-08 10:54:21 +01:00
Vicent Llopis	b70311999d	refactor: eliminado codigo innecesario y quitado update que se hará directamente en producción	2023-02-08 09:41:09 +01:00
Javi Gallego	4a562c3110	unificado todo a claimState isEditable	2023-02-07 15:40:03 +01:00
Pau	86e6672e49	Merge branch 'dev' into 5181-ticket.summary-recargo	2023-02-07 13:39:36 +00:00
Vicent Llopis	cec7602e1b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5097-item.summary_available	2023-02-07 13:44:53 +01:00
Vicent Llopis	6cb3930be0	feat: añadido icono info, que indica de que almacén se saca la información	2023-02-07 13:40:39 +01:00
Alexandre Riera	9f2ff4e4b7	addFilter	2023-02-07 12:30:30 +01:00
Alexandre Riera	d3564209ba	findById	2023-02-07 08:05:48 +01:00
Vicent Llopis	2e8aabab14	fix: type relation in models	2023-02-06 14:32:54 +01:00
Vicent Llopis	499c9fa706	refactor	2023-02-06 14:03:38 +01:00
Vicent Llopis	a2f93e68b1	feat: add 'parking' column	2023-02-06 13:57:04 +01:00
Vicent Llopis	4f76465246	fix: no recarga cada vez	2023-02-06 12:24:26 +01:00
Alexandre Riera	68b4d269ff	Merge branch 'dev' into 4588-campo-nota-ultimo-usuario	2023-02-06 09:18:13 +00:00
Alexandre Riera	3879dfc89b	Merge branch '5074-ticket-balance-null' of https://gitea.verdnatura.es/verdnatura/salix into 5074-ticket-balance-null	2023-02-06 08:19:16 +01:00
Alexandre Riera	f2f8a4eb04	fix test	2023-02-06 08:19:13 +01:00
Alexandre Riera	2c946b38d4	Merge branch 'dev' into 5074-ticket-balance-null	2023-02-06 07:08:50 +00:00
Alexandre Riera	df3e818182	refs #5074 refactor this.receipt.description	2023-02-06 08:07:50 +01:00
Alex Moreno	c11df75a82	Merge branch 'master' into hotFix_invoiceIn_supplier_email	2023-02-06 06:30:56 +00:00
Alexandre Riera	fd31547b22	Merge branch 'dev' into 3291-entryLatestBuys-buscador	2023-02-06 06:00:41 +00:00
Alexandre Riera	546b3f6c9b	refs #3291 lateral menu added, fixed tests	2023-02-03 15:21:27 +01:00
Alex Moreno	2717c6420c	fix(invoiceIn_descriptor): supplier.email	2023-02-03 14:58:58 +01:00
Joan Sanchez	d773837740	Removed user model	2023-02-03 14:44:00 +01:00
Vicent Llopis	ba5616055b	feat: item.descriptor en summary coge el warehouse por defecto	2023-02-03 14:31:50 +01:00
Joan Sanchez	38f34adc9a	Merge pull request 'master → test' (!1305) from master into test ... Reviewed-on: #1305	2023-02-03 12:44:42 +00:00
Vicent Llopis	c32a627fe5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4873-zone.delivery-day	2023-02-03 13:23:42 +01:00
Guillermo Bonet	ca24de7ee5	refs #4975 Changed description	2023-02-03 12:50:19 +01:00
Guillermo Bonet	dddeca0832	refs #4975 Added property dsName in mdbBranch tab	2023-02-03 12:46:01 +01:00
Alexandre Riera	0c91f95762	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos	2023-02-03 12:03:16 +01:00
Alexandre Riera	141ae7b11c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3291-entryLatestBuys-buscador	2023-02-03 11:56:09 +01:00
Alex Moreno	575784c870	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-02-03 10:03:59 +01:00
Juan Ferrer	f4fc597c2c	Merge pull request 'master to test' (!1302) from master into test ... Reviewed-on: #1302	2023-02-03 08:12:09 +00:00
Pau	6c8609e180	Merge branch 'dev' into 5181-ticket.summary-recargo	2023-02-03 07:52:14 +00:00
Vicent Llopis	508bce73bc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5097-item.summary_available	2023-02-03 08:41:35 +01:00
Pau	e3de54b811	changed styles on summary	2023-02-03 08:35:15 +01:00
Pau	199dd2ba8d	Merge branch 'dev' into 5181-ticket.summary-recargo	2023-02-03 06:09:38 +00:00
Alex Moreno	8a50c56284	fix(updateWorkCenter): use vnNew()	2023-02-02 14:52:40 +01:00
Alex Moreno	6c772643a8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-02-02 11:55:11 +01:00
Joan Sanchez	eded1ebf20	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser	2023-02-02 11:42:48 +01:00
Alexandre Riera	16a6167db0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3291-entryLatestBuys-buscador	2023-02-02 10:39:26 +01:00
Pau	cadd525380	Merge branch 'dev' into 5174-refactor-ticket-weekly	2023-02-02 08:36:07 +00:00
Joan Sanchez	d45c0cb99a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-02-02 08:59:39 +01:00
Joan Sanchez	4477486f8e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-02-02 08:58:44 +01:00
Alexandre Riera	5f656a894f	buscador	2023-02-02 08:52:38 +01:00
Joan Sanchez	85bde58752	Merge pull request 'fixes #4927 supplier.fiscal-data permitir 'Razón social' duplicada' (!1230) from 4927-permitir-razonSocial-duplicada into dev ... Reviewed-on: #1230 Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-02-02 07:47:38 +00:00
Alexandre Riera	780018e4df	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada	2023-02-02 08:40:49 +01:00
Alexandre Riera	52a3f77bc5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5077-horaEnvio-ticketBasicData	2023-02-02 08:39:28 +01:00
Alex Moreno	5b228c5e71	Merge branch 'master' into hotFix_getRate2	2023-02-02 07:35:34 +00:00
Joan Sanchez	7a700de5c2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser	2023-02-02 08:23:17 +01:00
Joan Sanchez	644d98ec1c	syncUser() and setPassword() changes	2023-02-02 07:32:38 +01:00
Alexandre Riera	547c7a336b	Merge branch 'dev' into 5072-comprobar-email-clientFiscalData	2023-02-01 08:52:17 +00:00
Pau	ec73b512fc	Merge branch 'dev' into 5063-item-module-doPhoto	2023-02-01 09:26:25 +01:00
Alexandre Riera	73b7a1d761	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5138-cambiarOrdenCampos-routeSummary	2023-02-01 08:52:53 +01:00
Alexandre Riera	62766706b1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5072-comprobar-email-clientFiscalData	2023-02-01 08:52:03 +01:00
Alexandre Riera	7d7e1a74da	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada	2023-02-01 08:46:28 +01:00
Alexandre Riera	d17f9396ad	refs #3291 save button	2023-02-01 08:43:13 +01:00
Alex Moreno	00ffc82f8d	use CURDATE() in rawSQL	2023-02-01 08:34:14 +01:00
Pau	dcd74bacc0	refs #5181 @1h30	2023-02-01 08:32:22 +01:00
Alex Moreno	ae6e0f0772	Merge branch 'master' into hotFix_getRate2	2023-02-01 06:20:48 +00:00
Alex Moreno	2528b2d3ad	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-02-01 07:10:51 +01:00
Guillermo Bonet	909f0c3532	Merge branch 'master' into 4975-mdbConfig-and-upload	2023-02-01 06:09:44 +00:00
Alexandre Riera	11a605ea04	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5129-enriquecer-mensaje	2023-01-31 15:40:54 +01:00
Alexandre Riera	c6f87f9084	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5131-cambios-ticketAdvance	2023-01-31 15:39:03 +01:00
Alexandre Riera	349829e5ed	refs #5131 fixed tests	2023-01-31 15:29:00 +01:00
Alexandre Riera	3622eda589	refs #5131 added lines liters to origin ticket	2023-01-31 15:09:16 +01:00
Joan Sanchez	e34d64361b	Account refactor	2023-01-31 14:57:24 +01:00
Guillermo Bonet	18168b07bb	refs #4975 Changes	2023-01-31 14:47:24 +01:00
Pau	5c0354bc17	add method to check if the ticket has refunds	2023-01-31 14:26:57 +01:00