version alfa

2023-05-31 16:03:41 +02:00 · 2023-05-31 16:03:41 +02:00 · 98ba481976
parent 4304da8316
commit 98ba481976
8 changed files with 222 additions and 116 deletions
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@ -37,7 +37,7 @@
        <device id="pixel_4" />
        <device id="pixel_5" />
        <device id="_device_class_phone" />
-        <locale>es</locale>
+        <locale>fr</locale>
        <option name="nonWearDeviceLastStateName" value="Portrait" />
        <target>android-28</target>
      </config>
@ -83,19 +83,32 @@
    </select>
  </component>
  <component name="ChangeListManager">
-    <list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="version 23.18.3Beta solucionado fallo ubicador. Añadido bbdd">
-      <change afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/db/database.kt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/viewmodels/DatabaseViewModel.kt" afterDir="false" />
+    <list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="refs #4678">
+      <change afterPath="$PROJECT_DIR$/app/alpha/release/output-metadata.json" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/app/betatesting/release/output-metadata.json" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/app/beta/release/output-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/beta/release/output-metadata.json" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/LoadUnloadFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/LoadUnloadFragment.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/model/InfoCompany.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/model/InfoCompany.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/viewmodels/DeliveryViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/viewmodels/DeliveryViewModel.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/google-services.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/google-services.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/release/output-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/release/output-metadata.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SalixService.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SalixService.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/SummaryFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/SummaryFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/viewmodels/DatabaseViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/viewmodels/DatabaseViewModel.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingCountFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingCountFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/SupplierFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/SupplierFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/model/EntrySalix.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/model/EntrySalix.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/model/Supplier.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/model/Supplier.kt" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemFragment.kt" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_expedition_loadunload_delivery.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_expedition_loadunload_delivery.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/component_custom_dialog.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/component_custom_dialog.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_itemsupplier_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_itemsupplier_row.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/app/src/main/res/values-es/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-es/strings.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/res/values-fr/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-fr/strings.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/res/values-pt/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-pt/strings.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
@ -107,7 +120,7 @@
  <component name="CodeInsightWorkspaceSettings">
    <option name="optimizeImportsOnTheFly" value="true" />
  </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[C:\Users\sergiodt\.android\avd\Pixel_2_API_24.avd]" />
+  <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[21114523025303]" />
  <component name="ExportToHTMLSettings">
    <option name="OPEN_IN_BROWSER" value="true" />
    <option name="OUTPUT_DIRECTORY" value="C:\Program Files\Android\Android Studio\inspections" />
@ -140,6 +153,7 @@
        <option value="resourceFile" />
        <option value="Class" />
        <option value="Kotlin Class" />
+        <option value="valueResourceFile" />
      </list>
    </option>
  </component>
@ -193,7 +207,7 @@
    </option>
    <option name="RECENT_BRANCH_BY_REPOSITORY">
      <map>
-        <entry key="$PROJECT_DIR$" value="testBeta_embalajes_pantallas" />
+        <entry key="$PROJECT_DIR$" value="4021_embalajes" />
      </map>
    </option>
    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@ -241,38 +255,40 @@
    <option name="showLibraryContents" value="true" />
    <option name="showMembers" value="true" />
  </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "ApkExportedModule": "Gestor_Almacén.app",
