1752 Commits

Author	SHA1	Message	Date
Alex Moreno	d02ee2fd12	deploy(232201)	2023-06-01 07:16:06 +02:00
Alex Moreno	f0024346a8	refs #5712 openDocuware	2023-05-31 11:32:37 +02:00
Alex Moreno	c23d8282eb	refs #5712 feat(workerDms): docuware download	2023-05-30 15:34:11 +02:00
Vicent Llopis	46b6625527	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token	2023-05-30 12:06:31 +02:00
Alexandre Riera	30816f7947	Merge branch 'dev' into 5513-backs-embalajes	2023-05-30 09:51:42 +00: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
Vicent Llopis	7d59c6ec0c	refs #5468 feat: eliminado acl nativo y añadido a salix.ACL	2023-05-30 10:07:17 +02:00
Vicent Llopis	81a8f383aa	refs #5468 feat: no depender del modulo worker	2023-05-30 10:00:05 +02:00
Vicent Llopis	ea1c860a18	refs #5468 refactor: modificado acl directamente sin necesidad de crear una nueva ruta	2023-05-30 09:13:47 +02:00
Alex Moreno	b60cd2539a	refs #5712 feat(workerDms): docuware integration	2023-05-29 15:21:37 +02:00
Carlos Satorres	3423ce612c	refs #5066 e2e fixs, change name sorted	2023-05-29 13:49:32 +02:00
Alexandre Riera	ba850415be	refs #5137 moved sql	2023-05-29 12:56:54 +02:00
Alexandre Riera	1bb5033729	Merge branch 'dev' into 5137-aviso-impresora	2023-05-29 10:56:21 +00:00
Carlos Satorres	91edc09057	refs #5066 move sql	2023-05-29 10:24:37 +02:00
Alex Moreno	f37d93b469	refs #5488 correct folder	2023-05-26 14:04:00 +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
Alex Moreno	375fdf2a21	fix item_getBalance	2023-05-25 14:31:28 +02:00
Vicent Llopis	ce211b436d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5252-canRefund_withOutWarehouse2	2023-05-25 13:00:11 +02:00
Vicent Llopis	886c4a15b5	refs #5554 fix: manejado si la tabla accessTokenConfig esta vacía	2023-05-25 10:19:00 +02:00
Alex Moreno	256f30987f	refs #5730 new version 232401	2023-05-25 09:46:39 +02:00
Alex Moreno	33928aa406	refs #5730 correct folder	2023-05-25 09:29:46 +02:00
Vicent Llopis	eab329b230	refs #554 feat: actualizar el token automáticamente	2023-05-24 15:01:59 +02:00
Carlos Satorres	a99b7cd4f1	Merge branch 'dev' into 5297-newWorker_iban_not_required	2023-05-24 08:02:33 +00:00
Carlos Satorres	6294fc0435	refs #5297 back&e2e fix changes	2023-05-24 10:02:02 +02:00
Alex Moreno	6a6d28efa0	Merge branch 'dev' into 5488-use_checkAccessAcl	2023-05-24 05:40:11 +00:00
Vicent Llopis	2c7473b064	refs #5252 feat: permite crear un abono con o sin almacén	2023-05-23 15:06:38 +02:00
Carlos Satorres	0dda7791f6	Merge branch 'dev' into 5639-seccionesFormaPagoYPais(MOROSOS)	2023-05-23 12:51:10 +00:00
Carlos Satorres	af1f92613f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5297-newWorker_iban_not_required	2023-05-23 13:57:11 +02:00
Vicent Llopis	91207c5a3c	refs #5468 fix: test e2e	2023-05-23 13:33:27 +02:00
Carlos Satorres	2d06f42493	refs #5639 defaulterView	2023-05-23 13:33:06 +02:00
Vicent Llopis	0702e4ef43	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges	2023-05-23 13:08:19 +02:00
Vicent Llopis	940ed29dfc	refs #5468 feat: comprobacion de acl en el back en 'Reenvío de correo'	2023-05-23 12:21:35 +02:00
Vicent Llopis	96163cb07f	refs #5468 feat: update acls	2023-05-23 10:43:46 +02:00
Vicent Llopis	aea39dd0b7	refs #5468 feat: modificalos acl de VnUser	2023-05-23 08:45:03 +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	dc244b5567	refs #5488 remove State_seeFilteredEditableStates	2023-05-23 08:23:52 +02:00
Carlos Satorres	ee8685329f	Merge branch 'dev' into 5599-ticketColors	2023-05-23 06:23:19 +00: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
Juan Ferrer	da0aa57539	Merge branch 'test' into dev	2023-05-22 19:06:20 +02: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
Carlos Satorres	a7c59f51b9	Merge branch 'dev' into 5599-ticketColors	2023-05-22 13:51:35 +00:00
Alex Moreno	bbc34f04ff	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-05-19 07:35:23 +02:00
Alexandre Riera	37b2920157	refs #5513 moved sql	2023-05-18 14:49:40 +02:00
Alexandre Riera	ca9d76db77	refs #5137 moved sql	2023-05-18 14:47:41 +02:00
Alexandre Riera	e8376c00a0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5137-aviso-impresora	2023-05-18 14:43:20 +02:00
Alex Moreno	2ef922e80c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-05-18 08:10:10 +02:00
Alex Moreno	36205e75be	feat(232201): new version	2023-05-18 07:55:43 +02:00
Alex Moreno	e17b9a32b9	add schema	2023-05-18 07:46:51 +02:00
Alex Moreno	ba763abc26	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 232001_test_to_dev	2023-05-18 07:17:31 +02:00
Alex Moreno	6ddbd8b8ea	Merge branch 'dev' into 5488-use_checkAccessAcl	2023-05-17 11:43:25 +00:00
Vicent Llopis	eaaa860e97	Merge branch 'dev' into 5594-sendPdf_whenMakeInvoice	2023-05-17 07:27:46 +00:00
Alex Moreno	08fcbebbaf	refs #5488 polish specifics acls	2023-05-15 14:14:08 +02:00
Vicent Llopis	9ce3e79e00	refs #5594 eliminado archivo ducplicado	2023-05-15 11:50:51 +02:00
Vicent Llopis	d5f5115980	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5594-sendPdf_whenMakeInvoice	2023-05-15 11:50:09 +02:00
Pablo Natek	8419c76b12	refs #5153 worker sin tr	2023-05-12 12:51:07 +02:00
Carlos Satorres	943e8b09c1	refs #5599 DELIMITER	2023-05-12 11:15:47 +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
Carlos Satorres	0dea1dfd9e	Merge branch 'dev'	2023-05-11 15:52:35 +02:00
Carlos Satorres	fd85cd2d98	refs #5599 replace	2023-05-11 15:48:31 +02:00
Vicent Llopis	b10f90fbe1	refs #5468 a la seccion privileges se le pasa el parametro user	2023-05-11 15:25:37 +02:00
Alex Moreno	1d6a541b02	test into master	2023-05-11 15:07:02 +02:00
Carlos Satorres	43ab07d954	refs move reports views	2023-05-11 11:57:13 +02:00
Carlos Satorres	2111ca0993	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5599-ticketColors	2023-05-10 14:49:37 +02:00
Carlos Satorres	e258e779b3	refs #5599 ticketFuture	2023-05-10 14:49:19 +02:00
Carlos Satorres	9a813c075c	refs #5599 procedure y colorClass	2023-05-10 14:43:08 +02:00
Alex Moreno	a345265a89	refs #5488 specifics acls	2023-05-10 14:09:06 +02:00
Carlos Satorres	c59915f951	refs #5599 procedure	2023-05-10 13:55:36 +02:00
Vicent Llopis	74ea0ce9fd	refs #5468 actualizados acls	2023-05-10 13:44:51 +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	3166a9e420	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5137-aviso-impresora	2023-05-10 13:23:10 +02:00
Alexandre Riera	ded8e0e141	refs #5137 added trigger, template and test	2023-05-10 13:22:53 +02:00
Alex Moreno	49e2c38ddd	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test_to_dev	2023-05-10 12:30:56 +02:00
Vicent Llopis	62dd64eb89	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges	2023-05-10 11:56:50 +02:00
Alex Moreno	706c62f624	typo	2023-05-10 09:26:33 +02:00
Alex Moreno	3b8cafc783	fix(ticketConfigSql): correct folder	2023-05-10 09:22:33 +02:00
Alex Moreno	8c0deb6cfa	test(e2e_order): fiter optimized	2023-05-10 09:16:19 +02:00
Alex Moreno	ca8373d7f7	feat(acl): add specifics acls to ticket, claim, state and worker	2023-05-09 14:04:39 +02:00
Vicent Llopis	313c641cd7	move chages sql	2023-05-09 12:26:29 +02:00
Vicent Llopis	461966d73e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5594-sendPdf_whenMakeInvoice	2023-05-09 11:33:28 +02:00
Alex Moreno	7021e52705	correct folder	2023-05-09 07:11:21 +02:00
Alex Moreno	8ae67799a1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-05-09 07:11:09 +02:00
Alex Moreno	3b8d670c5b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-05-08 13:43:31 +02:00
Alex Moreno	e019ab4160	deploy(232001): add changes folder, package and changelog	2023-05-08 12:40:52 +02:00
Alex Moreno	90465c275a	correct folder	2023-05-08 12:21:20 +02:00
Alex Moreno	ad3c34bd35	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 231801_dev_to_test	2023-05-08 12:08:00 +02:00
Alex Moreno	73fb940c63	refs #5472 try change-password	2023-05-08 10:55:16 +02:00
Carlos Satorres	2c6f71b4c4	Merge branch 'dev'	2023-05-08 10:16:57 +02: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
Alex Moreno	97da5e6e24	refs #5488 feat(isRoleAdvanced): use Acl instead of method	2023-05-05 13:58:11 +02:00
Alex Moreno	a22a8a6bd8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-05-04 11:34:19 +02:00
Alex Moreno	2e020b5ebb	fix(): correct version	2023-05-04 09:02:23 +02:00
Alexandre Riera	a2d3b79246	Merge branch 'dev' into 4713-saleTracking	2023-05-04 06:42:39 +00:00
Alex Moreno	a1521f5220	Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice	2023-05-03 09:39:39 +00:00
Alex Moreno	bf3aac70f3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-05-03 11:37:07 +02:00
Carlos Satorres	17425a627c	Merge branch 'dev' into 5316-kkeoEntryNotes	2023-05-02 11:25:17 +00:00
Alex Moreno	306d73eb69	Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice	2023-05-02 09:42:56 +00:00
Alex Moreno	4a7902ae4d	Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice	2023-05-02 08:41:18 +00:00
Alex Moreno	ac55dc4cc7	refs #5297 feat(worker_new): add payMethod	2023-04-28 14:17:19 +02:00
Alex Moreno	c3038a4d61	fix(imageCollection):	2023-04-28 11:54:11 +02:00
Pablo Natek	8651898a1f	Merge branch 'dev' into 5153-worker-sin-tr	2023-04-28 08:36:47 +00:00
Alex Moreno	42e3c8f29d	refs #5488 fix(): use hasWriteRole	2023-04-28 09:35:15 +02:00
Alex Moreno	42fc0b62d8	refs #5472 feat(user): add passExpired	2023-04-27 15:18:27 +02:00
Carlos Satorres	66986d3c21	Merge branch 'dev' into 5316-kkeoEntryNotes	2023-04-27 12:08:28 +00: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
Alex Moreno	34bb216f17	deploy(231601): dev to test	2023-04-27 08:53:54 +02:00
Alex Moreno	9b13e3fd2f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges	2023-04-27 07:23:25 +02:00
Vicent Llopis	2d181139b4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5594-sendPdf_whenMakeInvoice	2023-04-26 14:58:34 +02:00
Vicent Llopis	09dbd29086	refs #5594 cuando se factura se envía automáticamente un mail y quitados logs duplicados	2023-04-26 14:46:16 +02:00
Alexandre Riera	5844da4474	refs #4713 updated sql	2023-04-26 14:34:29 +02:00
Carlos Satorres	15df9518ab	Merge branch 'dev' into 084200-arreglarChanges	2023-04-26 12:31:33 +00:00
Carlos Satorres	09c1d7e393	refs #084200 add table	2023-04-26 14:30:58 +02:00
Alexandre Riera	878f232fda	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4713-saleTracking	2023-04-26 14:20:23 +02:00
Alex Moreno	c1ea1acc8c	refs #4614 fear(ticket): add 'set weight' funcionality	2023-04-26 13:49:08 +02:00
Carlos Satorres	480784ee18	refs #084200 cambio nombre	2023-04-26 13:48:31 +02:00
Vicent Llopis	c69e038a56	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5542-refund_refactor	2023-04-26 12:45:54 +02:00
Vicent Llopis	c580be2790	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges	2023-04-26 12:07:34 +02:00
Carlos Satorres	a524d7837d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5316-kkeoEntryNotes	2023-04-26 11:45:20 +02:00
Vicent Llopis	2e5a43af68	refs #5468 restringido permisos 'WRITE' para sysadmin en VnUser	2023-04-26 11:40:21 +02:00
Carlos Satorres	af875dd67e	Merge	2023-04-26 10:26:54 +02:00
Carlos Satorres	57ec0f8587	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 084200-footerAlbaranReport	2023-04-26 09:03:37 +02:00
Alex Moreno	af0523a155	refs #5468 descriptor account solo lo puede ejecutar sysadmin y mail-forwarding solo el mismo o un superior	2023-04-25 15:17:45 +02: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
Alex Moreno	0c668c6ade	refs #5488 feat(): replace all hasRole to checkAccessAcl	2023-04-25 14:17:36 +02:00
Alexandre Riera	83319894b2	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test-to-dev	2023-04-25 11:25:29 +02:00
Alex Moreno	618100b68a	refs #5542 eliminados procesos que no se usan	2023-04-25 10:40:24 +02:00
Alex Moreno	4cb231759f	feat(State/Supplier): replace hasRole to acls	2023-04-25 09:15:05 +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
Carlos Satorres	67db2f0476	Merge branch 'dev' into 5540-validarSupplierIsVies	2023-04-24 06:51:41 +00:00
Vicent Llopis	5b7ca82509	Merge branch 'dev' into 5318-deviceProductionLog_toSalix	2023-04-24 04:58:30 +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	d8b5659a5d	refs #5540 client vies	2023-04-21 09:14:30 +02:00
Alexandre Riera	b3a10698af	hotfix negativeBases	2023-04-21 08:20:38 +02:00
Pablo Natek	de3b4f37c2	Merge branch 'dev' into 5075-client_balance	2023-04-21 05:54:00 +00:00
Vicent Llopis	bcf7b6ab3d	borrado acl innecesario	2023-04-20 15:17:49 +02:00
Carlos Satorres	d6e6dab03b	Merge branch 'dev'	2023-04-20 11:55:52 +02:00
Alex Moreno	7df4a2b15d	fix(231401): fix tests and fixtures	2023-04-20 08:25:15 +02:00
Alex Moreno	63e0031bc6	deploy(231401): test to master	2023-04-20 08:24:43 +02:00
Alex Moreno	39333a9119	refs #5488 replace hasRole for checkAccessAcl	2023-04-19 15:23:32 +02:00
Vicent Llopis	187ba032d2	refs #5128 rol por ACL	2023-04-19 14:43:15 +02:00
Alex Moreno	c1d4281b1b	refs #5488 replace hasWriteRole, hasReadRole	2023-04-19 13:59:26 +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
Vicent Llopis	be8a11cafc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5318-deviceProductionLog_toSalix	2023-04-19 09:52:28 +02:00
Alex Moreno	bde81e685f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-04-19 07:55:46 +02:00
Alex Moreno	db19f153fb	refs #5488 removes 'role =='	2023-04-18 15:03:23 +02:00
Joan Sanchez	c2af40edb5	changes	2023-04-18 13:15:04 +02:00
Joan Sanchez	d5ea45e36f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-04-18 13:14:57 +02:00
Joan Sanchez	cdf092a989	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-04-18 11:52:17 +02:00
Joan Sanchez	32c9e22d96	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser	2023-04-18 11:41:55 +02:00
Joan Sanchez	a0d8ed1433	E2e fixes	2023-04-18 11:33:36 +02:00
Alexandre Riera	2df362327f	Merge branch 'dev' into 5418-buscador-lateral-fixed-price	2023-04-18 08:33:15 +00:00
Alexandre Riera	28a7722bb6	Merge branch 'dev' into 5518-log-user-role	2023-04-18 08:01:42 +00: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
Carlos Satorres	8b60e9f5fd	sql arreglado	2023-04-18 08:07:35 +02:00
Alex Moreno	560b5b374f	Merge branch 'dev' into 5075-client_balance	2023-04-18 05:37:12 +00:00
Vicent Llopis	d99815356a	refs #5144 manejado que el usuario sea NULL	2023-04-18 07:26:35 +02:00
Carlos Satorres	f76727903a	update insert	2023-04-17 15:17:05 +02:00
Alex Moreno	0c475be10b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4617-use_tmp_in_ticketToInvoice	2023-04-17 14:23:02 +02:00
Joan Sanchez	06a845e7f0	Cambios SQL	2023-04-17 14:15:39 +02:00
Alex Moreno	b5434c5e4e	tab	2023-04-17 12:58:55 +02:00
Alexandre Riera	7d8a0597c1	Merge branch 'dev' into 5518-log-user-role	2023-04-17 09:53:36 +00:00
Alexandre Riera	2675c02d13	refs #5518 moved models to account	2023-04-17 11:52:52 +02:00
Alex Moreno	f97d169cbf	observationEmail	2023-04-17 11:52:31 +02:00
Joan Sanchez	3ee29553b4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser	2023-04-17 09:00:52 +02:00
Joan Sanchez	610f51aaf8	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-04-17 08:59:49 +02:00
Joan Sanchez	02c573bd23	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser	2023-04-17 08:57:24 +02:00
Carlos Satorres	60d3729b4a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5316-kkeoEntryNotes	2023-04-17 08:55:22 +02:00
Alex Moreno	0bfdbcb750	refs #4617 use temporary instead of vn	2023-04-17 08:44:24 +02:00
Joan Sanchez	51e42e485b	Merge pull request 'refs #5284 new onCreateClaimAccepted y createClaim' (!1372) from 5284-fueraPlazo into dev ... Reviewed-on: #1372 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-04-17 06:44:17 +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
Alexandre Riera	ad3836552e	refs #5518 sections added	2023-04-14 14:16:29 +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
Alexandre Riera	b9b52c6b1d	Merge branch 'dev' into 5418-buscador-lateral-fixed-price	2023-04-14 07:08:02 +00:00
Alexandre Riera	8ade602563	hotfix one sign for every ticket	2023-04-13 14:18:01 +02:00
Joan Sanchez	7a02a3213a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-04-13 13:47:34 +02:00
Joan Sanchez	6d5167ab7f	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-04-13 13:47:18 +02:00
Alexandre Riera	ac4772e44e	refs #5418 mistake doing git pull origin dev	2023-04-13 13:46:29 +02:00
Joan Sanchez	9aaea7e8ed	Changed to new SQL version	2023-04-13 12:01:51 +02:00
Joan Sanchez	f5d26bdb99	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-04-13 12:00:22 +02:00
Joan Sanchez	b5f2cf3711	Added unit test & translation fixes	2023-04-13 11:54:56 +02:00
Carlos Satorres	44eab101cc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5284-fueraPlazo	2023-04-13 08:44:56 +02:00
Carlos Satorres	ad267c933c	refs #5540 country.code	2023-04-13 08:30:33 +02:00
Joan Sanchez	eb1798100f	Added version 23.16	2023-04-13 08:16:06 +02:00
Carlos Satorres	747efc4342	refs #5540 sql mod	2023-04-12 14:52:59 +02:00
Carlos Satorres	117849f093	refs #5540 supplier js	2023-04-12 12:03:55 +02:00
Vicent Llopis	58750aa065	refs #5318 eliminido triggers y añadido loggable en salix	2023-04-12 10:02:06 +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
Alexandre Riera	245b0e70f4	hotfix rollback delivery.sql	2023-04-11 14:51:39 +02:00
Alexandre Riera	3ee08e0300	changed folder	2023-04-11 12:34:26 +02:00
Alexandre Riera	c6db5f1a4b	hotfix apply changes procedure	2023-04-11 12:29:09 +02:00
Alexandre Riera	d5d18d5376	hotfix apply SQL delivery.sql	2023-04-11 11:02:08 +02:00
Alexandre Riera	53bd6cd729	Merge branch 'dev' into 5522-loggable-deadlock	2023-04-11 07:52:16 +00:00