version 23.22

2023-06-06 08:56:01 +02:00 · 2023-06-06 08:56:01 +02:00 · e3e7a3375a
parent f48f112773
commit e3e7a3375a
8 changed files with 231 additions and 214 deletions
--- a/.idea/assetWizardSettings.xml
+++ b/.idea/assetWizardSettings.xml
@ -19,8 +19,8 @@
                        <option name="values">
                          <map>
                            <entry key="assetSourceType" value="FILE" />
-                            <entry key="outputName" value="ic_info" />
-                            <entry key="sourceFile" value="Z:\DISEÑO-APP\GENERAL\icomoon\SVG\info.svg" />
+                            <entry key="outputName" value="reset_all" />
+                            <entry key="sourceFile" value="C:\Users\sergiodt\Downloads\restart_alt_FILL0_wght400_GRAD0_opsz48.svg" />
                          </map>
                        </option>
                      </PersistentState>
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <targetSelectedWithDropDown>
+      <Target>
+        <type value="QUICK_BOOT_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="VIRTUAL_DEVICE_PATH" />
+            <value value="C:\Users\sergiodt\.android\avd\Pixel_5_API_22.avd" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </targetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2023-06-05T13:46:57.531979300Z" />
+  </component>
+</project>
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@ -83,33 +83,19 @@
    </select>
  </component>
  <component name="ChangeListManager">
-    <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" />
+    <list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="refs #5713">
+      <change afterPath="$PROJECT_DIR$/.idea/deploymentTargetDropDown.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/assetWizardSettings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/assetWizardSettings.xml" 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/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/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/db/database.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/db/database.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/activity/LoginActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/activity/LoginActivity.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/main/activity/MainActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.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/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" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -152,8 +138,8 @@
        <option value="layoutResourceFile" />
        <option value="resourceFile" />
        <option value="Class" />
-        <option value="Kotlin Class" />
        <option value="valueResourceFile" />
+        <option value="Kotlin Class" />
      </list>
    </option>
  </component>
@ -255,40 +241,40 @@
    <option name="showLibraryContents" value="true" />
    <option name="showMembers" value="true" />
  </component>
-  <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;
+  <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/drawable",
+    "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": "preferences.sourceCode.Shell Script"
  },
-  &quot;keyToStringList&quot;: {
-    &quot;ExportApk.BuildVariants&quot;: [
-      &quot;alphaRelease&quot;
+  "keyToStringList": {
+    "ExportApk.BuildVariants": [
+      "betaRelease"
    ],
-    &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;
+    "com.android.tools.idea.sqlite.queryhistory": [
+      "select * from  expedition e where e.addressFk= 34915",
+      "select * from  expedition e where e.id= 6872921",
+      "select count(*) from expeditionPending\n",
+      "select count(*) from expedition\n",
+      "select count(*) from expedition"
    ]
  }
-}</component>
+}]]></component>
  <component name="PsdUISettings">
    <option name="MODULE_TAB" value="Default Config" />
    <option name="LAST_EDITED_SIGNING_CONFIG" value="debug" />
@ -298,9 +284,9 @@
    <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\xml" />
      <recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\res\raw" />
      <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>
    <key name="MoveFile.RECENT_KEYS">
      <recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\res\drawable" />
@ -431,125 +417,6 @@
      <option name="presentableId" value="Default" />
      <updated>1618825571576</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" />
