version 23.40Beta

2023-10-10 10:08:02 +02:00 · 2023-10-10 10:08:02 +02:00 · 76d6daf34b
parent aaae380f07
commit 76d6daf34b
14 changed files with 219 additions and 138 deletions
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
+    <bytecodeTargetLevel target="17" />
  </component>
 </project>
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@ -5,16 +5,16 @@
    <option name="linkedExternalProjectsSettings">
      <GradleProjectSettings>
        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
        <option name="externalProjectPath" value="$PROJECT_DIR$" />
        <option name="gradleHome" value="$PROJECT_DIR$/../../../../gradle/gradle-7.5" />
-        <option name="gradleJvm" value="11" />
+        <option name="gradleJvm" value="jbr-17" />
        <option name="modules">
          <set>
            <option value="$PROJECT_DIR$" />
            <option value="$PROJECT_DIR$/app" />
          </set>
        </option>
+        <option name="resolveExternalAnnotations" value="false" />
      </GradleProjectSettings>
    </option>
  </component>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@ -275,7 +275,7 @@
    </option>
  </component>
  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
    <output url="file://$PROJECT_DIR$/build/classes" />
  </component>
  <component name="ProjectType">
--- a/.idea/modules/app/Gestor_Almacén.app.iml
+++ b/.idea/modules/app/Gestor_Almacén.app.iml
@ -30,9 +30,6 @@
          <option name="pluginOptions">
            <array />
          </option>
-          <option name="errors">
-            <ArgumentParseErrors />
-          </option>
        </compilerArguments>
      </configuration>
    </facet>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
  </component>
 </project>
--- a/.idea/vn-warehouseManager.iml
+++ b/.idea/vn-warehouseManager.iml
@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@ -34,13 +34,58 @@
  <component name="AndroidLayouts">
    <shared>
      <config>
-        <device id="pixel_4" />
-        <device id="pixel_5" />
-        <device id="_device_class_phone" />
-        <locale>fr</locale>
-        <target>android-28</target>
+        <locale>es</locale>
+        <pickBest>false</pickBest>
+        <target>android-27</target>
      </config>
    </shared>
+    <layouts>
+      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_login.xml">
+        <config>
+          <theme>@style/AppTheme</theme>
+        </config>
+      </layout>
+      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
+        <config>
+          <theme>@style/AppTheme</theme>
+        </config>
+      </layout>
+      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/buyers_fragment.xml">
+        <config>
+          <theme>@style/AppTheme</theme>
+        </config>
+      </layout>
+      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/item_expeditionpallet_row.xml">
+        <config>
+          <theme>@style/AppTheme</theme>
+        </config>
+      </layout>
+      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/item_general_row.xml">
+        <config>
+          <theme>@style/AppTheme</theme>
+        </config>
+      </layout>
+      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/item_route_row.xml">
+        <config>
+          <theme>@style/AppTheme</theme>
+        </config>
+      </layout>
+      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/item_shelvinglog_row.xml">
+        <config>
+          <theme>@style/AppTheme</theme>
+        </config>
+      </layout>
+      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/reposicion_fragment.xml">
+        <config>
+          <theme>@style/AppTheme</theme>
+        </config>
+      </layout>
+      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/sale_row_fragment.xml">
+        <config>
+          <theme>@style/AppTheme</theme>
+        </config>
+      </layout>
+    </layouts>
  </component>
  <component name="AndroidLogFilters">
    <option name="TOOL_WINDOW_CUSTOM_FILTER" value="verdnatura::" />
@ -82,16 +127,40 @@
    </select>
  </component>
  <component name="ChangeListManager">
-    <list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="refs #4677 add scan manual">
+    <list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="refs #4815 serial">
+      <change afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_collection_new.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/app/src/main/res/layout/sale_row_fragment_test.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/app/src/main/res/layout/testing.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/modules/app/Gestor_Almacén.app.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/app/Gestor_Almacén.app.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/vn-warehouseManager.iml" beforeDir="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/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/domain/VerdnaturaService.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/VerdnaturaService.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/ajustes/fragment/AjustesFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesViewModel.kt" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPicker.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPicker.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPreChecker.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPreChecker.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/mapper/CollectionMapper.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/mapper/CollectionMapper.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelvinglog/model/ShelvingLog.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelvinglog/model/ShelvingLog.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/sacador/fragment/SacadorViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorViewModel.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/mapper/SacadoresMapper.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/mapper/SacadoresMapper.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/model/TicketItemVO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/model/TicketItemVO.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/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" />
+      <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/java/es/verdnatura/presentation/view/feature/workermistake/model/mistakeWorkerType.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/model/mistakeWorkerType.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -99,10 +168,13 @@
    <option name="LAST_RESOLUTION" value="IGNORE" />
  </component>
  <component name="ChangesViewManager" show_ignored="true" />