-    "ExportApk.ApkPathForGestor_Almacén.app": "C:\\Users\\sergiodt\\AndroidStudioProjects\\vn-warehouseManager\\app",
-    "PROJECT_TRUSTED_KEY": "true",
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "RunOnceActivity.cidr.known.project.marker": "true",
-    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
-    "ScreenRecorder.SavePath": "C:\\Users\\sergiodt\\device-2023-03-17-114045.mp4",
-    "android-custom-viewC:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/androidx.recyclerview/recyclerview/1.2.1/f0f93e67af3f7417bdd560d5142f6dec4fe629c3/recyclerview-1.2.1-sources.jar!/androidx/recyclerview/widget/RecyclerView.java_SELECTED": "RecyclerView",
-    "cidr.known.project.marker": "true",
-    "com.developerphil.adbidea.selecteddevices": "21114523025303",
-    "com.google.services.firebase.aqiPopupShown": "true",
-    "last_opened_file_path": "C:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout",
-    "project.structure.last.edited": "Modules",
-    "project.structure.proportion": "0.17",
-    "project.structure.side.proportion": "0.2",
-    "run.code.analysis.last.selected.profile": "pProject Default",
-    "settings.editor.selected.configurable": "reference.settingsdialog.project.gradle"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;ApkExportedModule&quot;: &quot;Gestor_Almacén.app&quot;,
+    &quot;ExportApk.ApkPathForGestor_Almacén.app&quot;: &quot;C:\\Users\\sergiodt\\AndroidStudioProjects\\vn-warehouseManager\\app&quot;,
+    &quot;PROJECT_TRUSTED_KEY&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.cidr.known.project.marker&quot;: &quot;true&quot;,
+    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
+    &quot;ScreenRecorder.SavePath&quot;: &quot;C:\\Users\\sergiodt\\device-2023-03-17-114045.mp4&quot;,
+    &quot;android-custom-viewC:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/androidx.recyclerview/recyclerview/1.2.1/f0f93e67af3f7417bdd560d5142f6dec4fe629c3/recyclerview-1.2.1-sources.jar!/androidx/recyclerview/widget/RecyclerView.java_SELECTED&quot;: &quot;RecyclerView&quot;,
+    &quot;cidr.known.project.marker&quot;: &quot;true&quot;,
+    &quot;com.developerphil.adbidea.selecteddevices&quot;: &quot;21114523025303&quot;,
+    &quot;com.google.services.firebase.aqiPopupShown&quot;: &quot;true&quot;,
+    &quot;last_opened_file_path&quot;: &quot;C:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable&quot;,
+    &quot;project.structure.last.edited&quot;: &quot;Modules&quot;,
+    &quot;project.structure.proportion&quot;: &quot;0.17&quot;,
+    &quot;project.structure.side.proportion&quot;: &quot;0.2&quot;,
+    &quot;run.code.analysis.last.selected.profile&quot;: &quot;pProject Default&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;com.obiscr.chatgpt.settings.OpenAISettings&quot;
  },
-  "keyToStringList": {
-    "ExportApk.BuildVariants": [
-      "generalRelease"
+  &quot;keyToStringList&quot;: {
+    &quot;ExportApk.BuildVariants&quot;: [
+      &quot;alphaRelease&quot;
    ],
-    "com.android.tools.idea.sqlite.queryhistory": [
-      "select * from expediciones;",
-      "select * from expediciones",
-      "select * from expedicion"
+    &quot;com.android.tools.idea.sqlite.queryhistory&quot;: [
+      &quot;select count(*) from expeditionPending\n&quot;,
+      &quot;select count(*) from expedition\n&quot;,
+      &quot;select count(*) from expedition&quot;,
+      &quot;select count(*) from expeditionPending&quot;,
+      &quot;select count(*) from expedition\n\n\n&quot;
    ]
  }
-}]]></component>
+}</component>
  <component name="PsdUISettings">
    <option name="MODULE_TAB" value="Default Config" />
    <option name="LAST_EDITED_SIGNING_CONFIG" value="debug" />
@ -280,9 +296,9 @@
  </component>
  <component name="RecentsManager">
    <key name="CopyFile.RECENT_KEYS">
+      <recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\res\drawable" />
      <recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\res\layout" />
      <recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\res\raw" />
-      <recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\res\drawable" />
      <recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\java\es\verdnatura\presentation\view\feature" />
      <recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\res\drawable-v24" />
    </key>
@ -415,69 +431,6 @@
      <option name="presentableId" value="Default" />
      <updated>1618825571576</updated>
    </task>