-      <option name="presentableId" value="LOCAL-00095" />
-      <option name="project" value="LOCAL" />
-      <updated>1668763686582</updated>
-    </task>
-    <task id="LOCAL-00096" summary="Version 9.6Beta Añadido a BaseFragment(context). Quitado código repetido de las llamadas">
-      <created>1669105520909</created>
-      <option name="number" value="00096" />
-      <option name="presentableId" value="LOCAL-00096" />
-      <option name="project" value="LOCAL" />
-      <updated>1669105520910</updated>
-    </task>
-    <task id="LOCAL-00097" summary="Version 9.6Beta Cambiadas llamadas y campos( collectionFk). Borrado Presacador">
-      <created>1669186502340</created>
-      <option name="number" value="00097" />
-      <option name="presentableId" value="LOCAL-00097" />
-      <option name="project" value="LOCAL" />
-      <updated>1669186502342</updated>
-    </task>
-    <task id="LOCAL-00098" summary="Version 9.6Beta en test">
-      <created>1669275670424</created>
-      <option name="number" value="00098" />
-      <option name="presentableId" value="LOCAL-00098" />
-      <option name="project" value="LOCAL" />
-      <updated>1669275670424</updated>
-    </task>
-    <task id="LOCAL-00099" summary="Version 9.6Beta en test : ubicador, quality, posicion, buscar item, reclamaciones...">
-      <created>1669631463102</created>
-      <option name="number" value="00099" />
-      <option name="presentableId" value="LOCAL-00099" />
-      <option name="project" value="LOCAL" />
-      <updated>1669631463102</updated>
-    </task>
-    <task id="LOCAL-00100" summary="Version 9.6Beta en test: paletizadores">
-      <created>1669715487611</created>
-      <option name="number" value="00100" />
-      <option name="presentableId" value="LOCAL-00100" />
-      <option name="project" value="LOCAL" />
-      <updated>1669715487612</updated>
-    </task>
-    <task id="LOCAL-00101" summary="Version 9.6Beta en test: paletizadores">
-      <created>1669720979790</created>
-      <option name="number" value="00101" />
-      <option name="presentableId" value="LOCAL-00101" />
-      <option name="project" value="LOCAL" />
-      <updated>1669720979790</updated>
-    </task>
-    <task id="LOCAL-00102" summary="Version 9.6Beta. TEST5: imprimir ok, ubicador ok, no se cierra app sacador">
-      <created>1669975009865</created>
-      <option name="number" value="00102" />
-      <option name="presentableId" value="LOCAL-00102" />
-      <option name="project" value="LOCAL" />
-      <updated>1669975009872</updated>
-    </task>
-    <task id="LOCAL-00103" summary="Version 9.6Beta. TEST6-final: Modificando llamadas a SilexCallback (AjustesFragment)">
-      <created>1670580001733</created>
-      <option name="number" value="00103" />
-      <option name="presentableId" value="LOCAL-00103" />
-      <option name="project" value="LOCAL" />
-      <updated>1670580001733</updated>
-    </task>
-    <task id="LOCAL-00104" summary="Version 9.6Beta. TEST6-13122022. Dos revisiones de ubicador.">
-      <created>1670915898012</created>
-      <option name="number" value="00104" />
-      <option name="presentableId" value="LOCAL-00104" />
-      <option name="project" value="LOCAL" />
-      <updated>1670915898013</updated>
-    </task>
-    <task id="LOCAL-00105" summary="Version 23.2 Cambiado collection_assign a String.">
-      <created>1673601175078</created>
-      <option name="number" value="00105" />
-      <option name="presentableId" value="LOCAL-00105" />
-      <option name="project" value="LOCAL" />
-      <updated>1673601175078</updated>
-    </task>
-    <task id="LOCAL-00106" summary="Version 23.2-Fallo item_card">
-      <created>1674486271874</created>
-      <option name="number" value="00106" />
-      <option name="presentableId" value="LOCAL-00106" />
-      <option name="project" value="LOCAL" />
-      <updated>1674486271876</updated>
-    </task>
-    <task id="LOCAL-00107" summary="Version 23.2 Modificado orden ubicador y revisión anterior falta activar icono">
-      <created>1674660080703</created>
-      <option name="number" value="00107" />
-      <option name="presentableId" value="LOCAL-00107" />
-      <option name="project" value="LOCAL" />
-      <updated>1674660080704</updated>
-    </task>
-    <task id="LOCAL-00108" summary="Version 23.2 Modificado actualizar pantalla al transferir en Ubicador. Subida version">
-      <created>1674813532897</created>
-      <option name="number" value="00108" />
-      <option name="presentableId" value="LOCAL-00108" />
-      <option name="project" value="LOCAL" />
-      <updated>1674813532898</updated>
-    </task>
-    <task id="LOCAL-00109" summary="Activado impresion labelCount">
-      <created>1676562624750</created>
-      <option name="number" value="00109" />
-      <option name="presentableId" value="LOCAL-00109" />
-      <option name="project" value="LOCAL" />
-      <updated>1676562624751</updated>
-    </task>
-    <task id="LOCAL-00110" summary="refs #5117 Autoconsumo">
-      <created>1679050268326</created>
-      <option name="number" value="00110" />
-      <option name="presentableId" value="LOCAL-00110" />
-      <option name="project" value="LOCAL" />
-      <updated>1679050268327</updated>
-    </task>
-    <task id="LOCAL-00111" summary="refs #5117 Autoconsumo">
-      <created>1679050285819</created>
-      <option name="number" value="00111" />
-      <option name="presentableId" value="LOCAL-00111" />
-      <option name="project" value="LOCAL" />
-      <updated>1679050285819</updated>
-    </task>
    <task id="LOCAL-00112" summary="refs #4683 Autoconsumo">
      <created>1679050359974</created>
      <option name="number" value="00112" />
