Commit Graph

1037 Commits

Author SHA1 Message Date
Carlos Satorres 45085cccc8 refs #5334 fix search-panel
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 12:54:51 +02:00
Carlos Satorres e7d25a6cf3 refs #5334 filter
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 12:08:45 +02:00
Carlos Satorres e26eedb51c refs #5334 descriptor wprkerFk clientFk
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 11:54:14 +02:00
Vicent Llopis 4f9dae3522 refs #5468 fix: no muestra el id de contrato en worker/calendar
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 11:52:04 +02:00
Carlos Satorres cf632040e7 refs #5334 workFk, clientFk
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-30 10:13:49 +02:00
Carlos Satorres d9a64211de refs #5334 fix descriptor, basic-data, summary
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-29 15:27:50 +02:00
Alex Moreno b60cd2539a refs #5712 feat(workerDms): docuware integration
gitea/salix/pipeline/head This commit looks good Details
2023-05-29 15:21:37 +02:00
Carlos Satorres f4e877dada refs #5334 refactor summary
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-29 14:46:39 +02:00
Alexandre Riera 1bb5033729 Merge branch 'dev' into 5137-aviso-impresora
gitea/salix/pipeline/head Build queued... Details
2023-05-29 10:56:21 +00:00
Alexandre Riera 059467a383 refs #5137 sql moved to template
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-29 12:55:20 +02:00
Carlos Satorres 1593b4b626 Merge branch 'dev' into 5398-Agencys&WarehousesData
gitea/salix/pipeline/head This commit looks good Details
2023-05-29 07:09:08 +00:00
Carlos Satorres 2a78a912eb refs #5334 worker.department
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-26 14:35:12 +02:00
Carlos Satorres 3aa5ce6208 refs #5334 fix hasToSendMail
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-26 14:23:34 +02:00
Carlos Satorres ceaaece007 refs #5334 label-value
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-26 14:08:37 +02:00
Carlos Satorres 07e176ae4f refs #5334 fix checks basic-data
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-26 13:25:49 +02:00
Carlos Satorres f74c370446 refs #5334 checks vertical
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-26 13:15:47 +02:00
Alex Moreno 0789804352 refs #5334 fix basic-data
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-26 12:58:03 +02:00
Alex Moreno 2b06c62876 refs #5334 left-menu
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-26 12:21:15 +02:00
Carlos Satorres 027d45bc25 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-26 11:47:04 +02:00
Carlos Satorres 10e085ca1b refs #5334 link department
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/head This commit looks good Details
2023-05-26 07:41:48 +02:00
Carlos Satorres fa8fd8d5bc refs #5398 update from oldbranch
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 11:41:14 +02:00
Carlos Satorres 6294fc0435 refs #5297 back&e2e fix changes
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 05:55:08 +00:00
Vicent Llopis b65ebc6af3 refs #5468 feat: cambiados acls
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-23 07:09:51 +02:00
Juan Ferrer 26c2ab867d Merge pull request 'master into test' (!1546) from master into test
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 14:43:20 +02:00
Carlos Satorres 814568f2a9 refs #5297 errors solve, trad
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-18 13:11:17 +02:00
Alex Moreno 6ddbd8b8ea Merge branch 'dev' into 5488-use_checkAccessAcl
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 11:43:25 +00:00
Juan Ferrer f55e5f9f74 refs #5667 Business translations
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 11:52:13 +02:00
Juan Ferrer fa40bd9811 refs #5667 Style & translation fixes
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 10:18:41 +02:00
Carlos Satorres adafd7444b refs #5334 worker-department
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-17 10:04:44 +02:00
Carlos Satorres f63dd0f9a3 refs #5334 datos
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-17 09:05:28 +02:00
Juan Ferrer d8eeacb371 refs #5667 Translation improved
gitea/salix/pipeline/head This commit looks good Details
2023-05-16 20:24:04 +02:00
Juan Ferrer 30d6f56c39 refs #5667 Style fixes, model translations
gitea/salix/pipeline/head This commit looks good Details
2023-05-16 20:06:14 +02:00
Carlos Satorres 5c9ee21cfc refs #5334 department.card
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-16 14:00:05 +02:00
Carlos Satorres 9f9963af56 refs #5334 descriptor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-16 13:10:26 +02:00
Carlos Satorres d09889b08a refs #5334 fix summary route
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-16 12:12:25 +02:00
Carlos Satorres 3dcdbe0223 refs #5334 summary basic data
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-16 11:41:42 +02:00
Carlos Satorres 612d0a2dfb refs #5334 fix index
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-16 09:52:48 +02:00
Carlos Satorres fd4d04756a refs #5334 routes index fix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-16 08:54:54 +02:00
Alex Moreno 08fcbebbaf refs #5488 polish specifics acls
gitea/salix/pipeline/head This commit looks good Details
2023-05-15 14:14:08 +02:00
Carlos Satorres 443821b5c2 refs #5334 ?q
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-15 13:59:54 +02:00
Carlos Satorres 071849065a refs #5334 fix main
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-15 13:55:35 +02:00
Carlos Satorres 598067f757 refs #5334 routes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-15 13:15:33 +02:00
Carlos Satorres 87e1caa4eb refs #5334 department seccion
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-15 10:43:06 +02:00
Alex Moreno 0aa12a5efb hotFix(worker_new): use postcode not postalCode
gitea/salix/pipeline/head This commit looks good Details
2023-05-15 09:54:40 +02:00
Pablo Natek 8419c76b12 refs #5153 worker sin tr
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/head This commit looks good Details
2023-05-12 08:28:19 +02:00
Alexandre Riera ded8e0e141 refs #5137 added trigger, template and test
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
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
Alexandre Riera 13c37e88ef Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector
gitea/salix/pipeline/head This commit looks good Details
2023-05-02 11:38:07 +02:00
Alexandre Riera c2de5c5ff4 refs #4797 added redirection section
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-02 07:28:59 +02:00
Carlos Satorres 06c01f3e94 Merge branch 'dev' into 5540-validarSupplierIsVies
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-28 13:02:10 +00:00
Alex Moreno ac55dc4cc7 refs #5297 feat(worker_new): add payMethod
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-28 09:35:15 +02:00
Alex Moreno c62f8e1c14 refs #5297 feat(worker): iban and bankEntity not required
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 12:13:14 +02:00
Vicent Llopis d6ff61b768 refs #5468 corregidas condiciones de autorización
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2023-04-25 15:17:45 +02:00
Pablo Natek e8ce8e42fd refs #5153
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2023-04-25 14:17:46 +02:00
Alex Moreno 0c668c6ade refs #5488 feat(): replace all hasRole to checkAccessAcl
gitea/salix/pipeline/head This commit looks good Details
2023-04-25 14:17:36 +02:00
Juan Ferrer 49368a837b refs #5517 Filter improved
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-24 06:51:41 +00:00
Carlos Satorres cd4f66e292 refs #5540 arreglar e2e
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/head This commit looks good Details
2023-04-19 13:59:26 +02:00
Vicent Llopis 5ace66ebca refs #5318 fix e2e
gitea/salix/pipeline/head This commit looks good Details
2023-04-19 09:54:54 +02:00
Vicent Llopis be8a11cafc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5318-deviceProductionLog_toSalix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-19 09:52:28 +02:00
Joan Sanchez 6f2aa0f618 Worker note ACL
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 14:51:48 +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
gitea/salix/pipeline/head This commit looks good Details
2023-04-13 08:43:42 +02:00
Vicent Llopis 2a2d03e05a refs #5517 añadidas traducciones de algunos modelos
gitea/salix/pipeline/head This commit looks good Details
2023-04-12 15:02:21 +02:00
Alexandre Riera 0666163ca0 refs #5546 deleted log property, fixed back tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-12 12:33:14 +02:00
Vicent Llopis 58750aa065 refs #5318 eliminido triggers y añadido loggable en salix
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-06 10:06:29 +02:00
Vicent Llopis 041590e541 refs #4856 maneja errores y notifica a los jefes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-06 08:54:12 +02:00
Vicent Llopis a44a640d15 refs #4856 manejo errores
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-05 15:14:42 +02:00
Vicent Llopis 0db3bc5e26 refs #4856 fix test
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-03 21:29:02 +02:00
Joan Sanchez 8b4c70e8ba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-30 14:57:00 +02:00
Vicent Llopis e1bfdc3f3c eliminada variable que no se usa
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
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'
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 12:11:42 +01:00
Carlos Satorres fde854f5c2 refs #5250 campo de notes
gitea/salix/pipeline/head This commit looks good Details
2023-03-22 10:21:15 +01:00
Robert Ferrús 1d697e1ac5 refs #4357 add operator model
gitea/salix/pipeline/head This commit looks good Details
2023-03-17 08:46:01 +01:00
Vicent Llopis a87e0c52d2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control 2023-03-16 07:32:04 +01:00
Vicent Llopis 4dc9e9e590 refs #4856 refactor: make agnostic the component calendar 2023-03-14 07:44:39 +01:00
Carlos Satorres e947672c69 Merge branch 'dev' into 5352-worker.create_swift/bic
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-13 14:36:51 +00:00
Vicent Llopis 165dc73b33 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 12:22:29 +01:00
Vicent Llopis 79023fbfaf feat: add backTest
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 12:16:53 +01:00
Vicent Llopis f461c75af1 feat: add front test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 12:06:31 +01:00
Vicent Llopis 776f7783c6 refactor code 2023-03-08 12:06:20 +01:00
Vicent Llopis 0396d3707c refator: creada ruta de back, en vez de hacer peticiones http anidadas en el front
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 11:47:10 +01:00
Vicent Llopis 760690a625 fix: test front
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 09:51:21 +01:00
Joan Sanchez 9050c06994 Updated unit test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 07:44:56 +01:00
Joan Sanchez 3ad96b6ad7 Endpoint fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-07 11:55:13 +01:00
Vicent Llopis a98bb59479 fix: test front
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-06 12:47:49 +01:00
Vicent Llopis 497d756af6 fix: autocompletar el switf/bic
gitea/salix/pipeline/head This commit looks good Details
2023-03-03 13:46:18 +01:00
Joan Sanchez 37043beb68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-03 07:44:31 +01:00
Vicent Llopis 7c24b940b3 feat: colorea los numeros de la semana al inicio y cada vez que canvias de mes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-02 14:55:18 +01:00
Vicent Llopis 3051768781 WIP: 9b11987d7 feat: desaparecen los botones para las semanas que no tienen registros
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2023-03-01 14:11:12 +01:00
Alexandre Riera d5ea59e284 refs #5287 permisos añadidos
gitea/salix/pipeline/head This commit looks good Details
2023-02-28 12:46:48 +01:00
Alexandre Riera 96e103d76e refs #5287 sections sorted
gitea/salix/pipeline/head This commit looks good Details
2023-02-28 08:37:17 +01:00
Alexandre Riera 7a04b0b3de refs #5287 icon added
gitea/salix/pipeline/head This commit looks good Details
2023-02-28 08:00:18 +01:00
Alexandre Riera 94901d5b1f refs #5287 pda section added, tests added
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-28 07:49:34 +01:00
Alexandre Riera 5d9220c5c0 refs #5287 locker added
gitea/salix/pipeline/head This commit looks good Details
2023-02-27 08:39:46 +01:00
Vicent Llopis 9b11987d75 feat: desaparecen los botones para las semanas que no tienen registros
gitea/salix/pipeline/head This commit looks good Details
2023-02-23 14:33:38 +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 9310e92223 refactor
gitea/salix/pipeline/head This commit looks good Details
2023-02-23 10:44:08 +01:00
Vicent Llopis 35b47c6da2 refactor code
gitea/salix/pipeline/head This commit looks good Details
2023-02-23 08:21:59 +01:00
Vicent Llopis 05d91ed50e feat: actualizada interfaz
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-22 15:12:25 +01:00
Vicent Llopis c8c48ea175 feat: colorar numeros de semanas segun el registro de horas
gitea/salix/pipeline/head This commit looks good Details
2023-02-21 15:16:28 +01:00
Joan Sanchez e34d64361b Account refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-31 14:57:24 +01:00
Alex Moreno a74fb31b5b fix: vn.time
gitea/salix/pipeline/head This commit looks good Details
2023-01-30 15:15:27 +01:00
Alex Moreno 0a096bc96f fix: updateWorkCenter
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-25 15:29:01 +01:00
Joan Sanchez 12cf79ab39 Updated e2e 2023-01-25 14:14:55 +01:00
Joan Sanchez f0b44a2992 Updated back unit tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-24 10:35:21 +01:00
Joan Sanchez 3076123c04 Updated models relation
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-24 09:05:50 +01:00
Joan Sanchez ee1ce21bb9 refactor(account): account model refactor
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 08:30:30 +01:00
Vicent Llopis 921b5cf3fb add excluded test
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2023-01-18 14:25:24 +01:00
Vicent Llopis 2c995208d1 fix: transaccionado por trabajador y día
gitea/salix/pipeline/head This commit looks good Details
2023-01-18 14:23:05 +01:00
Vicent Llopis 7368b572a0 fix: añadidos await y actualizado condicional permissionRate
gitea/salix/pipeline/head This commit looks good Details
2023-01-18 13:05:02 +01:00
Alex Moreno e27a559416 refactor: replace all Date
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-16 15:18:24 +01:00
Alex Moreno ecfad94057 refactor(worker_new): remove roleFk and profileType
gitea/salix/pipeline/head This commit looks good Details
2023-01-16 12:19:03 +01:00
Vicent Llopis 4b60aacbbe refactor: añadidos valores a piñon a la tabla workerTimeControlConfig
gitea/salix/pipeline/head This commit looks good Details
2023-01-12 08:50:03 +01:00
Alex Moreno 9c044dc95b fix: phone
gitea/salix/pipeline/head This commit looks good Details
2023-01-04 09:38:43 +01:00
Alex Moreno 9b98249398 test: front test and e2e
gitea/salix/pipeline/head This commit looks good Details
2023-01-04 09:23:18 +01:00
Alex Moreno ef437f2fee test: e2e and backTest
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 14:50:29 +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
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 08:34:46 +01:00
Alex Moreno 46c3d87dab feat(worker_create): add vn-acl
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 08:09:46 +01:00
Alex Moreno aa5cfde1ae test(worker_new): add back tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-02 14:52:03 +01:00
Alexandre Riera 96f2e4b542 refs #5051 skipped tests and changed fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-01-02 13:35:33 +01:00
Alex Moreno 2c5e42d408 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-28 11:49:16 +01:00
Alex Moreno 156f2b9129 feat: handle errors and autogenerate user and code
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-14 15:03:55 +01:00
Alex Moreno bb944f9fee feat(newWorker): use worker-welcome
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-12 13:11:45 +01:00
Joan Sanchez 990dd88e2c Merge pull request 'test → dev (Hacer despues)' (!1186) from test into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1186
2022-11-29 13:08:38 +00:00
Joan Sanchez 5f3e7c3384 Merge branch 'test' into master
gitea/salix/pipeline/head This commit looks good Details
2022-11-29 11:49:06 +00:00
Vicent Llopis e3e337c02e fix: backTest
gitea/salix/pipeline/head This commit looks good Details
2022-11-28 14:28:47 +01:00
Vicent Llopis 4b54cf954b refactor: envia el email con formato Verdnatura
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-28 13:56:21 +01:00
Alex Moreno f70a9cb785 feat(worker_new): use resetPassword funcionality
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 15:09:41 +01:00
Alex Moreno 7a7da9508f feat: workerWelcomeEmail
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 08:47:08 +01:00
Vicent Llopis 8d7296cc8f feat: add backTest
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2022-11-07 13:57:54 +01:00
Vicent Llopis ffa0ff650e feat: add time control
gitea/salix/pipeline/head This commit looks good Details
2022-11-07 12:21:14 +01:00
Vicent Llopis 6858de83a3 feat: backTest
gitea/salix/pipeline/head This commit looks good Details
2022-11-04 14:55:47 +01:00
Vicent Llopis 892094f85c feat: add backTest
gitea/salix/pipeline/head This commit looks good Details
2022-11-04 13:41:45 +01:00
Vicent Llopis 98cc2b5866 refactor: endpoint 2022-11-04 13:41:38 +01:00
Vicent Llopis 626355d251 fix: sustituido insert por insert ignore
gitea/salix/pipeline/head This commit looks good Details
2022-11-04 12:37:07 +01:00
Vicent Llopis ab739f412f feat: add test
gitea/salix/pipeline/head This commit looks good Details
2022-11-03 15:00:55 +01:00
Vicent Llopis 6df74facdc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail 2022-11-02 14:23:20 +01:00
Vicent Llopis 57564325e1 feat: añadidas opciones para confirmar o no confirmar el registro de horas
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 14:22:18 +01:00
Alex Moreno 84a5f3986b feat(worker): createWorker refs #4658
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 13:24:35 +01:00
Vicent Llopis 3243d35bd7 feat: send email
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-31 14:48:37 +01:00
Vicent Llopis 1f2ea2c4d8 fix: incorrect number of params
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-31 13:30:08 +01:00
Vicent Llopis 273a8cd7c7 refactor code
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-31 13:00:32 +01:00
Vicent Llopis b17fe0d18c refator code
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-31 09:55:11 +01:00
Vicent Llopis 786ba0d614 feat: inserta fichadas de los teletrabajadores
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-31 07:34:34 +01:00
Pau f481cc3c97 Capitalizar
gitea/salix/pipeline/head This commit looks good Details
2022-10-18 10:38:40 +02:00
Pau 1d8fb25325 Refactored according to the suggested changes
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 10:25:54 +02:00
Pau 3376293d1a Added user icon and fixed icon not updating
gitea/salix/pipeline/head This commit is unstable Details
2022-10-06 11:54:14 +02:00
Pau 1165e050eb feat: workerDisableExcluded update DB field
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-10-06 10:18:08 +02:00
Pau 600dd7a434 Created the model and UI 2022-10-05 11:52:14 +02:00
Pau 26a16bf846 ACL para sector,añadido sector al model-config
gitea/salix/pipeline/head This commit looks good Details
2022-09-23 13:53:33 +02:00
Alex Moreno b3aaa493d5 fix(): fix fixtures and all code needed for change the structure
gitea/salix/pipeline/head This commit looks good Details
2022-09-19 09:45:28 +02:00
Joan Sanchez 5a46444875 Use POST request method instead of GET
gitea/salix/pipeline/head This commit looks good Details
2022-09-13 13:53:44 +02:00
Joan Sanchez 768e4d5e77 Resolved conflicts
gitea/salix/pipeline/head This commit looks good Details
2022-08-10 12:13:31 +02:00
Vicent Llopis 020990dadc fix: backTest
gitea/salix/pipeline/head This commit is unstable Details
2022-08-04 09:53:22 +02:00
Carlos Andrés 918a09ad5c #3530 Eliminar uso tabla person
gitea/salix/pipeline/head This commit is unstable Details
2022-07-29 15:17:00 +02:00
Joan Sanchez f9b9dfaf4b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-05-24 14:54:06 +02:00
Joan Sanchez caa9a63c4c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2022-05-24 08:45:37 +02:00
Vicent Llopis db7638f153 refactor: sectorFk property deleted
gitea/salix/pipeline/head This commit looks good Details
2022-05-23 12:45:20 +02:00
Vicent Llopis a043c5d346 refactor: request changes
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 13:10:48 +02:00
Vicent Llopis ebbb0466a0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3870-models
gitea/salix/pipeline/head This commit is unstable Details
2022-05-17 10:13:05 +02:00
Carlos Jimenez Ruiz d31f7f1b6b all type Dates replaced to date as per convention
gitea/salix/pipeline/head This commit looks good Details
2022-05-16 10:19:43 +02:00
Alex Moreno 5021315ed4 refactor(clientCredit): test and types
gitea/salix/pipeline/head This commit looks good Details
2022-05-12 09:47:47 +02:00
Alex Moreno 798147ea99 jenkins error
gitea/salix/pipeline/head This commit looks good Details
2022-05-05 14:40:13 +02:00
Alex Moreno 1e3b05a95d remove console.log
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-05 13:32:34 +02:00
Alex Moreno 70aca5d11a fix(worker): fix getMonth
gitea/salix/pipeline/head This commit looks good Details
2022-05-05 13:25:57 +02:00
Vicent Llopis bad90c12f4 feat: add required fields and models
gitea/salix/pipeline/head This commit looks good Details
2022-04-27 14:17:41 +02:00
Carlos Jimenez Ruiz 080975208b Merge branch 'dev' into 2958-vnDescriptor_OpenSummaryPopup
gitea/salix/pipeline/head This commit looks good Details
2022-04-13 08:12:28 +00:00
Vicent Llopis a348762153 refactor: pull request changes
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 09:09:05 +02:00
Alex Moreno 786b7fa84f feat(descriptor): button open summary popup
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 08:02:05 +02:00
Vicent Llopis 2c54f31985 refactor: uppercase
gitea/salix/pipeline/head This commit looks good Details
2022-03-31 10:54:30 +02:00
Vicent Llopis 443db55f58 feat(worker_basic-data): add new fields
gitea/salix/pipeline/head This commit looks good Details
2022-03-31 09:18:18 +02:00
Carlos Jimenez Ruiz 7d3f8844cc Merge branch 'dev' into 3637-departments_hasToMistake
gitea/salix/pipeline/head This commit looks good Details
2022-03-29 08:27:46 +00:00
Carlos Jimenez Ruiz b27a7ca263 Merge branch 'dev' into 3637-departments_hasToMistake
gitea/salix/pipeline/head This commit looks good Details
2022-03-29 08:19:01 +00:00
Carlos Jimenez Ruiz 74fb7c95c2 Merge branch 'dev' into 3621-worker_calendar
gitea/salix/pipeline/head This commit looks good Details
2022-03-29 08:18:13 +00:00
Vicent Llopis 133152460a fix: translate
gitea/salix/pipeline/head This commit looks good Details
2022-03-28 14:14:41 +02:00
Vicent Llopis 4bdc29e283 refactor: calculate holidays through db procedures 2022-03-24 10:59:23 +01:00
Alex Moreno ad4c89af5f feat(department): add hasToMistake in model
gitea/salix/pipeline/head This commit looks good Details
2022-03-23 14:12:47 +01:00
Alex Moreno 254fee5036 feat(worker_calendar): repaint, fix front test and add fixtures
gitea/salix/pipeline/head This commit looks good Details
2022-03-23 14:02:48 +01:00
Alex Moreno 0963b66560 fix(worker_calendar): absence in holiday day
gitea/salix/pipeline/head There was a failure building this commit Details
2022-03-23 13:06:17 +01:00
Vicent Llopis a3dbec82bd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3638-export_database 2022-03-17 07:59:07 +01:00
Vicent Llopis 6a91fe6c11 solved backTest
gitea/salix/pipeline/head This commit looks good Details
2022-03-10 14:43:07 +01:00
Alex Moreno c8a512db4e unnecessary 2022-03-08 15:16:36 +01:00
Vicent Llopis 87daac03ee Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3638-export_database 2022-03-04 13:06:38 +01:00
Alex Moreno ccb5261ff6 Merge branch '3598-worker_calendar_absences' of https://gitea.verdnatura.es/verdnatura/salix into 3598-worker_calendar_absences
gitea/salix/pipeline/head This commit looks good Details
2022-03-02 10:31:27 +01:00
Alex Moreno bf712ba5af feat(worker): absences can return all absences of worker 2022-02-25 10:33:47 +01:00
Alex Moreno c33b8fbb83 refactor(worker): absences return one or all abscences
gitea/salix/pipeline/head This commit looks good Details
2022-02-23 14:50:59 +01:00
Vicent Llopis 30763e5c08 fix: backTest
gitea/salix/pipeline/head This commit looks good Details
2022-02-23 09:05:53 +01:00
Vicent Llopis 13ce7991ec refactor: uppercase in model type
gitea/salix/pipeline/head This commit looks good Details
2022-01-17 09:49:45 +01:00
Vicent Llopis e850fdaf4e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3448-worker_calendar-payedHolidays 2022-01-12 12:15:32 +01:00
Carlos Jimenez Ruiz 7b5e6e8a23 added shorcuts for order, monitor and worker modules
gitea/salix/pipeline/head This commit looks good Details
2022-01-10 16:08:45 +01:00
Vicent Llopis 914fca0814 fix: delete unnecessary ng-if
gitea/salix/pipeline/head This commit looks good Details
2022-01-04 10:28:06 +01:00
Vicent Llopis ac833ac625 feat: add field payedHolidays
gitea/salix/pipeline/head This commit looks good Details
2021-12-24 11:30:28 +01:00
Vicent Llopis e1c4f144a7 feat: add code
gitea/salix/pipeline/head This commit looks good Details
2021-12-23 14:57:22 +01:00
Vicent Llopis 671a35f8c9 upload branch
gitea/salix/pipeline/head This commit looks good Details
2021-12-23 13:11:17 +01:00
Vicent Llopis 238577ec8f refactor: change ids by codes and add fixtures
gitea/salix/pipeline/head This commit looks good Details
2021-11-30 13:57:17 +01:00
Carlos Jimenez Ruiz d760eba446 Merge branch 'dev' into 3275-worker_calendar
gitea/salix/pipeline/head This commit looks good Details
2021-11-30 11:40:54 +00:00
Vicent Llopis 21bd625b3b add exceprion to half day absence
gitea/salix/pipeline/head This commit looks good Details
2021-11-30 12:31:02 +01:00
Vicent Llopis 4c064f8a80 feat(worker_calendar): add restrictions to add absence and to add hours recorded
gitea/salix/pipeline/head This commit looks good Details
2021-11-30 09:11:23 +01:00
Alex Moreno 594f258232 modify js date format
gitea/salix/pipeline/head This commit looks good Details
2021-11-30 07:16:43 +01:00
Alex Moreno 85e3b47408 test(worker_time-control): tested url parameter timestamp
gitea/salix/pipeline/head There was a failure building this commit Details
2021-11-29 15:22:16 +01:00
Alex Moreno 65053f5f28 feat(worker_time-control): add timestamp url param
gitea/salix/pipeline/head This commit looks good Details
2021-11-26 13:26:48 +01:00
Carlos Jimenez Ruiz dd19ac975d Merge branch 'dev' into 3338-worker_calendar
gitea/salix/pipeline/head This commit looks good Details
2021-11-22 13:18:53 +00:00
Vicent Llopis abf3c1c84b Merge branch '3338-worker_calendar' of https://gitea.verdnatura.es/verdnatura/salix into 3338-worker_calendar
gitea/salix/pipeline/head This commit looks good Details
2021-11-22 13:34:44 +01:00
Vicent Llopis cdf7c20b16 feat(worker_createAbsense): update backTest 2021-11-22 13:34:42 +01:00
Joan Sanchez 9c5939b661 Updated styles
gitea/salix/pipeline/head This commit looks good Details
2021-11-18 16:02:47 +01:00
Carlos Jimenez Ruiz c1adba3249 Merge branch 'dev' into 3338-worker_calendar
gitea/salix/pipeline/head This commit looks good Details
2021-11-18 14:01:25 +00:00
Joan Sanchez c98730e6b9 Updated styles
gitea/salix/pipeline/head This commit looks good Details
2021-11-18 14:00:45 +01:00
Carlos Jimenez Ruiz 1d253fc53d definitions corrected for myOptions of endpoints 2021-11-18 11:17:30 +01:00
Vicent Llopis 00a33fabb3 update backTest
gitea/salix/pipeline/head This commit looks good Details
2021-11-17 14:38:12 +01:00
Vicent Llopis 651a925708 feat(worker_calendar): only can choose one halfHoliday by year
gitea/salix/pipeline/head This commit looks good Details
2021-11-17 14:20:26 +01:00
Vicent Llopis 180fb95a00 feat(createAbsence): add backTest
gitea/salix/pipeline/head This commit looks good Details
2021-11-16 10:09:42 +01:00
Vicent Llopis 7efb19ab83 feat(worker_calendar): add restriction to choose "Vacaciones 1/2 día"
gitea/salix/pipeline/head This commit looks good Details
2021-11-15 14:49:14 +01:00
Alex Moreno da80fee0e2 refactor(time-control): getWorkedHours.spec
gitea/salix/pipeline/head This commit looks good Details
2021-11-09 10:09:44 +01:00
Alex Moreno 9e4627617d fix(time-control): modify select & refactor dates
gitea/salix/pipeline/head This commit looks good Details
2021-11-08 14:08:44 +01:00
Joan Sanchez 66830f32fd feat(exportation): added exportation report & send report with client invoicing
gitea/salix/pipeline/head This commit looks good Details
Refs: 3254
2021-10-25 11:58:23 +02:00
Carlos Jimenez Ruiz 580ba36357 refactor(jasmine): usage of done on async functions is deprecated 2021-10-15 14:45:41 +02:00
Joan Sanchez b3a34489b0 fix(calendar): Event colors were not showing properly
gitea/salix/pipeline/head This commit looks good Details
Refs: 3166
2021-10-04 09:30:55 +02:00
Javi Gallego 3365eadf5e Merge branch 'dev' into 2995-supplierAccount-modificaciones 2021-09-21 14:02:07 +02:00
Joan Sanchez 4494522ad1 feat(calendar): component shows now the year week numbers
gitea/salix/pipeline/head This commit looks good Details
Refs: 2389
2021-09-16 12:13:20 +02:00
Javi Gallego cffe25d41f Merge branch 'dev' into 2995-supplierAccount-modificaciones
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-18 12:38:41 +02:00
Javi Gallego 78a98cd6b7 shrink-datetime
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-15 08:35:14 +02:00
Carlos Jimenez Ruiz 1a045442d4 added acl to goToUser button on client and worker descriptors 2021-08-13 14:53:39 +02:00
Joan Sanchez 63b502b368 Updated model ACL
gitea/salix/pipeline/head This commit looks good Details
2021-07-19 13:01:06 +02:00
Carlos Jimenez Ruiz ae4f1d1730 the absences are now fetched alongside the hours
gitea/salix/pipeline/head This commit looks good Details
2021-07-14 10:09:24 +02:00
Carlos Jimenez Ruiz 4148500c61 workers without active contract no longer set calendar and timeControl at fault
gitea/salix/pipeline/head This commit looks good Details
2021-06-30 14:05:16 +02:00
Carlos Jimenez Ruiz 8344a58ab8 updated client/worker/user IDs on tests
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-23 13:24:23 +02:00
Joan Sanchez 0ff114ff36 Ammends
gitea/salix/pipeline/head This commit looks good Details
2021-06-18 12:32:37 +02:00
Joan Sanchez bc7c288742 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-06-18 08:03:55 +02:00
Joan Sanchez bb80621890 2874 - Edit time entry direction
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-17 15:09:04 +02:00
Joan Sanchez 59e90c2c10 Removed commented block
gitea/salix/pipeline/head This commit looks good Details
2021-06-14 11:58:39 +02:00
Joan Sanchez de30a2d978 Total holidays fix
gitea/salix/pipeline/head This commit looks good Details
2021-06-14 08:09:53 +02:00
Joan Sanchez a72010554c Fixes and E2E updated
gitea/salix/pipeline/head This commit looks good Details
2021-06-11 10:58:00 +02:00
Joan Sanchez 3f3e5c2735 Unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-06-10 16:05:10 +02:00
Joan Sanchez 1b62233ea7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2567-calendar_rework 2021-06-10 14:22:13 +02:00
Joan Sanchez 8284702603 2567 - Working calendar refactor
gitea/salix/pipeline/head This commit looks good Details
2021-06-10 11:24:32 +02:00
Joan Sanchez 3c8629b3f3 Added entilementRate effects
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-08 16:36:16 +02:00
Joan Sanchez 8fa64122f8 Ammends
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-07 14:58:24 +02:00
Carlos Jimenez Ruiz a46fef5295 endpoint minor refactor
gitea/salix/pipeline/head This commit looks good Details
2021-06-07 14:26:34 +02:00
Joan Sanchez c853cfc86f Refactor 2021-06-04 15:49:48 +02:00
Joan Sanchez b77ecc2c06 changes2 2021-06-04 11:45:35 +02:00
Joan Sanchez 3fcd78e1f3 Changes 2021-06-03 11:00:40 +02:00
Joan Sanchez 714142f868 Merge branch 'dev' into 2908-label_value_full_text
gitea/salix/pipeline/head This commit looks good Details
2021-05-18 12:53:33 +00:00
Joan Sanchez a9e33abacc FIX: Show employee list
gitea/salix/pipeline/head This commit looks good Details
2021-05-18 14:44:24 +02:00
Carlos Jimenez Ruiz c0e2ff12da moved vn-log to salix components + css changes and renamed worker-log to log 2021-05-18 13:22:40 +02:00
Carlos Jimenez Ruiz b2ecd7d3c2 Merge branch 'dev' into 2878-activeWorkers_refactor
gitea/salix/pipeline/head This commit looks good Details
2021-04-14 08:15:06 +00:00
Joan Sanchez dac95805e8 2882 - Replaced worker userFk property by user id
gitea/salix/pipeline/head This commit looks good Details
2021-04-14 09:02:08 +02:00
Joan Sanchez 78313bd9a7 Updated unit tests 2021-04-14 08:15:03 +02:00
Joan Sanchez 6b8074e32f 2878 - Splitted method into activeWithRole and activeWithInheritedRole
gitea/salix/pipeline/head This commit looks good Details
2021-04-13 14:08:10 +02:00
jorgebl 1fd18cae5a QA
gitea/salix/pipeline/head This commit looks good Details
2021-03-05 11:40:01 +01:00
jorgebl cdd903dedf removed line break because the app interpretate it's a space 2021-03-03 15:09:01 +01:00
jorgebl 56154181aa QA done 2021-03-03 13:39:25 +01:00
jorgebl 60ca3e87a5 Test git 2021-03-02 16:53:54 +01:00
jorgebl 3c82a4997b Test gitea 2021-03-02 16:52:14 +01:00
jorgebl 022d31c952 remove line break
gitea/salix/pipeline/head This commit looks good Details
2021-03-02 14:43:55 +01:00
jorgebl 325a7e7235 Translate note
gitea/salix/pipeline/head This commit looks good Details
2021-03-02 12:50:07 +01:00
jorgebl 094552e0f2 Added ellipsize and align label
gitea/salix/pipeline/head This commit looks good Details
2021-02-26 12:32:05 +01:00
jorgebl 1f1db53d41 Summary boss shown on descriptor 2021-02-24 16:12:44 +01:00
jorgebl 9855bd14fe Translate Boss
gitea/salix/pipeline/head This commit looks good Details
2021-02-23 11:08:57 +01:00
jorgebl 8deb11d333 Added boss on basic data and summary 2021-02-19 17:45:45 +01:00
Joan Sanchez 2c9fd45958 2778 - Allow edit order number
gitea/salix/pipeline/head This commit looks good Details
2021-02-05 12:09:48 +01:00
Joan Sanchez 84cef1949b Image size fix
gitea/salix/pipeline/head This commit looks good Details
2021-02-04 18:28:58 +01:00
Joan Sanchez dea858c314 Removed focus
gitea/salix/pipeline/head This commit looks good Details
2021-02-02 10:12:37 +01:00
Joan Sanchez a21d8acde6 2762 - Delete entry ass teamBoss
gitea/salix/pipeline/head This commit looks good Details
2021-02-02 10:07:13 +01:00
Joan Sanchez f5f4c5936d 2763 - Notify urgen issues
gitea/salix/pipeline/head This commit looks good Details
2021-02-01 09:29:47 +01:00
Joan Sanchez dd29b351d2 Disabled loggable
gitea/salix/pipeline/head This commit looks good Details
2021-01-12 14:25:01 +01:00
Jorge Padawan b4899fc0ff Fix for good practique code
gitea/salix/pipeline/head This commit looks good Details
2021-01-12 10:17:12 +01:00
Jorge Padawan f45aa7937d Added conditionals with rols to display or not the icons with link 2021-01-12 07:39:12 +01:00
Jorge Padawan af55e2cc32 Add tooltip and modified sref for previews 2021-01-11 10:36:20 +01:00
Jorge Padawan 5a30bf5fa4 2650 add links to edit on summaries 2021-01-08 15:43:33 +01:00
Joan Sanchez 6416b0ad79 2666 - Closure invalid email notification
gitea/salix/pipeline/head This commit looks good Details
2020-12-22 14:56:21 +01:00
Carlos Jimenez Ruiz ec0ae8f07c years previous to contrar error corrected
gitea/salix/pipeline/head This commit looks good Details
2020-12-21 13:52:37 +01:00
Joan Sanchez 6717853efb Updated front tests
gitea/salix/pipeline/head This commit looks good Details
2020-12-18 18:02:41 +01:00
Joan Sanchez d8a2184695 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2576-photo_uploader 2020-12-18 17:24:30 +01:00
Joan Sanchez 42cd2356a2 Refactor v2
gitea/salix/pipeline/head There was a failure building this commit Details
2020-12-18 17:23:04 +01:00
Carlos Jimenez Ruiz e9f73c3299 worker module refactors 2020-12-16 10:32:32 +01:00
Joan Sanchez 0a4016be41 Updated unit tests & changed ACL
gitea/salix/pipeline/head This commit looks good Details
2020-12-11 15:04:55 +01:00
Joan Sanchez 59c622481f Updated image fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
2020-12-10 13:21:11 +01:00
Joan Sanchez 1ba1d27ba0 2576 - Photo upload component
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-27 13:10:39 +01:00
Joan Sanchez 8eb14a8bdc 2588 - No ellipsize on summary notes or address
gitea/salix/pipeline/head This commit looks good Details
2020-11-24 14:56:10 +01:00
Joan Sanchez 80bae4de0a 2607 - Changed preview icon
gitea/salix/pipeline/head This commit looks good Details
2020-11-24 08:22:54 +01:00
Joan Sanchez c654e14cfe 2611 - Summary go to entity
gitea/salix/pipeline/head This commit looks good Details
2020-11-23 13:41:51 +01:00
Bernat Exposito 4d91b26537 checkinbox moved to worker
gitea/salix/pipeline/head This commit looks good Details
2020-11-20 13:35:01 +01:00
Juan Ferrer 80cbb53dfe Merge branch 'test' into dev 2020-11-13 10:49:59 +01:00
Juan Ferrer cdf6cb661f Login sync fixes 2020-11-13 10:33:34 +01:00
Carlos Jimenez Ruiz e22e74a725 expanded date columns + order index translations
gitea/salix/pipeline/head This commit looks good Details
2020-11-10 16:47:39 +01:00
Carlos Jimenez Ruiz 25684ec521 small refactor timeControl index
gitea/salix/pipeline/head This commit looks good Details
2020-10-29 13:46:36 +01:00
Carlos Jimenez Ruiz a797a2db8b fixed the absences unit test
gitea/salix/pipeline/head This commit looks good Details
2020-10-23 13:34:57 +02:00
Joan Sanchez 3c37f0e993 Merge branch 'dev' into 2428-anchor_directive
gitea/salix/pipeline/head This commit looks good Details
2020-10-21 08:32:31 +00:00
Joan Sanchez 011bba1660 Added vn-anchor to client and ticket index
gitea/salix/pipeline/head There was a failure building this commit Details
2020-10-19 09:05:38 +02:00
Carlos Jimenez Ruiz b6b84cfea7 more tests fixed + small refactors 2020-10-08 16:00:19 +02:00
Joan Sanchez 0b8d8a4f65 Added focus directive to searchbar
gitea/salix/pipeline/head This commit looks good Details
2020-10-06 08:17:12 +02:00
Joan Sanchez 71e29e747a Requested changes
gitea/salix/pipeline/head This commit looks good Details
2020-10-05 14:45:39 +02:00
Joan Sanchez d0ece57219 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-10-05 10:09:36 +02:00
Joan Sanchez 420dfdbdff Send notification by email
gitea/salix/pipeline/head This commit looks good Details
2020-10-02 12:23:48 +02:00
Joan Sanchez 58965a9687 Enabled loggable on calendar model
gitea/salix/pipeline/head This commit looks good Details
2020-09-30 07:38:43 +02:00
Joan Sanchez d2dbf417f4 Updated to standard color
gitea/salix/pipeline/head This commit looks good Details
2020-09-24 11:15:35 +02:00
Joan Sanchez d18d7670ec Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2020-09-24 10:44:12 +02:00
Joan Sanchez 53e729eddd 2366 - Merge event colors
gitea/salix/pipeline/head This commit looks good Details
2020-09-24 10:14:53 +02:00
Bernat Exposito Domenech ce1c4e6f60 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2378-imap 2020-09-22 14:00:52 +02:00
Bernat Exposito Domenech 06f03c6b84 mail models and fix checkInbox 2020-09-22 13:59:00 +02:00
Juan Ferrer 4b5d2cd0dd 2177 account module
gitea/salix/pipeline/head There was a failure building this commit Details
LDAP test

