Commit Graph

339 Commits

Author SHA1 Message Date
William Buezas 9dfe5f5e68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemsList
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-10 09:34:51 -03:00
William Buezas eceb60f6e4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemsList
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-10 08:46:00 -03:00
William Buezas e8486099fc Resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-10 08:37:52 -03:00
William Buezas 0144aab7a5 Mini fix
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-09 08:51:00 -03:00
William Buezas f6e140e369 Apply workerDms changes
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-09 08:28:00 -03:00
William Buezas e51ea9996b Item list view
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-09 08:18:18 -03:00
Guillermo Bonet 4b9e69625b Merge branch 'dev' into 6636-pickup
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-09 08:02:30 +00:00
William Buezas 4da540fc9c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemsList 2024-04-08 08:47:56 -03:00
William Buezas f12ec3c0c9 Add redirection to summary and open summary action 2024-04-08 08:47:29 -03:00
Guillermo Bonet b2ef381f1d Merge branch 'dev' into 6636-pickup
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-08 05:18:34 +00:00
William Buezas 970d1a48e3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into features/ms_submodulos_worker 2024-04-05 08:25:28 -03:00
Javier Casado 5d7fed3b32 Merge branch 'dev' into 6816-removeMicroSip
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-05 07:57:21 +00:00
Guillermo Bonet b09ecefad4 feat: refs #6636 Added pickup in claim
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-04 14:12:16 +02:00
jcasado d00ec3c41c refs #6816 remove microsip tag
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-04 09:38:47 +02:00
William Buezas addbe9345b Resolve conflicts 2024-04-02 12:40:26 -03:00
Alex Moreno 181bff6c0c Merge branch 'dev' into 6514-gestDocSupplier
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-28 07:17:28 +00:00
William Buezas 37465ffa4a resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-27 11:23:54 -03:00
Jon Elias d555f7e09e Merge branch 'dev' into 6988-SummaryRefactor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-27 10:02:18 +00:00
Jorge Penadés 9c83c4cd6c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-27 08:30:37 +01:00
Jon Elias 1ec54d7664 feat: #6514 create supplierDms lilium
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-26 08:55:01 +01:00
Alex Moreno a4a96a106f Merge branch 'dev' into 6988-SummaryRefactor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-26 06:41:39 +00:00
Kevin Martinez 5e089e616e Merge branch 'dev' into feature/worker-log
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-25 12:00:06 +00:00
Alex Moreno c335accffb refs #6905 fix translation and warnings
gitea/salix-front/pipeline/head This commit looks good Details
2024-03-25 12:42:48 +01:00
Jon Elias 3e0f151570 refactor: refs #6988 fixed error
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-25 12:36:50 +01:00
Jon Elias 84a25acf22 refactor: refs #6988 used global translations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-25 11:42:29 +01:00
Jorge Penadés d2efbb204f feat: refs #5186 use arrayData in summary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-22 14:57:36 +01:00
carlosfonseca aa2db28eda Se crea submodulo mis documentos en worker
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-22 08:30:54 -05:00
Carlos Satorres 95d943e6f5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6905-userPanelConfig
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-22 10:17:36 +01:00
Jorge Penadés 4f242b0840 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-21 15:31:15 +01:00
Kevin Martinez f6e3b3607a Merge branch 'salix-dev' into feature/worker-log
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-21 08:01:57 -03:00
Carlos Fonseca 142155e14e Merge branch 'dev' into features/ms_submodulos_worker
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-20 16:55:09 +00:00
Carlos Satorres 798ffa7de3 refs #6905 fix 2024-03-20 10:20:05 +01:00
Carlos Satorres 0946a34422 Merge branch '6905-userPanelConfig' of https://gitea.verdnatura.es/verdnatura/salix-front into 6905-userPanelConfig
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-20 09:38:14 +01:00
Carlos Satorres 89fc147ad8 refs #6905 fix traduction 2024-03-20 09:38:11 +01:00
Kevin Martinez cf25476a5d Create worker log
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-18 21:04:52 -03:00
carlosfonseca 844cd0e12b Desarrollo de los submodulos basic data, notes y pbx
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-18 08:39:10 -05:00
Jorge Penadés f39595087a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-03-14 15:00:16 +01:00
William Buezas 22c49d9cf7 resolve conflicts
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-03-14 09:50:27 -03:00
Kevin Martinez 8587d46943 Merge branch 'salix-dev' into feature/route-module
gitea/salix-front/pipeline/pr-dev This commit looks good Details
# Conflicts:
#	src/pages/Route/Card/RouteSummary.vue
2024-03-14 08:05:51 -03:00
Jorge Penadés 0c012ed71a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-14 08:54:21 +01:00
Jorge Penadés e793b3dd93 feat: refs #5186 use global locales
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-13 15:06:02 +01:00
William Buezas 09582ab6a8 WIP 2024-03-13 09:05:23 -03:00
William Buezas 632049c13b Assign button change
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-12 11:31:32 -03:00
William Buezas dad2711311 fix translation
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-12 08:13:27 -03:00
William Buezas 319295f2c2 Workers PDA
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-11 16:53:33 -03:00
Jorge Penadés 33ef118dea Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-11 09:32:30 +01:00
Pablo Natek e5e0d8f806 Merge branch 'dev' into 6349-removeRma
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-08 07:08:36 +00:00
Jorge Penadés d8a0adb852 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-07 15:57:54 +01:00
William Buezas b994d39369 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/InvoicesOutCorrections
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-07 08:44:30 -03:00
Kevin Martinez d3a93da849 Merge branch 'salix-dev' into feature/route-module
gitea/salix-front/pipeline/pr-dev This commit looks good Details
# Conflicts:
#	src/components/ui/VnPaginate.vue
2024-03-06 23:19:47 -03:00