@ -774,7 +641,126 @@
      <option name="project" value="LOCAL" />
      <updated>1685541479797</updated>
    </task>
-    <option name="localTasksCounter" value="144" />
+    <task id="LOCAL-00144" summary="refs #5513 testBack">
+      <created>1685541609674</created>
+      <option name="number" value="00144" />
+      <option name="presentableId" value="LOCAL-00144" />
+      <option name="project" value="LOCAL" />
+      <updated>1685541609674</updated>
+    </task>
+    <task id="LOCAL-00145" summary="refs #5618 traducción">
+      <created>1685541667220</created>
+      <option name="number" value="00145" />
+      <option name="presentableId" value="LOCAL-00145" />
+      <option name="project" value="LOCAL" />
+      <updated>1685541667220</updated>
+    </task>
+    <task id="LOCAL-00146" summary="refs lentitud al leer codigos y fallo al volver atrás">
+      <created>1685541714867</created>
+      <option name="number" value="00146" />
+      <option name="presentableId" value="LOCAL-00146" />
+      <option name="project" value="LOCAL" />
+      <updated>1685541714867</updated>
+    </task>
+    <task id="LOCAL-00147" summary="refs #4678 preparar fallo conexión">
+      <created>1685541752286</created>
+      <option name="number" value="00147" />
+      <option name="presentableId" value="LOCAL-00147" />
+      <option name="project" value="LOCAL" />
+      <updated>1685541752286</updated>
+    </task>
+    <task id="LOCAL-00148" summary="version alfa">
+      <created>1685541821392</created>
+      <option name="number" value="00148" />
+      <option name="presentableId" value="LOCAL-00148" />
+      <option name="project" value="LOCAL" />
+      <updated>1685541821392</updated>
+    </task>
+    <task id="LOCAL-00149" summary="Modificado IntvsLong">
+      <created>1685629659021</created>
+      <option name="number" value="00149" />
+      <option name="presentableId" value="LOCAL-00149" />
+      <option name="project" value="LOCAL" />
+      <updated>1685629659022</updated>
+    </task>
+    <task id="LOCAL-00150" summary="refs #5764 Añadir onclick pantalla Día de venta">
+      <created>1685683001351</created>
+      <option name="number" value="00150" />
+      <option name="presentableId" value="LOCAL-00150" />
+      <option name="project" value="LOCAL" />
+      <updated>1685683001351</updated>
+    </task>
+    <task id="LOCAL-00151" summary="refs #5322 Nature">
+      <created>1685703249696</created>
+      <option name="number" value="00151" />
+      <option name="presentableId" value="LOCAL-00151" />
+      <option name="project" value="LOCAL" />
+      <updated>1685703249696</updated>
+    </task>
+    <task id="LOCAL-00152" summary="refs #5322 NaturePhotos">
+      <created>1685710226077</created>
+      <option name="number" value="00152" />
+      <option name="presentableId" value="LOCAL-00152" />
+      <option name="project" value="LOCAL" />
+      <updated>1685710226077</updated>
+    </task>
+    <task id="LOCAL-00153" summary="refs #5322 NaturePhotos">
+      <created>1685710258945</created>
+      <option name="number" value="00153" />
+      <option name="presentableId" value="LOCAL-00153" />
+      <option name="project" value="LOCAL" />
+      <updated>1685710258945</updated>
+    </task>
+    <task id="LOCAL-00154" summary="strings">
+      <created>1685943727757</created>
+      <option name="number" value="00154" />
+      <option name="presentableId" value="LOCAL-00154" />
+      <option name="project" value="LOCAL" />
+      <updated>1685943727757</updated>
+    </task>
+    <task id="LOCAL-00155" summary="refs #5322 NaturePhotos">
+      <created>1686034135416</created>
+      <option name="number" value="00155" />
+      <option name="presentableId" value="LOCAL-00155" />
+      <option name="project" value="LOCAL" />
+      <updated>1686034135416</updated>
+    </task>
+    <task id="LOCAL-00156" summary="Translation">
+      <created>1686034154826</created>
+      <option name="number" value="00156" />
+      <option name="presentableId" value="LOCAL-00156" />
+      <option name="project" value="LOCAL" />
+      <updated>1686034154826</updated>
+    </task>
+    <task id="LOCAL-00157" summary="refs #5513">
+      <created>1686034214348</created>
+      <option name="number" value="00157" />
+      <option name="presentableId" value="LOCAL-00157" />
+      <option name="project" value="LOCAL" />
+      <updated>1686034214348</updated>
+    </task>
+    <task id="LOCAL-00158" summary="refs #4678">
+      <created>1686034256459</created>
+      <option name="number" value="00158" />
+      <option name="presentableId" value="LOCAL-00158" />
+      <option name="project" value="LOCAL" />
+      <updated>1686034256459</updated>
+    </task>
+    <task id="LOCAL-00159" summary="refs #5713">
+      <created>1686034337439</created>
+      <option name="number" value="00159" />
+      <option name="presentableId" value="LOCAL-00159" />
+      <option name="project" value="LOCAL" />
+      <updated>1686034337439</updated>
+    </task>
+    <task id="LOCAL-00160" summary="refs #5713">
+      <created>1686034352693</created>
+      <option name="number" value="00160" />
+      <option name="presentableId" value="LOCAL-00160" />
+      <option name="project" value="LOCAL" />
+      <updated>1686034352693</updated>
+    </task>
+    <option name="localTasksCounter" value="161" />
    <servers />
  </component>
  <component name="Vcs.Log.History.Properties">