+  <component name="ClangdSettings">
+    <option name="formatViaClangd" value="false" />
+  </component>
  <component name="CodeInsightWorkspaceSettings">
    <option name="optimizeImportsOnTheFly" value="true" />
  </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[21114523025303]" />
+  <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[C:\Users\sergiodt\.android\avd\Pixel_6_API_30.avd]" />
  <component name="ExportToHTMLSettings">
    <option name="OPEN_IN_BROWSER" value="true" />
    <option name="OUTPUT_DIRECTORY" value="C:\Program Files\Android\Android Studio\inspections" />
@ -120,17 +192,7 @@
        </task>
        <projects_view>
          <tree_state>
-            <expand>
-              <path>
-                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
-                <item name="Gestor Almacén" type="f1a62948:ProjectNode" />
-              </path>
-              <path>
-                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
-                <item name="Gestor Almacén" type="f1a62948:ProjectNode" />
-                <item name="Run Configurations" type="7b0102dc:RunConfigurationsNode" />
-              </path>
-            </expand>
+            <expand />
            <select />
          </tree_state>
        </projects_view>
@ -141,11 +203,11 @@
    <option name="RECENT_TEMPLATES">
      <list>
        <option value="navigationResourceFile" />
-        <option value="layoutResourceFile" />
        <option value="resourceFile" />
        <option value="Class" />
        <option value="valueResourceFile" />
        <option value="Kotlin Class" />
+        <option value="layoutResourceFile" />
      </list>
    </option>
  </component>
@ -225,6 +287,7 @@
    <setting file="file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt" root0="FORCE_HIGHLIGHTING" />
    <setting file="file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemFragment.kt" root0="FORCE_HIGHLIGHTING" />
    <setting file="file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemViewModel.kt" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/app/src/main/res/layout/sale_row_fragment.xml" root0="FORCE_HIGHLIGHTING" />
    <setting file="file://$PROJECT_DIR$/app/src/main/res/layout/toolbar_fragment.xml" root0="FORCE_HIGHLIGHTING" />
    <setting file="file://$PROJECT_DIR$/app/src/main/res/values-es/strings.xml" root0="FORCE_HIGHLIGHTING" />
    <setting file="file://$PROJECT_DIR$/app/src/main/res/values/strings.xml" root0="FORCE_HIGHLIGHTING" />
@ -252,33 +315,21 @@
    "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_directory_selection": "C:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable",
-    "last_opened_file_path": "C:/Users/sergiodt/Downloads/AJVoIPTest/AJVoIPTest",
-    "project.structure.last.edited": "Project",
+    "git-widget-placeholder": "dev",
+    "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": "com.obiscr.chatgpt.settings.OpenAISettings"
+    "settings.editor.selected.configurable": "AndroidSdkUpdater"
  },
  "keyToStringList": {
    "ExportApk.BuildVariants": [
      "generalRelease"
-    ],
-    "com.android.tools.idea.sqlite.queryhistory": [
-      "delete from expedition;",
-      "select * from expedition where id = 7101969\n",
-      "select * from expedition",
-      "select * from  expedition e where e.addressFk= 34915",
-      "select * from  expedition e where e.id= 6872921"
    ]
  }
 }]]></component>
@ -310,11 +361,11 @@
      <recent name="es.verdnatura.presentation.view.feature.buffer.fragment" />
    </key>
    <key name="CopyKotlinDeclarationDialog.RECENTS_KEY">
+      <recent name="es.verdnatura.presentation.view.feature.collection.adapter" />
+      <recent name="es.verdnatura.presentation.view.feature.sacador.adapter" />
+      <recent name="es.verdnatura.presentation.view.feature.sacador.fragment" />
      <recent name="es.verdnatura.presentation.view.component" />
      <recent name="es.verdnatura.domain" />
