1232 Commits

Author	SHA1	Message	Date
Jorge Penadés	8f5a5d9cba	fix: refs #6703 tests & backs	2024-01-31 13:11:15 +01:00
Guillermo Bonet	dd17b2c05d	feat: refs #6235 Added device in clockIn	2024-01-31 09:04:30 +01:00
Jorge Penadés	9e12bdf4e8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch	2024-01-31 08:49:28 +01:00
Jorge Penadés	72e5050d93	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-29 08:37:55 +01:00
Jorge Penadés	ed77347fe1	fix: #6557 replace procedure	2024-01-25 15:41:55 +01:00
Pablo Natek	3848503853	fix(test): refs #6743 exportDb	2024-01-25 14:58:48 +01:00
Jorge Penadés	65e5c6dac5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-22 12:45:25 +01:00
Alex Moreno	ee6fe5a6e1	Merge branch 'dev' into 6667-searchFilter	2024-01-22 07:02:51 +00:00
Jorge Penadés	f8faa958e6	feat: refs #6276 drop worker_getPrinter	2024-01-19 14:53:41 +01:00
Jorge Penadés	d78e90687e	fix: refs #6276 drop worker_getPrinter	2024-01-19 14:51:03 +01:00
Jorge Penadés	428da6fe00	feat: refs #6276 drop worker_getPrinter	2024-01-19 14:50:33 +01:00
Jorge Penadés	6e59a87f9c	feat: refs #6276 test operator_add	2024-01-19 14:44:07 +01:00
Jorge Penadés	817a6b1289	feat: refs #6276 test operator_add	2024-01-19 14:35:10 +01:00
Carlos Satorres	0f104e5410	refs #6667 view workerDepartment	2024-01-19 10:11:33 +01:00
Jorge Penadés	d41d57143f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-18 13:53:26 +01:00
Carlos Satorres	ccdef0458a	refs #6667 fix groupBy	2024-01-17 14:39:11 +01:00
Carlos Satorres	d1a3c67d2e	refs #6667 fix limit	2024-01-17 14:07:04 +01:00
Carlos Satorres	bf796c445d	refs #5919 fix section	2024-01-17 13:20:28 +01:00
Carlos Satorres	d47429b4a7	refs #6667 sql	2024-01-17 10:01:38 +01:00
Guillermo Bonet	2f67056dbf	Merge branch 'test' into dev	2024-01-17 09:44:32 +01:00
Guillermo Bonet	5bbeda4014	feat: refs #4734 Added viaexpress interdia	2024-01-16 13:05:16 +01:00
Jorge Penadés	54192c54ad	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-15 13:56:32 +01:00
Alex Moreno	c20b9fe212	refs #6656 fix(updateTimeEntry): correct accessType (WRITE)	2024-01-15 07:45:40 +01:00
Alex Moreno	199656afb8	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-01-12 12:41:52 +01:00
Jorge Penadés	2a6b509a78	fix: refs #6656 change acls	2024-01-12 09:54:18 +01:00
Carlos Satorres	c0c3d913b7	refs #5919 locker	2024-01-12 09:03:54 +01:00
Jorge Penadés	ddcecb8f22	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-11 16:52:54 +01:00
Jorge Penadés	c61f5a67b6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-11 09:28:24 +01:00
Alex Moreno	edde5819e3	refs #6660 feat: update mariadb version 10.7.7→10.11.6	2024-01-10 15:39:35 +01:00
Carlos Satorres	782772bffc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6291-comprobarDNI	2024-01-08 09:54:50 +01:00
Jorge Penadés	7a64b57a2a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2024-01-04 15:07:33 +01:00
Jorge Penadés	2eca02d74f	refactor: drop getItemPackingType refs #6276	2024-01-04 12:57:46 +01:00
Jorge Penadés	3ebf0a30a9	refactor: drop getItemPackingType refs #6276	2024-01-04 12:44:44 +01:00
Jorge Penadés	6d0e1cc47c	refactor: fix conficts refs #6276	2024-01-04 08:51:18 +01:00
Javier Segarra	4d7f0329ee	Merge branch 'dev' into 5666-loggable_to_mixin	2024-01-03 12:46:26 +00:00
Carlos Satorres	3fbead7473	refs #6291 fix tinIsValid	2024-01-03 13:44:20 +01:00
Guillermo Bonet	a6ebd01ebd	Merge branch 'test' into dev	2024-01-03 13:28:23 +01:00
Jorge Penadés	5dc49d226a	refs #6274 fix locale	2024-01-03 10:13:56 +01:00
Alex Moreno	f607719efe	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2024-01-03 08:34:00 +01:00
Carlos Satorres	69739fca9c	refs #5919 locker relation	2024-01-03 08:17:37 +01:00
Jorge Penadés	924fe12a93	add root: refs #6276	2024-01-02 12:44:12 +01:00
Sergio De la torre	365e05d560	refs #6276:mdify back silex→salix	2024-01-02 12:21:25 +01:00
Jorge Penadés	763af7da2d	fix test: refs #6274	2024-01-02 08:58:41 +01:00
Carlos Satorres	3a429a31da	refs #5919 locker	2023-12-29 08:44:42 +01:00
Carlos Satorres	6ceee45b13	refs #5919 fix locker	2023-12-28 16:40:13 +01:00
Carlos Satorres	c77715d865	refs #6291 validation original	2023-12-26 15:03:10 +01:00
Carlos Satorres	f35b2a4905	refs #5919 back chooseLocker	2023-12-26 13:44:52 +01:00
Carlos Satorres	aa33c28468	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker	2023-12-26 12:15:43 +01:00
Jorge Penadés	86db5a931d	arrange test suites: refs #6274	2023-12-22 10:44:21 +01:00
Carlos Satorres	c4ff4c1984	refs #6291 tin valid	2023-12-21 15:07:03 +01:00
Jorge Penadés	0998b5bf2c	add locale and refactor: refs #6274	2023-12-21 13:58:33 +01:00
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	a5ecec9603	refs #2051 feat: remove front methods refactor	2023-12-13 13:47:30 +01:00
Javier Segarra	d206c93305	refs #2051 feat: getAllowedContentTypes approach	2023-12-12 15:03:00 +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
Javier Segarra	a7c48b6ddc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin	2023-12-05 13:02:34 +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	8cb97e2477	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2023-12-04 15:09:44 +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	30b63f577f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-12-01 09:49:49 +01:00
Alex Moreno	016e4ae37c	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2023-11-30 12:20:50 +01:00
Carlos Satorres	9cdb7c3cca	refs #6065 remove workcenter	2023-11-30 09:18:00 +01:00
Jorge Penadés	877c679273	refs #6276 getVersion	2023-11-29 13:22:44 +01:00
Jorge Penadés	133fe1065a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-11-29 09:44:09 +01:00
Jorge Penadés	c609f6f47f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2023-11-29 09:27:50 +01:00
Jorge Penadés	29fb36010c	refs #6274 back methods created	2023-11-28 14:48:03 +01:00
Pablo Natek	b713a32fe1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler	2023-11-28 08:12:06 +01:00
Juan Ferrer	74772472d5	Merge pull request 'master' (!1820) from master into test ... Reviewed-on: #1820 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-11-27 12:16:42 +00:00
Alex Moreno	3fb1ed9dfe	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6506-hotfixContract	2023-11-27 08:38:17 +01:00
Carlos Satorres	f9d5cad412	refs #6506 contract	2023-11-27 07:57:18 +01:00
Carlos Satorres	5d18c211a0	refs #6507 state	2023-11-24 08:40:06 +01:00
Carlos Satorres	8a568f180a	refs #6506 fix e2e, refactor business	2023-11-24 07:47:57 +01:00
Carlos Satorres	ebe467f721	refs #6506 hotfix	2023-11-24 07:04:55 +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	2b455488a3	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2023-11-22 18:35:16 +01:00
Carlos Satorres	6b07ee4eb1	hotfix workerhours	2023-11-22 18:35:14 +01:00
Pablo Natek	3788d160a6	Merge branch 'dev' into 6005-backupLabeler	2023-11-22 11:30:44 +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
Alex Moreno	f677382f96	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-11-16 09:29:53 +01:00
Alex Moreno	5bdf6a7338	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-11-16 07:56:23 +01:00
Alex Moreno	89967b8538	fix(workerDescriptor): show account button	2023-11-15 13:16:31 +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
Alex Moreno	52f419d4cf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector	2023-11-09 09:33:22 +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
Alex Moreno	d06810b1b9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector	2023-11-03 14:58:55 +01:00
Jorge Penadés	d0975f0acd	ref #6276 operator_add	2023-11-02 16:25:25 +01:00
Alex Moreno	83b9ef72fc	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-11-02 08:47:44 +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
Pablo Natek	3584b15c19	Merge branch 'dev' into 4131-unifyTicketStatusChanges	2023-10-26 22:10:35 +02:00
Alex Moreno	55d80458cc	refs #6065 warmFix(workerTimeControl): set date	2023-10-26 14:37:42 +02: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
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
Carlos Satorres	5a375ebfda	refs #5919 front back	2023-10-16 13:22:36 +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	38bf90da66	refs #5919 sql	2023-10-11 13:26:27 +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
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