Commit Graph

969 Commits

Author SHA1 Message Date
Jorge Penadés 1faab668b1 fix: refs #7323 show advanced fields
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-11-19 11:53:33 +01:00
Jorge Penadés 38ccf464b7 fix: refs #7323 locale #7396 2024-11-19 11:52:00 +01:00
Carlos Satorres 1844e15239 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6389-changesMonitor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-19 08:52:02 +01:00
Javier Segarra d284cec31a Merge branch '7346-manualInvoice' of https: refs #7346//gitea.verdnatura.es/verdnatura/salix-front into 7346-manualInvoice 2024-11-14 11:50:09 +01:00
Jorge Penadés f7c64fe6ff Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into xxxx-addSupportService
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-14 09:37:24 +01:00
Javi Gallego 79ce2ad79e Merge branch 'dev' into 7346-manualInvoice 2024-11-14 09:22:18 +01:00
Jon Elias 540e0348a1 Merge branch 'dev' of https: refs #7132//gitea.verdnatura.es/verdnatura/salix-front into 7132-FixTranslations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-13 14:10:08 +01:00
Jorge Penadés 0c476725ae refactor: use locale keys
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-13 13:11:02 +01:00
Jorge Penadés 00c712469f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into xxxx-addSupportService
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-13 12:37:33 +01:00
Carlos Andrés 4a0c15ed90 Merge branch 'dev' into 8087-nuevosCamposTravel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-12 10:24:06 +00:00
Carlos Andrés fc73149dcf feat: refs #8087 refs#8087 Redadas en travel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-11 14:20:39 +01:00
Alex Moreno 777ac58f04 feat(Supplier): add companySize
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-11 10:31:41 +01:00
Carlos Satorres 780af58747 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7529-workerPIT
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-07 12:48:26 +01:00
Jorge Penadés 3ca26a97dc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into xxxx-addSupportService 2024-11-05 09:22:46 +01:00
Jorge Penadés 8817fd7c55 feat: add support service wip 2024-10-30 13:55:51 +01:00
Jon Elias 1ff77abaf5 Merge branch 'dev' into Fix_OrderModuleProblems
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-29 08:26:16 +00:00
Carlos Satorres adbf1af453 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7529-workerPIT
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-29 06:13:22 +01:00
Carlos Andrés b8ba313132 Merge pull request 'feat: refs #8087 Traspasar redadas a travels' (!864) from 8087-nuevoCampoTravel into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #864
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-28 13:29:05 +00:00
Carlos Satorres 847cf6a5b4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7529-workerPIT
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-28 13:31:42 +01:00
Jon Elias 639e08406e Merge branch 'dev' into Fix_OrderModuleProblems
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-28 11:22:23 +00:00
Jon Elias df1c123444 feat: refs #7193 modified parking to use the scope and corrected small errors
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-28 10:39:45 +01:00
Carlos Satorres c0c1d3e3a9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6389-changesMonitor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-28 08:08:19 +01:00
Alex Moreno 100dfbec3e Merge branch 'dev' into 8087-nuevoCampoTravel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-25 08:14:09 +00:00
Carlos Andrés 12c236276d feat: refs #8087 Traspasar redadas a travels
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-24 19:32:20 +02:00
Carlos Andrés 64f36c7d4b feat: refs #8087 Traspasar redadas a travels
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-24 12:35:11 +02:00
Javier Segarra 3f640c650b perf: refs #7283 #7283 handle i18n
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-24 12:32:15 +02:00
Javier Segarra 87d2e0a39b perf: refs #7283 #7283 handle composable i18n
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-24 10:36:48 +02:00
Carlos Satorres fee51db30d Merge branch 'dev' of https: refs #6389//gitea.verdnatura.es/verdnatura/salix-front into 6389-changesMonitor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-24 08:09:09 +02:00
Carlos Satorres e8fd3c0a8f fix: refs #6389 fix front, filters, itp
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-10-23 14:58:03 +02:00
Jon Elias 76ed5150a5 Merge branch 'dev' into Fix_OrderModuleProblems
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-23 11:05:14 +00:00
Jon Elias b69ef48a44 refactor: refs #7132 deleted pageTitles repeated
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-23 12:21:34 +02:00
Jon Elias 03f2da8169 Merge branch 'dev' of https: refs #7132//gitea.verdnatura.es/verdnatura/salix-front into 7132-FixTranslations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-23 12:14:50 +02:00
Carlos Satorres 84dae53d66 Merge branch 'dev' of https: refs #7283//gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-10-23 07:53:02 +02:00
Alex Moreno 735ee09ef8 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head This commit looks good Details
2024-10-22 15:08:20 +02:00
Alex Moreno aaf749db6c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-10-22 15:08:11 +02:00
Jorge Penadés 9f3c834ce4 Merge branch 'master' of https: refs #8083//gitea.verdnatura.es/verdnatura/salix-front into 8083-hotfix-changeState
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-22 14:24:41 +02:00
Jorge Penadés f751408de2 feat: refs #8083 add change state btn
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-22 13:22:43 +02:00
Jon Elias 5b116a7301 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix_OrderModuleProblems 2024-10-22 11:31:45 +02:00
Jorge Penadés 0fbd5f45e1 fix: refs #7524 select department
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-21 14:29:29 +02:00
Javi Gallego 69215851bb Merge branch 'dev' into 7346-manualInvoice
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-21 14:01:18 +02:00
Jon Elias 1d41647022 Merge branch 'dev' of https: refs #7132//gitea.verdnatura.es/verdnatura/salix-front into 7132-FixTranslations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-21 12:57:32 +02:00
Jon Elias e5cd9d4b8f refactor: refs #7132 global translations files changed
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-10-21 12:56:09 +02:00
Jorge Penadés 2b2ccbc6a1 feat: refs #7524 myTeam filter & default params
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-21 12:14:54 +02:00
Jon Elias 89cb9aacec refactor: refs #7132 1st wave of changes in global translations files
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-18 12:54:21 +02:00
Carlos Satorres 237b3ed4df Merge branch 'dev' of https: refs #7529//gitea.verdnatura.es/verdnatura/salix-front into 7529-workerPIT
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-18 11:17:06 +02:00
Carlos Satorres d1c61c5aed Merge branch 'dev' of https: refs #7283//gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-16 14:01:01 +02:00
Carlos Satorres cad3fddc3e fix: refs #7986 descriptor fix
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-15 14:52:52 +02:00
Carlos Satorres b4245d05fb fix: refs #7986 crudModel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-15 13:00:01 +02:00
Carlos Satorres af830591b3 fix: refs #7986 front fixed
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-15 09:44:55 +02:00
Carlos Satorres dfceb9403c fix: refs #7986 fix front
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-15 07:54:52 +02:00
Pablo Natek 321b8dd9f9 fix: refs #8004 some style issues on all list 2024-10-11 11:01:58 +02:00
Jon Elias 419d3d2d45 fix: refs #6896 fixed module problems
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-10 07:20:33 +02:00
Guillermo Bonet 50eed83d05 feat: refs #7893 Requested changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-07 13:50:19 +02:00
Guillermo Bonet f98739f0ed Merge branch 'dev' into 7893-wasteRecalc
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-07 08:03:26 +00:00
Guillermo Bonet 4f3e7e2630 feat: refs #7893 Added waste recalc section
gitea/salix-front/pipeline/pr-dev Build queued... Details
2024-10-07 10:03:05 +02:00
Jorge Penadés b735ccb3a0 Merge branch 'dev' of https: refs #7323//gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker 2024-10-04 13:37:55 +02:00
Javier Segarra 2877ef8a33 feat: refs #7346 #7346 improve form 2024-10-04 11:50:55 +02:00
Jorge Penadés 67c2e284ba feat: refs #7702 ask old pass
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-10-04 11:45:10 +02:00
Javier Segarra 1aab0abbcd Merge branch 'dev' into 7346-manualInvoice
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-04 07:45:31 +00:00
Carlos Satorres 5d8f9dbd72 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7529-workerPIT
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-03 13:02:56 +02:00
Pablo Natek 05a1d0e8fb fix: refs #7129 translates from globals to module locals
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-03 10:52:16 +02:00
Javi Gallego 909244a658 Merge branch 'dev' into 7346-manualInvoice 2024-10-03 08:50:46 +02:00
Javi Gallego 789e70b7a8 feat: all clients just with global series
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-02 16:37:58 +02:00
Jon Elias 03a3d6bd50 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7884-AddLabelerField 2024-10-02 08:47:21 +02:00
Javi Gallego 4399a91e99 fix: misSpelling
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-01 13:29:45 +02:00
Javi Gallego 589c672ab2 fix: show degrees 2024-10-01 13:28:49 +02:00
Carlos Satorres 06a1b3b409 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-01 06:30:19 +02:00
Javier Segarra 2302e22f11 fix: solve conflicts from master to test
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-09-30 15:00:05 +02:00
Javier Segarra 12a452d774 Merge branch 'dev' into 8031_notify_dataSaved
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-27 18:02:24 +00:00
Jorge Penadés 7eb951ef13 fix: refs #7323 use right locale
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-26 15:28:00 +02:00
Jorge Penadés 14b7654db3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-26 15:16:32 +02:00
Jorge Penadés 18ea23adf1 refactor: refs #7323 pr request
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-26 15:03:22 +02:00
Javier Segarra a0b3e933a8 Merge branch 'dev' into 8031_notify_dataSaved
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-26 12:17:40 +00:00
Jorge Penadés 478d4695b8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-26 09:16:59 +02:00
Pablo Natek 6e6b65771a Merge branch 'dev' into 7129-fixMigrationIssues
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-26 06:09:21 +00:00
Pablo Natek c388d5ab2a Merge branch 'dev' of https: refs #7129//gitea.verdnatura.es/verdnatura/salix-front into 7129-fixMigrationIssues
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-26 07:57:59 +02:00
Javier Segarra 73c45b8c4a Merge branch 'dev' into 8031_notify_dataSaved
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-25 12:08:40 +00:00
Javi Gallego eb0e18bf58 Merge branch 'dev' into 6722-thermograph 2024-09-25 13:48:12 +02:00
Javi Gallego bd2fa37450 feat: maxTemperature and minTemperature 2024-09-25 13:34:43 +02:00
Alex Moreno 8c13ceb3fe Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-25 13:28:13 +02:00
Pablo Natek 27b699ebf4 fix: refs #7129 some component styles
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-25 11:16:27 +02:00
Javier Segarra 72ddeaa90a test: refs #8031 e2e 2024-09-25 10:53:38 +02:00
Pablo Natek 1ee3691cc0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7129-fixMigrationIssues 2024-09-25 08:26:27 +02:00
Jon Elias a14eb53f14 Merge branch 'dev' into 7884-AddLabelerField
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-25 06:02:51 +00:00
Alex Moreno e555bd4cde Merge branch 'test' of https: refs #7155//gitea.verdnatura.es/verdnatura/salix-front into 7155-travel_daysOnward
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-09-24 12:21:31 +02:00
Jon Elias 8315eb2b4c Merge branch 'dev' into 7553_FixTicketExpedition
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-24 09:37:17 +00:00
Jon Elias 8ac0083b9c Merge branch 'dev' into 7884-AddLabelerField
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-24 08:44:15 +00:00
Jon Elias 21f7613f21 Merge branch 'dev' into 7553_FixTicketExpedition
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-24 08:36:57 +00:00
Jorge Penadés 3eb846b70c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-24 10:15:46 +02:00
Alex Moreno edb6e9ce61 feat(TravelList): add daysOnward
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-09-24 09:57:05 +02:00
Javier Segarra 6e57306026 Merge branch 'dev' into 7671_dense_itemFixedPrices
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-24 07:39:22 +00:00
Pablo Natek c400929c99 fix: refs #7129 translate page title 2024-09-24 08:33:16 +02:00
Alex Moreno b7ed63afc6 Merge branch 'dev' into 7404-fixFront
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-24 06:18:42 +00:00
Alex Moreno 98a3b03be7 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head There was a failure building this commit Details
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-09-24 07:48:58 +02:00
Pablo Natek 8124a341a0 feat: refs #7129 route extended list and simplify route list 2024-09-24 07:25:17 +02:00
Javier Segarra ac8aa6bcc1 fix: table order
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-23 14:21:41 +02:00
Jon Elias f025b4361e refactor: refs #7553 last requested changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-23 10:21:30 +02:00
Pablo Natek 17bb144bce fix: refs #7404 translates and some minor style fixes 2024-09-23 10:04:45 +02:00
Jorge Penadés 37545b4cab Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-23 09:29:26 +02:00
Jon Elias d7fb8bdaf5 Merge branch 'dev' into 7884-AddLabelerField
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-20 08:24:39 +00:00