764 Commits

Author	SHA1	Message	Date
Javier Segarra	6b37f23349	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin	2023-12-21 13:06:52 +01:00
Carlos Satorres	73d1c1698b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6291-comprobarDNI	2023-12-21 12:38:58 +01:00
Jorge Penadés	5d75592627	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2023-12-20 12:19:10 +01:00
Pablo Natek	3e2cac5544	Merge branch 'dev' into 6005-backupLabeler	2023-12-19 14:05:45 +01:00
Alex Moreno	7777696cf7	refs #6589 fix(worker_absences): fix started hours	2023-12-19 13:58:08 +01:00
Pablo Natek	f68529960e	fix(notification): refs #6005 notification changes	2023-12-19 10:51:18 +01:00
Jorge Penadés	5c22f51043	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-12-18 10:29:14 +01:00
Javier Segarra	dc98436b85	refs #2051 perf: rename variable	2023-12-15 13:01:44 +01:00
Javier Segarra	9316c31180	refs #6264 perf: rename variable when destroy ids	2023-12-14 12:36:36 +01:00
Javier Segarra	1939c65fab	refs #6264 test: remove force describe for dms test	2023-12-14 12:35:54 +01:00
Javier Segarra	d0af29c0c5	refs #6264 test: remove force describe for dms test	2023-12-14 12:28:41 +01:00
Javier Segarra	06bae44824	refs #2051 perf: uploadFile after review	2023-12-13 15:38:46 +01:00
Javier Segarra	7b9e3b0985	refs #2051 perf: removeFile after review	2023-12-13 14:24:05 +01:00
Carlos Satorres	6416891918	refs #6291 tinIsValid worker	2023-12-13 13:55:31 +01:00
Javier Segarra	6b70f8b3eb	refs #2051 feat: uploadFile approach	2023-12-12 13:49:14 +01:00
Javier Segarra	ae76776245	refs #2051 feat: removeFile approach	2023-12-12 12:09:06 +01:00
Jorge Penadés	84270587cb	refs #6274 refactor	2023-12-11 13:42:19 +01:00
Jorge Penadés	968dc65231	refs #6274 tests created	2023-12-07 14:47:22 +01:00
Jorge Penadés	25006a938b	refs #6274 refactor clockIn	2023-12-05 11:53:27 +01:00
Javier Segarra	1d92bbf4a2	refs #5666 feat: replace base value and add mixins	2023-12-05 07:48:56 +01:00
Javier Segarra	57add7abf0	refs #5666 perf: replace Role by VnRole	2023-12-05 07:16:12 +01:00
Jorge Penadés	1dfdd94584	refs #6276 fix getItemPackingType	2023-12-01 13:56:43 +01:00
Jorge Penadés	4690dca4f9	refs #6276 getItemPackingType	2023-12-01 13:54:09 +01:00
Jorge Penadés	877c679273	refs #6276 getVersion	2023-11-29 13:22:44 +01:00
Jorge Penadés	29fb36010c	refs #6274 back methods created	2023-11-28 14:48:03 +01:00
Jorge Penadés	e314a67fe7	refs #6274 time control methods migrated	2023-11-23 13:25:31 +01:00
Pablo Natek	754150d17d	feat(operator.spec): refs #6005 add spec for delay and fix spec for spam	2023-11-23 10:10:09 +01:00
Pablo Natek	1b4ce1a0b5	feat(noSpam): refs #6005 check if exists a previous notification	2023-11-23 08:22:24 +01:00
Carlos Satorres	7c6798c564	refs #6291 dni vn-user	2023-11-21 16:25:48 +01:00
Jorge Penadés	251578146e	refs #6276 several methods created	2023-11-21 12:32:36 +01:00
Jorge Penadés	67fa60ae81	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-11-21 12:27:13 +01:00
Carlos Satorres	b57106af48	refs #6291 validateTin	2023-11-14 11:13:33 +01:00
Carlos Satorres	c5c314eb43	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker	2023-11-10 11:59:01 +01:00
Pablo Natek	1e4f778ef9	refactor(main-labeler): refs #6005 refactor de mainLabeler a backupPrinterFk	2023-11-09 13:22:12 +01:00
Pablo Natek	c00bbe070c	Merge branch 'dev' into 6005-backupLabeler	2023-11-09 09:26:13 +01:00
Sergio De la torre	4258015c07	refs #5870 feat:fixModel	2023-11-09 08:04:38 +01:00
Pablo Natek	9c896c835f	refactor(printer-notification): refs #6005 refactor de la notificación	2023-11-09 07:56:35 +01:00
Jorge Penadés	d0975f0acd	ref #6276 operator_add	2023-11-02 16:25:25 +01:00
Alex Moreno	742d6de986	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-11-02 07:28:41 +01:00
Carlos Andrés	08431e94c6	Merge branch 'master' into 4707-test-workerTimeControl	2023-10-23 13:52:52 +00:00
Carlos Andrés	6e3517b40f	refs #4707 fix: problemas fichadas y test	2023-10-23 14:51:09 +02:00
Jorge Penadés	1f0a57d320	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate	2023-10-23 09:03:15 +02:00
Alex Moreno	dc00b85bec	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-10-23 08:31:37 +02:00
Jorge Penadés	33656e9d9a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate	2023-10-23 08:21:32 +02:00
Guillermo Bonet	5c51d7fb04	Merge branch 'test' into dev	2023-10-19 13:22:33 +02:00
Jorge Penadés	52b14cf8b4	ref #6138 fix emailVerified	2023-10-19 09:51:10 +02:00
Pablo Natek	f1b11fdca2	Merge branch 'master' into 5979-getAppOrigin	2023-10-19 06:51:50 +00:00
Pablo Natek	488181e1b6	feat(getUrl): se añade el metodo getUrl refs #5979	2023-10-19 08:37:28 +02:00
Jorge Penadés	8fe911ee0b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate	2023-10-18 13:43:22 +02:00
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
Carlos Satorres	fd64cb7e80	refs #5919 front back	2023-10-17 13:08:00 +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
Alex Moreno	03687cb482	hotFix: delete getCurrentWorkerMana	2023-10-13 14:56:56 +02:00
Carlos Satorres	c061841cac	refs #5919 locker and back	2023-10-10 13:58:33 +02:00
Carlos Satorres	3c58f86c2a	refs #5919 locker back y front	2023-10-10 13:44:22 +02: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
Sergio De la torre	3ba349b74a	refs #5890 feat: itemShelvingSaleAsignado more calls	2023-10-02 09:14:30 +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
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	4918e3ccc7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2	2023-09-06 14:02:53 +02:00
Sergio De la torre	00201197cc	Merge branch 'dev' into 4815-deviLogModel	2023-09-01 05:24:55 +00:00
Carlos Satorres	0b9199688e	refs #5843 userFk remove and vchange	2023-08-30 12:48:57 +02:00
Vicent Llopis	b304210e8f	Merge branch 'dev' into 5244-component_workerAutocomplete	2023-08-25 08:47:12 +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	dad792cb76	refs #5244 move changes sql	2023-08-24 07:40:37 +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	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
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
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
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	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	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	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
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
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	dc10c20fe3	refs #5334 email validate	2023-07-03 07:29:58 +02:00
Carlos Satorres	83b096c206	refs #5334 fix errors	2023-06-30 09:40:12 +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
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
Carlos Satorres	07712f58e7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment	2023-06-27 13:36:51 +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
Alex Moreno	18a8106461	refs #5339 fix after save	2023-06-22 08:56:27 +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
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
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	0aae1732bf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges	2023-06-13 07:35:29 +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
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	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
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
Alex Moreno	0aed2c2c08	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-05-31 13:10:25 +02:00
Alex Moreno	f0024346a8	refs #5712 openDocuware	2023-05-31 11:32:37 +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
Alex Moreno	c23d8282eb	refs #5712 feat(workerDms): docuware download	2023-05-30 15:34:11 +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
Alexandre Riera	138f03d891	refs #5137 fix back test	2023-05-30 11:34:53 +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
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	027d45bc25	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment	2023-05-26 11:47:04 +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	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
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	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	6ddbd8b8ea	Merge branch 'dev' into 5488-use_checkAccessAcl	2023-05-17 11:43:25 +00:00
Juan Ferrer	f55e5f9f74	refs #5667 Business translations	2023-05-17 11:52:13 +02:00
Juan Ferrer	fa40bd9811	refs #5667 Style & translation fixes	2023-05-17 10:18:41 +02:00
Juan Ferrer	d8eeacb371	refs #5667 Translation improved	2023-05-16 20:24:04 +02:00
Juan Ferrer	30d6f56c39	refs #5667 Style fixes, model translations	2023-05-16 20:06:14 +02:00
Alex Moreno	08fcbebbaf	refs #5488 polish specifics acls	2023-05-15 14:14:08 +02:00
Carlos Satorres	598067f757	refs #5334 routes	2023-05-15 13:15:33 +02:00
Alex Moreno	0aa12a5efb	hotFix(worker_new): use postcode not postalCode	2023-05-15 09:54:40 +02:00
Pablo Natek	8419c76b12	refs #5153 worker sin tr	2023-05-12 12:51:07 +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
Alexandre Riera	ded8e0e141	refs #5137 added trigger, template and test	2023-05-10 13:22:53 +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
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
Carlos Satorres	06c01f3e94	Merge branch 'dev' into 5540-validarSupplierIsVies	2023-04-28 13:02:10 +00:00
Alex Moreno	ac55dc4cc7	refs #5297 feat(worker_new): add payMethod	2023-04-28 14:17:19 +02:00
Alex Moreno	e00edf0266	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5297-newWorker_iban_not_required	2023-04-28 12:06:45 +02:00
Alex Moreno	42e3c8f29d	refs #5488 fix(): use hasWriteRole	2023-04-28 09:35:15 +02:00
Alex Moreno	c62f8e1c14	refs #5297 feat(worker): iban and bankEntity not required	2023-04-26 12:13:14 +02:00
Vicent Llopis	d6ff61b768	refs #5468 corregidas condiciones de autorización	2023-04-26 09:48:02 +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
Juan Ferrer	49368a837b	refs #5517 Filter improved	2023-04-24 19:10: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
Carlos Satorres	cd4f66e292	refs #5540 arreglar e2e	2023-04-24 08:48:35 +02:00
Juan Ferrer	6f1744baff	Merge branch 'dev' into 5517-improveLogs+translations	2023-04-20 16:30:24 +02:00
Alex Moreno	c1d4281b1b	refs #5488 replace hasWriteRole, hasReadRole	2023-04-19 13:59:26 +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
Juan Ferrer	add3a8b1fa	merge with dev	2023-04-15 01:49:23 +02:00
Vicent Llopis	3790e3457f	refs #5517 añadidas más traducciones	2023-04-13 08:43:42 +02:00
Vicent Llopis	2a2d03e05a	refs #5517 añadidas traducciones de algunos modelos	2023-04-12 15:02:21 +02:00
Alexandre Riera	0666163ca0	refs #5546 deleted log property, fixed back tests	2023-04-12 12:33:14 +02:00
Vicent Llopis	58750aa065	refs #5318 eliminido triggers y añadido loggable en salix	2023-04-12 10:02:06 +02:00
Joan Sanchez	5732f9a33b	Merge pull request 'refs #5250 campo de notes' (!1407) from 5250-observacionesWorker into dev ... Reviewed-on: #1407 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-04-11 07:07:55 +00:00
Vicent Llopis	8a297469d6	refs #4856 añadido myOptions	2023-04-06 10:06:29 +02:00
Vicent Llopis	041590e541	refs #4856 maneja errores y notifica a los jefes	2023-04-06 08:54:12 +02:00
Vicent Llopis	a44a640d15	refs #4856 manejo errores	2023-04-05 15:14:42 +02:00
Vicent Llopis	0db3bc5e26	refs #4856 fix test	2023-04-04 09:29:51 +02:00
Vicent Llopis	21b7050cfd	refs #4856 otros usuarios pueden actualizar el estado	2023-04-04 09:29:40 +02:00
Vicent Llopis	862101c4b0	refs #4856 feat: si se modifica una fichada actualiza el estado a 'SENDED' y notifica al trabajador	2023-04-03 21:29:02 +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
Vicent Llopis	e1bfdc3f3c	eliminada variable que no se usa	2023-03-30 11:13:40 +02:00
Carlos Satorres	4edb2463b8	refs #5250 eliminacion isEnabled	2023-03-30 08:23:53 +02:00
Vicent Llopis	5a67f47305	refs #4856 fix: actualizar estado a 'SENDED' movido al back	2023-03-30 08:14:17 +02:00
Vicent Llopis	d066c4ea0b	refs #4856 feat: se envia el registro a todos los teletrabajadores. Tmb se pone estado 'SENDED' cuando se da a 'Reenviar'	2023-03-29 11:27:48 +02:00
Carlos Satorres	564165dc0f	refs #5250 Self.validatesPresenceOf	2023-03-28 10:07:14 +02:00
Carlos Satorres	c68c78cc5b	refs #5250 solucion error WorkerObserv	2023-03-24 12:11:42 +01:00
Robert Ferrús	1d697e1ac5	refs #4357 add operator model	2023-03-17 08:46:01 +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
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
Joan Sanchez	9050c06994	Updated unit test	2023-03-08 07:44:56 +01:00
Joan Sanchez	3ad96b6ad7	Endpoint fixes	2023-03-07 11:55:13 +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
Vicent Llopis	3051768781	WIP: 9b11987d7 feat: desaparecen los botones para las semanas que no tienen registros	2023-03-01 14:50:23 +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
Alexandre Riera	96e103d76e	refs #5287 sections sorted	2023-02-28 08:37:17 +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
Vicent Llopis	475bc2c255	feat: solo puede dar conforme/no confome el propio usuario	2023-02-23 14:33:16 +01:00
Vicent Llopis	05d91ed50e	feat: actualizada interfaz	2023-02-22 15:12:25 +01:00
Joan Sanchez	e34d64361b	Account refactor	2023-01-31 14:57:24 +01:00
Alex Moreno	a74fb31b5b	fix: vn.time	2023-01-30 15:15:27 +01:00
Alex Moreno	0a096bc96f	fix: updateWorkCenter	2023-01-25 15:29:01 +01:00
Joan Sanchez	f0b44a2992	Updated back unit tests	2023-01-24 10:35:21 +01:00
Joan Sanchez	3076123c04	Updated models relation	2023-01-24 09:05:50 +01:00
Joan Sanchez	ee1ce21bb9	refactor(account): account model refactor	2023-01-23 15:24:00 +01:00
Alex Moreno	fe656aa125	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-01-23 14:10:20 +01:00
Alex Moreno	8a844917ce	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-01-23 08:07:14 +01:00
Alex Moreno	a674169ddb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker	2023-01-20 08:30:30 +01:00
Vicent Llopis	921b5cf3fb	add excluded test	2023-01-19 08:54:36 +01:00
Vicent Llopis	92a9004d98	fix: borrada propiedad transaction cuando se hace commit	2023-01-19 08:54:26 +01:00
Vicent Llopis	38e4349e17	borrado comentario	2023-01-18 14:25:24 +01:00
Vicent Llopis	2c995208d1	fix: transaccionado por trabajador y día	2023-01-18 14:23:05 +01:00
Vicent Llopis	7368b572a0	fix: añadidos await y actualizado condicional permissionRate	2023-01-18 13:05:02 +01:00
Alex Moreno	e27a559416	refactor: replace all Date	2023-01-16 15:18:24 +01:00
Alex Moreno	ecfad94057	refactor(worker_new): remove roleFk and profileType	2023-01-16 12:19:03 +01:00
Vicent Llopis	4b60aacbbe	refactor: añadidos valores a piñon a la tabla workerTimeControlConfig	2023-01-12 08:50:03 +01:00
Alex Moreno	9c044dc95b	fix: phone	2023-01-04 09:38:43 +01:00
Alex Moreno	29483bcc1b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker	2023-01-03 12:28:55 +01:00
Alexandre Riera	9887f87dd3	refs #5051 pending added	2023-01-03 08:34:46 +01:00
Alex Moreno	aa5cfde1ae	test(worker_new): add back tests	2023-01-02 14:52:03 +01:00
Alexandre Riera	96f2e4b542	refs #5051 skipped tests and changed fixtures	2023-01-02 13:35:33 +01:00
Alex Moreno	2c5e42d408	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker	2022-12-28 11:49:16 +01:00
Alex Moreno	156f2b9129	feat: handle errors and autogenerate user and code	2022-12-14 15:03:55 +01:00
Alex Moreno	bb944f9fee	feat(newWorker): use worker-welcome	2022-12-12 15:05:49 +01:00
Alex Moreno	09edb99a1b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker	2022-12-12 13:48:06 +01:00
Alex Moreno	4cb8d8c763	test: enable one test and skip another	2022-12-12 13:11:45 +01:00
Joan Sanchez	990dd88e2c	Merge pull request 'test → dev (Hacer despues)' (!1186) from test into dev ... Reviewed-on: #1186	2022-11-29 13:08:38 +00:00
Joan Sanchez	5f3e7c3384	Merge branch 'test' into master	2022-11-29 11:49:06 +00:00
Vicent Llopis	e3e337c02e	fix: backTest	2022-11-28 14:28:47 +01:00
Vicent Llopis	4b54cf954b	refactor: envia el email con formato Verdnatura	2022-11-28 13:56:21 +01:00
Alex Moreno	f70a9cb785	feat(worker_new): use resetPassword funcionality	2022-11-23 14:46:25 +01:00
Alex Moreno	cbdffc98a4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker	2022-11-23 14:16:42 +01:00
Vicent Llopis	bf782c3782	fix: añadido esquema account	2022-11-23 10:09:09 +01:00
Vicent Llopis	e854fd248e	feat: add checkInBox	2022-11-23 10:08:58 +01:00
Vicent Llopis	c200e1af32	refactor: optimizado select	2022-11-15 15:09:41 +01:00
Alex Moreno	7a7da9508f	feat: workerWelcomeEmail	2022-11-15 12:56:30 +01:00
Alex Moreno	db3a6df23d	feat(worker): new worker	2022-11-14 15:19:16 +01:00
Alex Moreno	0f2c0fc490	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker	2022-11-11 12:48:32 +01:00
Vicent Llopis	4d81991d86	delete focus test	2022-11-08 08:47:08 +01:00
Vicent Llopis	8d7296cc8f	feat: add backTest	2022-11-08 08:46:47 +01:00
Vicent Llopis	11459bbd56	refactor: change column name	2022-11-08 08:46:36 +01:00
Vicent Llopis	7fc18c89df	feat: error handlers	2022-11-07 13:57:54 +01:00
Vicent Llopis	ffa0ff650e	feat: add time control	2022-11-07 12:21:14 +01:00
Vicent Llopis	6858de83a3	feat: backTest	2022-11-04 14:55:47 +01:00
Vicent Llopis	892094f85c	feat: add backTest	2022-11-04 13:41:45 +01:00