-      <recent name="es.verdnatura.presentation.view.feature.delivery.activity" />
-      <recent name="es.verdnatura.presentation.view.feature.ubicador.adapter" />
-      <recent name="es.verdnatura.presentation.view.feature.ubicador.fragment" />
    </key>
    <key name="CopyClassDialog.RECENTS_KEY">
      <recent name="es.verdnatura.presentation.view.feature.delivery.activity" />
@ -328,7 +379,7 @@
        <option name="Android.Gradle.BeforeRunTask" enabled="true" />
      </method>
    </configuration>
-    <configuration name="app" type="AndroidRunConfigurationType" factoryName="Android App">
+    <configuration name="app" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
      <module name="Gestor_Almacén.app.main" />
      <option name="DEPLOY" value="true" />
      <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
@ -338,7 +389,6 @@
      <option name="ALL_USERS" value="false" />
      <option name="ALWAYS_INSTALL_WITH_PM" value="false" />
      <option name="CLEAR_APP_STORAGE" value="false" />
-      <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" />
      <option name="ACTIVITY_EXTRA_FLAGS" value="" />
      <option name="MODE" value="default_activity" />
      <option name="CLEAR_LOGCAT" value="false" />
@ -354,6 +404,8 @@
        <option name="WORKING_DIR" value="" />
        <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
        <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+        <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
+        <option name="DEBUG_SANDBOX_SDK" value="false" />
      </Auto>
      <Hybrid>
        <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
@ -361,14 +413,21 @@
        <option name="WORKING_DIR" value="" />
        <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
        <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+        <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
+        <option name="DEBUG_SANDBOX_SDK" value="false" />
      </Hybrid>
-      <Java />
+      <Java>
+        <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
+        <option name="DEBUG_SANDBOX_SDK" value="false" />
+      </Java>
      <Native>
        <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
        <option name="SHOW_STATIC_VARS" value="true" />
        <option name="WORKING_DIR" value="" />
        <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
        <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+        <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
+        <option name="DEBUG_SANDBOX_SDK" value="false" />
      </Native>
      <Profilers>
        <option name="ADVANCED_PROFILING_ENABLED" value="false" />
@ -405,6 +464,19 @@
      <DebugAllEnabled>false</DebugAllEnabled>
      <method v="2" />
    </configuration>
+    <configuration default="true" type="JetRunConfigurationType">
+      <module name="Gestor Almacén" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration default="true" type="KotlinStandaloneScriptRunConfigurationType">
+      <module name="Gestor Almacén" />
+      <option name="filePath" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
    <recent_temporary>
      <list>
        <item itemvalue="Gradle.vn-warehouseManager" />
@ -427,27 +499,6 @@
      <option name="presentableId" value="Default" />
      <updated>1618825571576</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>
    <task id="LOCAL-00144" summary="refs #5513 testBack">
      <created>1685541609674</created>
      <option name="number" value="00144" />
@ -770,7 +821,28 @@
      <option name="project" value="LOCAL" />
      <updated>1695105770477</updated>
    </task>
-    <option name="localTasksCounter" value="190" />
+    <task id="LOCAL-00190" summary="refs #5890">
+      <created>1696924758942</created>
+      <option name="number" value="00190" />
+      <option name="presentableId" value="LOCAL-00190" />
+      <option name="project" value="LOCAL" />
+      <updated>1696924758942</updated>
+    </task>
+    <task id="LOCAL-00191" summary="refs #6183">
+      <created>1696924804015</created>
+      <option name="number" value="00191" />
+      <option name="presentableId" value="LOCAL-00191" />
+      <option name="project" value="LOCAL" />
+      <updated>1696924804015</updated>
+    </task>
+    <task id="LOCAL-00192" summary="refs #4815 serial">
+      <created>1696924964121</created>
+      <option name="number" value="00192" />
+      <option name="presentableId" value="LOCAL-00192" />
+      <option name="project" value="LOCAL" />
+      <updated>1696924964121</updated>
+    </task>
+    <option name="localTasksCounter" value="193" />
    <servers />
  </component>
  <component name="Vcs.Log.History.Properties">
@ -871,9 +943,6 @@
  </component>
  <component name="VcsManagerConfiguration">
    <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