RC1

SQL version changed

Tests fixes

Back & front tests fixed

All tests passed

Front and back tests plus some fixes
2020-09-11 14:36:16 +02:00
Joan Sanchez d0ac1b621c Merge branch 'dev' into 2385-worker_descriptor_refactor
gitea/salix/pipeline/head This commit looks good Details
2020-09-09 09:06:11 +00:00
Joan Sanchez 03a0a22526 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-09-07 08:53:47 +02:00
Joan Sanchez ba9cfedec7 Worker calendar holiday name
gitea/salix/pipeline/head This commit looks good Details
2020-09-07 07:59:27 +02:00
Joan Sanchez b848fa52f2 2385 - Replaced worker nickname
gitea/salix/pipeline/head This commit looks good Details
2020-09-03 15:11:16 +02:00
Joan Sanchez a3d3ed4aba Fixed unit test
gitea/salix/pipeline/head This commit looks good Details
2020-08-18 14:14:34 +02:00
Joan Sanchez 540d5e9e71 Fixed errors
gitea/salix/pipeline/head There was a failure building this commit Details
2020-08-18 13:50:08 +02:00
Joan Sanchez b50b30c792 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-08-11 12:16:19 +02:00
Joan Sanchez d17f289af9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1361-calendar_date_filter 2020-08-11 07:42:26 +02:00
Joan Sanchez 7833b87475 Added filter
gitea/salix/pipeline/head This commit looks good Details
2020-08-10 14:44:57 +02:00
Joan Sanchez e2c742c893 #2383 - Changed model
gitea/salix/pipeline/head This commit looks good Details
2020-08-10 14:29:25 +02:00
Carlos Jimenez Ruiz e2481366a2 removed on response if just accept
gitea/salix/pipeline/head This commit looks good Details
2020-07-29 10:47:48 +02:00
Carlos Jimenez Ruiz e126350079 scroll removed as it comes from layaout 2020-07-28 19:22:21 +02:00
Carlos Jimenez Ruiz c62801e741 modules component to vnComponent working
gitea/salix/pipeline/head This commit looks good Details
2020-07-24 14:22:30 +02:00
Carlos Jimenez Ruiz 6913f2db72 $httpBackend.when and .expect no longer misused
gitea/salix/pipeline/head This commit looks good Details
2020-07-23 17:10:07 +02:00
Carlos Jimenez Ruiz 4ca004f833 angular.mock.injet shorten to inject 2020-07-23 16:46:16 +02:00
Carlos Jimenez Ruiz 7d5dc776c1 replaced most of the translate.instant for $t 2020-07-23 16:07:08 +02:00
Joan Sanchez a07d960a2e Fixed test
gitea/salix/pipeline/head This commit looks good Details
2020-07-16 12:09:50 +02:00
Joan Sanchez cbb2ad7f44 Removed duplicated test
gitea/salix/pipeline/head There was a failure building this commit Details
2020-07-16 11:59:16 +02:00
Joan Sanchez 87fa66fe8c Updated methods description
gitea/salix/pipeline/head This commit looks good Details
2020-07-16 11:45:44 +02:00
Joan Sanchez bbf3b72001 Added front & back tests
gitea/salix/pipeline/head This commit looks good Details
2020-07-16 10:04:16 +02:00
Joan Sanchez 2f9d80be7a Added ACL + unit tests
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-07-15 11:35:34 +02:00
Joan Sanchez 91e739547b Changes
gitea/salix/pipeline/head There was a failure building this commit Details
2020-07-11 18:30:27 +02:00
Joan Sánchez 01b32d2b89 Calendar changes
gitea/salix/pipeline/head This commit looks good Details
2020-07-08 15:05:56 +02:00
Joan Sánchez dd8e03dd0f Added absence selection
gitea/salix/pipeline/head There was a failure building this commit Details
2020-07-07 14:29:57 +02:00
Javi Gallego 039eec7d26 test excepto fallo e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-30 10:16:22 +02:00
Javi Gallego db06626675 refactor
gitea/salix/pipeline/head This commit has test failures Details
2020-06-29 14:26:27 +02:00
Joan Sanchez 8729d1c765 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-19 10:35:57 +02:00
Joan Sanchez 41eeaeef0b Entitlement rate
gitea/salix/pipeline/head This commit looks good Details
2020-06-19 09:58:09 +02:00
Joan Sanchez 25b1c6bd8f 2239 - Added services
gitea/salix/pipeline/head This commit looks good Details
2020-06-12 14:28:29 +02:00
Bernat Exposito Domenech e24c5b00e9 fix descriptors
gitea/salix/pipeline/head This commit looks good Details
2020-06-08 11:05:17 +02:00
Bernat Exposito Domenech 90541a4c13 fix client descriptor in log section 2020-06-05 12:13:05 +02:00
Joan Sanchez d24f04912e 2205 - Prevent relations to being logged in
gitea/salix/pipeline/head This commit has test failures Details
2020-05-26 14:37:34 +02:00
Carlos Jimenez Ruiz 55c4ccdb29 Merge pull request 'searchbar translates' (#261) from 2247-refactor_searchBar into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-05-20 08:40:02 +00:00
Bernat Exposito Domenech 4133021e5c fix translate on plural
gitea/salix/pipeline/head This commit looks good Details
2020-05-20 08:52:20 +02:00
Bernat Exposito Domenech d289c17530 searchbar translates
gitea/salix/pipeline/head This commit looks good Details
2020-05-19 10:27:22 +02:00
Juan Ferrer 6c14743017 Last fixes & tests passed
gitea/salix/pipeline/head This commit looks good Details
2020-05-06 14:38:09 +02:00
Juan Ferrer 6a8e1bf6b5 #1882 Boileplate code removed, declarative quicklinks
gitea/salix/pipeline/head This commit looks good Details
2020-04-30 12:48:52 +02:00
Juan Ferrer b536c8291a #1882 Popover::show() boilerplate code removed
gitea/salix/pipeline/head There was a failure building this commit Details
2020-04-28 14:26:02 +02:00
Juan Ferrer 5826099601 #1882 First step, front tests passed
gitea/salix/pipeline/head There was a failure building this commit Details
2020-04-25 11:50:04 +02:00
Javi Gallego dad77cfa08 Merge branch 'dev' into #2219-Añadir-menu-wikipedia
gitea/salix/pipeline/head This commit looks good Details
2020-04-06 12:41:07 +02:00
Javi Gallego d835dd60ed 2219 Añadir menu wikipedia 2020-04-06 12:40:21 +02:00
Javi Gallego ea1cc68d29 test passed
gitea/salix/pipeline/head This commit looks good Details
2020-04-03 17:52:47 +02:00
Javi Gallego b6aedd2e6d Merge branch '2215-windowsE2EFixes' into worker---Añadir-sección-con-enlace-a-Wikipedia 2020-04-03 12:26:27 +02:00
Javi Gallego 0b966cbb76 Merge branch 'dev' into worker---Añadir-sección-con-enlace-a-Wikipedia 2020-04-03 08:28:49 +02:00
Juan Ferrer 559cc5eb8c SCSS em to px: Second step 2020-04-02 14:52:02 +02:00
Juan Ferrer 734c86c5f5 SCSS px to em - First step 2020-04-02 14:20:57 +02:00
Javi Gallego 0a8272a730 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into zone-deliveryDays-quita
gitea/salix/pipeline/head This commit looks good Details
2020-03-26 17:52:41 +01:00
Joan Sanchez e71ace6da7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2132-extend_from_section
gitea/salix/pipeline/head This commit looks good Details
2020-03-25 15:59:41 +01:00
Bernat Exposito Domenech dcdae825d2 fixex pull request
gitea/salix/pipeline/head This commit looks good Details
2020-03-25 08:43:49 +01:00
Javi Gallego 0561f19313 version 1
gitea/salix/pipeline/head There was a failure building this commit Details
2020-03-24 17:34:23 +01:00
Javi Gallego a30a4bf961 quitado el campo provincia
gitea/salix/pipeline/head This commit looks good Details
2020-03-24 17:32:30 +01:00
Bernat Exposito Domenech 423f59dfb0 worker log
gitea/salix/pipeline/head This commit looks good Details
2020-03-24 12:20:53 +01:00
Joan Sanchez 9b933e7d88 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2132-extend_from_section
gitea/salix/pipeline/head This commit looks good Details
2020-03-20 12:00:53 +01:00
Joan Sanchez 3d23583e0b Fixes
gitea/salix/pipeline/head This commit looks good Details
2020-03-18 14:08:04 +01:00
Joan Sanchez a9c622377e Refactor
gitea/salix/pipeline/head This commit looks good Details
2020-03-18 12:55:22 +01:00
Juan Ferrer 56a21edeca Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1992-goWhenOneResult 2020-03-16 18:33:39 +01:00
Juan Ferrer 9d1bc8eb54 First functional version (No tests) 2020-03-13 20:33:12 +01:00
Bernat Exposito Domenech f9abaa409a fix calendar-holiday model
gitea/salix/pipeline/head This commit looks good Details
2020-03-13 13:10:04 +01:00
Bernat Exposito Domenech 6798f9709c update view holiday
gitea/salix/pipeline/head This commit looks good Details
2020-03-12 10:59:41 +01:00
Joan Sanchez 97671fd4a1 Merge branch '1878-print_with_auth' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-03-06 10:34:38 +00:00
Joan Sanchez fddc8e7ed1 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-03-05 14:49:41 +01:00
Carlos Jimenez Ruiz 0f7ed5bbfa get worked hours unit test 2020-03-03 15:14:28 +01:00
Joan Sanchez 03e952c83e Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-03-02 07:57:33 +01:00
Joan Sanchez 28553a1c0d Worker dms changes
gitea/salix/pipeline/head There was a failure building this commit Details
2020-03-02 07:50:07 +01:00
Joan Sanchez 28b7f5d3a2 2151 - Added thermograph edit section
gitea/salix/pipeline/head This commit has test failures Details
2020-02-28 14:18:55 +01:00
Joan Sanchez 25a1c0d2de Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-02-28 08:34:42 +01:00
Joan Sanchez a8eea3d8f6 Changed primary key 2020-02-28 08:19:37 +01:00
Joan Sanchez 220f36d795 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-02-28 07:34:26 +01:00
Joan Sanchez 442541d0f8 Renamed rgb column 2020-02-28 07:24:36 +01:00
Carlos Jimenez Ruiz 6c668131a4 replaced returnValur for returnThis
gitea/salix/2131_jest_spyOn This commit looks good Details
2020-02-27 07:19:42 +01:00
Carlos Jimenez Ruiz 794b20fc83 #2131 jest.spyOn 2020-02-26 13:22:52 +01:00
Bernat Exposito Domenech 005adc252d worker dms index 2020-02-24 08:05:26 +01:00
Bernat Exposito Domenech 3f978bd32b entry index refactor
gitea/salix/2122-entry_index This commit looks good Details
2020-02-18 10:33:17 +01:00
Joan Sanchez e1942875af 1684 - Log transfer old values
gitea/salix/1684-ticket_transfer_salesLog Something is wrong with the build of this commit Details
2020-02-10 14:32:52 +01:00
Bernat Exposito Domenech 7bb5b19398 refactor table holidayType and holidayDetail
gitea/salix/2040-update_view_holidays This commit looks good Details
2020-02-06 09:33:36 +01:00
Bernat Exposito Domenech 89dc8e27e0 update models
gitea/salix/2040_view_holiday This commit looks good Details
2020-02-04 11:20:05 +01:00
Bernat Exposito Domenech 759ac5b5c7 add icon in worker.index
gitea/salix/2020-worker_index This commit looks good Details
2020-02-03 14:03:09 +01:00
Bernat Exposito Domenech c07d5f337a fix getWorkerdHours
gitea/salix/fixGetWorkerHours This commit looks good Details
2020-01-30 11:20:41 +01:00
Bernat Exposito Domenech 9f73c68210 udate client.log styles
gitea/salix/1997-client_log This commit looks good Details
2020-01-24 14:22:11 +01:00
Javi Gallego 08fda3ed1b #workedHours
gitea/salix/%232037-worked-hours This commit looks good Details
2020-01-24 12:38:08 +01:00
Joan Sanchez 3ff1fb7d2d Added back unit tests
gitea/salix/2015-chat_sendCheckingPresence This commit looks good Details
2020-01-20 11:59:15 +01:00
Bernat Exposito Domenech 0fe0596b3e worker phone refactor 2020-01-20 11:03:40 +01:00
Joan Sanchez 8a36e0913f changed fixtures for dynamic holidays
gitea/salix/1924-worker_calendar_dynamic_holidays This commit looks good Details
2020-01-03 08:43:03 +01:00
Joan Sanchez 7fb3f75808 changed comparator
gitea/salix/1966-teamBoss_worker_time_control This commit looks good Details
2020-01-02 11:21:11 +01:00
Joan Sanchez 8f92abe49c fixed procedure bug
gitea/salix/1967-worker_time_control_worked_hours This commit looks good Details
2019-12-31 14:01:05 +01:00
Bernat Exposito Domenech 0827b998a1 update structure sql
gitea/salix/1932-delete_scheme_bs This commit looks good Details
2019-12-23 15:15:58 +01:00
Bernat Exposito Domenech 9a6c8db140 focus on the dialog
gitea/salix/1937-workerDepartment This commit looks good Details
2019-12-20 08:32:02 +01:00
Joan Sanchez f42f46dc42 Merge branch '1913-stowaway_unboarding' of verdnatura/salix into master
gitea/salix/master This commit looks good Details
2019-12-17 12:53:06 +00:00
Joan Sanchez 8ddcd5a654 ACL fixes
gitea/salix/master This commit looks good Details
2019-12-17 12:18:17 +01:00
Juan Ferrer d1341c2758 Hotfixes
gitea/salix/test This commit looks good Details
gitea/salix/master This commit looks good Details
2019-12-17 09:23:11 +01:00
Joan Sanchez ef95244d07 stowaway refactor
gitea/salix/1913-stowaway_unboarding This commit looks good Details
2019-12-17 08:38:36 +01:00
Bernat Exposito Domenech 2e68ad0d01 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1858testworkerPhone
gitea/salix/1858testworkerPhone This commit looks good Details
2019-12-13 10:54:52 +01:00
Juan Ferrer d61b08ed10 Merge branch '1922-mysql8' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-12-12 13:49:05 +00:00
Bernat Exposito Domenech a87ce44f08 test front worker.phone
gitea/salix/1858testworkerPhone This commit looks good Details
2019-12-12 12:23:31 +01:00
Joan Sanchez 62aae9ce14 removed password from fixtures
gitea/salix/1920-remove-sms-password This commit looks good Details
2019-12-12 09:46:29 +01:00
Juan Ferrer 3428dfa6e0 Migration complete & test 2019-12-11 15:01:01 +01:00
Joan Sanchez f9dba9489f updated tests
gitea/salix/1762-worker_dms This commit looks good Details
2019-11-25 09:17:24 +01:00
Joan Sanchez a077dd5165 test unitario
gitea/salix/1762-worker_dms There was a failure building this commit Details
2019-11-22 14:34:20 +01:00
Joan Sanchez 3c144ea0cd transaction changes
gitea/salix/1762-worker_dms There was a failure building this commit Details
2019-11-22 13:46:38 +01:00