-    <task id="LOCAL-00086" summary="Version 9.2.1 Modificado fragment a fragment_general">
-      <created>1665038575752</created>
-      <option name="number" value="00086" />
-      <option name="presentableId" value="LOCAL-00086" />
-      <option name="project" value="LOCAL" />
-      <updated>1665038575752</updated>
-    </task>
-    <task id="LOCAL-00087" summary="Version 9.2.1 añadido error encajado y modificado marcaje">
-      <created>1665118245168</created>
-      <option name="number" value="00087" />
-      <option name="presentableId" value="LOCAL-00087" />
-      <option name="project" value="LOCAL" />
-      <updated>1665118245169</updated>
-    </task>
-    <task id="LOCAL-00088" summary="Version 9.2.1 en producción">
-      <created>1665123288355</created>
-      <option name="number" value="00088" />
-      <option name="presentableId" value="LOCAL-00088" />
-      <option name="project" value="LOCAL" />
-      <updated>1665123288355</updated>
-    </task>
-    <task id="LOCAL-00089" summary="Version 9.2.1 en producción. Borrada Voz y Ajustes impresora">
-      <created>1665470010499</created>
-      <option name="number" value="00089" />
-      <option name="presentableId" value="LOCAL-00089" />
-      <option name="project" value="LOCAL" />
-      <updated>1665470010500</updated>
-    </task>
-    <task id="LOCAL-00090" summary="Version 9.2.1 en producción. Borrada Voz y Ajustes impresora">
-      <created>1665470036509</created>
-      <option name="number" value="00090" />
-      <option name="presentableId" value="LOCAL-00090" />
-      <option name="project" value="LOCAL" />
-      <updated>1665470036509</updated>
-    </task>
-    <task id="LOCAL-00091" summary="Version 9.2 Error encajado y en ver Ticket aparece ver la colección">
-      <created>1666276993765</created>
-      <option name="number" value="00091" />
-      <option name="presentableId" value="LOCAL-00091" />
-      <option name="project" value="LOCAL" />
-      <updated>1666276993765</updated>
-    </task>
-    <task id="LOCAL-00092" summary="Version 9.4Beta Cmr, Control ubicación, volver atrás de Controlador, botón llamadas, volver pantalla anterior parking,">
-      <created>1667385476140</created>
-      <option name="number" value="00092" />
-      <option name="presentableId" value="LOCAL-00092" />
-      <option name="project" value="LOCAL" />
-      <updated>1667385476141</updated>
-    </task>
-    <task id="LOCAL-00093" summary="Modificado control ubicación">
-      <created>1667541612505</created>
-      <option name="number" value="00093" />
-      <option name="presentableId" value="LOCAL-00093" />
-      <option name="project" value="LOCAL" />
-      <updated>1667541612505</updated>
-    </task>
-    <task id="LOCAL-00094" summary="Version 9.5Beta añadido inteceptor y modificado código worker_getId. Subida como 9.4.2Beta">
-      <created>1668156827443</created>
-      <option name="number" value="00094" />
-      <option name="presentableId" value="LOCAL-00094" />
-      <option name="project" value="LOCAL" />
-      <updated>1668156827444</updated>
-    </task>
    <task id="LOCAL-00095" summary="Version 9.6Beta Interteptors, quitando userCase y arreglado click sobre carita. Cambiado .gitignore">
      <created>1668763686581</created>
      <option name="number" value="00095" />
@ -758,7 +711,70 @@
      <option name="project" value="LOCAL" />
      <updated>1683183005751</updated>
    </task>