-    <MESSAGE value="refs #5339" />
-    <MESSAGE value="refs #4678" />
-    <MESSAGE value="version 23.26 refs #4678" />
    <MESSAGE value="refs #5613 renew token" />
    <MESSAGE value="refs #5891" />
    <MESSAGE value="versionBeta 23.28 renovarToken" />
@ -896,19 +965,22 @@
    <MESSAGE value="refs #5134 silex→salix" />
    <MESSAGE value="refs varios" />
    <MESSAGE value="refs #4677 add scan manual" />
-    <option name="LAST_COMMIT_MESSAGE" value="refs #4677 add scan manual" />
+    <MESSAGE value="refs #5890" />
+    <MESSAGE value="refs #6183" />
+    <MESSAGE value="refs #4815 serial" />
+    <option name="LAST_COMMIT_MESSAGE" value="refs #4815 serial" />
  </component>
  <component name="XDebuggerManager">
    <breakpoint-manager>
      <breakpoints>
        <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>475</line>
+          <line>473</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/login/fragment/LoginViewModel.kt</url>
-          <line>530</line>
+          <line>531</line>
          <option name="timeStamp" value="6" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="kotlin-line">
@ -922,9 +994,39 @@
          <option name="timeStamp" value="18" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="kotlin-line">
-          <url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt</url>
-          <line>260</line>
-          <option name="timeStamp" value="52" />
+          <url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerNew.kt</url>
+          <line>2153</line>
+          <option name="timeStamp" value="53" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="kotlin-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerNew.kt</url>
+          <line>964</line>
+          <option name="timeStamp" value="54" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="kotlin-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerNew.kt</url>
+          <line>1813</line>
+          <option name="timeStamp" value="55" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="kotlin-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerNew.kt</url>
+          <line>1809</line>
+          <option name="timeStamp" value="56" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="kotlin-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerNew.kt</url>
+          <line>1749</line>
+          <option name="timeStamp" value="57" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="kotlin-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerNew.kt</url>
+          <line>577</line>
+          <option name="timeStamp" value="58" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="kotlin-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerNew.kt</url>
+          <line>583</line>
+          <option name="timeStamp" value="60" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <url>jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.3.0/76f3c69879d3e01c082f49d8661c5590838148e1/retrofit-2.3.0-sources.jar!/retrofit2/Response.java</url>
--- a/app/beta/release/output-metadata.json
+++ b/app/beta/release/output-metadata.json
@ -11,8 +11,8 @@
      "type": "SINGLE",
      "filters": [],
      "attributes": [],
-      "versionCode": 228,
-      "versionName": "23.38Beta",
+      "versionCode": 229,
+      "versionName": "23.40Beta",
      "outputFile": "app-beta-release.apk"
    }
  ],
