1457 Commits

Author	SHA1	Message	Date
Alex Moreno	c6bee8f2f9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-06-29 14:50:06 +02:00
Carlos Satorres	af91630852	refs #5836 e2e fix	2023-06-29 13:22:51 +02:00
Alex Moreno	8723cf2958	refs #5753 fix legacy bugs	2023-06-28 14:10:21 +02:00
Carlos Satorres	a930963ef9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant	2023-06-27 12:34:37 +02:00
Vicent Llopis	87c233d221	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5808-client.credit-management	2023-06-27 10:33:15 +02:00
Carlos Satorres	5216f12001	refs #5836 check fix	2023-06-27 10:27:39 +02:00
Carlos Satorres	549235429c	refs #5640 oldBranch	2023-06-27 07:18:36 +02:00
Carlos Satorres	24ea18aeb0	refs #5836 isworker back	2023-06-26 13:55:39 +02:00
Guillermo Bonet	e54e0784bf	Merge branch '5816-noCreateLog' into 5900-removeDuplicatedLogs	2023-06-26 10:06:41 +02:00
Guillermo Bonet	cc5021a75f	refs #5684 Removed xxxLog.create and dependences	2023-06-26 09:40:55 +02:00
Alex Moreno	798481b24a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-06-26 07:53:44 +02:00
Juan Ferrer	e32a29fc09	refs #5900 Remove duplicated logs	2023-06-25 19:08:13 +02:00
Carlos Andrés	12aa9c6b4b	Merge branch 'dev'	2023-06-22 13:23:03 +02:00
Carlos Satorres	7f9d8da7a7	refs #5836 defaulter	2023-06-22 11:42:21 +02:00
Carlos Satorres	9870cc7b14	refs #5660 change assist	2023-06-21 13:34:27 +02:00
Juan Ferrer	44192c0606	refs #5667 Client translations added	2023-06-21 11:08:28 +02:00
Alex Moreno	d6c504d3bb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-06-21 07:53:40 +02:00
Vicent Llopis	f37974c835	Merge branch 'dev' into 5468-account_privileges	2023-06-20 12:39:27 +00:00
Alex Moreno	092471f74e	refs #5475 feat(account_changePassword): accessScope and backTest	2023-06-19 15:06:06 +02:00
Carlos Satorres	0eca606de0	Merge branch 'dev' into 5660-changeRolDeliveryAssistant	2023-06-16 07:29:30 +00:00
Juan Ferrer	1c666cd48e	refs #5595 Fix: ctx & userId removed from TpvTransaction/confirm	2023-06-15 13:10:44 +02:00
Vicent Llopis	0aae1732bf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges	2023-06-13 07:35:29 +02:00
Carlos Satorres	908799adee	refs #5660 deliveryAssit	2023-06-12 14:58:28 +02:00
Alex Moreno	1c39ad873c	resolve dev conflicts	2023-06-12 11:06:45 +02:00
Alex Moreno	22e69e6e91	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-06-12 11:06:27 +02:00
Alex Moreno	5c1b867d05	WIP: d735f142a Merge branch 'dev' into 5472-user_passExpired	2023-06-12 10:46:21 +02:00
Alexandre Riera	48ee29568d	Merge branch 'dev' into 5595-modify-loggable-tables-in-procs	2023-06-12 05:26:28 +00:00
Alexandre Riera	81a96e7d82	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs	2023-06-09 09:03:23 +02:00
Pablo Natek	ac67a2606f	Merge branch 'dev' into 5735-creditFormat	2023-06-09 07:11:13 +02:00
Vicent Llopis	653c37f048	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges	2023-06-08 13:12:59 +02:00
Juan Ferrer	9a63ce86aa	refs #5667 filter by changes, align entity id to right, duplicated code remove from Log models	2023-06-07 23:54:27 +02:00
Juan Ferrer	980ea67c24	Merge pull request 'test' (!1596) from test into dev ... Reviewed-on: #1596	2023-06-07 21:02:22 +00:00
Vicent Llopis	0dbd3abd65	refs #5808 fix: corregido el condicional	2023-06-07 15:06:37 +02:00
Alexandre Riera	7121b1e516	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs	2023-06-07 08:50:53 +02:00
Juan Ferrer	fe32a2af05	refs #5667 RoleInherit & Sms: Translations added	2023-06-05 08:35:07 +02:00
Alex Moreno	bca7224f74	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-06-05 08:09:16 +02:00
Alexandre Riera	f9528b922c	refs #5595 added userId in options	2023-06-01 08:32:06 +02:00
Alex Moreno	0aed2c2c08	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-05-31 13:10:25 +02:00
Carlos Satorres	2c3869d961	refs #5398 capital letters	2023-05-30 15:48:09 +02:00
Pablo Natek	382bc06075	refs #5153	2023-05-30 11:23:07 +02:00
Vicent Llopis	21448a84dd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges	2023-05-30 10:16:34 +02:00
Pablo Natek	a232e9ecea	refs #5153	2023-05-29 09:26:36 +02:00
Carlos Satorres	1593b4b626	Merge branch 'dev' into 5398-Agencys&WarehousesData	2023-05-29 07:09:08 +00:00
Carlos Satorres	8adc104cf4	refs #5735 fix currency	2023-05-26 08:39:58 +02:00
Alex Moreno	c7b8e57d95	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-05-26 07:41:48 +02:00
Carlos Satorres	fa8fd8d5bc	refs #5398 update from oldbranch	2023-05-25 11:41:14 +02:00
Carlos Satorres	4f5bd95d21	refs #5639 order	2023-05-23 13:23:46 +02:00
Carlos Satorres	e2bea16e68	refs #5639 select country, paymethod	2023-05-23 12:31:02 +02:00
Carlos Satorres	db7d3b6868	refs #5639 payMethodFk	2023-05-23 11:32:26 +02:00
Carlos Satorres	7fd2927ec9	refs #5639 smart-table country	2023-05-23 11:26:31 +02:00
Vicent Llopis	9426ff204f	refs #5468 fix: testFront	2023-05-23 09:12:27 +02:00
Carlos Satorres	0c673e43bc	refs #5639 smart-tabla defaulter	2023-05-23 09:02:05 +02:00
Vicent Llopis	3b7b31deb1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges	2023-05-23 08:31:52 +02:00
Alex Moreno	6f503e2a81	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-05-23 08:23:16 +02:00
Alex Moreno	6f06bac0c1	Merge branch 'dev' into 4797-worker-notification-selector	2023-05-23 05:55:08 +00:00
Juan Ferrer	26c2ab867d	Merge pull request 'master into test' (!1546) from master into test ... Reviewed-on: #1546	2023-05-22 17:04:32 +00:00
Alexandre Riera	58c25786a6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector	2023-05-18 14:52:33 +02:00
Alex Moreno	6ddbd8b8ea	Merge branch 'dev' into 5488-use_checkAccessAcl	2023-05-17 11:43:25 +00:00
Juan Ferrer	0d51987d47	refs #5667 Client sample translations	2023-05-17 12:41:25 +02:00
Juan Ferrer	fa40bd9811	refs #5667 Style & translation fixes	2023-05-17 10:18:41 +02:00
Juan Ferrer	30d6f56c39	refs #5667 Style fixes, model translations	2023-05-16 20:06:14 +02:00
Alexandre Riera	d4e2049bc7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector	2023-05-15 14:27:49 +02:00
Vicent Llopis	3f26072787	refs #5468 eliminados getters a VnUser	2023-05-12 09:02:55 +02:00
Pablo Natek	65082be077	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5153-worker-sin-tr	2023-05-12 08:28:19 +02:00
Alex Moreno	29e0562c8b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-05-10 13:33:52 +02:00
Alexandre Riera	b37bde2ba7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector	2023-05-09 08:14:42 +02:00
Juan Ferrer	2aaded4ed4	refs #5517 Fix: Show spinner when loading	2023-05-08 16:30:21 +02:00
Alex Moreno	ebbc860ba3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-05-08 12:03:53 +02:00
Juan Ferrer	68b1b6c5bd	refs #5517 E2E fixes	2023-05-08 12:03:27 +02:00
Alex Moreno	7273dd4f1e	Merge branch 'dev' into 5488-use_checkAccessAcl	2023-05-08 08:56:06 +00:00
Alex Moreno	456e1d5912	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-05-05 14:11:47 +02:00
Juan Ferrer	805e678ca7	Merge branch 'dev' into 5517-e2eFix	2023-05-05 08:14:13 +02:00
Juan Ferrer	a48e197e46	refs #5517 E2E fixes	2023-05-05 08:12:38 +02:00
Juan Ferrer	677764f302	refs #5517 Fix e2e	2023-05-04 10:00:21 +02:00
Alex Moreno	b2027fddf3	fix(client): use account setPassword	2023-05-03 14:56:14 +02:00
Alexandre Riera	4c0ec6faf5	changedModel sms	2023-05-02 14:26:47 +02:00
Alexandre Riera	13c37e88ef	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector	2023-05-02 11:38:07 +02:00
Carlos Satorres	5436eec63e	Merge branch '5540-validarSupplierIsVies' of https://gitea.verdnatura.es/verdnatura/salix into 5540-validarSupplierIsVies	2023-05-02 10:00:50 +02:00
Carlos Satorres	8156c17c7d	refs #5540 del jasmine	2023-05-02 10:00:47 +02:00
Alexandre Riera	c2de5c5ff4	refs #4797 added redirection section	2023-05-02 07:28:59 +02:00
Carlos Satorres	06c01f3e94	Merge branch 'dev' into 5540-validarSupplierIsVies	2023-04-28 13:02:10 +00:00
Carlos Satorres	fb59371d54	refs #5540 quit logs	2023-04-28 14:38:49 +02:00
Carlos Satorres	0e0db960af	refs #5540 supplier	2023-04-28 14:23:44 +02:00
Carlos Satorres	c0deb745d6	refs #5540 arreglo en supplier	2023-04-28 14:03:21 +02:00
Carlos Satorres	38142c121d	refs #5540 mods client	2023-04-28 12:12:26 +02:00
Pablo Natek	8651898a1f	Merge branch 'dev' into 5153-worker-sin-tr	2023-04-28 08:36:47 +00:00
Carlos Satorres	cdbbec9d36	refs #5540 validate	2023-04-28 10:21:54 +02:00
Carlos Satorres	b8f7f7bd69	refs #5540 create validateIban	2023-04-28 09:07:06 +02:00
Juan Ferrer	2cfd2d9dda	Merge branch 'dev' into 5517-improveLogs+translations	2023-04-27 18:13:24 +02:00
Carlos Satorres	08c173acf1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5540-validarSupplierIsVies	2023-04-27 12:49:01 +02:00
Pablo Natek	990bfc63a8	Merge branch 'dev' into 4795-client_getDebt	2023-04-26 16:10:39 +00:00
Pablo Natek	e8ce8e42fd	refs #5153	2023-04-25 14:25:22 +02:00
Alex Moreno	28ead70615	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-04-25 14:17:46 +02:00
Juan Ferrer	49368a837b	refs #5517 Filter improved	2023-04-24 19:10:04 +02:00
Pablo Natek	3e15728db4	Merge branch 'dev' into 5075-client_balance	2023-04-24 15:33:28 +00:00
Alex Moreno	8502b74dee	feat(): replace hasRole to checkAccessAcl	2023-04-24 11:07:04 +02:00
Juan Ferrer	081b4af6d6	Merge branch 'dev' into 5517-improveLogs+translations	2023-04-24 10:44:42 +02:00
Carlos Satorres	67db2f0476	Merge branch 'dev' into 5540-validarSupplierIsVies	2023-04-24 06:51:41 +00:00
Alex Moreno	faee5ccd7d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-04-21 13:53:07 +02:00
Vicent Llopis	ea1035311e	Merge branch 'dev' into 5128-client.credit-management	2023-04-21 11:30:58 +00:00
Alex Moreno	294bf2b8a8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-04-21 13:30:34 +02:00
Alex Moreno	7a79dfd4d1	deploy: 231401 test to dev	2023-04-21 12:49:03 +02:00
Carlos Satorres	397d8f658e	refs #5540 error trad	2023-04-21 10:41:50 +02:00
Carlos Satorres	d8b5659a5d	refs #5540 client vies	2023-04-21 09:14:30 +02:00
Pablo Natek	de3b4f37c2	Merge branch 'dev' into 5075-client_balance	2023-04-21 05:54:00 +00:00
Juan Ferrer	6f1744baff	Merge branch 'dev' into 5517-improveLogs+translations	2023-04-20 16:30:24 +02:00
Vicent Llopis	ec9a5722c2	refs #5128 añadido icono de grafana	2023-04-20 13:58:49 +02:00
Alex Moreno	39333a9119	refs #5488 replace hasRole for checkAccessAcl	2023-04-19 15:23:32 +02:00
Vicent Llopis	f6bf92b74b	refs #5128 intentando poner icono grafana	2023-04-19 15:21:59 +02:00
Vicent Llopis	6fbb734a34	quitado salto de linea	2023-04-19 14:43:23 +02:00
Vicent Llopis	187ba032d2	refs #5128 rol por ACL	2023-04-19 14:43:15 +02:00
Vicent Llopis	34b360040b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5128-client.credit-management	2023-04-19 12:18:45 +02:00
Joan Sanchez	fded7d062b	section fix	2023-04-18 09:49:23 +02:00
Vicent Llopis	b3e7cedd1e	refs #5128 borrada línea por error	2023-04-18 09:49:12 +02:00
Vicent Llopis	c5225cb632	refs #5128 borrado código innecesario	2023-04-18 09:23:19 +02:00
Vicent Llopis	48cd23750e	refs #5128 add testBack	2023-04-18 09:09:09 +02:00
Vicent Llopis	c9dffe9175	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5128-client.credit-management	2023-04-18 08:39:43 +02:00
Joan Sanchez	6fd5c8ae2d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser	2023-04-18 08:34:20 +02:00
Joan Sanchez	6d593a0937	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5213-minorBugs2	2023-04-18 08:32:22 +02:00
Pablo Natek	3636543f73	refs #5075	2023-04-18 08:19:23 +02:00
Alex Moreno	560b5b374f	Merge branch 'dev' into 5075-client_balance	2023-04-18 05:37:12 +00:00
Juan Ferrer	c5dcfd3cab	refs #4480, #5484 Front & back tests passed, md5 password removed from code, some e2e missing	2023-04-15 14:24:50 +02:00
Juan Ferrer	add3a8b1fa	merge with dev	2023-04-15 01:49:23 +02:00
Vicent Llopis	4c18efa589	refs #5128 creado método setRating	2023-04-14 13:05:57 +02:00
Vicent Llopis	83dd386eed	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5128-client.credit-management	2023-04-14 10:39:16 +02:00
Pablo Natek	9594bd68b5	refs #4795	2023-04-12 21:10:50 +02:00
Vicent Llopis	2a2d03e05a	refs #5517 añadidas traducciones de algunos modelos	2023-04-12 15:02:21 +02:00
Carlos Satorres	ef6e85532e	refs #5213 cambios e2e, descriptor	2023-04-12 14:20:05 +02:00
Alexandre Riera	0666163ca0	refs #5546 deleted log property, fixed back tests	2023-04-12 12:33:14 +02:00
Pablo Natek	1456da58f5	refs #5075	2023-04-11 15:41:45 +02:00
Pablo Natek	c928274e24	Merge branch 'dev' into 5075-client_balance	2023-04-11 13:19:54 +00:00
Vicent Llopis	d03ca01b73	refs #5128 añadida subseccion "Gestión de crédito"	2023-04-11 14:57:56 +02:00
Pablo Natek	1770b8c038	refs #5075	2023-04-11 13:42:28 +02:00
Alexandre Riera	5cbc826281	Merge branch 'dev' into 4954-client-isTaxDataChecked-businessTypeFk	2023-04-06 07:16:00 +00:00
Joan Sanchez	b71ad207ff	Merge pull request 'fixes #5437 Desactivar correos "Cliente con email/teléfono/móvil duplicados"' (!1420) from 5437-deactivate-mail-duplicated-client into dev ... Reviewed-on: #1420 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-04-06 07:07:35 +00:00
Alexandre Riera	eed1ecc208	refs #4954 trigger modified	2023-04-04 14:47:13 +02:00
Vicent Llopis	3630c7d398	refs #5410 creada ruta de back para enviar emails	2023-04-04 14:09:55 +02:00
Vicent Llopis	c89f95a33e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5410-client.defaulter_getChecked	2023-04-04 13:40:12 +02:00
Alexandre Riera	9380b88460	refs #5437 back and test deprecated	2023-04-04 12:40:03 +02:00
Joan Sanchez	8b4c70e8ba	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser	2023-03-30 14:57:00 +02:00
Pablo Natek	2c01ebf681	Merge branch 'dev' into 5075-client_balance	2023-03-28 13:26:17 +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
Vicent Llopis	f689d35100	refs #5410 fix test	2023-03-24 10:05:17 +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
Vicent Llopis	41c79263c4	refs #5410 feat: envia email cuando se añade una nota	2023-03-21 14:53:36 +01: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
Joan Sanchez	634db7c7fc	refactor(getTransactions): lilium customer transactions	2023-03-20 23:09:17 +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	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	387576d63a	Merge branch 'dev' into 5036-regularizar-historicos	2023-03-16 06:42:39 +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
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	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
Vicent Llopis	38bf49c0b6	refs #5410 fix: se mantenien los checkbox marcados al paginar	2023-03-15 08:40:53 +01:00
Joan Sanchez	f052af92cd	Proper template name	2023-03-15 08:07:14 +01:00
Vicent Llopis	50ccb61728	refactor: el report llama directamente al filtro de extra-community	2023-03-14 09:59:29 +01:00
Joan Sanchez	6495e016a8	Endpoints refactor	2023-03-14 08:17:46 +01:00
Joan Sanchez	63d7dafcde	feat(print): added reusable pdf print functions ... Refs #5182	2023-03-13 15:05:19 +01:00
Alexandre Riera	eee4c815e7	Merge branch 'dev' into 5092-listado-ticketsSinFacturar	2023-03-13 06:10:51 +00: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
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
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	9ff920c67e	Merge branch 'dev' into 5036-regularizar-historicos	2023-03-09 06:50:33 +00:00
Alexandre Riera	b1d5a2ba1a	Merge branch 'dev' into 5092-listado-ticketsSinFacturar	2023-03-08 10:46:16 +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
Juan Ferrer	99f8bc6bac	refs #5174 TpvTransaction.confirm code refator to improve debugging	2023-03-03 18:55:58 +01:00
Juan Ferrer	6eaf4bdd1b	refs #5174 tpvTransaction: Añadidas columnas para depuración	2023-03-03 10:57:57 +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	76cd2d160e	Merge branch 'dev' into 5036-regularizar-historicos	2023-02-27 06:05:21 +00:00
Alexandre Riera	ed7f3f5d63	Merge branch 'dev' into 5172-cliente-impagado	2023-02-24 08:34:41 +00: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
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	be8d19a9f8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos	2023-02-22 09:27:38 +01:00
Joan Sanchez	45c4f2ff45	Updated test	2023-02-21 08:51:50 +01:00
Alexandre Riera	063c60b4a1	Merge branch 'dev' into 5172-cliente-impagado	2023-02-20 13:58:31 +00: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
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	885a98457e	feat: sustido sql por loopback del report 'balance-compensation'	2023-02-17 09:11:20 +01:00
Alexandre Riera	dca5ae0f72	refs #5223 added params	2023-02-15 13:14:52 +01:00
Alexandre Riera	ea2fd59cdc	refs #5223 changed ref and email text	2023-02-14 12:41:36 +01:00
Alexandre Riera	4c7aae95aa	refs #5172 added default icon	2023-02-13 13:04:22 +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
Alexandre Riera	f2f8a4eb04	fix test	2023-02-06 08:19:13 +01:00
Alexandre Riera	df3e818182	refs #5074 refactor this.receipt.description	2023-02-06 08:07:50 +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
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	4477486f8e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-02-02 08:58:44 +01: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
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
Joan Sanchez	e34d64361b	Account refactor	2023-01-31 14:57:24 +01:00
Juan Ferrer	5045a8f670	#5175 TpvTransaction.confirm(): Return response	2023-01-31 14:00:10 +01:00
Juan Ferrer	5a4ae7d742	refs #5174 TpvTransaction: Methods start & end added, fixes & refactor	2023-01-31 13:29:17 +01:00
Alexandre Riera	1b12770655	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5072-comprobar-email-clientFiscalData	2023-01-31 11:31:01 +01:00
Juan Ferrer	82bc7307f0	#5174 Signature verification fixed & enabled	2023-01-31 00:41:36 +01:00
Juan Ferrer	424dcb954c	refs #5174 Hotfix	2023-01-30 20:23:52 +01:00
Juan Ferrer	64d8ae1f49	refs #5174 Hotfix	2023-01-30 20:22:52 +01:00
Juan Ferrer	339cdab3c4	refs #5174 Debug enabled	2023-01-30 19:59:46 +01:00
Juan Ferrer	d6794cb4c8	#5174 Hotfix	2023-01-30 19:51:01 +01:00
Juan Ferrer	b20194b6d0	#5174 Hotfix	2023-01-30 17:45:36 +01:00
Juan Ferrer	5744759d53	refs #5122 Hotfix: Signature verification	2023-01-30 17:33:15 +01:00
Alexandre Riera	9cb363e4e5	refs #5074 deleted null in reference	2023-01-30 13:34:08 +01:00
Juan Ferrer	109556ae2e	refs #5122 Hotfix: Basic implementation for payment confirmation	2023-01-30 12:39:47 +01:00
Alexandre Riera	7e5f50e637	refs #5072 email validation added	2023-01-30 08:30:39 +01:00
Alexandre Riera	fccfabdcd1	hotfix viewReceipt clientBalance	2023-01-27 08:31:14 +01:00
Alexandre Riera	d69b204c4c	refs #5036 loggable refactored, tests fixed	2023-01-26 15:49:30 +01:00
Joan Sanchez	12cf79ab39	Updated e2e	2023-01-25 14:14:55 +01:00
Joan Sanchez	0208b31f44	Naming rollback	2023-01-24 09:12:26 +01:00
Joan Sanchez	89eb065f6d	Updated models	2023-01-24 09:04:43 +01:00
Joan Sanchez	ee1ce21bb9	refactor(account): account model refactor	2023-01-23 15:24:00 +01:00
Alex Moreno	e27a559416	refactor: replace all Date	2023-01-16 15:18:24 +01:00
Alexandre Riera	53b5ef6d78	refs #4937 viewReceipt added	2022-12-23 11:48:59 +01:00
Vicent Llopis	630890cd04	fix: colum name in model	2022-12-21 12:23:16 +01:00
Vicent Llopis	06075aa17b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4804-ticket.descriptor_sms	2022-12-21 12:15:21 +01:00
Pau	5a01e49f27	Merge branch 'dev' into 4791-refactor-sendsms	2022-12-19 12:25:58 +00:00
Alexandre Riera	48a7635449	refs #4893 regex changed	2022-12-02 09:18:52 +01:00
Joan Sanchez	6cb0e518d4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-12-01 07:33:38 +01:00
Pau	97baa89a71	Merge branch 'dev' into hotfix(#4914)-Bug-Client-Phone	2022-11-30 09:52:19 +01:00
Alexandre Riera	492b852be8	delete orderBy	2022-11-30 09:22:53 +01:00
Pau	bef1071316	refs #4914 @1h	2022-11-30 09:22:03 +01:00
Alexandre Riera	27078595ce	fix balances	2022-11-30 08:39:04 +01:00
Pau	2d7b3cc3a2	Merge branch 'dev' into 4871-socialName-on-client-filter	2022-11-29 13:13:57 +00:00
Pau	0d6e424a3e	allow client search by socialname	2022-11-28 10:21:01 +01:00
Alex Moreno	da2d1df522	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4613-Eliminar-cálculo-portfolio	2022-11-28 10:14:16 +01:00
Pau	8f98082910	refs #4791 @2h	2022-11-25 09:59:02 +01:00
Vicent Llopis	e540bf7b31	feat: inserta en la nueva tabla ticketSms	2022-11-25 09:38:34 +01:00
Carlos Andrés	8d2e532167	#4613 eliminar uso de portfolio	2022-11-25 09:32:54 +01:00
Pau	7c71e40cc5	Merge branch 'dev' into 4791-refactor-sendsms	2022-11-24 13:15:54 +00:00
Pau	f74b257d75	Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente	2022-11-24 09:27:49 +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
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
Alexandre Riera	34fb80beec	fix translations	2022-11-22 14:24:19 +01:00
Alexandre Riera	5552cd654e	Merge branch 'dev' into 4547-fix-compensation	2022-11-22 10:48:11 +00:00
Pau	3b66da20ca	Merge branch 'dev' into 4791-refactor-sendsms	2022-11-22 07:01:33 +00:00
Pau	4bd643143b	requested changes refs #4791 @1h	2022-11-22 07:59:18 +01:00
Pau	cb6ae41c13	Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente	2022-11-21 13:45:28 +00:00
Alexandre Riera	40ea9805cf	fixes #4547 check compensation and tests	2022-11-21 10:49:19 +01:00
Pau	4e97d931f7	refs #4791 @2h	2022-11-21 08:45:45 +01:00
Pau	c320342476	Merge branch 'dev' into 4507-greuge-add-userFk	2022-11-21 06:05:43 +00:00
Alexandre Riera	4a063cc310	refs #4780 verification deleted	2022-11-17 09:25:18 +01:00
Pau	9d0cd36afe	Merge branch 'dev' into 4457'	2022-11-15 08:49:21 +01:00
Pau	8b06243041	Fix link being the whole column	2022-11-10 08:36:26 +01:00
Pau	8dd6012b1f	Added worker descriptor popover	2022-11-10 08:27:47 +01:00
Pau	c53e309071	Fix typo	2022-11-10 08:19:54 +01:00
Pau	1327f0ae9d	Added requested changes, refs #4507 @1:20h	2022-11-10 08:18:05 +01:00
Pau	eab9289408	Merge branch 'dev' into 4507-greuge-add-userFk	2022-11-10 06:26:05 +00:00
Alexandre Riera	ff2ee4401e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4547-informe-compensacion	2022-11-09 13:26:54 +01:00
Pau	e85505ee8e	#4457 implement notification system, @1h 30m	2022-11-08 12:26:01 +01:00
Pau	f21907855f	Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente	2022-11-08 10:04:47 +01:00
Pau	7ff4c4d33c	Merge branch 'dev' into 4507-greuge-add-userFk	2022-11-04 07:35:01 +00:00
Alexandre Riera	98dd5963bf	refs #4547 traduccion añadida	2022-11-04 08:15:12 +01:00
Alex Moreno	ec9139f985	Merge branch 'dev' into 4159-tableQ_filter	2022-11-03 07:24:05 +00:00
Alexandre Riera	908908a643	refs #4547 correcciones	2022-11-02 15:54:23 +01:00
Vicent Llopis	f96fc0f91e	Merge branch 'dev' into 3852-client.search-panel2	2022-11-02 14:13:41 +00:00
Alexandre Riera	8d8d217fe7	refs #4547 formateo arreglado	2022-11-02 13:59:13 +01:00
Joan Sanchez	34997b72f5	Merge branch 'dev' into 3811-ticket.sale_updatePrice	2022-11-02 11:55:47 +00:00
Alex Moreno	9891f7060d	fix(smart-table): monitor only ticketFilter use url and add ?q in routes	2022-11-02 09:40:09 +01:00
Pau	0739608de3	Merge branch 'dev' into 4457-hasInvoiceElectronic	2022-10-31 07:57:50 +01:00
Alexandre Riera	1246a65f32	refs #4547 informe y email generados	2022-10-28 14:49:22 +02:00
Vicent Llopis	1d908002e2	feat: add backTest	2022-10-26 14:25:27 +02:00
Vicent Llopis	c0b95564c3	refactor: borrado codigo sql innecesario	2022-10-26 14:25:17 +02:00
Vicent Llopis	b39b28e43d	refactor: añadido salto de lineas	2022-10-26 13:10:17 +02:00
Vicent Llopis	65e32f5e7f	feat: client search panel add find by zone	2022-10-26 12:40:13 +02:00
Vicent Llopis	3110172c54	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3811-ticket.sale_updatePrice	2022-10-26 08:39:58 +02:00
Alex Moreno	f65d06fc7d	fixes #4073	2022-10-26 08:27:28 +02:00
Vicent Llopis	931a891f71	fix: check client.email exists	2022-10-25 08:09:23 +02:00
Alex Moreno	6a17a634d4	hotFix(receipt): add receiptPdf	2022-10-24 09:49:51 +02:00
Pau	30933220ac	#4507 greuge.js/json now insert userFk @2h	2022-10-24 09:37:17 +02:00
Vicent Llopis	6f31bea21f	feat: update testBack	2022-10-21 08:00:48 +02:00
Alex Moreno	9befa2531b	Merge branch 'hotFix_travel_extraCommunity-css' of https://gitea.verdnatura.es/verdnatura/salix into hotFix_travel_extraCommunity-css	2022-10-10 07:29:26 +02:00
Joan Sanchez	934c0d0169	Updated unit test	2022-10-10 07:28:10 +02:00
Joan Sanchez	587da840c0	Fix	2022-10-07 12:16:30 +02:00
Joan Sanchez	6c5acc75eb	Consumption fix	2022-10-07 12:00:06 +02:00
Pau	4f25961988	Created checkbox and logic, package-lock	2022-10-07 08:33:45 +02:00
Vicent Llopis	aa51fa1722	feat: check the client to edit is in vn.client and not in account.account	2022-10-05 12:36:36 +02:00
Joan Sanchez	377a0f7228	Attachments refactor	2022-10-04 13:41:37 +02:00
Joan Sanchez	eadff3fff9	Updated back unit tests	2022-10-04 09:46:44 +02:00
Joan Sanchez	1598b6c703	Back unit tests	2022-10-04 09:39:42 +02:00
Joan Sanchez	3dbd304217	Updated unit tests	2022-10-04 09:21:24 +02:00
Joan Sanchez	c8bad23621	Tests	2022-10-04 07:41:40 +02:00
Joan Sanchez	3b0f1efbf4	ACL's	2022-09-30 13:54:20 +02:00
Joan Sanchez	1ac35c0b68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2	2022-09-29 14:52:31 +02:00
Joan Sanchez	3601881026	Client consumption queue	2022-09-29 14:43:27 +02:00
Joan Sanchez	7f78286d6b	Reports refactor	2022-09-26 13:33:27 +02:00
Joan Sanchez	85698410db	Templates refactor	2022-09-26 08:07:45 +02:00
Joan Sanchez	664fd444cc	Sample refactor	2022-09-22 15:44:35 +02:00