-    <option name="localTasksCounter" value="135" />
+    <task id="LOCAL-00135" summary="refs #4902 retrocompatibilidad etd-eta">
+      <created>1684304895723</created>
+      <option name="number" value="00135" />
+      <option name="presentableId" value="LOCAL-00135" />
+      <option name="project" value="LOCAL" />
+      <updated>1684304895724</updated>
+    </task>
+    <task id="LOCAL-00136" summary="refs #5618 traducciones">
+      <created>1684997085511</created>
+      <option name="number" value="00136" />
+      <option name="presentableId" value="LOCAL-00136" />
+      <option name="project" value="LOCAL" />
+      <updated>1684997085512</updated>
+    </task>
+    <task id="LOCAL-00137" summary="refs #5071 summaryFragment">
+      <created>1684999085300</created>
+      <option name="number" value="00137" />
+      <option name="presentableId" value="LOCAL-00137" />
+      <option name="project" value="LOCAL" />
+      <updated>1684999085300</updated>
+    </task>
+    <task id="LOCAL-00138" summary="refs #4678 Carga/descarga">
+      <created>1684999128361</created>
+      <option name="number" value="00138" />
+      <option name="presentableId" value="LOCAL-00138" />
+      <option name="project" value="LOCAL" />
+      <updated>1684999128361</updated>
+    </task>
+    <task id="LOCAL-00139" summary="refs #4678 Carga/descarga">
+      <created>1684999166457</created>
+      <option name="number" value="00139" />
+      <option name="presentableId" value="LOCAL-00139" />
+      <option name="project" value="LOCAL" />
+      <updated>1684999166457</updated>
+    </task>
+    <task id="LOCAL-00140" summary="refs #5675 fallo parking">
+      <created>1684999232201</created>
+      <option name="number" value="00140" />
+      <option name="presentableId" value="LOCAL-00140" />
+      <option name="project" value="LOCAL" />
+      <updated>1684999232201</updated>
+    </task>
+    <task id="LOCAL-00141" summary="refs #5618 traducciones">
+      <created>1685001238898</created>
+      <option name="number" value="00141" />
+      <option name="presentableId" value="LOCAL-00141" />
+      <option name="project" value="LOCAL" />
+      <updated>1685001238898</updated>
+    </task>
+    <task id="LOCAL-00142" summary="refs #4940">
+      <created>1685355657569</created>
+      <option name="number" value="00142" />
+      <option name="presentableId" value="LOCAL-00142" />
+      <option name="project" value="LOCAL" />
+      <updated>1685355657569</updated>
+    </task>
+    <task id="LOCAL-00143" summary="refs #4678">
+      <created>1685541479796</created>
+      <option name="number" value="00143" />
+      <option name="presentableId" value="LOCAL-00143" />
+      <option name="project" value="LOCAL" />
+      <updated>1685541479797</updated>
+    </task>
+    <option name="localTasksCounter" value="144" />
    <servers />
  </component>
  <component name="Vcs.Log.History.Properties">
@ -859,13 +875,6 @@
  </component>
  <component name="VcsManagerConfiguration">
    <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
-    <MESSAGE value="Reclycler extra y agrupacion previa" />
-    <MESSAGE value="refs #5117 Autoconsumo" />
-    <MESSAGE value="refs #4683 Autoconsumo" />
-    <MESSAGE value="refs #4755 mostrar tickets" />
-    <MESSAGE value="refs #5117 autoconsumo" />
-    <MESSAGE value="refs #4755 añadirTickets" />
-    <MESSAGE value="refs #4923 previas" />
    <MESSAGE value="EntrySalix" />
    <MESSAGE value="refs #4731 print" />
    <MESSAGE value="refs #4940 packingHolland" />
@ -884,9 +893,33 @@
    <MESSAGE value="refs #5442" />
    <MESSAGE value="version 23.18.2Beta - Solucionado doble pitido, fusionada pantalla sacador, filtro a ubicador, quitado baldas." />
    <MESSAGE value="version 23.18.3Beta solucionado fallo ubicador. Añadido bbdd" />