--- a/app/build.gradle
+++ b/app/build.gradle
@ -6,15 +6,15 @@ apply plugin: 'com.google.firebase.crashlytics'


 android {
-    compileSdkVersion 33
-    // buildToolsVersion "29.0.3"
+    compileSdk 33
+// buildToolsVersion "29.0.3"

    defaultConfig {
        applicationId "es.verdnatura"
        minSdkVersion 24 //21
        targetSdkVersion 33
-        versionCode 228
-        versionName = "23.38Beta"
+        versionCode 229
+        versionName = "23.40"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }

--- a/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt
+++ b/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt
@ -47,9 +47,6 @@ interface VerdnaturaService {
    ):
            Call<LoginDevice>

-    @POST("almacennew/worker_getId")//REVISADA
-    fun worker_getId(@Body vararg params: Any):
-            Call<Int>

    @POST("almacennew/deviceLog_add")//REVISADA
    fun deviceLog_add(
@ -66,9 +63,6 @@ interface VerdnaturaService {
            Call<versionApp>

    //AJUSTES ========================================================================>
-    @POST("almacennew/sector_get")//SALIX
-    fun getSectors():
-            Call<List<SectorItemVO>>

    @POST("almacennew/printer_get")//NO SALIX
    fun printer_get():
@ -83,18 +77,6 @@ interface VerdnaturaService {
    fun worker_getPrinter(
    ):
            Call<List<Printers>>
-/*
-    @POST("almacennew/worker_updatePrinter")//NO SALIX
-    fun worker_updatePrinter(
-        @Body vararg params: Any
-    ):
-            Call<Unit>*/
-/*
-    @POST("almacennew/worker_updateSector")//NO SALIX
-    fun worker_updateSector(
-        @Body vararg params: Any
-    ):
-            Call<Unit>*/

    @POST("almacennew/operator_updateItemPackingType")//NO SALIX
    fun operator_updateItemPackingType(
@ -171,7 +153,8 @@ interface VerdnaturaService {
    @POST("almacennew/collection_assign")//NO SALIX
    fun collection_assign(
    ):
-            Call<String>
+            Call<Int>
+

    @POST("almacennew/operator_getItemPackingType")//NO SALIX
    fun operator_getItemPackingType(
@ -536,11 +519,6 @@ interface VerdnaturaService {
    ):
            Call<List<ItemUbicadorVO>>

-    @POST("almacennew/shelvingPriorityUpdate")//A BORRAR
-    fun shelvingPriorityUpdate(
-        @Body vararg params: Any
-    ):
-            Call<Any>

    @POST("almacennew/itemShelvingMake")//REVISADA
    fun itemShelvingMake(
@ -598,13 +576,6 @@ interface VerdnaturaService {
    ):
            Call<Any>

-    @POST("almacennew/itemShelving_merge")//REVISADA
-    fun itemShelving_merge(
-        @Body vararg params: Any
-    ):
-            Call<Any>
-
-
    @POST("almacennew/shelvingLog_add")//REVISADA
    fun shelvingLog_add(
        @Body vararg params: Any
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt
@ -156,6 +156,28 @@ class ItemCardViewModel(var context: Context) : BaseViewModel(context) {
            })
    }

+    fun setVisibleDiscard(
+        itemFk: Int,
+        warehouseFk: Int,
+        newValue: Int,
+        isTrash: Boolean
+    ) {
+        silex.itemTrash(itemFk, warehouseFk, newValue, isTrash)
+            .enqueue(object : SilexCallback<Any>(context) {
+                override fun onError(t: Throwable) {
+                    _response.value = ResponseItemVO(
+                        isError = true,
+                        errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!)
+                    )
+                }
+
+                override fun onSuccess(response: Response<Any>) {
+                    _response.value =
+                        ResponseItemVO(isError = false, response = response.message())
+                }
+            })
+    }
+
    fun updateGrouping(
        itemFk: Int,
        value: Int,
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt
@ -748,7 +748,7 @@ class UbicadorFragment(
                        packingUpdate = true
                    }
                    saveNewItem(
-                        customDialogUbicador.getItemValue().toInt(),
+                        customDialogUbicador.getItemValue().toLong(),
                        if (customDialogUbicador.getEtiquetaValue().isNullOrEmpty()) {
                            1
                        } else {
@ -869,7 +869,7 @@ class UbicadorFragment(
    }

    private fun saveNewItem(
-        itemFk: Int?,
+        itemFk: Number?,
        etiquetas: Int,
        packing: Int?,
        visible: Int?,
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt
@ -108,7 +108,7 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) {
    ) {
        //Tarea 5134 ok
        salix.updateShelvingPriority("""{"code": "$shelving"}""", hashMapOf("priority" to priority))
-            .enqueue(object : SilexCallback<Any>(context) {
+            .enqueue(object : SalixCallback<Any>(context) {
                override fun onError(t: Throwable) {
                    _responsepriority.value = ResponseItemVO(
                        isError = true,
@ -154,7 +154,7 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) {

    fun itemShelvingMake(
        shelving: String,
-        item: Int,
+        item: Number,
        quantity: Int,
        packing: Int?,
        warehouse: Int,
@ -271,9 +271,7 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) {
        vShelvingFk: String

    ) {
-        /*salix.itemShelvingUpdate()
-            .enqueue(object : SilexCallback<Any>(context) {*/
-        silex.itemShelving_merge(vShelf, vShelvingFk)
+        salix.itemShelvingsUpdate(id= """{"id":$vShelf}""", params=  hashMapOf("shelvingFk" to vShelvingFk))
            .enqueue(object : SilexCallback<Any>(context) {
                override fun onError(t: Throwable) {
                    _response.value = ResponseItemVO(
--- a/build.gradle
+++ b/build.gradle
@ -19,7 +19,7 @@ buildscript {
        
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:7.0.4'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
        classpath 'com.google.gms:google-services:4.3.10'
        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'