Commit Graph

317 Commits

Author SHA1 Message Date
Jorge Penadés af11bb8663 feat: refs #5919 hook 2024-05-10 13:04:12 +02:00
Jorge Penadés 7f4965879c fix: refs #5919 get locker by relation 2024-05-09 15:54:34 +02:00
Pablo Natek 98e28b8d50 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7187-addPdaFreelancers 2024-05-09 09:09:00 +02:00
Jorge Penadés dc45527e1d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-09 08:45:17 +02:00
Carlos Satorres f64e899061 Merge pull request 'refs #6882 absence' (!2271) from 6682-notHolidays into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2271
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-08 10:27:20 +00:00
Carlos Satorres fa2c4de562 Merge pull request 'refs #6842 worker' (!2404) from 6842-errorCalendar into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2404
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-08 10:21:19 +00:00
Jorge Penadés 26ff5e8fa9 feat; refs #5919 WIP acls 2024-05-08 11:03:18 +02:00
Jorge Penadés d0c9e83504 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-08 10:35:07 +02:00
Carlos Satorres c0b4a931a6 Merge branch 'dev' into 6682-notHolidays
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 07:55:26 +00:00
Carlos Satorres 8637488fc1 refs #6882 fix pr
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 08:48:19 +02:00
Guillermo Bonet 6e9ea9665d Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-05-07 13:18:46 +02:00
Guillermo Bonet 0d7d4917a7 Merge branch 'master' into test 2024-05-07 13:18:28 +02:00
Jorge Penadés 0f5e2dcc54 fix: refs #6938 rollback
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-07 11:47:22 +02:00
Carlos Satorres 19c729d5fd Merge branch 'dev' into 6842-errorCalendar
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-07 06:55:05 +00:00
Carlos Satorres fe300f0f24 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6682-notHolidays
gitea/salix/pipeline/pr-dev Build queued... Details
2024-05-06 09:26:14 +02:00
Carlos Satorres e15b8eee30 refs #6842 worker
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-03 14:54:12 +02:00
Pablo Natek 699684bd65 feat: refs #7187 add sim column to the model and id 2024-05-03 14:22:48 +02:00
Pablo Natek 4c55ae40ef Merge pull request 'test' (!2402) from test into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2402
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-03 10:58:42 +00:00
Pablo Natek 6152820078 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 6005-fix-runtime-error 2024-05-03 12:47:14 +02:00
Pablo Natek 48bfba71de fix: refs #6005 runtime
gitea/salix/pipeline/pr-test This commit looks good Details
2024-05-03 12:33:59 +02:00
Carlos Satorres f77cf619db refs #6682 holidays conditional
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-03 12:27:19 +02:00
Pablo Natek 8b11a4a290 fix: refs #6005 time issue
gitea/salix/pipeline/pr-test This commit looks good Details
2024-05-03 12:08:22 +02:00
Jorge Penadés 63655a4dd1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-02 08:58:51 +02:00
Jorge Penadés 8adb52aac4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-04-29 09:24:10 +02:00
Guillermo Bonet 1044a24bc7 refactor: #6997 Deleted vn.client.eypbc
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-23 12:00:23 +02:00
Javier Segarra f6199f8f8e Actualizar modules/worker/back/models/worker.json
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-22 06:56:05 +00:00
Javier Segarra 283d27e1c5 Actualizar modules/worker/back/models/worker.json
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-22 06:22:36 +00:00
Javier Segarra 30d0db163e feat(salix): refs #6930 minor updates 2024-04-19 10:50:14 +02:00
Jorge Penadés 3e1218463c fix: refs #6938 filters & scope
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-15 14:44:18 +02:00
Jorge Penadés d7b06fe637 fix: refs #6938 scope
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-15 12:47:27 +02:00
Jorge Penadés 200cbd8d74 fix: refs #6938 acls & scope
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-15 11:03:57 +02:00
Jorge Penadés a68b8431c5 feat: refs #6938 add scope & acls
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-15 10:21:59 +02:00
Pablo Natek da037c5235 refactor: refs #6005 delay on productionConfig 2024-04-09 13:34:33 +02:00
Pablo Natek 638b715ee5 fix: refs #6005 move logic to hook
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-09 09:30:28 +02:00
Pablo Natek 4b4aaa9e10 feat: refs #6005 move logic from report to hook 2024-04-05 08:04:53 +02:00
Pablo Natek e3b7c7bb60 Merge branch 'dev' into 6005-backupLabeler
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-14 09:39:13 +00:00
Pablo Natek 2421cc7c68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-08 08:23:08 +01:00
Sergio De la torre 69ad44c0bd Merge branch 'dev' into 6078_workerActivty
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-07 07:18:16 +01:00
Sergio De la torre 96abdd4630 refs #6078 feat:add workeractivity 2024-02-26 12:52:34 +01:00
Jorge Penadés 70c400c5f9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 12:51:22 +01:00
Pablo Natek ab7eb88913 merge(dev): refs #6005 merge dev
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-20 09:34:08 +01:00
Jorge Penadés d5a3413307 fix: refs #6776 method names & chanmges
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-19 14:46:42 +01:00
Pablo Natek 7b0dd6975d fix(usesMana): refs #6879 add mana excluded worker
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-02-19 14:13:36 +01:00
Jorge Penadés c4161eec97 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse 2024-02-01 08:14:37 +01:00
Guillermo Bonet dd17b2c05d feat: refs #6235 Added device in clockIn 2024-01-31 09:04:30 +01: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
Carlos Satorres bf796c445d refs #5919 fix section
gitea/salix/pipeline/head There was a failure building this commit Details
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-01-17 13:20:28 +01:00
Carlos Satorres c0c3d913b7 refs #5919 locker
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-12 09:03:54 +01:00
Jorge Penadés c61f5a67b6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-11 09:28:24 +01:00
Carlos Satorres 782772bffc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6291-comprobarDNI
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-04 15:07:33 +01:00
Jorge Penadés 2eca02d74f refactor: drop getItemPackingType refs #6276
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-04 12:57:46 +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
gitea/salix/pipeline/head This commit looks good Details
2024-01-03 12:46:26 +00:00
Carlos Satorres 3fbead7473 refs #6291 fix tinIsValid
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-03 13:44:20 +01:00
Carlos Satorres 3a429a31da refs #5919 locker
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-29 08:44:42 +01:00
Carlos Satorres c77715d865 refs #6291 validation original
gitea/salix/pipeline/head This commit looks good Details
2023-12-26 15:03:10 +01:00
Carlos Satorres f35b2a4905 refs #5919 back chooseLocker
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-26 13:44:52 +01:00
Carlos Satorres c4ff4c1984 refs #6291 tin valid
gitea/salix/pipeline/head This commit looks good Details
2023-12-21 15:07:03 +01:00
Pablo Natek f68529960e fix(notification): refs #6005 notification changes
gitea/salix/pipeline/head This commit looks good Details
2023-12-19 10:51:18 +01:00
Carlos Satorres 6416891918 refs #6291 tinIsValid worker
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-13 13:55:31 +01:00
Javier Segarra 1d92bbf4a2 refs #5666 feat: replace base value and add mixins 2023-12-05 07:48:56 +01:00
Jorge Penadés 4690dca4f9 refs #6276 getItemPackingType
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-01 13:54:09 +01:00
Jorge Penadés 877c679273 refs #6276 getVersion
gitea/salix/pipeline/head This commit looks good Details
2023-11-29 13:22:44 +01:00
Jorge Penadés e314a67fe7 refs #6274 time control methods migrated
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-23 13:25:31 +01:00
Pablo Natek 754150d17d feat(operator.spec): refs #6005 add spec for delay and fix spec for spam 2023-11-23 10:10:09 +01:00
Pablo Natek 1b4ce1a0b5 feat(noSpam): refs #6005 check if exists a previous notification 2023-11-23 08:22:24 +01:00
Carlos Satorres 7c6798c564 refs #6291 dni vn-user
gitea/salix/pipeline/head This commit looks good Details
2023-11-21 16:25:48 +01:00
Jorge Penadés 251578146e refs #6276 several methods created
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-21 12:27:13 +01:00
Carlos Satorres b57106af48 refs #6291 validateTin
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-14 11:13:33 +01:00
Carlos Satorres c5c314eb43 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-10 11:59:01 +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
gitea/salix/pipeline/head This commit looks good Details
2023-11-09 08:04:38 +01:00
Pablo Natek 9c896c835f refactor(printer-notification): refs #6005 refactor de la notificación 2023-11-09 07:56:35 +01:00
Jorge Penadés d0975f0acd ref #6276 operator_add
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-02 16:25:25 +01:00
Jorge Penadés 33656e9d9a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate
gitea/salix/pipeline/head This commit looks good Details
2023-10-23 08:21:32 +02:00
Guillermo Bonet 5c51d7fb04 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 13:22:33 +02:00
Jorge Penadés 69a54be1a9 ref #5947 refactorWorkerCreate
gitea/salix/pipeline/head This commit looks good Details
2023-10-17 14:02:08 +02:00
Carlos Satorres fd64cb7e80 refs #5919 front back
gitea/salix/pipeline/head This commit looks good Details
2023-10-17 13:08:00 +02:00
Jorge Penadés bd535374d8 ref #6138 setPasword created
gitea/salix/pipeline/head This commit looks good Details
2023-10-16 15:58:25 +02:00
Alex Moreno 03687cb482 hotFix: delete getCurrentWorkerMana
gitea/salix/pipeline/head This commit looks good Details
2023-10-13 14:56:56 +02:00
Carlos Satorres c061841cac refs #5919 locker and back
gitea/salix/pipeline/head This commit looks good Details
2023-10-10 13:58:33 +02:00
Carlos Satorres 3c58f86c2a refs #5919 locker back y front
gitea/salix/pipeline/head This commit looks good Details
2023-10-10 13:44:22 +02:00
Sergio De la torre 3ba349b74a refs #5890 feat: itemShelvingSaleAsignado more calls
gitea/salix/pipeline/head This commit looks good Details
2023-10-02 09:14:30 +02:00
Sergio De la torre 22f71e6147 Merge branch 'dev' into 5134-ModelsSalix
gitea/salix/pipeline/head This commit looks good Details
2023-09-28 08:18:15 +02:00
Sergio De la torre 18de92f9e7 refs #5134 fix: format
gitea/salix/pipeline/head This commit looks good Details
2023-09-28 07:51:54 +02:00
Sergio De la torre a86469ccd2 refs #5134 fix: format
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-28 07:42:44 +02:00
Alex Moreno d43b70c971 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-09-22 14:30:28 +02:00
Alex Moreno cf36b10763 refs #4815 feat: add serialNumber in deviceLog
gitea/salix/pipeline/head This commit looks good Details
2023-09-22 14:29:48 +02:00
Carlos Satorres 1f1dfae7e3 refs #5843 changes models
gitea/salix/pipeline/head This commit looks good Details
2023-09-21 12:50:07 +02:00
Carlos Satorres 4918e3ccc7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-06 14:02:53 +02:00
Sergio De la torre 00201197cc Merge branch 'dev' into 4815-deviLogModel
gitea/salix/pipeline/head This commit looks good Details
2023-09-01 05:24:55 +00:00
Vicent Llopis dd1dbcbd4a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete
gitea/salix/pipeline/head This commit looks good Details
2023-08-22 13:39:09 +02:00
Carlos Satorres b1b6bd13ea refs #5843 change userFk
gitea/salix/pipeline/head This commit looks good Details
2023-08-22 10:45:41 +02:00
Sergio De la torre 8d0b3efa11 refs #4815 feat:DeviceLog Model
gitea/salix/pipeline/head This commit looks good Details
2023-08-14 09:39:40 +02:00
Sergio De la torre a6047d257b refs #5134 feat:modelsSalix
gitea/salix/pipeline/head This commit looks good Details
2023-08-11 12:45:18 +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 e253dd7982 refs #5351 fix(worker_model): remove required userFk
gitea/salix/pipeline/head This commit looks good Details
2023-07-28 14:39:01 +02:00