-    <option name="LAST_COMMIT_MESSAGE" value="version 23.18.3Beta solucionado fallo ubicador. Añadido bbdd" />
+    <MESSAGE value="refs #4902 retrocompatibilidad etd-eta" />
+    <MESSAGE value="refs #5071 summaryFragment" />
+    <MESSAGE value="refs #4678 Carga/descarga" />
+    <MESSAGE value="refs #5675 fallo parking" />
+    <MESSAGE value="refs #5618 traducciones" />
+    <MESSAGE value="refs #4940" />
+    <MESSAGE value="refs #4678" />
+    <option name="LAST_COMMIT_MESSAGE" value="refs #4678" />
  </component>
  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" type="kotlin-function">
+          <url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt</url>
+          <line>866</line>
+          <properties class="es.verdnatura.domain.VerdnaturaService" method="route_getExpeditionSummary">
+            <option name="WATCH_EXIT" value="false" />
+          </properties>
+          <option name="timeStamp" value="2" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="kotlin-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt</url>
+          <line>457</line>
+          <option name="timeStamp" value="3" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
    <pin-to-top-manager>
      <pinned-members>
        <PinnedItemInfo parentTag="java.net.SocketException" memberName="detailMessage" />
--- a/app/alpha/release/output-metadata.json
+++ b/app/alpha/release/output-metadata.json
@ -0,0 +1,20 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "es.verdnatura.alpha",
+  "variantName": "alphaRelease",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "attributes": [],
+      "versionCode": 187,
+      "versionName": "23.20Beta",
+      "outputFile": "app-alpha-release.apk"
+    }
+  ],
+  "elementType": "File"
+}
--- a/app/beta/release/output-metadata.json
+++ b/app/beta/release/output-metadata.json
@ -11,8 +11,8 @@
      "type": "SINGLE",
      "filters": [],
      "attributes": [],
-      "versionCode": 186,
-      "versionName": "23.18.3Beta",
+      "versionCode": 187,
+      "versionName": "23.20Beta",
      "outputFile": "app-beta-release.apk"
    }
  ],
--- a/app/betatesting/release/output-metadata.json
+++ b/app/betatesting/release/output-metadata.json
@ -0,0 +1,20 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "es.verdnatura.betatesting",
+  "variantName": "betatestingRelease",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "attributes": [],
+      "versionCode": 187,
+      "versionName": "23.20Beta",
+      "outputFile": "app-betatesting-release.apk"
+    }
+  ],
+  "elementType": "File"
+}
--- a/app/build.gradle
+++ b/app/build.gradle
@ -13,8 +13,8 @@ android {
        applicationId "es.verdnatura"
        minSdkVersion 24 //21
        targetSdkVersion 33
-        versionCode 186
-        versionName = "23.18.3Beta"
+        versionCode 187
+        versionName = "23.20Beta"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }

@ -37,6 +37,9 @@ android {
        create("general") {
            //versionNameSuffix = "General"
        }
+        create("alpha"){
+            applicationIdSuffix = ".alpha"
+        }
    }

    buildFeatures {
--- a/app/google-services.json
+++ b/app/google-services.json
@ -62,6 +62,35 @@
          ]
        }
      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:975691769093:android:83eff0dadf5ca9d3e3c36c",
+        "android_client_info": {
+          "package_name": "es.verdnatura.alpha"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "975691769093-j2u5241eac30n2saa1mvbguq670tsvd0.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyC3skTw7I7BbOuSS4jOBa373zV5e8wCMDM"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "975691769093-j2u5241eac30n2saa1mvbguq670tsvd0.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
    }
  ],
  "configuration_version": "1"
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@ -11,7 +11,7 @@
      "type": "SINGLE",
      "filters": [],
      "attributes": [],
-      "versionCode": 160,
+      "versionCode": 161,
      "versionName": "23.3Beta",
      "outputFile": "app-release.apk"
    }
--- a/app/src/main/res/layout/component_custom_dialog.xml
+++ b/app/src/main/res/layout/component_custom_dialog.xml
@ -9,6 +9,7 @@
    app:cardCornerRadius="@dimen/dialog_radius">

    <LinearLayout
+        android:id="@+id/dynamic"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:orientation="vertical"