1050 Commits

Author	SHA1	Message	Date
Jorge Penadés	ea5597d3f3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6138-setPassword	2023-10-18 13:40:02 +02:00
Alex Moreno	4300b24c14	refs #5918 refactor(worker_timeControl): simplify ng-show	2023-10-18 10:45:15 +02:00
Alex Moreno	d1cb2a1d9a	refs #5918 test: add updateWorkerTimeControlMail	2023-10-18 10:30:36 +02:00
Alex Moreno	a7b0ef1e4c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5918-worker.time-control_resend	2023-10-18 09:23:55 +02:00
Jorge Penadés	69a54be1a9	ref #5947 refactorWorkerCreate	2023-10-17 14:02:08 +02:00
Jorge Penadés	48003b5d03	ref #6138	2023-10-17 08:28:15 +02:00
Pablo Natek	033c02750b	refactor(origin): .origin por getUrl()	2023-10-16 18:24:58 +02:00
Jorge Penadés	bd535374d8	ref #6138 setPasword created	2023-10-16 15:58:25 +02:00
Alex Moreno	9e39e96cf4	hotFix: workerTimeControl	2023-10-16 15:22:33 +02:00
Sergio De la torre	f6bf36d46a	Merge branch 'dev' into 5134-ModelsSalix	2023-10-13 14:02:25 +00:00
Alex Moreno	03687cb482	hotFix: delete getCurrentWorkerMana	2023-10-13 14:56:56 +02:00
Sergio De la torre	35c0ec0d04	Merge branch 'dev' into 5134-ModelsSalix	2023-10-11 15:14:13 +00:00
Carlos Satorres	05812c3f35	refs #6282 left join	2023-10-06 07:14:30 +02:00
Alex Moreno	f8a510b330	refs #5918 fix(workerTimeControl): update(workerTimeControl	2023-10-04 12:31:46 +02:00
Alex Moreno	df6d10e514	refs #5918 fix(workerTimeControl): resend mail	2023-10-04 12:17:24 +02:00
Alex Moreno	45e41de9a9	refs #5918 fix(worker_time-control): isMailSended	2023-10-03 14:03:52 +02:00
Alex Moreno	21ddcb7e8e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5918-worker.time-control_resend	2023-10-03 11:39:44 +02:00
Jorge Penadés	2eb9a97ece	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink	2023-10-02 09:28:41 +02:00
Sergio De la torre	3ba349b74a	refs #5890 feat: itemShelvingSaleAsignado more calls	2023-10-02 09:14:30 +02:00
Jorge Penadés	5f93df26a5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6065-fixWorkerTimeControl	2023-10-02 08:21:09 +02:00
Alex Moreno	7b8518ff5a	Merge branch 'dev' into 6033-vnLog_userDescriptor	2023-10-02 05:04:26 +00:00
Jorge Penadés	9536fdba58	ref #6119 refactor	2023-09-29 10:10:58 +02:00
Jorge Penadés	f1dc809147	Merge branch 'dev' into 6119-addMicrosipLink	2023-09-29 06:22:51 +00:00
Jorge Penadés	4d226d9a58	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6065-fixWorkerTimeControl	2023-09-29 08:20:16 +02:00
Jorge Penadés	e209ab28f4	ref #6065 first time hours load fixed	2023-09-28 11:53:09 +02:00
Jorge Penadés	869bdab7ce	ref #6065 fetchHours relocated	2023-09-28 11:36:03 +02:00
Sergio De la torre	22f71e6147	Merge branch 'dev' into 5134-ModelsSalix	2023-09-28 08:18:15 +02:00
Sergio De la torre	18de92f9e7	refs #5134 fix: format	2023-09-28 07:51:54 +02:00
Sergio De la torre	a86469ccd2	refs #5134 fix: format	2023-09-28 07:42:44 +02:00
Jorge Penadés	a7c0949f0e	ref #6065 replace then by async/await	2023-09-27 08:57:31 +02:00
Alex Moreno	e36f98195c	refs #6033 feat: create user-photo component for worker and user descriptor	2023-09-26 08:15:19 +02:00
Alex Moreno	7a3d3d5e2a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5918-worker.time-control_resend	2023-09-25 14:14:23 +02:00
Alex Moreno	d43b70c971	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-09-22 14:30:28 +02:00
Alex Moreno	cf36b10763	refs #4815 feat: add serialNumber in deviceLog	2023-09-22 14:29:48 +02:00
Alex Moreno	d16ae47712	Merge branch 'dev' into 5843-quitUserFk2	2023-09-22 11:01:25 +00:00
Carlos Satorres	c7f84ad6db	refs #5843 add return	2023-09-22 10:36:51 +02:00
Pablo Natek	c175bcfc97	refs #6159 rename spec	2023-09-22 09:40:37 +02:00
Pablo Natek	1357b60b9b	refs #6159 fixFixtures	2023-09-22 09:14:08 +02:00
Carlos Satorres	1f1dfae7e3	refs #5843 changes models	2023-09-21 12:50:07 +02:00
Carlos Satorres	cd20a2d06d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2	2023-09-21 07:32:19 +02:00
Pablo Natek	66e851b5ea	refs #4131 changeStateRefactor	2023-09-13 19:48:58 +02:00
Carlos Satorres	544259df9a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant	2023-09-11 10:47:21 +02:00
Jorge Penadés	48a6bf2969	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink	2023-09-08 08:05:17 +02:00
Jorge Penadés	427425a750	ref #6119 simplifiy component	2023-09-07 09:50:13 +02:00
Carlos Satorres	4918e3ccc7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2	2023-09-06 14:02:53 +02:00
Carlos Satorres	7025326e06	Merge branch 'dev' into 6044-fixTickCalendar	2023-09-04 10:31:08 +00:00
Jorge Penadés	f46d6355dd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink	2023-09-04 08:06:47 +02:00
Jorge Penadés	52d698b0eb	ref#6119 link fixed	2023-09-01 12:38:35 +02:00
Carlos Satorres	9b971abb55	refs #6044 class scss	2023-09-01 11:49:08 +02:00
Sergio De la torre	00201197cc	Merge branch 'dev' into 4815-deviLogModel	2023-09-01 05:24:55 +00:00
Jorge Penadés	c2a54b8c65	ref #6119 vnLinkPhone created	2023-08-31 13:02:56 +02:00
Jorge Penadés	05f0f72c73	refs #6119 microsip link added	2023-08-30 14:14:48 +02:00
Carlos Satorres	0b9199688e	refs #5843 userFk remove and vchange	2023-08-30 12:48:57 +02:00
Vicent Llopis	00b1746fd8	Merge branch 'dev' into 5918-worker.time-control_resend	2023-08-25 11:32:58 +00:00
Vicent Llopis	b304210e8f	Merge branch 'dev' into 5244-component_workerAutocomplete	2023-08-25 08:47:12 +00:00
Vicent Llopis	c4cf5f3a4f	Merge branch 'dev' into 5918-worker.time-control_resend	2023-08-25 08:04:42 +00:00
Vicent Llopis	9da5c4c1db	refs #5918 refacotr: cambiado nombre variable	2023-08-25 10:04:27 +02:00
Vicent Llopis	9a12169ba4	Merge branch 'dev' into 6013-sendMail_fix	2023-08-24 07:33:07 +00:00
Vicent Llopis	beeebbdf9c	refs #6013 refactor: siempre se crea una tranacción para cada dia	2023-08-24 09:33:58 +02:00
Vicent Llopis	1f63648697	refs #5918 fix: muestra los botones en una línea y no carga todos los datos de workerTimeControlMail de la semana	2023-08-24 09:10:04 +02:00
Vicent Llopis	f8fd2bbd17	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5918-worker.time-control_resend	2023-08-24 07:50:24 +02:00
Vicent Llopis	3cffdca0c7	Merge branch 'dev' into 5244-component_workerAutocomplete	2023-08-24 05:39:48 +00:00
Vicent Llopis	dad792cb76	refs #5244 move changes sql	2023-08-24 07:40:37 +02:00
Alex Moreno	7349d4496f	refs #5351 hotFix(worker_sip): use worker.id not worker.userFk	2023-08-23 07:34:01 +02:00
Vicent Llopis	dd1dbcbd4a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete	2023-08-22 13:39:09 +02:00
Vicent Llopis	c7c17e6e4a	Merge branch 'dev' into 6013-sendMail_fix	2023-08-22 11:18:08 +00:00
Carlos Satorres	b1b6bd13ea	refs #5843 change userFk	2023-08-22 10:45:41 +02:00
Sergio De la torre	8d0b3efa11	refs #4815 feat:DeviceLog Model	2023-08-14 09:39:40 +02:00
Sergio De la torre	a6047d257b	refs #5134 feat:modelsSalix	2023-08-11 12:45:18 +02:00
Alex Moreno	4191d2529d	refs #5712 warnFix: getById condition	2023-08-07 07:57:38 +02:00
Carlos Satorres	3388fd7c59	fix test back	2023-08-03 10:26:29 +02:00
Carlos Satorres	4fb0ad415c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5640-mayusFiscalDate	2023-08-03 10:03:15 +02:00
Carlos Satorres	183fdacefc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5640-mayusFiscalDate	2023-08-03 10:01:11 +02:00
Alex Moreno	fd9b842e6f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-08-02 13:58:40 +02:00
Alex Moreno	56cd94feaa	refs #5843 fix(timeControl_filter): not use userFk	2023-08-02 13:26:42 +02:00
Alex Moreno	b8780dfbbf	Merge branch 'master' into hotifx-loadDataDepartment	2023-08-01 12:12:17 +00:00
Carlos Satorres	40607a42cf	hotfix-loadData	2023-08-01 10:25:44 +02:00
Vicent Llopis	81dc163819	ya no muestra error en el front	2023-07-28 14:40:03 +02:00
Alex Moreno	e253dd7982	refs #5351 fix(worker_model): remove required userFk	2023-07-28 14:39:01 +02:00
Vicent Llopis	251ed36eca	refs #6013 feat: mostrar error en el mail	2023-07-28 10:51:48 +02:00
Carlos Satorres	af60412232	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant	2023-07-27 17:24:50 +02:00
Vicent Llopis	0054f2d82f	refs #6013 fix: codigo no bloqueante	2023-07-27 15:07:10 +02:00
Vicent Llopis	7367d1cdfe	refs #6013 fix: add await	2023-07-27 14:41:53 +02:00
Vicent Llopis	8267daef3a	refs #5918 fix: permite reenviar el correo si ha dado fallo	2023-07-21 12:58:44 +02:00
Alex Moreno	23308d7ae3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5712-workerDms_integrateDocuware	2023-07-21 12:40:59 +02:00
Vicent Llopis	d6a27741b5	a	2023-07-20 09:50:56 +02:00
Vicent Llopis	04ca5743a2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete	2023-07-20 09:40:41 +02:00
Alex Moreno	8c84f006b0	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-07-20 07:15:30 +02:00
Carlos Satorres	6f3cdd3508	refs #5640 fix e2e back	2023-07-17 12:30:48 +02:00
Carlos Satorres	b113052b5c	refs #5640 fixtures and test fix	2023-07-14 13:48:36 +02:00
Vicent Llopis	6980392ba1	fix: tabulacion	2023-07-14 13:11:09 +02:00
Vicent Llopis	5716acaa3c	fix: test	2023-07-14 13:01:31 +02:00
Vicent Llopis	4f183d1c6a	fix: worker.basic-data el boton guardar estava activo al hacer F5	2023-07-14 12:18:41 +02:00
Vicent Llopis	4a7cfe9122	fix: workCenter	2023-07-14 11:51:15 +02:00
Vicent Llopis	75a66571ba	refs #5244 refactor: modificados todos los url='activeWith...'	2023-07-13 12:59:39 +02:00
Vicent Llopis	c876719a5c	refs #5244 fix: corregidos errores	2023-07-13 12:59:02 +02:00
Vicent Llopis	1d7f0e2135	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete	2023-07-13 11:42:49 +02:00
Vicent Llopis	01dc26f64e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4770-routes_roadmap2	2023-07-13 09:42:53 +02:00
Vicent Llopis	954c2f5435	refs #5244 feat: carga valor inicial	2023-07-12 13:12:51 +02:00
Vicent Llopis	bd85cf4e90	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete	2023-07-12 12:29:17 +02:00
Vicent Llopis	a831a1534b	Merge branch 'dev' into 4770-routes_roadmap2	2023-07-11 11:50:15 +00:00
Vicent Llopis	7030be3efa	fix	2023-07-07 09:30:04 +02:00
Carlos Satorres	3d9f0e1497	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment	2023-07-06 05:48:45 +02:00
Alex Moreno	d7fca07446	Merge branch 'dev' into 5712-workerDms_integrateDocuware	2023-07-05 10:17:42 +00:00
Alex Moreno	5d933da28a	refs #5712 fix empty data	2023-07-05 12:14:26 +02:00
Alex Moreno	444b08c566	refs #5712 test(docuware)	2023-07-05 12:09:52 +02:00
Alex Moreno	1a18ba66a9	refs #5712 fix(workerDms): filter	2023-07-04 15:18:57 +02:00
Vicent Llopis	e58d4e5db3	refs #4770 feat: añadida sección 'Troncales'	2023-07-04 14:42:51 +02:00
Carlos Satorres	5000e05e05	refs #5334 merge + e2e solve	2023-07-04 09:57:16 +02:00
Carlos Satorres	f1502139ac	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment	2023-07-04 09:56:38 +02:00
Alex Moreno	4f616397a2	refs #5712 use dmsType readRole	2023-07-03 15:05:39 +02:00
Carlos Satorres	983d028d06	refs #5334 popover y basic data	2023-07-03 13:58:40 +02:00
Alex Moreno	c7b9d0827e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5712-workerDms_integrateDocuware	2023-07-03 13:42:54 +02:00
Pablo Natek	8ef6f0dd17	Merge branch 'dev' into 5347-clientCreateRefactor	2023-07-03 11:35:50 +00:00
Carlos Satorres	5e68363312	refs #5334 onsearch postlink	2023-07-03 09:38:36 +02:00
Carlos Satorres	dc10c20fe3	refs #5334 email validate	2023-07-03 07:29:58 +02:00
Carlos Satorres	dc36c6fd9d	refs #5334 basicData solve e2e	2023-06-30 13:52:46 +02:00
Alex Moreno	f636c3b1ab	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-06-30 11:57:56 +02:00
Carlos Satorres	3d93043b98	Merge branch '5334-editDepartment' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment	2023-06-30 09:40:15 +02:00
Carlos Satorres	83b096c206	refs #5334 fix errors	2023-06-30 09:40:12 +02:00
Carlos Satorres	6b4501146d	refs #5334 fix errors	2023-06-30 09:39:48 +02:00
Vicent Llopis	f3e771747a	refs #5244 fix: getItemTypeWorker permite filtrar por id	2023-06-29 15:56:07 +02:00
Vicent Llopis	3cedef6f16	refs #5244 fix: add id	2023-06-29 15:22:53 +02:00
Javi Gallego	bc4058512a	Merge branch 'test' into 5900-removeDuplicatedLogs	2023-06-29 12:43:16 +00:00
Vicent Llopis	011db142d3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete	2023-06-29 12:49:55 +02:00
Carlos Satorres	bb4951bbc8	Merge branch 'dev' into 5334-editDepartment	2023-06-29 07:47:41 +00:00
Carlos Satorres	9dc52b6011	refs #5334 fix labels trad	2023-06-29 09:44:21 +02:00
Pablo Natek	bbc5ed2683	Merge branch 'dev' into 5347-clientCreate-→-client_create	2023-06-29 05:22:06 +00:00
Alex Moreno	befa385830	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5712-workerDms_integrateDocuware	2023-06-28 14:30:20 +02:00
Vicent Llopis	6894da7e22	refs #5688 fix: front test	2023-06-28 13:27:18 +02:00
Alex Moreno	da50ea1dd0	Merge branch 'dev' into 5688-worker.calendar_workCenter	2023-06-28 11:10:51 +00:00
Carlos Satorres	f02019d64d	refs #5334 fix words	2023-06-28 11:52:53 +02:00
Carlos Satorres	07712f58e7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment	2023-06-27 13:36:51 +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
Alex Moreno	ecf742959c	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-06-26 11:55:28 +02:00
Juan Ferrer	e32a29fc09	refs #5900 Remove duplicated logs	2023-06-25 19:08:13 +02:00
Carlos Satorres	beb173f6ce	refs #5334 quit e2e no necesario	2023-06-22 15:20:28 +02:00
Vicent Llopis	d9b1f4b8a1	refs #5688 fix: test e2e	2023-06-22 15:06:27 +02:00
Carlos Satorres	137e01e60c	refs #5334 fix acl, filter	2023-06-22 15:00:59 +02:00
Vicent Llopis	d272121258	refs 5688 fix: e2e	2023-06-22 14:52:42 +02:00
Vicent Llopis	d26778e94e	refs #5688 fix: e2e	2023-06-22 13:30:53 +02:00
Vicent Llopis	5f4b62f133	refs #5688 fix: test front	2023-06-22 09:48:14 +02:00
Alex Moreno	18a8106461	refs #5339 fix after save	2023-06-22 08:56:27 +02:00
Vicent Llopis	473b218da1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5688-worker.calendar_workCenter	2023-06-22 08:04:17 +02:00
Alex Moreno	aea32492e3	Merge branch 'master' into 5339_instance_vs_data	2023-06-22 05:33:34 +00:00
Vicent Llopis	e9ef81f8d7	refs #5244 feat: coge todos los hijos recursivamente	2023-06-21 15:00:46 +02:00
Vicent Llopis	a699e2d874	refs #5244 feat: añadido 'depatments' como binding	2023-06-21 14:07:36 +02:00
Carlos Satorres	9870cc7b14	refs #5660 change assist	2023-06-21 13:34:27 +02:00
Vicent Llopis	dd75302bbb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete	2023-06-21 13:33:09 +02:00
Carlos Satorres	168d05a830	refs #5334 fix errors	2023-06-21 13:07:04 +02:00
Alex Moreno	2ddf8e5de6	Merge branch 'dev' into 5334-editDepartment	2023-06-21 06:24:19 +00:00
Pablo Natek	e741904250	refs #5347	2023-06-20 17:01:06 +02:00
Vicent Llopis	f37974c835	Merge branch 'dev' into 5468-account_privileges	2023-06-20 12:39:27 +00:00
Alex Moreno	dcfb991f94	hotFix(getLeaves): remoteMethodCtx correct defined	2023-06-20 09:20:06 +02:00
Carlos Satorres	c63df30e5c	refs #5334 fix back	2023-06-20 09:19:20 +02:00
Carlos Satorres	a155f846c2	refs #5334 fix ctx	2023-06-20 09:15:37 +02:00
Carlos Satorres	4537344790	merge	2023-06-20 08:20:13 +02:00
Carlos Satorres	7f20973650	refs #5334 merge	2023-06-20 08:16:36 +02:00
Carlos Satorres	3701acd26e	refs #5334 error getLeaves solve	2023-06-19 13:48:14 +02:00
Carlos Satorres	98125f8974	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment	2023-06-19 13:22:41 +02:00
Sergio De la torre	b6c8ca20ee	refs #5339 data	2023-06-19 08:58:20 +02:00
Vicent Llopis	55e123e795	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete	2023-06-16 11:45:08 +02:00
Vicent Llopis	55990869e2	refs #5688 ya no muestra mensaje de error	2023-06-15 14:16:26 +02:00
Vicent Llopis	b7b6f413ba	refs #5688 feat: no mostrar datos si no tiene workerCenterFk	2023-06-15 14:15:22 +02:00
Vicent Llopis	192f4c7864	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5688-worker.calendar_workCenter	2023-06-15 14:15:00 +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
Vicent Llopis	6f3c28c4a4	refs #5468 refactor: eliminado código obsoleto	2023-06-13 07:34:41 +02:00
Carlos Satorres	908799adee	refs #5660 deliveryAssit	2023-06-12 14:58:28 +02: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
Vicent Llopis	f47a049d7a	refs #5244 fix: cambiada descripción erronea	2023-06-08 13:39:21 +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
Vicent Llopis	7dd5a5ac8e	refs #5244 feat: hereda correctamente	2023-06-08 13:12:30 +02:00
Vicent Llopis	1e759119db	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete	2023-06-08 11:13:07 +02:00
Vicent Llopis	874255f2e5	refs #5244 feat: extiende correctamente	2023-06-08 11:07:57 +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
Alex Moreno	e5ababb0a9	Merge branch 'dev' into 5712-workerDms_integrateDocuware	2023-06-07 11:49:40 +00: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
Alexandre Riera	bfd421c188	Merge branch 'dev' into 5137-aviso-impresora	2023-06-07 06:30:43 +00:00
Carlos Satorres	d8f5978284	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment	2023-06-05 08:30:12 +02:00
Carlos Satorres	c1cda1a3ff	refs #5334 basicData e2e	2023-06-05 08:29:56 +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
Carlos Satorres	1095a59954	refs #5334 rest back, e2e summary, less e2e basic	2023-06-02 14:44:56 +02:00
Vicent Llopis	01175a4c6c	quitado vn	2023-06-02 12:32:34 +02:00
Vicent Llopis	186ec2ea41	fix sendMail: sustituido modelo Journey por BusinessSchedule	2023-06-02 12:22:27 +02:00
Juan Ferrer	c05d6bb9a1	refs #5563 WorkerDocument translation fixes	2023-06-02 11:43:44 +02:00
Juan Ferrer	95715763a1	refs #5667 Worker translations added/fixed	2023-06-02 08:57:22 +02:00
Carlos Satorres	5f72fabf8e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment	2023-06-02 08:21:14 +02:00
Carlos Satorres	04780e211d	refs #5334 test front & 1/2 back	2023-06-01 16:03:55 +02:00
Carlos Satorres	bb5247c49b	refs #5334 tree	2023-06-01 14:19:50 +02:00
Alex Moreno	69bf26433d	fix(workerLog): acl to hr	2023-06-01 13:19:34 +02:00
Carlos Satorres	f37c66304f	refs #5334 change info	2023-06-01 12:00:15 +02:00
Carlos Satorres	4c7c7f5c96	refs #5334 mod search-panel	2023-06-01 11:30:28 +02:00
Alexandre Riera	f9528b922c	refs #5595 added userId in options	2023-06-01 08:32:06 +02:00
Carlos Satorres	0ee8811c15	refs #5398 fix agencies, warehouses	2023-06-01 07:52:21 +02:00
Vicent Llopis	d5aae8f824	refs #5688 refactor: muestra un mensaje de error controlado	2023-05-31 14:53:31 +02:00
Carlos Satorres	967e07933d	refs #5398 fix	2023-05-31 14:46:19 +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	eb6953a2b6	refs #5334 department	2023-05-31 12:50:02 +02:00
Vicent Llopis	02665ec8e9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete	2023-05-31 12:28:13 +02:00
Carlos Satorres	d1a61b3e0d	refs #5334 dinamic	2023-05-31 12:26:49 +02:00
Carlos Satorres	489012886b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment	2023-05-31 12:04:26 +02:00
Carlos Satorres	e38bf4f1b3	refs #5334 button delete, btn popover	2023-05-31 12:02:22 +02:00
Alex Moreno	9ebac5a3f8	Merge branch 'dev' into 5712-workerDms_integrateDocuware	2023-05-31 09:40:32 +00:00
Alex Moreno	f0024346a8	refs #5712 openDocuware	2023-05-31 11:32:37 +02:00
Carlos Satorres	0774a94d8b	refs #5334 params	2023-05-31 11:24:11 +02:00
Vicent Llopis	a539abf3d8	refs #5244 feat: creado back para buscar trabjadores por name. nickname y code	2023-05-31 10:15:16 +02:00
Juan Ferrer	a4d7988591	refs #5517 Translations fixes	2023-05-30 19:39:11 +02:00
Carlos Satorres	2c3869d961	refs #5398 capital letters	2023-05-30 15:48:09 +02:00
Carlos Satorres	0fd7f4183e	refs #5334 fk	2023-05-30 15:36:39 +02:00
Alex Moreno	c23d8282eb	refs #5712 feat(workerDms): docuware download	2023-05-30 15:34:11 +02:00
Carlos Satorres	1dcaba1fdc	refs #5334 department workers list	2023-05-30 15:13:16 +02:00
Carlos Satorres	26187898e1	refs #5334 popover	2023-05-30 14:02:34 +02:00
Carlos Satorres	8860c77147	refs #5334 fix descriptor	2023-05-30 13:21:57 +02:00
Carlos Satorres	45085cccc8	refs #5334 fix search-panel	2023-05-30 12:54:51 +02:00
Carlos Satorres	e7d25a6cf3	refs #5334 filter	2023-05-30 12:08:45 +02:00
Carlos Satorres	e26eedb51c	refs #5334 descriptor wprkerFk clientFk	2023-05-30 11:54:14 +02:00
Vicent Llopis	4f9dae3522	refs #5468 fix: no muestra el id de contrato en worker/calendar	2023-05-30 11:52:04 +02:00
Carlos Satorres	cf632040e7	refs #5334 workFk, clientFk	2023-05-30 11:48:39 +02:00
Alexandre Riera	138f03d891	refs #5137 fix back test	2023-05-30 11:34:53 +02:00
Carlos Satorres	2778858705	refs #5334 search-panel	2023-05-30 10:27:49 +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
Carlos Satorres	107d8d1edd	refs #5334 model y vista	2023-05-30 10:13:49 +02:00
Carlos Satorres	d9a64211de	refs #5334 fix descriptor, basic-data, summary	2023-05-30 09:16:02 +02:00
Carlos Satorres	9ee653dbd1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment	2023-05-30 08:05:17 +02:00
Carlos Satorres	2d6f0bb2ce	refs #5334 front fix	2023-05-29 15:27:50 +02:00
Alex Moreno	b60cd2539a	refs #5712 feat(workerDms): docuware integration	2023-05-29 15:21:37 +02:00
Carlos Satorres	f4e877dada	refs #5334 refactor summary	2023-05-29 14:46:39 +02:00
Alexandre Riera	1bb5033729	Merge branch 'dev' into 5137-aviso-impresora	2023-05-29 10:56:21 +00:00
Alexandre Riera	059467a383	refs #5137 sql moved to template	2023-05-29 12:55:20 +02:00
Carlos Satorres	1593b4b626	Merge branch 'dev' into 5398-Agencys&WarehousesData	2023-05-29 07:09:08 +00:00
Carlos Satorres	2a78a912eb	refs #5334 worker.department	2023-05-26 14:35:12 +02:00
Carlos Satorres	3aa5ce6208	refs #5334 fix hasToSendMail	2023-05-26 14:23:34 +02:00
Carlos Satorres	ceaaece007	refs #5334 label-value	2023-05-26 14:08:37 +02:00
Carlos Satorres	07e176ae4f	refs #5334 fix checks basic-data	2023-05-26 13:25:49 +02:00
Carlos Satorres	f74c370446	refs #5334 checks vertical	2023-05-26 13:15:47 +02:00
Alex Moreno	0789804352	refs #5334 fix basic-data	2023-05-26 12:58:03 +02:00
Alex Moreno	2b06c62876	refs #5334 left-menu	2023-05-26 12:21:15 +02:00
Carlos Satorres	027d45bc25	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment	2023-05-26 11:47:04 +02:00
Carlos Satorres	10e085ca1b	refs #5334 link department	2023-05-26 11:43:51 +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	6294fc0435	refs #5297 back&e2e fix changes	2023-05-24 10:02:02 +02: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	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
Vicent Llopis	b65ebc6af3	refs #5468 feat: cambiados acls	2023-05-23 07:09:51 +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
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
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