@ -875,20 +861,6 @@
  </component>
  <component name="VcsManagerConfiguration">
    <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
-    <MESSAGE value="EntrySalix" />
-    <MESSAGE value="refs #4731 print" />
-    <MESSAGE value="refs #4940 packingHolland" />
-    <MESSAGE value="version 23.10 General" />
-    <MESSAGE value="version 23.10.1 Modificar controlador orden" />
-    <MESSAGE value="refs #4765" />
-    <MESSAGE value="refs #4765 Refactor" />
-    <MESSAGE value="refs #4830" />
-    <MESSAGE value="refs varios" />
-    <MESSAGE value="refs Precontrol activado" />
-    <MESSAGE value="version 23.14.1" />
-    <MESSAGE value="refs #5004" />
-    <MESSAGE value="refs #4979" />
-    <MESSAGE value="refs #4815" />
    <MESSAGE value="refs #5430" />
    <MESSAGE value="refs #5442" />
    <MESSAGE value="version 23.18.2Beta - Solucionado doble pitido, fusionada pantalla sacador, filtro a ubicador, quitado baldas." />
@ -899,13 +871,27 @@
    <MESSAGE value="refs #5675 fallo parking" />
    <MESSAGE value="refs #5618 traducciones" />
    <MESSAGE value="refs #4940" />
+    <MESSAGE value="refs #5513 testBack" />
+    <MESSAGE value="refs #5618 traducción" />
+    <MESSAGE value="refs lentitud al leer codigos y fallo al volver atrás" />
+    <MESSAGE value="refs #4678 preparar fallo conexión" />
+    <MESSAGE value="version alfa" />
+    <MESSAGE value="Modificado IntvsLong" />
+    <MESSAGE value="refs #5764" />
+    <MESSAGE value="refs #5764 Añadir onclick pantalla Día de venta" />
+    <MESSAGE value="refs #5322 Nature" />
+    <MESSAGE value="strings" />
+    <MESSAGE value="refs #5322 NaturePhotos" />
+    <MESSAGE value="Translation" />
+    <MESSAGE value="refs #5513" />
    <MESSAGE value="refs #4678" />
-    <option name="LAST_COMMIT_MESSAGE" value="refs #4678" />
+    <MESSAGE value="refs #5713" />
+    <option name="LAST_COMMIT_MESSAGE" value="refs #5713" />
  </component>
  <component name="XDebuggerManager">
    <breakpoint-manager>
      <breakpoints>
-        <line-breakpoint enabled="true" type="kotlin-function">
+        <line-breakpoint 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">
@ -918,6 +904,16 @@
          <line>457</line>
          <option name="timeStamp" value="3" />
        </line-breakpoint>
+        <line-breakpoint enabled="true" type="kotlin-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/photos/fragment/PhotosFragment.kt</url>
+          <line>150</line>
+          <option name="timeStamp" value="8" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="kotlin-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/photos/fragment/PhotosViewModel.kt</url>
+          <line>55</line>
+          <option name="timeStamp" value="9" />
+        </line-breakpoint>
      </breakpoints>
    </breakpoint-manager>
    <pin-to-top-manager>
--- a/app/beta/release/output-metadata.json
+++ b/app/beta/release/output-metadata.json
@ -11,8 +11,8 @@
      "type": "SINGLE",
      "filters": [],
      "attributes": [],
-      "versionCode": 187,
-      "versionName": "23.20Beta",
+      "versionCode": 188,
+      "versionName": "23.22Beta",
      "outputFile": "app-beta-release.apk"
    }
  ],
--- a/app/build.gradle
+++ b/app/build.gradle
@ -13,8 +13,8 @@ android {
        applicationId "es.verdnatura"
        minSdkVersion 24 //21
        targetSdkVersion 33
-        versionCode 187
-        versionName = "23.20Beta"
+        versionCode 200
+        versionName = "23.22Beta"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }

--- a/app/src/main/java/es/verdnatura/db/database.kt
+++ b/app/src/main/java/es/verdnatura/db/database.kt
@ -37,11 +37,11 @@ interface ExpedicionDao {
    @Query("SELECT * FROM expedition e WHERE e.routeFk = :parametro1")
    suspend fun getAll(parametro1:Int): List<ExpeditionInfoLoadUnload>

-    @Query("SELECT * FROM expeditionPending")
-    suspend fun getAllPending(): List<ExpeditionInfoLoadUnload>
+  /*  @Query("SELECT * FROM expeditionPending")
+    suspend fun getAllPending(): List<ExpeditionInfoLoadUnload>*/

    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insert(expedition:MutableList<ExpeditionInfoLoadUnload>)
+    suspend fun insert(expedition:List<ExpeditionInfoLoadUnload>)

    @Insert(onConflict = OnConflictStrategy.REPLACE)
    suspend fun insertPending(expeditionPending:MutableList<ExpeditionInfoPending>)
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/login/activity/LoginActivity.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/login/activity/LoginActivity.kt
@ -15,7 +15,9 @@ class LoginActivity : BaseActivity<ActivityLoginBinding>() {
    override fun getLayoutId(): Int = R.layout.activity_login

    override fun init() {
-
+     /*   val intent = intent
+        val action = intent.action
+        val type = intent.type*/
        /* val crashButton = Button(this)
        crashButton.text = "Crash!"
        crashButton.setOnClickListener {
@ -27,6 +29,18 @@ class LoginActivity : BaseActivity<ActivityLoginBinding>() {
            ViewGroup.LayoutParams.WRAP_CONTENT))*/

        //goToMain()
+        /*Tarea 5322
+          if (Intent.ACTION_SEND == action && type?.startsWith("image/") == true) {
+               val imageUri: Uri? = intent.getParcelableExtra(Intent.EXTRA_STREAM)
+               imageUri?.let {
+                   // Aquí puedes procesar la imagen recibida
+                   // por ejemplo, mostrarla en una ImageView
+                   val imageView: ImageView = findViewById(R.id.imageView)
+                   imageView.setImageURI(imageUri)
+               }
+
+           }*/
+
        addFragment(LoginFragment.newInstance(), R.id.main_frame_layout, LoginFragment.TAG)
    }

--- a/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt
@ -488,7 +488,7 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
            )
        )

-      //Tarea 4678
+  /*    //Tarea 4678
      _pasillerositem.add(
            PasillerosItemVO(
                6,
@ -500,16 +500,6 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
        )


-        //#tarea4679
-        _pasillerositem.add(
-                  PasillerosItemVO(
-                      6,
-                      R.drawable.ic_delivery_truck,
-                      contextApp.getString(R.string.titleDelivery),
-                      R.string.titleDelivery,
-                      contextApp.getString(R.string.titleDeliveryDescrip)
-                  )
-              )

    //#tarea4021
    _pasillerositem.add(
@ -529,9 +519,9 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
                R.string.titlePhotos,
                contextApp.getString(R.string.titlePhotos)
            )
-        )
+        )*/

-        val working_in_test=true
+        val working_in_test=false
        if (working_in_test){
            _pasillerositem.add(
                PasillerosItemVO(