From 81758cf3400fb5aa31962ed6bdf8963cf307f61e Mon Sep 17 00:00:00 2001
From: Sergio De la torre <sergiodt@verdnatura.es>
Date: Tue, 10 Sep 2024 07:19:28 +0200
Subject: [PATCH] feat: refactorResponse refs #7827

---
 .idea/appInsightsSettings.xml                 |  11 +-
 .idea/workspace.xml                           | 235 ++++++++++++------
 app/build.gradle                              |   4 +-
 .../java/es/verdnatura/di/viewModelModule.kt  |   5 -
 .../java/es/verdnatura/domain/SalixService.kt |   6 +-
 .../presentation/common/GeneralAdapter.kt     |  58 +++--
 .../presentation/common/UICallbacks.kt        |  16 +-
 .../presentation/common/UtilFunctions.kt      |  19 +-
 .../ajustes/fragment/AjustesFragment.kt       |   6 +-
 .../articulo/adapter/ItemProposalAdapter.kt   |   6 +-
 .../articulo/fragment/ItemCardFragment.kt     |   8 +-
 .../articulo/fragment/ItemCardViewModel.kt    |  27 +-
 .../buffer/fragment/BufferLoadFragment.kt     |   2 +-
 .../buffer/fragment/adapter/BufferAdapter.kt  |  14 +-
 .../buscaritem/adapter/LocationAdapter.kt     |   4 +-
 .../category/ChangeCategoryFragment.kt        |  18 +-
 .../category/ChangeCategoryViewModel.kt       |  25 +-
 .../reubication/adapter/ReubicatorAdapter.kt  |   5 +-
 .../adapter/ReubicatorPlacementAdapter.kt     |   5 +-
 .../ubication/ClaimUbicationFragment.kt       |   4 +-
 .../collection/adapter/PlacementAdapter.kt    |   4 +-
 .../feature/collection/adapter/SaleAdapter.kt |   4 +-
 .../collection/adapter/SaleAdapterNew.kt      |   4 +-
 .../collection/fragment/CollectionFragment.kt |  11 +-
 .../fragment/CollectionFragmentPicker.kt      |  53 ++--
 .../fragment/CollectionFragmentPickerNew.kt   |   8 +-
 .../CollectionFragmentPickerPreviousNew.kt    |   8 +-
 .../fragment/CollectionFragmentPreChecker.kt  |  18 +-
 .../CollectionFragmentPreCheckerNew.kt        |   9 +-
 .../fragment/CollectionViewModel.kt           |  26 +-
 .../fragment/ControlVehiculoFragment.kt       |   2 +-
 .../fragment/ControlVehiculoViewModel.kt      |  23 +-
 .../delivery/activity/SignedActivity.kt       |   2 +-
 .../delivery/fragments/RoutesFragment.kt      |  31 ++-
 .../delivery/fragments/SummaryFragment.kt     |   2 +-
 .../delivery/fragments/TicketsFragment.kt     |  16 +-
 .../delivery/viewmodels/DeliveryViewModel.kt  |  10 +-
 .../diadeventa/adapter/DayOfSaleAdapter.kt    |   4 +-
 .../fragment/HistoricoArticuloFragment.kt     |   2 +-
 .../adapter/ItemShelvingLogAdapter.kt         |   5 +-
 .../fragment/shelvingLogFragment.kt           |   2 +-
 .../inventario/adapter/InventoryAdapter.kt    |  10 +-
 .../adapter/InventoryParkingAdapter.kt        |  11 +-
 .../inventario/fragment/InventaryFragment.kt  |   2 +-
 .../inventario/fragment/InventaryViewModel.kt |  25 +-
 .../feature/login/adapter/WorkFormAdapter.kt  |  13 +-
 .../feature/login/fragment/LoginFragment.kt   |  60 +++--
 .../feature/login/fragment/LoginViewModel.kt  |   3 -
 .../feature/main/activity/MainActivity.kt     | 106 ++++----
 .../packaging/adapter/ItemSupplierAdapter.kt  |   2 +-
 .../packaging/adapter/ListImageAdapter.kt     |   2 +-
 .../packaging/fragment/ObservFragment.kt      |   4 +-
 .../fragment/PackagingCountFragment.kt        |  66 ++---
 .../packaging/fragment/SupplierFragment.kt    |   4 +-
 .../model/ItemExpeditionTruckVO.kt            |   8 +-
 .../feature/paletizador/model/ItemPalletVO.kt |   7 +-
 .../feature/paletizador/model/ItemScanVO.kt   |  24 +-
 .../parking/fragment/ParkingFragment.kt       |  21 +-
 .../parking/fragment/ParkingViewModel.kt      |   7 +-
 .../feature/photos/fragment/PhotosFragment.kt |  48 ++--
 .../precontrol/PreControladorFragment.kt      |  11 +-
 .../precontrol/PreControladorViewModel.kt     |  45 ----
 .../presacador/adapter/PreSacadorAdapter.kt   |   2 +-
 .../presacador/fragment/EndSacadorFragment.kt |   4 +-
 .../fragment/PreSacadorViewModel.kt           |  11 +-
 .../SectorCollectionReserveFragment.kt        |   4 +-
 .../view/feature/qr/QrFragment.kt             |  17 +-
 .../roadmap/fragment/StopMapListFragment.kt   |  38 +--
 .../sacador/fragment/SacadorViewModel.kt      |   2 -
 .../fragment/showticket/ShowTicketFragment.kt |  10 +-
 .../feature/sacador/model/TicketItemVO.kt     |   8 +-
 .../ubicador/adapter/UbicadorAdapter.kt       |   5 +-
 .../ubicador/adapter/UbicadorAdapterNew.kt    |   6 +-
 .../fragment/AutomaticAddItemFragment.kt      |  20 +-
 .../fragment/AutomaticAddItemViewModel.kt     |  43 +---
 .../ubicador/fragment/UbicadorFragmentNew.kt  | 120 +++++----
 .../ubicador/fragment/UbicadorViewModel.kt    | 103 +++-----
 .../fragment/PackingMistakeFragment.kt        |   2 +-
 .../fragment/WorkermistakeFragment.kt         |  23 +-
 .../workermistake/model/mistakeWorkerType.kt  |  15 +-
 app/src/main/res/values-es/strings.xml        |   4 +-
 app/src/main/res/values-fr/strings.xml        |   4 +-
 app/src/main/res/values-pt/strings.xml        |   4 +-
 app/src/main/res/values/strings.xml           |   5 +-
 84 files changed, 778 insertions(+), 873 deletions(-)
 delete mode 100644 app/src/main/java/es/verdnatura/presentation/view/feature/precontrol/PreControladorViewModel.kt

diff --git a/.idea/appInsightsSettings.xml b/.idea/appInsightsSettings.xml
index cbb5825e..66b54b89 100644
--- a/.idea/appInsightsSettings.xml
+++ b/.idea/appInsightsSettings.xml
@@ -35,7 +35,16 @@
                 </ConnectionSetting>
               </option>
               <option name="signal" value="SIGNAL_UNSPECIFIED" />
-              <option name="timeIntervalDays" value="ONE_DAY" />
+              <option name="timeIntervalDays" value="SIXTY_DAYS" />
+              <option name="versions">
+                <list>
+                  <VersionSetting>
+                    <option name="buildVersion" value="324" />
+                    <option name="displayName" value="24.32 (324)" />
+                    <option name="displayVersion" value="24.32" />
+                  </VersionSetting>
+                </list>
+              </option>
               <option name="visibilityType" value="ALL" />
             </InsightsFilterSettings>
           </value>
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 12348f2a..49029d75 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -160,11 +160,6 @@
           <theme>@style/AppTheme</theme>
         </config>
       </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_item_expeditionstate_prepared_card.xml">
-        <config>
-          <theme>@style/AppTheme</theme>
-        </config>
-      </layout>
       <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_itemexpeditionstate_card.xml">
         <config>
           <theme>@style/AppTheme</theme>
@@ -190,11 +185,6 @@
           <theme>@style/AppTheme</theme>
         </config>
       </layout>
-      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_parking_expedition.xml">
-        <config>
-          <theme>@style/AppTheme</theme>
-        </config>
-      </layout>
       <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_roadmap_truck_list.xml">
         <config>
           <theme>@style/AppTheme</theme>
@@ -251,6 +241,11 @@
           <theme>@style/AppTheme</theme>
         </config>
       </layout>
+      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/item_expeditionscan_row.xml">
+        <config>
+          <theme>@style/AppTheme</theme>
+        </config>
+      </layout>
       <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/item_expeditionstate_row.xml">
         <config>
           <theme>@style/AppTheme</theme>
@@ -281,6 +276,16 @@
           <theme>@style/AppTheme</theme>
         </config>
       </layout>
+      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/item_main_menu.xml">
+        <config>
+          <theme>@style/AppTheme</theme>
+        </config>
+      </layout>
+      <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/item_pasilleros_main_menu.xml">
+        <config>
+          <theme>@style/AppTheme</theme>
+        </config>
+      </layout>
       <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/item_roadmap_truck_row.xml">
         <config>
           <theme>@style/AppTheme</theme>
@@ -368,28 +373,99 @@
     </select>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="feat: regularizar Parking #7817">
-      <change afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPreparedStateFragment.kt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/ic_scan_prepared.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/ic_ubicador_expedition.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_automatic_add_expedition.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_parking_expedition.xml" afterDir="false" />
+    <list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="feat: refactorResponse PasillerosItem refs #7827">
       <change beforePath="$PROJECT_DIR$/.idea/appInsightsSettings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/appInsightsSettings.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/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/di/viewModelModule.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/di/viewModelModule.kt" 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/common/GeneralAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/common/GeneralAdapter.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/common/UICallbacks.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/common/UICallbacks.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/common/UtilFunctions.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/common/UtilFunctions.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/articulo/adapter/ItemProposalAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/adapter/ItemProposalAdapter.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/buffer/fragment/BufferLoadFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/BufferLoadFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/adapter/BufferAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/adapter/BufferAdapter.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/adapter/LocationAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/adapter/LocationAdapter.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/category/ChangeCategoryFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/category/ChangeCategoryFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/category/ChangeCategoryViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/category/ChangeCategoryViewModel.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/claim/fragment/reubication/adapter/ReubicatorAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/claim/fragment/reubication/adapter/ReubicatorAdapter.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/claim/fragment/reubication/adapter/ReubicatorPlacementAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/claim/fragment/reubication/adapter/ReubicatorPlacementAdapter.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/claim/fragment/ubication/ClaimUbicationFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/claim/fragment/ubication/ClaimUbicationFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/PlacementAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/PlacementAdapter.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapter.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapterNew.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapterNew.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/CollectionFragmentPickerNew.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerNew.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerPreviousNew.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerPreviousNew.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/CollectionFragmentPreCheckerNew.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPreCheckerNew.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/controlvehiculo/fragment/ControlVehiculoFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoViewModel.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/activity/SignedActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/activity/SignedActivity.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/RoutesFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/RoutesFragment.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/fragments/TicketsFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/TicketsFragment.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/src/main/java/es/verdnatura/presentation/view/feature/diadeventa/adapter/DayOfSaleAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/diadeventa/adapter/DayOfSaleAdapter.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/fragment/HistoricoArticuloFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/fragment/HistoricoArticuloFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/adapter/ItemShelvingLogAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/adapter/ItemShelvingLogAdapter.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelvinglog/fragment/shelvingLogFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelvinglog/fragment/shelvingLogFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/adapter/InventoryAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/adapter/InventoryAdapter.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/adapter/InventoryParkingAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/adapter/InventoryParkingAdapter.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryViewModel.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/adapter/WorkFormAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/adapter/WorkFormAdapter.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/login/fragment/LoginViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginViewModel.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/packaging/adapter/ItemSupplierAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/adapter/ItemSupplierAdapter.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/adapter/ListImageAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/adapter/ListImageAdapter.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/ObservFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/ObservFragment.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/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/paletizador/fragment/ExpeditionPalletDetailFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletDetailFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletDetailViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletDetailViewModel.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletViewModel.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPreparedStateFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPreparedStateFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanFragment.kt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanSorterFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanSorterFragment.kt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanSorterViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanSorterViewModel.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionStateViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionStateViewModel.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanViewModel.kt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionTruckListFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionTruckListFragment.kt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionTruckListViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionTruckListViewModel.kt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/model/ItemExpeditionTruckVO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/model/ItemExpeditionTruckVO.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/adapter/AutomaticAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/AutomaticAdapter.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/AutomaticAdapterTEST.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/model/ItemPalletVO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/model/ItemPalletVO.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/model/ItemScanVO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/model/ItemScanVO.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/parking/fragment/ParkingFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/parking/fragment/ParkingFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/parking/fragment/ParkingViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/parking/fragment/ParkingViewModel.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/photos/fragment/PhotosFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/photos/fragment/PhotosFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/precontrol/PreControladorFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/precontrol/PreControladorFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/precontrol/PreControladorViewModel.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/adapter/PreSacadorAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/adapter/PreSacadorAdapter.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/SectorCollectionReserveFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/SectorCollectionReserveFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/qr/QrFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/qr/QrFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/roadmap/fragment/StopMapListFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/roadmap/fragment/StopMapListFragment.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/fragment/showticket/ShowTicketFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/showticket/ShowTicketFragment.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/adapter/UbicadorAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/UbicadorAdapter.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/UbicadorAdapterNew.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/UbicadorAdapterNew.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/res/layout/fragment_automatic_add_item.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_automatic_add_item.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemViewModel.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragmentNew.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragmentNew.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/java/es/verdnatura/presentation/view/feature/workermistake/fragment/PackingMistakeFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/PackingMistakeFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/WorkermistakeFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/WorkermistakeFragment.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$/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" />
@@ -445,6 +521,9 @@
       </list>
     </option>
   </component>
+  <component name="FormatOnSaveOptions">
+    <option name="myRunOnSave" value="true" />
+  </component>
   <component name="GenerateSignedApkSettings">
     <option name="KEY_STORE_PATH" value="C:\Users\sergiodt\Documents\KEYSTORE\keystore.jks" />
     <option name="KEY_ALIAS" value="keystore" />
@@ -535,6 +614,9 @@
   <component name="MarkdownSettingsMigration">
     <option name="stateVersion" value="1" />
   </component>
+  <component name="OptimizeOnSaveOptions">
+    <option name="myRunOnSave" value="true" />
+  </component>
   <component name="ProblemsViewState">
     <option name="proportion" value="0.50190353" />
     <option name="selectedTabId" value="CurrentFile" />
@@ -553,62 +635,63 @@
     <option name="showLibraryContents" value="true" />
     <option name="showMembers" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;Android App.app.executor&quot;: &quot;Run&quot;,
-    &quot;ApkExportedModule&quot;: &quot;Gestor_Almacén.app&quot;,
-    &quot;DEBUGGABLE_DEVICE&quot;: &quot;zebra_technologies-tc21-21114523025303&quot;,
-    &quot;DEBUGGABLE_PROCESS&quot;: &quot;es.verdnatura.sfusion&quot;,
-    &quot;DEBUGGER_ID&quot;: &quot;Auto&quot;,
-    &quot;ExportApk.ApkPathForGestor_Almacén.app&quot;: &quot;C:\\Users\\sergiodt\\AndroidStudioProjects\\vn-warehouseManager\\app&quot;,
-    &quot;Gradle.vn-warehouseManager [clean].executor&quot;: &quot;Run&quot;,
-    &quot;Gradle.vn-warehouseManager.executor&quot;: &quot;Run&quot;,
-    &quot;KotlinFunctionFindUsagesOptions.isSearchForTextOccurrences&quot;: &quot;true&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;RunOnceActivity.readMode.enableVisualFormatting&quot;: &quot;true&quot;,
-    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
-    &quot;SHOW_ALL_PROCESSES&quot;: &quot;false&quot;,
-    &quot;ScreenRecorder.SavePath&quot;: &quot;C:\\Users\\sergiodt&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;android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-29/android/widget/TextView.java_SELECTED&quot;: &quot;TextView&quot;,
-    &quot;android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-33/android/view/View.java_SELECTED&quot;: &quot;View&quot;,
-    &quot;android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-34/android/view/View.java_SELECTED&quot;: &quot;View&quot;,
-    &quot;android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-34/android/widget/CompoundButton.java_SELECTED&quot;: &quot;CompoundButton&quot;,
-    &quot;android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-34/android/widget/TextView.java_SELECTED&quot;: &quot;TextView&quot;,
-    &quot;cf.first.check.clang-format&quot;: &quot;false&quot;,
-    &quot;cidr.known.project.marker&quot;: &quot;true&quot;,
-    &quot;com.developerphil.adbidea.selecteddevices&quot;: &quot;G65TY9DQN7X4BIE6&quot;,
-    &quot;com.google.services.firebase.aqiPopupShown&quot;: &quot;true&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;dev__6078&quot;,
-    &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
-    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
-    &quot;last_directory_selection&quot;: &quot;C:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable&quot;,
-    &quot;last_opened_file_path&quot;: &quot;C:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout&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;preferences.editor.code.editing&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "Android App.app.executor": "Run",
+    "ApkExportedModule": "Gestor_Almacén.app",
+    "DEBUGGABLE_DEVICE": "zebra_technologies-tc21-21114523025303",
+    "DEBUGGABLE_PROCESS": "es.verdnatura.sfusion",
+    "DEBUGGER_ID": "Auto",
+    "ExportApk.ApkPathForGestor_Almacén.app": "C:\\Users\\sergiodt\\AndroidStudioProjects\\vn-warehouseManager\\app",
+    "Gradle.vn-warehouseManager [clean].executor": "Run",
+    "Gradle.vn-warehouseManager.executor": "Run",
+    "KotlinFunctionFindUsagesOptions.isSearchForTextOccurrences": "true",
+    "PROJECT_TRUSTED_KEY": "true",
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.cidr.known.project.marker": "true",
+    "RunOnceActivity.readMode.enableVisualFormatting": "true",
+    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
+    "SHOW_ALL_PROCESSES": "false",
+    "ScreenRecorder.SavePath": "C:\\Users\\sergiodt",
+    "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",
+    "android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-29/android/widget/TextView.java_SELECTED": "TextView",
+    "android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-33/android/view/View.java_SELECTED": "View",
+    "android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-34/android/view/View.java_SELECTED": "View",
+    "android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-34/android/widget/CompoundButton.java_SELECTED": "CompoundButton",
+    "android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-34/android/widget/TextView.java_SELECTED": "TextView",
+    "cf.first.check.clang-format": "false",
+    "cidr.known.project.marker": "true",
+    "com.developerphil.adbidea.selecteddevices": "G65TY9DQN7X4BIE6",
+    "com.google.services.firebase.aqiPopupShown": "true",
+    "git-widget-placeholder": "dev__6078",
+    "ignore.virus.scanning.warn.message": "true",
+    "kotlin-language-version-configured": "true",
+    "last_directory_selection": "C:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable",
+    "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",
+    "rearrange.code.on.save": "true",
+    "run.code.analysis.last.selected.profile": "pProject Default",
+    "settings.editor.selected.configurable": "actions.on.save"
   },
-  &quot;keyToStringList&quot;: {
-    &quot;ExportApk.BuildVariants&quot;: [
-      &quot;betaRelease&quot;
+  "keyToStringList": {
+    "ExportApk.BuildVariants": [
+      "betaRelease"
     ],
-    &quot;com.android.tools.idea.sqlite.queryhistory&quot;: [
-      &quot;select * from expedition where routeFk=182933;&quot;,
-      &quot;select * from expedition;&quot;,
-      &quot;select * from expeditionPending;&quot;,
-      &quot;select * from expedition where id = 7753995;\n\n&quot;,
-      &quot;\nselect * from expedition where id = 7753995;&quot;
+    "com.android.tools.idea.sqlite.queryhistory": [
+      "select * from expedition where routeFk=182933;",
+      "select * from expedition;",
+      "select * from expeditionPending;",
+      "select * from expedition where id = 7753995;\n\n",
+      "\nselect * from expedition where id = 7753995;"
     ],
-    &quot;kotlin-gradle-user-dirs&quot;: [
-      &quot;C:\\Users\\sergiodt\\.gradle&quot;
+    "kotlin-gradle-user-dirs": [
+      "C:\\Users\\sergiodt\\.gradle"
     ]
   }
-}</component>
+}]]></component>
   <component name="PsdUISettings">
     <option name="MODULE_TAB" value="Properties" />
     <option name="LAST_EDITED_SIGNING_CONFIG" value="debug" />
@@ -1145,7 +1228,7 @@
       <option name="project" value="LOCAL" />
       <updated>1709725795643</updated>
     </task>
-    <option name="localTasksCounter" value="335" />
+    <option name="localTasksCounter" value="338" />
     <servers />
   </component>
   <component name="Vcs.Log.History.Properties">
@@ -1273,8 +1356,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
-    <MESSAGE value="refs #6530 feat:refactorOnBackPressed" />
-    <MESSAGE value="feat changeCategory #refs 4979" />
     <MESSAGE value="feat refactor Ubicador #refs 6413" />
     <MESSAGE value="feat notesDelivery #refs 6921" />
     <MESSAGE value="feat lilium" />
@@ -1298,7 +1379,9 @@
     <MESSAGE value="feat reservas refs #6861" />
     <MESSAGE value="version 24.30" />
     <MESSAGE value="feat itemGetBalance refs #6769" />
-    <option name="LAST_COMMIT_MESSAGE" value="feat itemGetBalance refs #6769" />
+    <MESSAGE value="feat: boxPickingPrepared refs #7855" />
+    <MESSAGE value="feat: refactorResponse PasillerosItem refs #7827" />
+    <option name="LAST_COMMIT_MESSAGE" value="feat: refactorResponse PasillerosItem refs #7827" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
diff --git a/app/build.gradle b/app/build.gradle
index 855a1627..ce7a1871 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
         applicationId "es.verdnatura"
         minSdkVersion 26
         targetSdkVersion 33 // se deja con target si no Play Protect la bloquea
-        versionCode 324
-        versionName = "24.32Beta"
+        versionCode 326
+        versionName = "24.36Beta"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
diff --git a/app/src/main/java/es/verdnatura/di/viewModelModule.kt b/app/src/main/java/es/verdnatura/di/viewModelModule.kt
index e1392b8b..4aad49c1 100644
--- a/app/src/main/java/es/verdnatura/di/viewModelModule.kt
+++ b/app/src/main/java/es/verdnatura/di/viewModelModule.kt
@@ -21,7 +21,6 @@ import es.verdnatura.presentation.view.feature.packaging.fragment.SupplierViewMo
 import es.verdnatura.presentation.view.feature.packingHolland.fragment.PackingHollandViewModel
 import es.verdnatura.presentation.view.feature.paletizador.fragment.CmrExpeditionPalletViewModel
 import es.verdnatura.presentation.view.feature.paletizador.fragment.ExpeditionPalletDetailViewModel
-import es.verdnatura.presentation.view.feature.paletizador.fragment.ExpeditionPalletViewModel
 import es.verdnatura.presentation.view.feature.paletizador.fragment.ExpeditionScanSorterViewModel
 import es.verdnatura.presentation.view.feature.paletizador.fragment.ExpeditionScanViewModel
 import es.verdnatura.presentation.view.feature.paletizador.fragment.ExpeditionStateViewModel
@@ -125,10 +124,6 @@ val viewModelModule = module {
         ExpeditionTruckListViewModel(androidContext())
     }
 
-    viewModel {
-        ExpeditionPalletViewModel(androidContext())
-    }
-
     viewModel {
         ExpeditionPalletDetailViewModel(androidContext())
     }
diff --git a/app/src/main/java/es/verdnatura/domain/SalixService.kt b/app/src/main/java/es/verdnatura/domain/SalixService.kt
index 0d41c7a1..8733095e 100644
--- a/app/src/main/java/es/verdnatura/domain/SalixService.kt
+++ b/app/src/main/java/es/verdnatura/domain/SalixService.kt
@@ -160,7 +160,7 @@ interface SalixService {
     @POST("Applications/expedition_checkRoute/execute-func")
     fun expeditionCheckRoute(
         @Query("params") params: Any, @Query("schema") schema: String = "vn"
-    ): Call<String>
+    ): Call<Int>
 
     @GET("ExpeditionStates/filter")
     fun getExpeditionStates(
@@ -264,10 +264,6 @@ interface SalixService {
         @Body workerActionSalix: WorkerActionSalix
     ): Call<Any>
 
-    @GET("workerActivityTypes")
-    fun workerActivityList(
-    ): Call<Any>
-
     @POST("Applications/cmrPallet_add/execute-proc")
     fun cmrPalletAdd(
         @Query("params") params: Any? = null, @Query("schema") schema: String = "vn"
diff --git a/app/src/main/java/es/verdnatura/presentation/common/GeneralAdapter.kt b/app/src/main/java/es/verdnatura/presentation/common/GeneralAdapter.kt
index ca905184..eb39382f 100644
--- a/app/src/main/java/es/verdnatura/presentation/common/GeneralAdapter.kt
+++ b/app/src/main/java/es/verdnatura/presentation/common/GeneralAdapter.kt
@@ -7,42 +7,40 @@ import androidx.recyclerview.widget.RecyclerView
 import es.verdnatura.databinding.ItemGeneralRowBinding
 
 class GeneralAdapter(
-        private val items: List<GeneralItem>,
-        private val OnGeneralItemRowClickListener: OnGeneralItemRowClickListener,
-      //  private var showDelete: Boolean = false
-    ): RecyclerView.Adapter<GeneralAdapter.ItemHolder> () {
+    private val items: List<GeneralItem>,
+    private val OnGeneralItemRowClickListener: OnGeneralItemRowClickListener,
+    //  private var showDelete: Boolean = false
+) : RecyclerView.Adapter<GeneralAdapter.ItemHolder>() {
 
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemHolder {
+        return ItemHolder(
+            ItemGeneralRowBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        )
+    }
 
-        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemHolder {
-            return ItemHolder(
-                ItemGeneralRowBinding.inflate(LayoutInflater.from(parent.context),parent,false)
-            )
+    override fun getItemCount() = items.size
+
+    override fun onBindViewHolder(holder: ItemHolder, position: Int) {
+        holder.bind(items[position])
+
+        holder.binding.root.setOnClickListener {
+            OnGeneralItemRowClickListener.onGeneralItemRowClickListener(items[position])
         }
 
-        override fun getItemCount() =items.size
+    }
 
-        override fun onBindViewHolder(holder: ItemHolder, position: Int) {
-            holder.bind(items[position])
+    inner class ItemHolder(
+        val binding: ItemGeneralRowBinding
+    ) : RecyclerView.ViewHolder(binding.root) {
+        //private val res = binding.root.context.resources
+        fun bind(item: GeneralItem) {
+            binding.apply {
+                this.item = item
+                /*if (showDelete) itemImage.visibility = View.VISIBLE
+                else itemImage.visibility = View.GONE*/
 
-            holder.binding.root.setOnClickListener {
-                OnGeneralItemRowClickListener.OnGeneralItemRowClickListener(items[position])
-            }
-
-        }
-
-
-        inner class ItemHolder(
-            val binding: ItemGeneralRowBinding
-        ) : RecyclerView.ViewHolder(binding.root){
-            //private val res = binding.root.context.resources
-            fun bind(item: GeneralItem) {
-                binding.apply {
-                    this.item = item
-                    /*if (showDelete) itemImage.visibility = View.VISIBLE
-                    else itemImage.visibility = View.GONE*/
-
-                    itemCode.visibility=View.GONE
-                }
+                itemCode.visibility = View.GONE
             }
         }
     }
+}
diff --git a/app/src/main/java/es/verdnatura/presentation/common/UICallbacks.kt b/app/src/main/java/es/verdnatura/presentation/common/UICallbacks.kt
index 98c2bee3..0daa0cb4 100644
--- a/app/src/main/java/es/verdnatura/presentation/common/UICallbacks.kt
+++ b/app/src/main/java/es/verdnatura/presentation/common/UICallbacks.kt
@@ -77,6 +77,7 @@ interface OnItemButtonTicketRowClickListener {
 interface OnItemButtonRoadMapStopRowClickListener {
     fun onItemButtonRoadMapStopRowClickListener(item: ClientTicketSalix, action: String)
 }
+
 interface OnItemButtonCMRRowClickListener {
     fun onItemButtonCMRRowClickListener(item: Ticket)
 }
@@ -94,11 +95,11 @@ interface OnBarcodeRowClickListener {
 }
 
 interface OnSmartTagRowClickListener {
-    fun OnSmartTagRowClickListener(item: SmartTag)
+    fun onSmartTagRowClickListener(item: SmartTag)
 }
 
 interface OnGeneralItemRowClickListener {
-    fun OnGeneralItemRowClickListener(item: GeneralItem)
+    fun onGeneralItemRowClickListener(item: GeneralItem)
 }
 
 interface OnImageTrashClickListener {
@@ -106,8 +107,9 @@ interface OnImageTrashClickListener {
 }
 
 interface OnEditSubQuantityListener {
-    fun OnEditSubQuantityListener(item: Any, text: String)
+    fun onEditSubQuantityListener(item: Any, text: String)
 }
+
 interface AdapterCallback {
     fun getPosition(): Int
 }
@@ -117,15 +119,15 @@ interface OnItemClickListener {
 }
 
 interface OnImageUpdateClickListener {
-    fun OnImageUpdateClickListener(item: Any)
+    fun onImageUpdateClickListener(item: Any)
 }
 
 interface OnWorkFormsItemRowClickListener {
-    fun OnWorkFormsItemRowClickListener(item: WorkForms)
+    fun onWorkFormsItemRowClickListener(item: WorkForms)
 }
 
 interface OnTrashItemRowClickListener {
-    fun OnTrashItemRowClickListener(item: WorkForms)
+    fun onTrashItemRowClickListener(item: WorkForms)
 }
 
 interface OnLocationRowClickListener {
@@ -209,7 +211,7 @@ interface OnComprobarPalletViewClickListener {
 }
 
 interface OnScanLongClickListener {
-    fun onScanLongClickListener(ItemExpeditionScanVO: ItemExpeditionScanVO)
+    fun onScanLongClickListener(itemExpeditionScanVO: ItemExpeditionScanVO)
 }
 
 interface OnCollectionSelectedListener {
diff --git a/app/src/main/java/es/verdnatura/presentation/common/UtilFunctions.kt b/app/src/main/java/es/verdnatura/presentation/common/UtilFunctions.kt
index 03fb56cc..a82d26c9 100644
--- a/app/src/main/java/es/verdnatura/presentation/common/UtilFunctions.kt
+++ b/app/src/main/java/es/verdnatura/presentation/common/UtilFunctions.kt
@@ -1,13 +1,18 @@
 package es.verdnatura.presentation.common
 
+import android.content.Context
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
+import es.verdnatura.R
+import java.text.SimpleDateFormat
+import java.util.Calendar
+import java.util.Locale
 
 class FunctionUtils{
     fun getMessageFromJSON(json: String): String {
         val gson = Gson()
         var message = ""
-        var tutorialMap: Map<String, Any> =
+        val tutorialMap: Map<String, Any> =
             gson.fromJson(json, object : TypeToken<Map<String, Any>>() {}.type)
         tutorialMap.forEach {
             if (it.key == "Message") {
@@ -19,9 +24,9 @@ class FunctionUtils{
 
     fun getListFromJSON(json: String): List<String> {
         val gson = Gson()
-        var list = mutableListOf<String>()
+        val list = mutableListOf<String>()
         //  val mapType = object : TypeToken<Map<String, Any>>() {}.type
-        var tutorialMap: Map<String, Any> =
+        val tutorialMap: Map<String, Any> =
             gson.fromJson(json, object : TypeToken<Map<String, Any>>() {}.type)
         tutorialMap.forEach {
 
@@ -30,4 +35,12 @@ class FunctionUtils{
         }
         return list
     }
+
+    private fun getCurdate(date: String, context: Context): String {
+        val c = Calendar.getInstance()
+        val df = SimpleDateFormat(context.getString(R.string.dateCompleteFormat), Locale.getDefault())
+        val df2 = SimpleDateFormat(context.getString(R.string.timeFormat), Locale.getDefault())
+        c.time = df.parse(date)!!
+        return df2.format(c.time)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt
index e81b7592..2efae36a 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt
@@ -106,7 +106,7 @@ class AjustesFragment :
                                     mobileApplication.dataStoreApp.readDataStoreKey<String>(
                                         ANDROID_ID
                                     ) + "\n" +
-                                    if (mobileApplication.serialNumber != "") {
+                                    if (!mobileApplication.serialNumber.isNullOrBlank() ) {
                                         getString(R.string.serialNumber) + "\t" +
                                                 mobileApplication.serialNumber
                                     } else ""
@@ -141,7 +141,7 @@ class AjustesFragment :
 
                         getString(R.string.vehicleControl) -> ma.onPasillerosItemClickListener(
                             PasillerosItemVO(
-                                title = getString(R.string.titleUserControlVehicle)
+                                title = R.string.titleUserControlVehicle
                             ), mobileApplication.userId.toString()
                         )
 
@@ -290,7 +290,7 @@ class AjustesFragment :
         val arrayList: ArrayList<String> = arrayListOf()
 
         pasilleroViewModel.pasillerositem.forEach {
-            arrayList.add(it.title)
+            arrayList.add(getString(it.title!!))
         }
         arrayList.add(getString(R.string.all))
         arrayList.sorted()
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/adapter/ItemProposalAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/adapter/ItemProposalAdapter.kt
index 3d84bbea..7bc79c8f 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/adapter/ItemProposalAdapter.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/adapter/ItemProposalAdapter.kt
@@ -51,21 +51,21 @@ class ItemProposalAdapter(
                 itemFk.setOnClickListener {
                     onPasillerosItemClickListener.onPasillerosItemClickListener(
                         PasillerosItemVO(
-                            title = res.getString(R.string.itemSearch)
+                            title =R.string.itemSearch
                         ), item.itemFk.toString()
                     )
                 }
                 itemUp.setOnClickListener {
                     onPasillerosItemClickListener.onPasillerosItemClickListener(
                         PasillerosItemVO(
-                            title = res.getString(R.string.titleItemSearch)
+                            title = R.string.titleItemSearch
                         ), item.itemFk.toString()
                     )
                 }
                 itemDown.setOnClickListener {
                     onPasillerosItemClickListener.onPasillerosItemClickListener(
                         PasillerosItemVO(
-                            title = res.getString(R.string.titleItemSearch)
+                            title = R.string.titleItemSearch
                         ), item.itemFk.toString()
                     )
                 }
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt
index 9e2643e8..842bc292 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt
@@ -119,7 +119,7 @@ class ItemCardFragment(
                         iconHistory.drawable -> {
 
                             ma.onPasillerosItemClickListener(
-                                PasillerosItemVO(title = getString(R.string.titleHistorical)),
+                                PasillerosItemVO(title = R.string.titleHistorical),
                                 itemInfoG!!.id.toString()
                             )
 
@@ -137,7 +137,7 @@ class ItemCardFragment(
                             )
                             ma.onPasillerosItemClickListener(
                                 PasillerosItemVO(
-                                    title = getString(R.string.titleWebViewer),
+                                    title = R.string.titleWebViewer,
                                 ), entryPoint = entryPoint
                             )
 
@@ -379,7 +379,7 @@ class ItemCardFragment(
                     "itemProposal" -> {
                         ma.onPasillerosItemClickListener(
                             PasillerosItemVO(
-                                title = getString(R.string.titleSearchSimilarItems)
+                                title = R.string.titleSearchSimilarItems
                             ), itemInfoG!!.id.toString()
                         )
                     }
@@ -391,7 +391,7 @@ class ItemCardFragment(
                     "buscarItem" -> {
                         ma.onPasillerosItemClickListener(
                             PasillerosItemVO(
-                                title = getString(R.string.titleItemSearch)
+                                title = R.string.titleItemSearch
                             ), itemInfoG!!.id.toString()
                         )
                     }
diff --git 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
index a38a45d0..6f9d6e3a 100644
--- 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
@@ -11,7 +11,6 @@ import es.verdnatura.presentation.base.BaseViewModel
 import es.verdnatura.presentation.common.Event
 import es.verdnatura.presentation.common.ItemBarCodeSalix
 import es.verdnatura.presentation.common.ItemDiscardSalixShortage
-import es.verdnatura.presentation.common.ResponseItemVO
 import es.verdnatura.presentation.view.feature.articulo.model.AddressLoses
 import es.verdnatura.presentation.view.feature.articulo.model.AddressLosesList
 import es.verdnatura.presentation.view.feature.articulo.model.ItemCardVO
@@ -94,7 +93,7 @@ class ItemCardViewModel(var context: Context) : BaseViewModel(context) {
         ).enqueue(object : SalixCallback<Any>(context) {
 
             override fun onSuccess(response: Response<Any>) {
-                getItemCard(itemFk,warehouseFk)
+                getItemCard(itemFk, warehouseFk)
                 super.onSuccess(response)
             }
         })
@@ -107,7 +106,7 @@ class ItemCardViewModel(var context: Context) : BaseViewModel(context) {
         salix.updateGrouping(params = arrayListOf(warehouseFk, itemFk, value))
             .enqueue(object : SalixCallback<Any>(context) {
                 override fun onSuccess(response: Response<Any>) {
-                    getItemCard(itemFk,warehouseFk)
+                    getItemCard(itemFk, warehouseFk)
                     super.onSuccess(response)
                 }
 
@@ -121,7 +120,7 @@ class ItemCardViewModel(var context: Context) : BaseViewModel(context) {
         salix.updatePacking(params = arrayListOf(warehouseFk, itemFk, value))
             .enqueue(object : SalixCallback<Any>(context) {
                 override fun onSuccess(response: Response<Any>) {
-                    getItemCard(itemFk,warehouseFk)
+                    getItemCard(itemFk, warehouseFk)
                     super.onSuccess(response)
                 }
 
@@ -129,13 +128,13 @@ class ItemCardViewModel(var context: Context) : BaseViewModel(context) {
     }
 
     fun updateStems(
-        itemFk: Int, value: Int?,warehouseFk: Int
+        itemFk: Int, value: Int?, warehouseFk: Int
     ) {
         salix.updateItem(itemFk, hashMapOf("stems" to value))
             .enqueue(object : SalixCallback<Any>(context) {
 
                 override fun onSuccess(response: Response<Any>) {
-                    getItemCard(itemFk,warehouseFk)
+                    getItemCard(itemFk, warehouseFk)
                     super.onSuccess(response)
                 }
             })
@@ -148,7 +147,7 @@ class ItemCardViewModel(var context: Context) : BaseViewModel(context) {
             .enqueue(object : SalixCallback<Any>(context) {
 
                 override fun onSuccess(response: Response<Any>) {
-                    getItemCard(itemFk,warehouseFk)
+                    getItemCard(itemFk, warehouseFk)
                     super.onSuccess(response)
                 }
             })
@@ -165,7 +164,7 @@ class ItemCardViewModel(var context: Context) : BaseViewModel(context) {
             })
     }
 
-    fun barcodesEditSalix(itemFk: Int, barCodeValue: String, delete: Boolean,warehouseFk: Int) {
+    fun barcodesEditSalix(itemFk: Int, barCodeValue: String, delete: Boolean, warehouseFk: Int) {
 
         if (delete) {
             salix.barcodesDelete(itemFk = itemFk, barcode = barCodeValue)
@@ -177,15 +176,11 @@ class ItemCardViewModel(var context: Context) : BaseViewModel(context) {
         }.enqueue(object : SalixCallback<Any>(context) {
 
             override fun onSuccess(response: Response<Any>) {
-                getItemCard(itemFk,warehouseFk)
+                getItemCard(itemFk, warehouseFk)
             }
         })
     }
 
-    private val _responseinsert by lazy { MutableLiveData<ResponseItemVO>() }
-    val responseinsert: LiveData<ResponseItemVO>
-        get() = _responseinsert
-
     fun uploadPhoto(
         urlImage: String,
         itemFK: Number,
@@ -197,12 +192,6 @@ class ItemCardViewModel(var context: Context) : BaseViewModel(context) {
     ) {
         salix.uploadImage("catalog", itemFK, filePart)
             .enqueue(object : SalixCallback<Any>(context) {
-                override fun onSuccess(response: Response<Any>) {
-                    _responseinsert.value = ResponseItemVO(
-                        isError = false
-
-                    )
-                }
             })
     }
 
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/BufferLoadFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/BufferLoadFragment.kt
index f741a5e6..98f94ac0 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/BufferLoadFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/BufferLoadFragment.kt
@@ -157,7 +157,7 @@ class BufferLoadFragment(
 
 
         tagsAdapter = BufferAdapter(listTags, object : OnSmartTagRowClickListener {
-            override fun OnSmartTagRowClickListener(item: SmartTag) {
+            override fun onSmartTagRowClickListener(item: SmartTag) {
             }
         }, showDelete = false)
         customDialogList.getRecyclerView().adapter = tagsAdapter
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/adapter/BufferAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/adapter/BufferAdapter.kt
index 4b0f6974..9417e7b3 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/adapter/BufferAdapter.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/adapter/BufferAdapter.kt
@@ -1,6 +1,5 @@
 package es.verdnatura.presentation.view.feature.buffer.fragment.adapter
 
-
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -9,35 +8,32 @@ import es.verdnatura.databinding.ItemSmarttagRowBinding
 import es.verdnatura.presentation.common.OnSmartTagRowClickListener
 import es.verdnatura.presentation.view.feature.smarttag.model.SmartTag
 
-
 class BufferAdapter(
     private val items: List<SmartTag>,
     private val onSmartTagRowClickListener: OnSmartTagRowClickListener,
     private var showDelete: Boolean = true
-): RecyclerView.Adapter<BufferAdapter.ItemHolder> () {
-
+) : RecyclerView.Adapter<BufferAdapter.ItemHolder>() {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemHolder {
         return ItemHolder(
-            ItemSmarttagRowBinding.inflate(LayoutInflater.from(parent.context),parent,false)
+            ItemSmarttagRowBinding.inflate(LayoutInflater.from(parent.context), parent, false)
         )
     }
 
-    override fun getItemCount() =items.size
+    override fun getItemCount() = items.size
 
     override fun onBindViewHolder(holder: ItemHolder, position: Int) {
         holder.bind(items[position])
 
         holder.binding.root.setOnClickListener {
-            onSmartTagRowClickListener.OnSmartTagRowClickListener(items[position])
+            onSmartTagRowClickListener.onSmartTagRowClickListener(items[position])
         }
 
     }
 
-
     inner class ItemHolder(
         val binding: ItemSmarttagRowBinding
-    ) : RecyclerView.ViewHolder(binding.root){
+    ) : RecyclerView.ViewHolder(binding.root) {
         private val res = binding.root.context.resources
         fun bind(item: SmartTag) {
             binding.apply {
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/adapter/LocationAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/adapter/LocationAdapter.kt
index cc62b779..36b8b877 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/adapter/LocationAdapter.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/adapter/LocationAdapter.kt
@@ -26,8 +26,8 @@ class LocationAdapter  (
     override fun onBindViewHolder(holder: ItemHolder, position: Int) {
         holder.bind(items[position])
         holder.binding.root.setOnClickListener {
-            onPasillerosItemClickListener.onPasillerosItemClickListener(PasillerosItemVO(title = holder.binding.root.context.getString(
-                R.string.titleUbicator)),items[position].Matricula)
+            onPasillerosItemClickListener.onPasillerosItemClickListener(PasillerosItemVO(title =
+                R.string.titleUbicator),items[position].Matricula)
         }
 
     }
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/category/ChangeCategoryFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/category/ChangeCategoryFragment.kt
index 9adce160..15e881d7 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/category/ChangeCategoryFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/category/ChangeCategoryFragment.kt
@@ -167,27 +167,13 @@ class ChangeCategoryFragment(var entrypoint: String) :
                 if (it == true) {
                     scanShelving()
                 } else {
-                    resetTxt()
-
-                }
-            }
-            responseItem.observe(viewLifecycleOwner) {
-                if (it.isError) {
                     isScannedForDetails = false
                     scanShelving()
-                    ma.messageWithSound(
-
-                        message = it.errorMessage,
-                        titleWithError = getString(R.string.errorChangeCategory),
-                        isError = true,
-                        isPlayed = true,
-                        isToasted = false
-                    )
                     resetTxt()
 
-
                 }
             }
+
         }
     }
 
@@ -228,7 +214,7 @@ class ChangeCategoryFragment(var entrypoint: String) :
             if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) {
                 customDialogDetails.setValue(
                     itemScanValue(
-                        customDialogDetails.getValue(),   arrayOf("buy"), "more"
+                        customDialogDetails.getValue(), arrayOf("buy"), "more"
                     ).toString()
                 )
 
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/category/ChangeCategoryViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/category/ChangeCategoryViewModel.kt
index acd589e1..07e28f1a 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/category/ChangeCategoryViewModel.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/category/ChangeCategoryViewModel.kt
@@ -6,9 +6,6 @@ import androidx.lifecycle.MutableLiveData
 import es.verdnatura.domain.SalixCallback
 import es.verdnatura.domain.formatWithQuotes
 import es.verdnatura.presentation.base.BaseViewModel
-import es.verdnatura.presentation.base.getMessageFromAllResponse
-import es.verdnatura.presentation.base.nameofFunction
-import es.verdnatura.presentation.common.ResponseItemVO
 import es.verdnatura.presentation.view.feature.articulo.model.ItemDetails
 import retrofit2.Response
 
@@ -18,14 +15,18 @@ class ChangeCategoryViewModel(val context: Context) : BaseViewModel(context) {
 
     private val _responseDevalue by lazy { MutableLiveData<Boolean>() }
     var responseDevalue: LiveData<Boolean> = _responseDevalue
-
-    private val _responseItem by lazy { MutableLiveData<ResponseItemVO>() }
-    var responseItem: LiveData<ResponseItemVO> = _responseItem
-
+    
     fun itemDevalueA2(
         itemFk: Long, shelvingFk: String, buyingValue: Double, quantity: Int
     ) {
-        salix.itemDevalueA2(params = arrayListOf(itemFk, shelvingFk, buyingValue, quantity).formatWithQuotes())
+        salix.itemDevalueA2(
+            params = arrayListOf(
+                itemFk,
+                shelvingFk,
+                buyingValue,
+                quantity
+            ).formatWithQuotes()
+        )
             .enqueue(object : SalixCallback<Unit>(context) {
                 override fun onSuccess(response: Response<Unit>) {
                     _responseDevalue.value = true
@@ -33,11 +34,8 @@ class ChangeCategoryViewModel(val context: Context) : BaseViewModel(context) {
                 }
 
                 override fun onError(t: Throwable) {
-                    _responseItem.value = ResponseItemVO(
-                        isError = true, errorMessage = getMessageFromAllResponse(
-                            nameofFunction(this), t.message!!
-                        )
-                    )
+                    super.onError(t)
+                    _responseDevalue.value = false
                 }
             })
     }
@@ -59,7 +57,6 @@ class ChangeCategoryViewModel(val context: Context) : BaseViewModel(context) {
 
                 }
 
-
             })
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/claim/fragment/reubication/adapter/ReubicatorAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/claim/fragment/reubication/adapter/ReubicatorAdapter.kt
index 6351f540..c0201bca 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/claim/fragment/reubication/adapter/ReubicatorAdapter.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/claim/fragment/reubication/adapter/ReubicatorAdapter.kt
@@ -9,9 +9,8 @@ import es.verdnatura.R
 import es.verdnatura.databinding.ItemArticleRowReubicationFragmentBinding
 import es.verdnatura.presentation.common.OnPasillerosItemClickListener
 import es.verdnatura.presentation.common.OnReubicationClickListener
-import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO
 import es.verdnatura.presentation.view.feature.claim.fragment.reubication.model.Reubication
-
+import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO
 
 class ReubicatorAdapter(
     private val items: List<Reubication>,
@@ -48,7 +47,7 @@ class ReubicatorAdapter(
                 itemArticleItemFk.setOnClickListener {
                     onPasillerosItemClickListener.onPasillerosItemClickListener(
                         PasillerosItemVO(
-                            title = binding.root.context.getString(R.string.titleItemConsult)
+                            title = R.string.titleItemConsult
                         ), reubication.itemFk.toString()
                     )
                 }
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/claim/fragment/reubication/adapter/ReubicatorPlacementAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/claim/fragment/reubication/adapter/ReubicatorPlacementAdapter.kt
index 2df26403..d5869c11 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/claim/fragment/reubication/adapter/ReubicatorPlacementAdapter.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/claim/fragment/reubication/adapter/ReubicatorPlacementAdapter.kt
@@ -7,8 +7,8 @@ import androidx.recyclerview.widget.RecyclerView
 import es.verdnatura.R
 import es.verdnatura.databinding.ItemPlacementReubicationRowBinding
 import es.verdnatura.presentation.common.OnPasillerosItemClickListener
-import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO
 import es.verdnatura.presentation.view.feature.claim.fragment.reubication.model.PlacementReubication
+import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO
 
 class ReubicatorPlacementAdapter(
     private val items: List<PlacementReubication>,
@@ -46,9 +46,8 @@ class ReubicatorPlacementAdapter(
                 itemRootLayout.setOnClickListener {
                     onPasillerosItemClickListener.onPasillerosItemClickListener(
                         PasillerosItemVO(
-                            title = binding.root.context.getString(
+                            title =
                                 R.string.titleUbicator
-                            )
                         ), placement.plate
                     )
                 }
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/claim/fragment/ubication/ClaimUbicationFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/claim/fragment/ubication/ClaimUbicationFragment.kt
index cce70cf3..fbcf1f20 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/claim/fragment/ubication/ClaimUbicationFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/claim/fragment/ubication/ClaimUbicationFragment.kt
@@ -52,7 +52,7 @@ class ClaimUbicationFragment(
 
     private fun setAdapter() {
         claimAdapter = GeneralAdapter(listClaims, object : OnGeneralItemRowClickListener {
-            override fun OnGeneralItemRowClickListener(item: GeneralItem) {
+            override fun onGeneralItemRowClickListener(item: GeneralItem) {
             }
         })
         customDialogList.getRecyclerView().adapter = claimAdapter
@@ -127,7 +127,7 @@ class ClaimUbicationFragment(
                         } catch (e: Exception) {
                             getString(R.string.errorInput).toast(requireContext())
                             listClaims.clear()
-                            claimAdapter!!.notifyItemRangeRemoved(0,1)
+                            claimAdapter!!.notifyItemRangeRemoved(0, 1)
                             showInputClaim()
                         }
                     }
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/PlacementAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/PlacementAdapter.kt
index 414608db..e32768eb 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/PlacementAdapter.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/PlacementAdapter.kt
@@ -40,8 +40,8 @@ class PlacementAdapter (
                 this.item = placement
 
                 itemRootLayout.setOnClickListener {
-                    onPasillerosItemClickListener.onPasillerosItemClickListener(PasillerosItemVO(title = binding.root.context.getString(
-                        R.string.titleUbicator)),placement.shelving)
+                    onPasillerosItemClickListener.onPasillerosItemClickListener(PasillerosItemVO(title =
+                        R.string.titleUbicator),placement.shelving)
                 }
             }
         }
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapter.kt
index 943c0d2a..9c0f3658 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapter.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapter.kt
@@ -91,7 +91,7 @@ class SaleAdapter(
                 itemArticleItemFk.setOnClickListener {
                     onPasillerosItemClickListener.onPasillerosItemClickListener(
                         PasillerosItemVO(
-                            title = binding.root.context.getString(R.string.titleItemConsult)
+                            title = R.string.titleItemConsult
                         ), sale.itemFk.toString()
                     )
                 }
@@ -340,7 +340,7 @@ class SaleAdapter(
                     txtdeNew.visibility = View.VISIBLE
                     itemArticleQuantityPicked.visibility = View.VISIBLE
                     itemArticleQuantityLine3.visibility = View.VISIBLE
-                    if (type != SACADOR) {//6276 hasMistake == retrocompatibilidad
+                    if (type != SACADOR) {
                         val colorRes =
                             if (sale.hasMistake == true || sale.hasMistake == 1) R.color.verdnatura_red_salix else R.color.verdnatura_black
                         imageErrorMessage.imageTintList =
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapterNew.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapterNew.kt
index e654ef36..ac60ba19 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapterNew.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapterNew.kt
@@ -103,7 +103,7 @@ class SaleAdapterNew(
                 itemArticleLongInfo.setOnClickListener {
                     onPasillerosItemClickListener.onPasillerosItemClickListener(
                         PasillerosItemVO(
-                            title = binding.root.context.getString(R.string.titleItemConsult)
+                            title = R.string.titleItemConsult
                         ), sale.itemFk.toString()
                     )
                 }
@@ -111,7 +111,7 @@ class SaleAdapterNew(
                 itemArticleItemFkNew.setOnClickListener {
                     onPasillerosItemClickListener.onPasillerosItemClickListener(
                         PasillerosItemVO(
-                            title = binding.root.context.getString(R.string.titleItemConsult)
+                            title = R.string.titleItemConsult
                         ), sale.itemFk.toString()
                     )
                 }
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt
index 97762246..aa8a9f0a 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt
@@ -266,7 +266,7 @@ class CollectionFragment(
                         iconUpdate.drawable -> updateScreen()
                         iconParking.drawable -> pasillerosItemClickListener?.onPasillerosItemClickListener(
                             PasillerosItemVO(
-                                title = getString(R.string.Parking)
+                                title = R.string.Parking
                             ), ""
                         )
                     }
@@ -389,7 +389,7 @@ class CollectionFragment(
     private fun showUser() {
 
         ma.onPasillerosItemClickListener(
-            PasillerosItemVO(title = getString(R.string.titleUserControlVehicle)),
+            PasillerosItemVO(title = R.string.titleUserControlVehicle),
             workerFkFromTicket.toString()
         )
 
@@ -901,7 +901,6 @@ class CollectionFragment(
         }
     }
 
-
     //CREATE LIST
     private fun createCollectionList() {
 
@@ -1030,7 +1029,7 @@ class CollectionFragment(
                         )
                         ma.onPasillerosItemClickListener(
                             PasillerosItemVO(
-                                title = getString(R.string.titleWebViewer),
+                                title = R.string.titleWebViewer,
                             ), entryPoint = entryPoint
                         )
                     }
@@ -2383,8 +2382,8 @@ class CollectionFragment(
 
                     mySale.line1 = "Previa :${mySale.saleGroupFk}"
                     mySale.line2 = "Líneas: ${value.size}"
-                    mySale.line3 = value[0].code ?: "" //6276
-                    mySale.placements = listOf(PlacementVO(shelving = value[0].code ?: "")) //6276
+                    mySale.line3 = value[0].code ?: ""
+                    mySale.placements = listOf(PlacementVO(shelving = value[0].code ?: ""))
 
                     myList.add(mySale)
                 } else {
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPicker.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPicker.kt
index 15f75946..0819a64e 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPicker.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPicker.kt
@@ -259,7 +259,7 @@ class CollectionFragmentPicker(
                         iconUpdate.drawable -> updateScreen()
                         iconParking.drawable -> pasillerosItemClickListener?.onPasillerosItemClickListener(
                             PasillerosItemVO(
-                                title = getString(R.string.Parking)
+                                title = R.string.Parking
                             ), ""
                         )
                     }
@@ -352,7 +352,7 @@ class CollectionFragmentPicker(
     private fun showUser() {
 
         ma.onPasillerosItemClickListener(
-            PasillerosItemVO(title = getString(R.string.titleUserControlVehicle)),
+            PasillerosItemVO(title = R.string.titleUserControlVehicle),
             workerFkFromTicket.toString()
         )
 
@@ -987,7 +987,7 @@ class CollectionFragmentPicker(
                         )
                         ma.onPasillerosItemClickListener(
                             PasillerosItemVO(
-                                title = getString(R.string.titleWebViewer),
+                                title = R.string.titleWebViewer,
                             ), entryPoint = entryPoint
                         )
                     }
@@ -1354,9 +1354,9 @@ class CollectionFragmentPicker(
             canChangeState = true
             try {
                 saleTracking_mark(position, newType)
-            }catch (ex:Exception){
+            } catch (ex: Exception) {
                 //error ""
-               Log.e("Crashlytics",ex.message.toString())
+                Log.e("Crashlytics", ex.message.toString())
             }
 
             //nuevo
@@ -1915,8 +1915,13 @@ class CollectionFragmentPicker(
                             ticketFk = ticketSelected,
                             quantity = customDialogList.getValueTwo().toInt()
                         )
-                    }catch (ex:Exception){
-                        ma.messageWithSound(message = getString(R.string.errorScanItem), isError = true, isToasted = true, isPlayed = true)
+                    } catch (ex: Exception) {
+                        ma.messageWithSound(
+                            message = getString(R.string.errorScanItem),
+                            isError = true,
+                            isToasted = true,
+                            isPlayed = true
+                        )
                     }
 
                     scanRequest()
@@ -1965,18 +1970,22 @@ class CollectionFragmentPicker(
                     ) {
                         getString(R.string.Todosloscampossonobligatorios).toast(requireContext())
                     } else {
-                    try {
-                        viewModel.collectionAddItem(
-                            itemFk = customDialogList.getValue().toInt(),
-                            ticketFk = ticketSelected,
-                            quantity = customDialogList.getValueTwo().toInt()
-                        )
-                        scanRequest()
-                        customDialogList.dismiss()
-                    }catch (_:Exception){
-                        ma.messageWithSound(getString(R.string.errorInput), isError = true, isPlayed = true, isToasted = true)
-                    }
-
+                        try {
+                            viewModel.collectionAddItem(
+                                itemFk = customDialogList.getValue().toInt(),
+                                ticketFk = ticketSelected,
+                                quantity = customDialogList.getValueTwo().toInt()
+                            )
+                            scanRequest()
+                            customDialogList.dismiss()
+                        } catch (_: Exception) {
+                            ma.messageWithSound(
+                                getString(R.string.errorInput),
+                                isError = true,
+                                isPlayed = true,
+                                isToasted = true
+                            )
+                        }
 
                     }
                 }
@@ -2417,7 +2426,7 @@ class CollectionFragmentPicker(
                         isPrepared = value[0].isPrepared,
                         isPreviousPrepared = value[0].isPreviousPrepared,
                         isControlled = value[0].isControlled,
-                        line3 = value[0].code ?: "", //6276
+                        line3 = value[0].code ?: "",
                         picked = value[0].picked,
                         ticketFk = value[0].ticketFk,
                         level = value[0].level
@@ -2431,8 +2440,8 @@ class CollectionFragmentPicker(
 
                     mySale.line1 = "Previa :${mySale.saleGroupFk}"
                     mySale.line2 = "Líneas: ${value.size}"
-                    mySale.line3 = value[0].code ?: ""//6276
-                    mySale.placements = listOf(PlacementVO(shelving = value[0].code ?: ""))//6276
+                    mySale.line3 = value[0].code ?: ""
+                    mySale.placements = listOf(PlacementVO(shelving = value[0].code ?: ""))
 
                     myList.add(mySale)
                 } else {
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerNew.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerNew.kt
index 3a16f86b..d44f2094 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerNew.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerNew.kt
@@ -200,7 +200,7 @@ class CollectionFragmentPickerNew(
                         iconUpdate.drawable -> updateScreen()
                         iconParking.drawable -> pasillerosItemClickListener?.onPasillerosItemClickListener(
                             PasillerosItemVO(
-                                title = getString(R.string.Parking)
+                                title = R.string.Parking
                             ), ""
                         )
                     }
@@ -243,7 +243,7 @@ class CollectionFragmentPickerNew(
     private fun showUser() {
 
         ma.onPasillerosItemClickListener(
-            PasillerosItemVO(title = getString(R.string.titleUserControlVehicle)),
+            PasillerosItemVO(title = R.string.titleUserControlVehicle),
             workerFkFromTicket.toString()
         )
 
@@ -556,7 +556,7 @@ class CollectionFragmentPickerNew(
                     goBack = true
                     if (!sale.code.isNullOrEmpty()) ma.onPasillerosItemClickListener(
                         PasillerosItemVO(
-                            title = getString(R.string.titleUbicator),
+                            title = R.string.titleUbicator,
                         ), entryPoint = sale.code
                     )
                 }
@@ -574,7 +574,7 @@ class CollectionFragmentPickerNew(
                     )
                     ma.onPasillerosItemClickListener(
                         PasillerosItemVO(
-                            title = getString(R.string.titleWebViewer),
+                            title = R.string.titleWebViewer,
                         ), entryPoint = entryPoint
                     )
                 }
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerPreviousNew.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerPreviousNew.kt
index fc0057cf..7aa51b2d 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerPreviousNew.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerPreviousNew.kt
@@ -205,7 +205,7 @@ class CollectionFragmentPickerPreviousNew(
                         iconUpdate.drawable -> updateScreen()
                         iconParking.drawable -> pasillerosItemClickListener?.onPasillerosItemClickListener(
                             PasillerosItemVO(
-                                title = getString(R.string.Parking)
+                                title =R.string.Parking
                             ), ""
                         )
                     }
@@ -250,7 +250,7 @@ class CollectionFragmentPickerPreviousNew(
     private fun showUser() {
 
         ma.onPasillerosItemClickListener(
-            PasillerosItemVO(title = getString(R.string.titleUserControlVehicle)),
+            PasillerosItemVO(title = R.string.titleUserControlVehicle),
             workerFkFromTicket.toString()
         )
 
@@ -610,7 +610,7 @@ class CollectionFragmentPickerPreviousNew(
 
                     if (!sale.code.isNullOrEmpty()) ma.onPasillerosItemClickListener(
                         PasillerosItemVO(
-                            title = getString(R.string.titleUbicator),
+                            title = R.string.titleUbicator,
                         ), entryPoint = sale.code
                     )
                 }
@@ -628,7 +628,7 @@ class CollectionFragmentPickerPreviousNew(
                     )
                     ma.onPasillerosItemClickListener(
                         PasillerosItemVO(
-                            title = getString(R.string.titleWebViewer),
+                            title = R.string.titleWebViewer,
                         ), entryPoint = entryPoint
                     )
                 }
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPreChecker.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPreChecker.kt
index 0851620d..65a53e99 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPreChecker.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPreChecker.kt
@@ -260,7 +260,7 @@ class CollectionFragmentPreChecker(
                         iconUpdate.drawable -> updateScreen()
                         iconParking.drawable -> pasillerosItemClickListener?.onPasillerosItemClickListener(
                             PasillerosItemVO(
-                                title = getString(R.string.Parking)
+                                title = R.string.Parking
                             ), ""
                         )
                     }
@@ -343,7 +343,7 @@ class CollectionFragmentPreChecker(
     private fun showUser() {
 
         ma.onPasillerosItemClickListener(
-            PasillerosItemVO(title = getString(R.string.titleUserControlVehicle)),
+            PasillerosItemVO(title = R.string.titleUserControlVehicle),
             workerFkFromTicket.toString()
         )
 
@@ -960,20 +960,18 @@ class CollectionFragmentPreChecker(
 
         if (type == CONTROLADOR || type == PRECHECKER) {
 
-
-
             if (salesList.filter { it.sectorFk != null && it.sectorFk!! > 0 }.isNotEmpty()) {
 
                 val isOnReservationMode = mobileApplication.dataStoreApp.readDataStoreKey<Boolean>(
                     ConstAndValues.RESERVATIONMODE
                 )
                 //lolass
-                if (isOnReservationMode){
+                if (isOnReservationMode) {
 
                     sales = salesList.filter {
                         it.sectorFk == mobileApplication.dataStoreApp.readDataStoreKey<Int>(SECTORFK)
                     }.sortedWith(compareBy({ it.saleOrder }))
-                }else {
+                } else {
                     sales = salesList.filter {
                         it.sectorFk == mobileApplication.dataStoreApp.readDataStoreKey<Int>(SECTORFK)
                     }.sortedWith(compareBy({ it.picked }))
@@ -1054,7 +1052,7 @@ class CollectionFragmentPreChecker(
                             )
                             ma.onPasillerosItemClickListener(
                                 PasillerosItemVO(
-                                    title = getString(R.string.titleWebViewer),
+                                    title = R.string.titleWebViewer,
                                 ), entryPoint = entryPoint
                             )
                         }
@@ -2374,7 +2372,7 @@ class CollectionFragmentPreChecker(
                         isPrepared = value[0].isPrepared,
                         isPreviousPrepared = value[0].isPreviousPrepared,
                         isControlled = value[0].isControlled,
-                        line3 = value[0].code ?: "", //6276
+                        line3 = value[0].code ?: "",
                         picked = value[0].picked,
                         ticketFk = value[0].ticketFk,
                         level = value[0].level
@@ -2388,8 +2386,8 @@ class CollectionFragmentPreChecker(
 
                     mySale.line1 = "Previa :${mySale.saleGroupFk}"
                     mySale.line2 = "Líneas: ${value.size}"
-                    mySale.line3 = value[0].code ?: "" //6276
-                    mySale.placements = listOf(PlacementVO(shelving = value[0].code ?: ""))//6276
+                    mySale.line3 = value[0].code ?: ""
+                    mySale.placements = listOf(PlacementVO(shelving = value[0].code ?: ""))
 
                     myList.add(mySale)
                 } else {
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPreCheckerNew.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPreCheckerNew.kt
index 2ad9a5c6..11f2b522 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPreCheckerNew.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPreCheckerNew.kt
@@ -18,7 +18,6 @@ import androidx.recyclerview.widget.RecyclerView
 import com.google.gson.Gson
 import es.verdnatura.R
 import es.verdnatura.databinding.FragmentCollectionNewBinding
-import es.verdnatura.domain.ConstAndValues
 import es.verdnatura.domain.ConstAndValues.BASEURLSALIX
 import es.verdnatura.domain.ConstAndValues.PRECHECKERNEW
 import es.verdnatura.domain.ConstAndValues.PRINTERNAME
@@ -201,7 +200,7 @@ class CollectionFragmentPreCheckerNew(
                         iconUpdate.drawable -> updateScreen()
                         iconParking.drawable -> pasillerosItemClickListener?.onPasillerosItemClickListener(
                             PasillerosItemVO(
-                                title = getString(R.string.Parking)
+                                title = R.string.Parking
                             ), ""
                         )
                     }
@@ -249,7 +248,7 @@ class CollectionFragmentPreCheckerNew(
     private fun showUser() {
 
         ma.onPasillerosItemClickListener(
-            PasillerosItemVO(title = getString(R.string.titleUserControlVehicle)),
+            PasillerosItemVO(title = R.string.titleUserControlVehicle),
             workerFkFromTicket.toString()
         )
 
@@ -612,7 +611,7 @@ class CollectionFragmentPreCheckerNew(
 
                     if (!sale.code.isNullOrEmpty()) ma.onPasillerosItemClickListener(
                         PasillerosItemVO(
-                            title = getString(R.string.titleUbicator),
+                            title = R.string.titleUbicator,
                         ), entryPoint = sale.code
                     )
                 }
@@ -630,7 +629,7 @@ class CollectionFragmentPreCheckerNew(
                     )
                     ma.onPasillerosItemClickListener(
                         PasillerosItemVO(
-                            title = getString(R.string.titleWebViewer),
+                            title = R.string.titleWebViewer,
                         ), entryPoint = entryPoint
                     )
                 }
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt
index 5680464e..1293ab08 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt
@@ -237,7 +237,6 @@ class CollectionViewModel(val context: Context) : BaseViewModel(context) {
 
     }
 
-    //Tarea 6276 Salix collection_getTickets
     fun collectionTicketGetSalix(
         collectionFk: Int,
         print: Boolean,
@@ -325,19 +324,11 @@ class CollectionViewModel(val context: Context) : BaseViewModel(context) {
         buyFk: Long,
         isScanned: Boolean?
     ) {
-        //Tarea 6276 OK
         salix.saleTrackingUpdate(
             SaleTrackingReplaceSalix(
                 saleFk, originalQuantity, code, isChecked != "0", buyFk, isScanned!!
             )
-        )/*  silex.saleTrackingReplace(
-                  saleFk,
-                  originalQuantity,
-                  code,
-                  isChecked != "0",
-                  buyFk,
-                  isScanned!!
-              )*/.enqueue(object : SalixCallback<Any>(context) {
+        ).enqueue(object : SalixCallback<Any>(context) {
             override fun onError(t: Throwable) {
                 _responseSaleReplace.value = ResponseItemVO(
                     isError = true,
@@ -361,7 +352,6 @@ class CollectionViewModel(val context: Context) : BaseViewModel(context) {
         quantity: Int,
         isScanned: Boolean?
     ) {
-        //Tarea 6276 flata probar
         salix.saleTrackingMark(
             SaleTrackingSalix(
                 saleFk = saleFk,
@@ -373,15 +363,7 @@ class CollectionViewModel(val context: Context) : BaseViewModel(context) {
                 quantity = quantity,
                 isScanned = isScanned!!
             )
-        )/*   silex.saleTracking_mark(
-                   saleFk,
-                   originalQuantity,
-                   code,
-                   isChecked != "0",
-                   buyFk,
-                   itemShelvingFk,
-                   quantity,
-                   isScanned)*/.enqueue(object : SalixCallback<Any>(context) {
+        ).enqueue(object : SalixCallback<Any>(context) {
             override fun onError(t: Throwable) {
                 _responseSaleTracking_mark.value = ResponseItemVO(
                     isError = true,
@@ -669,13 +651,12 @@ class CollectionViewModel(val context: Context) : BaseViewModel(context) {
     }
 
     fun saleTrackingDel(saleFk: Int) {
-        //Tarea 6276
+
         salix.saleTrackingDel(
             SaleTrackingDelSalix(
                 saleFk = saleFk, stateCodes = listOf("CHECKED", "OK", "PREPARED")
             )
         )
-            //silex.saleTrackingDel(saleFk)
             .enqueue(object : SalixCallback<Any>(context) {
                 override fun onError(t: Throwable) {
                     _responseDel.value = ResponseItemVO(
@@ -694,7 +675,6 @@ class CollectionViewModel(val context: Context) : BaseViewModel(context) {
     fun itemShelvingUpdateFromSale(
         saleFk: Int
     ) {
-        //Tarea 6276 OK
         salix.itemShelvingUpdateFromSale(hashMapOf("saleFk" to saleFk))
             // silex.itemShelving_updateFromSale(saleFk)
             .enqueue(object : SalixCallback<Any>(context) {
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoFragment.kt
index 74f2f783..975256bc 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoFragment.kt
@@ -178,7 +178,7 @@ class ControlVehiculoFragment(
         when (direction) {
             "HISTORY" -> {
                 ma.onPasillerosItemClickListener(
-                    PasillerosItemVO(title = getString(R.string.titleHistoricalHide)), plateNumber
+                    PasillerosItemVO(title = R.string.titleHistoricalHide), plateNumber
                 )
             }
 
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoViewModel.kt
index e17af553..2164de3e 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoViewModel.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoViewModel.kt
@@ -33,7 +33,6 @@ class ControlVehiculoViewModel(val context: Context) : BaseViewModel(context) {
     fun machineWorkerUpdate(
         plate: String
     ) {
-        //tarea 6276 vehiculo
         salix.machineWorkerUpdateInTime(hashMapOf("plate" to plate))
             .enqueue(object : SalixCallback<Any>(context) {
 
@@ -70,15 +69,15 @@ class ControlVehiculoViewModel(val context: Context) : BaseViewModel(context) {
 
                 override fun onSuccess(response: Response<List<DeviceId>>) {
 
-                        _responseMachine.value =
-                            ResponseItemMachineControl(
-                                response = if (response.body()!!.isEmpty()) {
-                                    ""
-                                } else {
-                                    response.body()!![0].id.toString()
-                                },
-                                type = "getnameDevice"
-                            )
+                    _responseMachine.value =
+                        ResponseItemMachineControl(
+                            response = if (response.body()!!.isEmpty()) {
+                                ""
+                            } else {
+                                response.body()!![0].id.toString()
+                            },
+                            type = "getnameDevice"
+                        )
 
                 }
 
@@ -119,7 +118,8 @@ class ControlVehiculoViewModel(val context: Context) : BaseViewModel(context) {
                         response = if (response.body()!!.isEmpty()) {
                             ""
                         } else {
-                            response.body()!![0].entrySet().first().value.toString().replace("\"", "")
+                            response.body()!![0].entrySet().first().value.toString()
+                                .replace("\"", "")
                         },
                         type = "getWorkerPlate"
                     )
@@ -143,5 +143,4 @@ class ControlVehiculoViewModel(val context: Context) : BaseViewModel(context) {
 
     }
 
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/activity/SignedActivity.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/activity/SignedActivity.kt
index 52b715ca..54f9b4d9 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/activity/SignedActivity.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/activity/SignedActivity.kt
@@ -226,7 +226,7 @@ class SignedActivity : BaseActivity<ActivitySignBinding>(), LocationUpdateCallba
 
         val listObservationsAdapter =
             GeneralAdapter(ticketNotes, object : OnGeneralItemRowClickListener {
-                override fun OnGeneralItemRowClickListener(item: GeneralItem) {
+                override fun onGeneralItemRowClickListener(item: GeneralItem) {
 
                     customDialogList.dismiss()
                 }
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/RoutesFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/RoutesFragment.kt
index 161537ca..4a6c0448 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/RoutesFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/RoutesFragment.kt
@@ -51,7 +51,6 @@ class RoutesFragment(
 
     override fun getLayoutId(): Int = R.layout.fragment_route
 
-
     override fun init() {
         super.init()
         setEvents()
@@ -80,7 +79,7 @@ class RoutesFragment(
 
                     val pendingExpeditionSend = pendingExpedition.map { l ->
                         ExpeditionSalix(
-                            expeditionFk = l.id, stateCode = l.code , l.isScanned
+                            expeditionFk = l.id, stateCode = l.code, l.isScanned
                         )
                     }
 
@@ -131,6 +130,7 @@ class RoutesFragment(
 
         }
     }
+
     private fun setToolBar() {
         ma.hideBottomNavigation(View.GONE)
         binding.mainToolbar.toolbarSubtitle.setTextColor(requireContext().getColor((R.color.verdnatura_pumpkin_orange)))
@@ -167,14 +167,14 @@ class RoutesFragment(
 
                         iconInfo.drawable -> {
                             ma.onPasillerosItemClickListener(
-                                PasillerosItemVO(title = getString(R.string.titleInfo)),
+                                PasillerosItemVO(title = R.string.titleInfo),
                                 getString(R.string.titleInfo)
                             )
                         }
 
                         iconSearch.drawable -> {
                             ma.onPasillerosItemClickListener(
-                                PasillerosItemVO(title = getString(R.string.titleLog)),
+                                PasillerosItemVO(title = R.string.titleLog),
                                 getString(R.string.titleLog)
                             )
                         }
@@ -244,14 +244,26 @@ class RoutesFragment(
 
                 if (it.isError) {
                     binding.mainToolbar.toolbarIcons.visibility = View.VISIBLE
-                    ma.messageWithSound(it.errorMessage, isError = false, isPlayed =false, titleWithError = "", isToasted = true)
+                    ma.messageWithSound(
+                        it.errorMessage,
+                        isError = false,
+                        isPlayed = false,
+                        titleWithError = "",
+                        isToasted = true
+                    )
                 } else {
                     deleteSignTickets(it.response)
                 }
             }
 
             responseLoadList.observe(viewLifecycleOwner) {
-                ma.messageWithSound(getString(R.string.offline), isError = false, isPlayed = false, titleWithError = "", isToasted = true)
+                ma.messageWithSound(
+                    getString(R.string.offline),
+                    isError = false,
+                    isPlayed = false,
+                    titleWithError = "",
+                    isToasted = true
+                )
                 ma.onApplicationEventAnimation(View.INVISIBLE)
                 createListRoutes(mutableListOf(), getSaved = true)
             }
@@ -260,7 +272,6 @@ class RoutesFragment(
 
                 if (!it.isError) {
                     binding.mainToolbar.toolbarIcons.visibility = View.VISIBLE
-
                     deleteExpeditionsPending(it.response)
                 }
             }
@@ -294,14 +305,14 @@ class RoutesFragment(
                             "loadVan" -> {
                                 binding.scanInput.isEnabled = true
                                 ma.onPasillerosItemClickListener(
-                                    PasillerosItemVO(title = getString(R.string.titleDeliverySummary)),
+                                    PasillerosItemVO(title = R.string.titleDeliverySummary),
                                     item.id.toString()
                                 )
                             }
 
                             "showTickets" -> {
                                 ma.onPasillerosItemClickListener(
-                                    PasillerosItemVO(title = getString(R.string.tickets)),
+                                    PasillerosItemVO(title = R.string.tickets),
                                     Gson().toJson(item)
                                 )
                             }
@@ -326,7 +337,7 @@ class RoutesFragment(
             binding.routeRecyclerview.adapter = adapter
             binding.routeRecyclerview.layoutManager =
                 LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
-           // adapter!!.notifyDataSetChanged()
+            // adapter!!.notifyDataSetChanged()
             if (!binding.scanInput.text.isNullOrBlank()) {
                 filteredList(binding.scanInput.text.toString())
             }
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/SummaryFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/SummaryFragment.kt
index b5d6b920..c0d6e846 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/SummaryFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/SummaryFragment.kt
@@ -143,7 +143,7 @@ class SummaryFragment(
         )
 
         ma.onPasillerosItemClickListener(
-            PasillerosItemVO(title = getString(R.string.titleLoadTruck)), entryPoint
+            PasillerosItemVO(title = R.string.titleLoadTruck), entryPoint
         )
     }
 
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/TicketsFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/TicketsFragment.kt
index f16b1a08..bb15b2b5 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/TicketsFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/TicketsFragment.kt
@@ -175,7 +175,7 @@ class TicketsFragment : BaseFragment<FragmentTicketsBinding, DeliveryViewModel>(
                         iconSort.drawable -> {
                             ma.onPasillerosItemClickListener(
                                 PasillerosItemVO(
-                                    title = getString(R.string.titleWebViewer),
+                                    title = R.string.titleWebViewer,
                                 ), entryPoint = Gson().toJson(
                                     mutableMapOf(
                                         "entryPoint" to route.id, "web" to "${
@@ -415,9 +415,9 @@ class TicketsFragment : BaseFragment<FragmentTicketsBinding, DeliveryViewModel>(
                                     )
                                 )
                                 ma.onPasillerosItemClickListener(PasillerosItemVO(
-                                    title = getString(
-                                        R.string.titleUnLoadTruck
-                                    )
+                                    title =
+                                    R.string.titleUnLoadTruck
+
                                 ), entryPoint, myListClientTicket.filter { it.id == item.id })
                             }
 
@@ -449,7 +449,7 @@ class TicketsFragment : BaseFragment<FragmentTicketsBinding, DeliveryViewModel>(
 
                         ma.onPasillerosItemClickListener(
                             PasillerosItemVO(
-                                title = getString(R.string.titleWebViewer),
+                                title = R.string.titleWebViewer,
                             ), entryPoint = Gson().toJson(
                                 mutableMapOf(
                                     "entryPoint" to route.id, "web" to "${
@@ -498,7 +498,7 @@ class TicketsFragment : BaseFragment<FragmentTicketsBinding, DeliveryViewModel>(
 
         adapter = GeneralAdapter(itemsNotes, object : OnGeneralItemRowClickListener {
 
-            override fun OnGeneralItemRowClickListener(item: GeneralItem) {
+            override fun onGeneralItemRowClickListener(item: GeneralItem) {
                 itemClient.tickets.forEach { listClient ->
                     listClient.Note = customDialogInput.getValue()
                 }
@@ -563,7 +563,7 @@ class TicketsFragment : BaseFragment<FragmentTicketsBinding, DeliveryViewModel>(
         }.hideDialog().show()
 
         val listPhonesAdapter = GeneralAdapter(ticketNotes, object : OnGeneralItemRowClickListener {
-            override fun OnGeneralItemRowClickListener(item: GeneralItem) {
+            override fun onGeneralItemRowClickListener(item: GeneralItem) {
 
                 customDialogList.dismiss()
             }
@@ -626,7 +626,7 @@ class TicketsFragment : BaseFragment<FragmentTicketsBinding, DeliveryViewModel>(
         }.hideDialog().show()
 
         val listPhonesAdapter = GeneralAdapter(phones, object : OnGeneralItemRowClickListener {
-            override fun OnGeneralItemRowClickListener(item: GeneralItem) {
+            override fun onGeneralItemRowClickListener(item: GeneralItem) {
                 phones.forEach {
                     if (it.code == item.code) {
                         if (ContextCompat.checkSelfPermission(
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/viewmodels/DeliveryViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/viewmodels/DeliveryViewModel.kt
index 5335a715..a4be8129 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/viewmodels/DeliveryViewModel.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/viewmodels/DeliveryViewModel.kt
@@ -85,8 +85,8 @@ class DeliveryViewModel(val context: Context) : BaseViewModel(context) {
 
     val loadRouteList: LiveData<Event<RouteList>> = _routeList.map { Event(it) }
 
-    private val _responseLoadList by lazy { MutableLiveData<ResponseItemVO>() }
-    val responseLoadList: LiveData<ResponseItemVO> = _responseLoadList
+    private val _responseLoadList by lazy { MutableLiveData<Boolean>() }
+    val responseLoadList: LiveData<Boolean> = _responseLoadList
 
     private val _responseStateList by lazy { MutableLiveData<ResponseItemVO>() }
     val responseStateList: LiveData<ResponseItemVO> = _responseStateList
@@ -269,13 +269,13 @@ class DeliveryViewModel(val context: Context) : BaseViewModel(context) {
 
             override fun onError(t: Throwable) {
                 //_routeList.value = RouteList()
-                _responseLoadList.value = ResponseItemVO("", true, t.message.toString(), 0)
+                _responseLoadList.value = false
                 //super.onError(t)
 
             }
 
             override fun onFailure(call: Call<MutableList<RouteInfo>>, t: Throwable) {
-                _responseLoadList.value = ResponseItemVO("", true, t.message.toString(), 0)
+                _responseLoadList.value = false
             }
         })
     }
@@ -290,7 +290,7 @@ class DeliveryViewModel(val context: Context) : BaseViewModel(context) {
                 }
 
                 override fun onError(t: Throwable) {
-                    _responseLoadList.value = ResponseItemVO("", true, t.message.toString(), 0)
+                    _responseLoadList.value = false
 
                 }
             })
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/diadeventa/adapter/DayOfSaleAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/diadeventa/adapter/DayOfSaleAdapter.kt
index 51b4aec4..e39400bb 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/diadeventa/adapter/DayOfSaleAdapter.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/diadeventa/adapter/DayOfSaleAdapter.kt
@@ -65,9 +65,9 @@ class DayOfSaleAdapter(
                 historicoDate.setOnClickListener {
                     onPasillerosItemClickListener!!.onPasillerosItemClickListener(
                         PasillerosItemVO(
-                            title = res.getString(
+                            title =
                                 R.string.titleItemConsult
-                            )
+
                         ), item.itemFk.toString()
                     )
                 }
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/fragment/HistoricoArticuloFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/fragment/HistoricoArticuloFragment.kt
index b809ae09..eabe3e7d 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/fragment/HistoricoArticuloFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/fragment/HistoricoArticuloFragment.kt
@@ -215,7 +215,7 @@ class HistoricoArticuloFragment(
                 if (item.isTicket == 1) {
                     ma.onPasillerosItemClickListener(
                         PasillerosItemVO(
-                            title = getString(R.string.titleWebViewer),
+                            title = R.string.titleWebViewer,
                         ), entryPoint = Gson().toJson(
                             mutableMapOf(
                                 "entryPoint" to item.originId,
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/adapter/ItemShelvingLogAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/adapter/ItemShelvingLogAdapter.kt
index 0a11ea1d..aaac2c37 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/adapter/ItemShelvingLogAdapter.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/adapter/ItemShelvingLogAdapter.kt
@@ -30,9 +30,8 @@ class ItemShelvingLogAdapter(
 
                 onPasillerosItemClickListener.onPasillerosItemClickListener(
                     PasillerosItemVO(
-                        title = holder.binding.root.context.getString(
+                        title =
                             R.string.titleUbicator
-                        )
                     ), items[position].shelvingFk!!
                 )
             }
@@ -67,7 +66,7 @@ class ItemShelvingLogAdapter(
 
     private fun openWorker(binding: ItemShelvinglogRowBinding, id: Int) {
         onPasillerosItemClickListener.onPasillerosItemClickListener(
-            PasillerosItemVO(title = binding.root.context.getString(R.string.titleUserControlVehicle)),
+            PasillerosItemVO(title = R.string.titleUserControlVehicle),
             id.toString()
         )
     }
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelvinglog/fragment/shelvingLogFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelvinglog/fragment/shelvingLogFragment.kt
index 808ca6d6..4bdefe13 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelvinglog/fragment/shelvingLogFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelvinglog/fragment/shelvingLogFragment.kt
@@ -119,7 +119,7 @@ class ShelvingLogFragment(
     private fun openWebViewer(param: Int, web: String) {
         ma.onPasillerosItemClickListener(
             PasillerosItemVO(
-                title = getString(R.string.titleWebViewer),
+                title = R.string.titleWebViewer,
             ),
 
             entryPoint = Gson().toJson(
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/adapter/InventoryAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/adapter/InventoryAdapter.kt
index 8707978d..eef296a4 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/adapter/InventoryAdapter.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/adapter/InventoryAdapter.kt
@@ -52,27 +52,25 @@ class InventoryAdapter(
                 itemFk.setOnClickListener {
                     onPasillerosItemClickListener.onPasillerosItemClickListener(
                         PasillerosItemVO(
-                            title = res.getString(
+                            title =
                                 R.string.titleItemConsult
-                            )
                         ), item.itemFk.toString()
                     )
                 }
                 itemUp.setOnClickListener {
                     onPasillerosItemClickListener.onPasillerosItemClickListener(
                         PasillerosItemVO(
-                            title = res.getString(
+                            title =
                                 R.string.titleItemSearch
-                            )
                         ), item.itemFk.toString()
                     )
                 }
                 itemDown.setOnClickListener {
                     onPasillerosItemClickListener.onPasillerosItemClickListener(
                         PasillerosItemVO(
-                            title = res.getString(
+                            title =
                                 R.string.titleItemSearch
-                            )
+
                         ), item.itemFk.toString()
                     )
                 }
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/adapter/InventoryParkingAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/adapter/InventoryParkingAdapter.kt
index 98e9cca7..f931fbb4 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/adapter/InventoryParkingAdapter.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/adapter/InventoryParkingAdapter.kt
@@ -88,9 +88,8 @@ class InventoryParkingAdapter(
                 imgItem.setOnClickListener {
                     onPasillerosItemClickListener.onPasillerosItemClickListener(
                         PasillerosItemVO(
-                            title = res.getString(
+                            title =
                                 R.string.itemSearch
-                            )
                         ), item.itemFk.toString()
                     )
                 }
@@ -127,15 +126,15 @@ class InventoryParkingAdapter(
                 itemShelving.setOnClickListener {
                     onPasillerosItemClickListener.onPasillerosItemClickListener(
                         PasillerosItemVO(
-                            title = res.getString(R.string.titleUbicator)
-                        ), item.shelvingFk
+                            title = R.string.titleUbicator)
+                        , item.shelvingFk
                     )
                 }
                 itemfkText.setOnClickListener {
                     onPasillerosItemClickListener.onPasillerosItemClickListener(
                         PasillerosItemVO(
-                            title = res.getString(R.string.itemSearch)
-                        ), item.itemFk.toString()
+                            title = R.string.itemSearch)
+                        , item.itemFk.toString()
                     )
                 }
 
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryFragment.kt
index 4527e594..ce578998 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryFragment.kt
@@ -208,7 +208,7 @@ class InventaryFragment :
                                 customDialog.dismiss()
                                 ma.onPasillerosItemClickListener(
                                     PasillerosItemVO(
-                                        title = getString(R.string.titleUbicator),
+                                        title = R.string.titleUbicator,
                                     ), entryPoint = ""
                                 )
 
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryViewModel.kt
index bf24afa7..36a9cfe6 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryViewModel.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryViewModel.kt
@@ -9,8 +9,6 @@ import es.verdnatura.MobileApplication
 import es.verdnatura.domain.SalixCallback
 import es.verdnatura.domain.userCases.GetItemFromBarcodeUseCase
 import es.verdnatura.presentation.base.BaseViewModel
-import es.verdnatura.presentation.base.getMessageFromAllResponse
-import es.verdnatura.presentation.base.nameofFunction
 import es.verdnatura.presentation.common.Event
 import es.verdnatura.presentation.common.ItemDiscardSalixShortage
 import es.verdnatura.presentation.common.ResponseItemVO
@@ -131,7 +129,6 @@ class InventaryViewModel(val context: Context) : BaseViewModel(context) {
         })
     }
 
-
     fun itemSetVisibleDiscard(
         itemFk: Int, warehouseFk: Int, newValue: Int
     ) {
@@ -162,18 +159,6 @@ class InventaryViewModel(val context: Context) : BaseViewModel(context) {
                         response.body()?.let { WorkerFromMistakeList(it) }
                 }
 
-                override fun onError(t: Throwable) {
-                    val listError: ArrayList<WorkerFromMistake> = ArrayList()
-                    listError.add(
-                        WorkerFromMistake(
-                            isError = true, errorMessage = getMessageFromAllResponse(
-                                nameofFunction(this), t.message!!
-                            )
-                        )
-                    )
-                    _workerFromMistakeList.value = WorkerFromMistakeList(listError)
-                }
-
             })
     }
 
@@ -241,10 +226,10 @@ class InventaryViewModel(val context: Context) : BaseViewModel(context) {
     fun getIdFromCodeSalix(code: String) {
         getItemFromBarcodeUseCase.execute(code)
             .enqueue(object : SalixCallback<Int?>(context) {
-            override fun onSuccess(response: Response<Int?>) {
-                _responseCode.value =
-                    response.body()
-            }
-        })
+                override fun onSuccess(response: Response<Int?>) {
+                    _responseCode.value =
+                        response.body()
+                }
+            })
     }
 }
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/login/adapter/WorkFormAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/login/adapter/WorkFormAdapter.kt
index d145810c..9120e6d7 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/login/adapter/WorkFormAdapter.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/login/adapter/WorkFormAdapter.kt
@@ -16,7 +16,6 @@ class WorkFormAdapter(
     //  private var showDelete: Boolean = false
 ) : RecyclerView.Adapter<WorkFormAdapter.ItemHolder>() {
 
-
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemHolder {
         return ItemHolder(
             ItemWorkFormsRowBinding.inflate(LayoutInflater.from(parent.context), parent, false)
@@ -29,15 +28,14 @@ class WorkFormAdapter(
         holder.bind(items[position])
 
         holder.binding.root.setOnClickListener {
-            OnWorkFormsItemRowClickListener.OnWorkFormsItemRowClickListener(items[position])
+            OnWorkFormsItemRowClickListener.onWorkFormsItemRowClickListener(items[position])
         }
-        holder.binding.itemImage.setOnClickListener{
-            OnTrashItemRowClickListener.OnTrashItemRowClickListener(items[position])
+        holder.binding.itemImage.setOnClickListener {
+            OnTrashItemRowClickListener.onTrashItemRowClickListener(items[position])
         }
 
     }
 
-
     inner class ItemHolder(
         val binding: ItemWorkFormsRowBinding
     ) : RecyclerView.ViewHolder(binding.root) {
@@ -47,10 +45,9 @@ class WorkFormAdapter(
                 this.item = item
                 if (item.isShowDelete) {
                     itemImage.visibility = View.VISIBLE
-                }
-                else itemImage.visibility = View.GONE
+                } else itemImage.visibility = View.GONE
 
-                itemImage.setOnClickListener{
+                itemImage.setOnClickListener {
                     //deleteWorkForm(item.name)
                 }
                 //itemCode.visibility = View.GONE
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt
index 03f1101a..8123d53e 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt
@@ -186,7 +186,7 @@ class LoginFragment(private var imageUri: Uri?) :
 
         workFormAdapter = WorkFormAdapter(listWorkForms, object : OnWorkFormsItemRowClickListener {
 
-            override fun OnWorkFormsItemRowClickListener(item: WorkForms) {
+            override fun onWorkFormsItemRowClickListener(item: WorkForms) {
 
                 when (item.name) {
                     getString(R.string.addWorkForm) -> {
@@ -214,7 +214,7 @@ class LoginFragment(private var imageUri: Uri?) :
 
             }
         }, object : OnTrashItemRowClickListener {
-            override fun OnTrashItemRowClickListener(item: WorkForms) {
+            override fun onTrashItemRowClickListener(item: WorkForms) {
 
                 customDialog.setTitle(getString(R.string.deleteWorkForm))
                     .setDescription(getString(R.string.deleteWorkFormConfirmation))
@@ -335,38 +335,36 @@ class LoginFragment(private var imageUri: Uri?) :
 
             versionAppItem.observe(viewLifecycleOwner) {
 
+                if (it.version == getInfoVersionNameApp()) {
+                    goToMain()
+                } else {
+                    if (binding.edittextServer.text.toString() == "Producción") {
+                        mobileApplication.clearApplicationData()
+                    }
+                    customDialog.setTitle(getString(R.string.Actualizar))
+                        .setDescription(getString(R.string.updatemng)).setOkButton(
+                            getString(
+                                R.string.Actualizar
+                            )
+                        ) {
+                            try {
+                                val openURL = Intent(Intent.ACTION_VIEW)
+                                openURL.data = Uri.parse(it.url)
+                                startActivity(openURL)
+                            } catch (ex: Exception) {
+                                getString(R.string.problemUpdate).toast(requireActivity())
+                            }
 
-                    if (it.version == getInfoVersionNameApp()) {
-                        goToMain()
+                        }
+                    if (it.isVersionCritical) {
+                        customDialog.setDescription(getString(R.string.updatecritical))
                     } else {
-                        if (binding.edittextServer.text.toString() == "Producción") {
-                            mobileApplication.clearApplicationData()
+                        customDialog.setKoButton(getString(R.string.cancel)) {
+                            customDialog.dismiss()
+                            goToMain()
                         }
-                        customDialog.setTitle(getString(R.string.Actualizar))
-                            .setDescription(getString(R.string.updatemng)).setOkButton(
-                                getString(
-                                    R.string.Actualizar
-                                )
-                            ) {
-                                try {
-                                    val openURL = Intent(Intent.ACTION_VIEW)
-                                    openURL.data = Uri.parse(it.url)
-                                    startActivity(openURL)
-                                } catch (ex: Exception) {
-                                    getString(R.string.problemUpdate).toast(requireActivity())
-                                }
-
-                            }
-                        if (it.isVersionCritical) {
-                            customDialog.setDescription(getString(R.string.updatecritical))
-                        } else {
-                            customDialog.setKoButton(getString(R.string.cancel)) {
-                                customDialog.dismiss()
-                                goToMain()
-                            }
-                        }
-                        customDialog.show()
-
+                    }
+                    customDialog.show()
 
                 }
 
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginViewModel.kt
index ac8e65d6..a15197bf 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginViewModel.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginViewModel.kt
@@ -230,7 +230,6 @@ class LoginViewModel(val context: Context) : BaseViewModel(context) {
     }
 
     fun checkVersion(nameApp: String) {
-        //Tarea 6276 Modificado back
         salix.getVersion(nameApp).enqueue(object : SalixCallback<VersionApp>(context) {
             override fun onSuccess(response: Response<VersionApp>) {
 
@@ -262,7 +261,6 @@ class LoginViewModel(val context: Context) : BaseViewModel(context) {
     }
 
     fun operatorAdd(workerFk: Int? = null) {
-        //Tarea 6276
         salix.operatorAdd(OperatorAdd(workerFk!!, false))
             .enqueue(object : SalixCallback<Any>(context) {
                 override fun onError(t: Throwable) {
@@ -273,7 +271,6 @@ class LoginViewModel(val context: Context) : BaseViewModel(context) {
             })
     }
 
-    //Tarea 5870
     fun operatorGetData(
         workerId: Int
     ) {
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt
index 5bcd440c..7735f069 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt
@@ -273,13 +273,9 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
             if (uriImage != null) {
                 onPasillerosItemClickListener(
                     PasillerosItemVO(
-                        30,
                         R.drawable.photo_camera,
-                        getString(R.string.titlePhotos),
                         R.string.titlePhotos,
-                        getString(
                             R.string.titlePhotosDescrip
-                        )
 
                     ), uriImage.toString()
                 )
@@ -498,8 +494,8 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
     override fun onPasillerosItemClickListener(
         item: PasillerosItemVO, entryPoint: String, param: Any?
     ) {
-
-        when (item.title) {
+        val itemTitle = getString(item.title!!)
+        when (itemTitle) {
 
             //BUFFERS
             getString(R.string.titlePalletizar) -> {
@@ -518,25 +514,25 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
 
             getString(R.string.historicals) -> {
                 addFragmentOnTop(
-                    PasilleroFragment.newInstance(item.title, isInitMenu = false),
+                    PasilleroFragment.newInstance(itemTitle, isInitMenu = false),
                 )
             }
 
             getString(R.string.titleControllers) -> {
                 addFragmentOnTop(
-                    PasilleroFragment.newInstance(item.title, isInitMenu = false),
+                    PasilleroFragment.newInstance(itemTitle, isInitMenu = false),
                 )
             }
 
             getString(R.string.titleOther) -> {
                 addFragmentOnTop(
-                    PasilleroFragment.newInstance(item.title, isInitMenu = false),
+                    PasilleroFragment.newInstance(itemTitle, isInitMenu = false),
                 )
             }
 
             getString(R.string.titleChangeCategory) -> {
                 addFragmentOnTop(
-                    ChangeCategoryFragment.newInstance(item.title),
+                    ChangeCategoryFragment.newInstance(itemTitle),
                 )
             }
 
@@ -554,29 +550,29 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
             getString(R.string.titleCorridors) -> {
                 mainActivityPasilleroViewModel.workerActivityAdd(CodeWorkerAction.ON_PREPARATION)
                 addFragmentOnTop(
-                    PasilleroFragment.newInstance(item.title, isInitMenu = false),
+                    PasilleroFragment.newInstance(itemTitle, isInitMenu = false),
                 )
             }
 
             getString(R.string.titlePrevious) -> {
                 addFragmentOnTop(
-                    PasilleroFragment.newInstance(item.title, isInitMenu = false),
+                    PasilleroFragment.newInstance(itemTitle, isInitMenu = false),
                 )
             }
 
             getString(R.string.titleExpeditionState) -> {
                 // addFragment(ExpeditionStateFragment.newInstance(entryPoint),R.id.main_frame_layout, ExpeditionTruckListFragment.TAG,false)
-                addFragmentOnTop(ExpeditionStateFragment.newInstance(item.title))
+                addFragmentOnTop(ExpeditionStateFragment.newInstance(itemTitle))
             }
 
             getString(R.string.titleScanExpedition) -> {
-                addFragmentOnTop(ExpeditionScanSorterFragment.newInstance(item.title))
+                addFragmentOnTop(ExpeditionScanSorterFragment.newInstance(itemTitle))
             }
 
             getString(R.string.titleBufferManegement) -> {
                 addFragmentOnTop(
                     PasilleroFragment.newInstance(
-                        item.title, isInitMenu = false
+                        itemTitle, isInitMenu = false
                     )
                 )
             }
@@ -584,7 +580,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
             getString(R.string.titleClaims) -> {
                 addFragmentOnTop(
                     PasilleroFragment.newInstance(
-                        item.title, isInitMenu = false
+                        itemTitle, isInitMenu = false
                     )
                 )
 
@@ -603,7 +599,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
                  addFragmentOnTop(PreSacadorFragment.newInstance())
              }*/
             getString(R.string.titleDayOfSale) -> {
-                addFragmentOnTop(DayOfSaleFragment(item.title))
+                addFragmentOnTop(DayOfSaleFragment(itemTitle))
             }
 
             getString(R.string.titleShowTicket) -> {
@@ -666,11 +662,11 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
             }
 
             getString(R.string.titleAuto) -> {
-                addFragmentOnTop(AutomaticAddItemFragment.newInstance(entryPoint, item.title))
+                addFragmentOnTop(AutomaticAddItemFragment.newInstance(entryPoint, itemTitle))
             }
 
             /*    getString(R.string.titleControllersAction) -> {
-                    addFragmentOnTop(AutomaticAddItemFragment.newInstance(entryPoint, item.title))
+                    addFragmentOnTop(AutomaticAddItemFragment.newInstance(entryPoint, itemTitle))
                 }*/
 
             getString(R.string.titlePickers) -> {
@@ -689,32 +685,32 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
             }
             //Menu qr
             getString(R.string.titleQrReader) -> {
-                addFragmentOnTop(QrFragment.newInstance(item.title))
+                addFragmentOnTop(QrFragment.newInstance(itemTitle))
             }
 
             //Menu buffer
             getString(R.string.titleBufferEmpty) -> {
-                addFragmentOnTop(BufferFragment.newInstance(item.title))
+                addFragmentOnTop(BufferFragment.newInstance(itemTitle))
             }
 
             getString(R.string.titleBufferFill) -> {
-                addFragmentOnTop(BufferFragment.newInstance(item.title))
+                addFragmentOnTop(BufferFragment.newInstance(itemTitle))
             }
 
             getString(R.string.titleBufferAccumulate) -> {
-                addFragmentOnTop(BufferFragment.newInstance(item.title))
+                addFragmentOnTop(BufferFragment.newInstance(itemTitle))
             }
 
             getString(R.string.titleBufferOff) -> {
-                addFragmentOnTop(BufferFragment.newInstance(item.title))
+                addFragmentOnTop(BufferFragment.newInstance(itemTitle))
             }
 
             getString(R.string.titleBufferload) -> {
-                addFragmentOnTop(BufferLoadFragment.newInstance(item.title))
+                addFragmentOnTop(BufferLoadFragment.newInstance(itemTitle))
             }
 
             getString(R.string.titleBufferStrapping) -> {
-                addFragmentOnTop(BufferFragment.newInstance(item.title))
+                addFragmentOnTop(BufferFragment.newInstance(itemTitle))
             }
 
             getString(R.string.titlePreControl) -> {
@@ -726,24 +722,24 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
             }
 
             getString(R.string.titleShelvingHistorical) -> {
-                addFragmentOnTop(ItemShelvingLogFragment.newInstance(item.title))
+                addFragmentOnTop(ItemShelvingLogFragment.newInstance(itemTitle))
 
             }
 
             getString(R.string.titleLogShelving) -> {
-                addFragmentOnTop(ShelvingLogFragment.newInstance(item.title, LogType.SHELVING))
+                addFragmentOnTop(ShelvingLogFragment.newInstance(itemTitle, LogType.SHELVING))
             }
 
             getString(R.string.titleParkingTicketPrevia) -> {
-                addFragmentOnTop(ShelvingLogFragment.newInstance(item.title, LogType.PREVIOUS))
+                addFragmentOnTop(ShelvingLogFragment.newInstance(itemTitle, LogType.PREVIOUS))
             }
 
             getString(R.string.titleWorkerMistake) -> {
-                addFragmentOnTop(WorkermistakeFragment.newInstance(item.title))
+                addFragmentOnTop(WorkermistakeFragment.newInstance(itemTitle))
             }
 
             getString(R.string.titlePackingMistake) -> {
-                addFragmentOnTop(PackingMistakeFragment.newInstance(item.title))
+                addFragmentOnTop(PackingMistakeFragment.newInstance(itemTitle))
             }
 
             getString(R.string.titlePrePickerTest) -> {
@@ -755,39 +751,39 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
             }
 
             getString(R.string.titleClaimUbication) -> {
-                addFragmentOnTop(ClaimUbicationFragment.newInstance(item.title))
+                addFragmentOnTop(ClaimUbicationFragment.newInstance(itemTitle))
             }
 
             getString(R.string.titleReUbicator) -> {
-                addFragmentOnTop(ReubicationFragment.newInstance(item.title))
+                addFragmentOnTop(ReubicationFragment.newInstance(itemTitle))
             }
 
             getString(R.string.titleCMRState) -> {
-                addFragmentOnTop(CmrExpeditionPalletFragment.newInstance(item.title))
+                addFragmentOnTop(CmrExpeditionPalletFragment.newInstance(itemTitle))
             }
 
             getString(R.string.scanPlatform) -> {
-                addFragmentOnTop(PalletScanFragment.newInstance(item.title, "receive"))
+                addFragmentOnTop(PalletScanFragment.newInstance(itemTitle, "receive"))
             }
 
             getString(R.string.titleScanPalletizar) -> {
-                addFragmentOnTop(PalletScanFragment.newInstance(item.title, "get"))
+                addFragmentOnTop(PalletScanFragment.newInstance(itemTitle, "get"))
             }
 
             getString(R.string.titlePackaging) -> {
-                addFragmentOnTop(SupplierFragment.newInstance(item.title), name = item.title)
+                addFragmentOnTop(SupplierFragment.newInstance(itemTitle), name = itemTitle)
             }
 
             getString(R.string.titlePackagingCount) -> {
-                addFragmentOnTop(PackagingCountFragment.newInstance(item.title), name = item.title)
+                addFragmentOnTop(PackagingCountFragment.newInstance(itemTitle), name = itemTitle)
             }
 
             getString(R.string.titlePackagingObs) -> {
-                addFragmentOnTop(ObservFragment.newInstance(item.title), name = item.title)
+                addFragmentOnTop(ObservFragment.newInstance(itemTitle), name = itemTitle)
             }
 
             getString(R.string.titlePackagingSummary) -> {
-                addFragmentOnTop(PackagingSummaryFragment.newInstance(item.title))
+                addFragmentOnTop(PackagingSummaryFragment.newInstance(itemTitle))
             }
 
             getString(R.string.selfConsumption) -> {
@@ -795,7 +791,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
             }
 
             getString(R.string.titlePackingHolland) -> {
-                addFragmentOnTop(PackingHollandFragment.newInstance(item.title))
+                addFragmentOnTop(PackingHollandFragment.newInstance(itemTitle))
             }
 
             getString(R.string.titleDelivery) -> {
@@ -817,7 +813,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
 
             getString(R.string.titleInfo) -> {
                 addFragmentOnTop(
-                    InfoFragment.newInstance(item.title), getString(R.string.titleInfo)
+                    InfoFragment.newInstance(itemTitle), getString(R.string.titleInfo)
                 )
 
             }
@@ -825,14 +821,14 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
             getString(R.string.titleLog) -> {
 
                 addFragmentOnTop(
-                    LogExpeditionFragment.newInstance(item.title), getString(R.string.titleLog)
+                    LogExpeditionFragment.newInstance(itemTitle), getString(R.string.titleLog)
                 )
 
             }
 
             getString(R.string.titleLoadTruck) -> {
                 addFragmentOnTop(
-                    LoadUnloadFragment.newInstance(item.title, "ON DELIVERY", entryPoint),
+                    LoadUnloadFragment.newInstance(itemTitle, "ON DELIVERY", entryPoint),
                     getString(R.string.titleLoadTruck)
 
                 )
@@ -843,7 +839,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
                 @Suppress("UNCHECKED_CAST")
                 addFragmentOnTop(
                     LoadUnloadFragment.newInstance(
-                        item.title, "DELIVERED", entryPoint,
+                        itemTitle, "DELIVERED", entryPoint,
                         param as? ArrayList<ClientTicketSalix>
                     ), getString(R.string.titleUnLoadTruck)
                 )
@@ -853,7 +849,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
             getString(R.string.titleDeliverySummary) -> {
 
                 addFragmentOnTop(
-                    SummaryFragment.newInstance(item.title, "ON DELIVERY", entryPoint.toInt()),
+                    SummaryFragment.newInstance(itemTitle, "ON DELIVERY", entryPoint.toInt()),
                     getString(R.string.titleDeliverySummary)
                 )
 
@@ -862,43 +858,43 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
             getString(R.string.titleDeliveryRoute) -> {
 
                 addFragmentOnTop(
-                    RoutesFragment.newInstance(item.title), getString(R.string.titleDeliverySummary)
+                    RoutesFragment.newInstance(itemTitle), getString(R.string.titleDeliverySummary)
                 )
 
             }
 
             getString(R.string.titlePhotos) -> {
                 addFragmentOnTop(
-                    PhotosFragment.newInstance(item.title, entryPoint)
+                    PhotosFragment.newInstance(itemTitle, entryPoint)
                 )
             }
 
             getString(R.string.ticketAdvance) -> {
                 addFragmentOnTop(
-                    TicketAdvanceFragment.newInstance(item.title)
+                    TicketAdvanceFragment.newInstance(itemTitle)
                 )
             }
 
             getString(R.string.testing) -> {
                 // addFragmentOnTop(
-                // es.verdnatura.presentation.view.feature.photos.fragment.PhotosFragment.newInstance(item.title))
-                //addFragmentOnTop(testPrint.newInstance(item.title))
+                // es.verdnatura.presentation.view.feature.photos.fragment.PhotosFragment.newInstance(itemTitle))
+                //addFragmentOnTop(testPrint.newInstance(itemTitle))
             }
 
             getString(R.string.titleInventoryParking) -> {
-                addFragmentOnTop(InventaryParkingFragment.newInstance(item.title))
+                addFragmentOnTop(InventaryParkingFragment.newInstance(itemTitle))
             }
 
             getString(R.string.tickets) -> {
-                addFragmentOnTop(TicketsFragment.newInstance(item.title, entryPoint))
+                addFragmentOnTop(TicketsFragment.newInstance(itemTitle, entryPoint))
             }
 
             getString(R.string.reviewBoxPicking) -> {
-                addFragmentOnTop(BoxPickingFragment.newInstance(item.title))
+                addFragmentOnTop(BoxPickingFragment.newInstance(itemTitle))
             }
 
             getString(R.string.pickerHelper) -> {
-                addFragmentOnTop(PickerHelperFragment.newInstance(item.title))
+                addFragmentOnTop(PickerHelperFragment.newInstance(itemTitle))
             }
 
             "PREITEMPICKERTEST" -> {
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/adapter/ItemSupplierAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/adapter/ItemSupplierAdapter.kt
index 34bc052d..14ca0941 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/adapter/ItemSupplierAdapter.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/adapter/ItemSupplierAdapter.kt
@@ -48,7 +48,7 @@ class ItemSupplierAdapter(
                     itemRemove.visibility = View.GONE
                 }
                 itemAdd.setOnClickListener {
-                    onImageUpdateClickListener!!.OnImageUpdateClickListener(
+                    onImageUpdateClickListener!!.onImageUpdateClickListener(
                         item
                     )
                 }
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/adapter/ListImageAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/adapter/ListImageAdapter.kt
index 99e6821d..a761d537 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/adapter/ListImageAdapter.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/adapter/ListImageAdapter.kt
@@ -34,7 +34,7 @@ class ListImageAdapter(
                 itemName.text = item.name
 
                 itemImageUpdate.setOnClickListener {
-                    onImageUpdateClickListener.OnImageUpdateClickListener(
+                    onImageUpdateClickListener.onImageUpdateClickListener(
                         item
                     )
                 }
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/ObservFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/ObservFragment.kt
index 07ccf98c..da668cb9 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/ObservFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/ObservFragment.kt
@@ -160,7 +160,7 @@ class ObservFragment(
 
     private fun openSummary() {
         ma.onPasillerosItemClickListener(
-            PasillerosItemVO(title = getString(R.string.titlePackagingSummary)),
+            PasillerosItemVO(title = R.string.titlePackagingSummary),
             getString(R.string.titlePackagingSummary)
         )
     }
@@ -273,7 +273,7 @@ class ObservFragment(
         adapterListImage =
             ListImageAdapter(list, object : OnImageUpdateClickListener {
 
-                override fun OnImageUpdateClickListener(item: Any) {
+                override fun onImageUpdateClickListener(item: Any) {
 
                     val drawable = getDrawableFromImageUri(requireContext(), (item as Image).uri)
                     val bitmap = drawable!!.toBitmap()
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingCountFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingCountFragment.kt
index d46a0183..bbee128c 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingCountFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingCountFragment.kt
@@ -76,7 +76,7 @@ class PackagingCountFragment(
                     when (item) {
                         iconNext.drawable -> {
                             ma.onPasillerosItemClickListener(
-                                PasillerosItemVO(title = getString(R.string.titlePackagingObs)),
+                                PasillerosItemVO(title = R.string.titlePackagingObs),
                                 getString(R.string.titlePackagingObs)
                             )
                         }
@@ -105,43 +105,51 @@ class PackagingCountFragment(
             loadEntryAdd.observe(viewLifecycleOwner) { event ->
                 event.getContentIfNotHandled().notNull {
 
-                        viewModel.getItemsPackaging(
-                            mobileApplication.dataStoreApp.readDataStoreKey(SUPPLIERID),
-                            mobileApplication.dataStoreApp.readDataStoreKey(ENTRYID)
-                        )
+                    viewModel.getItemsPackaging(
+                        mobileApplication.dataStoreApp.readDataStoreKey(SUPPLIERID),
+                        mobileApplication.dataStoreApp.readDataStoreKey(ENTRYID)
+                    )
 
                 }
             }
 
             itemSupplierList.observe(viewLifecycleOwner) { iti ->
                 adapteritemsupplier =
-                    ItemSupplierAdapter(iti.list.sortedBy { it.name }, object : OnImageUpdateClickListener {
+                    ItemSupplierAdapter(
+                        iti.list.sortedBy { it.name },
+                        object : OnImageUpdateClickListener {
 
-                        override fun OnImageUpdateClickListener(item: Any) {
-                            showCustomDialog("quantity", item as ItemSupplier)
+                            override fun onImageUpdateClickListener(item: Any) {
+                                showCustomDialog("quantity", item as ItemSupplier)
 
-                        }
-
-                    }, object : OnImageTrashClickListener {
-                        override fun onImageTrashClickListener(item: Any) {
-                            showCustomDialog("delete", item as ItemSupplier)
-                        }
-
-                    }, object : OnEditSubQuantityListener {
-                        override fun OnEditSubQuantityListener(item: Any, text: String) {
-                            hideKeyboard()
-                        }
-
-                    }, object : OnItemClickListener {
-                        override fun onItemClickListener(item: ItemSupplier) {
-                            if (!item.url.isNullOrBlank()) {
-                                val i = Intent(activity, ImageViewActivity::class.java)
-                                i.putExtra(getString(R.string.url), "http:${item.url}/catalog/1600x900/${item.id}")
-                                i.putExtra(getString(R.string.title), item.name)
-                                startActivity(i)
                             }
-                        }
-                    })
+
+                        },
+                        object : OnImageTrashClickListener {
+                            override fun onImageTrashClickListener(item: Any) {
+                                showCustomDialog("delete", item as ItemSupplier)
+                            }
+
+                        },
+                        object : OnEditSubQuantityListener {
+                            override fun onEditSubQuantityListener(item: Any, text: String) {
+                                hideKeyboard()
+                            }
+
+                        },
+                        object : OnItemClickListener {
+                            override fun onItemClickListener(item: ItemSupplier) {
+                                if (!item.url.isNullOrBlank()) {
+                                    val i = Intent(activity, ImageViewActivity::class.java)
+                                    i.putExtra(
+                                        getString(R.string.url),
+                                        "http:${item.url}/catalog/1600x900/${item.id}"
+                                    )
+                                    i.putExtra(getString(R.string.title), item.name)
+                                    startActivity(i)
+                                }
+                            }
+                        })
                 binding.itemsupplierRecyclerview.adapter = adapteritemsupplier
                 layoutManager =
                     LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/SupplierFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/SupplierFragment.kt
index 154867c8..3bcc6d8d 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/SupplierFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/SupplierFragment.kt
@@ -124,7 +124,7 @@ class SupplierFragment(
                     mobileApplication.dataStoreApp.deleteImages()
                 }
                 ma.onPasillerosItemClickListener(
-                    PasillerosItemVO(title = getString(R.string.titlePackagingCount)),
+                    PasillerosItemVO(title = R.string.titlePackagingCount),
                     getString(R.string.titlePackagingCount)
                 )
                 // }
@@ -154,7 +154,7 @@ class SupplierFragment(
                     }
 
                     ma.onPasillerosItemClickListener(
-                        PasillerosItemVO(title = getString(R.string.titlePackagingCount)),
+                        PasillerosItemVO(title = R.string.titlePackagingCount),
                         getString(R.string.titlePackagingCount)
                     )
                 }
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/model/ItemExpeditionTruckVO.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/model/ItemExpeditionTruckVO.kt
index 2a77206e..008c7bf1 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/model/ItemExpeditionTruckVO.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/model/ItemExpeditionTruckVO.kt
@@ -1,17 +1,11 @@
 package es.verdnatura.presentation.view.feature.paletizador.model
 
-import com.google.gson.annotations.SerializedName
 import es.verdnatura.presentation.view.feature.articulo.model.BarcodeVO
 
 class ItemExpeditionTruckVO(
     var id: Int,
-    //Tarea 4902
-    @SerializedName(value = "ETD", alternate = ["eta"])
     var eta: String = "",
-    var Destino: String = "",
-    var description: String = "",
-    var isError: Boolean = false,
-    var errorMessage: String = ""
+    var description: String = ""
 )
 
 data class ItemExpeditionTruckSalix(
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/model/ItemPalletVO.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/model/ItemPalletVO.kt
index 6085bb65..77ef9513 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/model/ItemPalletVO.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/model/ItemPalletVO.kt
@@ -3,10 +3,7 @@ package es.verdnatura.presentation.view.feature.paletizador.model
 class ItemPalletVO(
     var Pallet:Int,
     var Rutas:Int =0,
-    var Eti:Int = 0,
-    var isError: Boolean = false,
-    var errorMessage: String = ""
-
+    var Eti:Int = 0
 )
 
 class ItemPalletListVO(
@@ -18,8 +15,6 @@ class ItemPalletViewVO(
     var Pallet:Int = 0,
     var Rutas:Int = 0,
     var Cajas:Int = 0,
-    var isError: Boolean = false,
-    var errorMessage: String = ""
 )
 
 class ItemPalletViewListVO(
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/model/ItemScanVO.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/model/ItemScanVO.kt
index 20cee657..6c80381b 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/model/ItemScanVO.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/model/ItemScanVO.kt
@@ -1,27 +1,23 @@
 package es.verdnatura.presentation.view.feature.paletizador.model
 
-class ItemScanVO (
-    var expeditionFk:String = "",
-    var palletFk:Int,
-    var isError:Boolean = false,
-    var errorMessage:String = ""
+class ItemScanVO(
+    var expeditionFk: String = "",
+    var palletFk: Int
 )
 
 class ItemScanList(
-    var list:List<ItemScanVO> = listOf()
+    var list: List<ItemScanVO> = listOf()
 )
 
 class ItemExpeditionScanVO(
-    var id:Int,
-    var expeditionFk:Int = 0,
-    var Ruta:Int = 0,
-    var Ticket:Int= 0,
-    var Caja:Int = 0,
-    var isError:Boolean = false,
-    var errorMessage:String = ""
+    var id: Int,
+    var expeditionFk: Int = 0,
+    var Ruta: Int = 0,
+    var Ticket: Int = 0,
+    var Caja: Int = 0
 )
 
 class ItemExpeditionScanList(
-    var list:List<ItemExpeditionScanVO> = listOf()
+    var list: List<ItemExpeditionScanVO> = listOf()
 )
 
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/parking/fragment/ParkingFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/parking/fragment/ParkingFragment.kt
index 69413520..6a088328 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/parking/fragment/ParkingFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/parking/fragment/ParkingFragment.kt
@@ -54,11 +54,11 @@ class ParkingFragment(var menuOrigin: String) :
                     try {
 
                         checkScan(
-                                itemScanValue(
-                                    binding.scanInput.text.toString(),
-                                    arrayOf("ticket", "saleGroup"),
-                                    "id"
-                                ).toString()
+                            itemScanValue(
+                                binding.scanInput.text.toString(),
+                                arrayOf("ticket", "saleGroup"),
+                                "id"
+                            ).toString()
                         )
 
                     } catch (ex: Exception) {
@@ -79,7 +79,7 @@ class ParkingFragment(var menuOrigin: String) :
 
     override fun observeViewModel() {
         with(viewModel) {
-            response.observe(viewLifecycleOwner) {
+            responseParking.observe(viewLifecycleOwner) {
 
                 ma.messageWithSound(
                     message = getString(R.string.Aparcado),
@@ -106,7 +106,7 @@ class ParkingFragment(var menuOrigin: String) :
                     val position = scanerList.indexOf(item)
                     if (position != -1) {
                         scanerList.removeAt(position)
-                        adapter!!.notifyItemRangeChanged(position,scanerList.size-position+1)
+                        adapter!!.notifyItemRangeChanged(position, scanerList.size - position + 1)
                     }
                 } catch (ex: Exception) {
                     ex.message.toString().toast(requireContext())
@@ -122,7 +122,7 @@ class ParkingFragment(var menuOrigin: String) :
 
     private fun checkScan(txtScan: String) {
         var isParking = false
-        if (txtScan.isParking() 
+        if (txtScan.isParking()
         ) {
             isParking = true
         }
@@ -146,9 +146,4 @@ class ParkingFragment(var menuOrigin: String) :
         super.onCreate(savedInstanceState)
     }
 
-    @Throws(NumberFormatException::class)
-    fun isLetter(text: String): Boolean {
-        return text.matches(getString(R.string.regExp).toRegex())
-    }
-
 }
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/parking/fragment/ParkingViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/parking/fragment/ParkingViewModel.kt
index 39019212..80e84f7f 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/parking/fragment/ParkingViewModel.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/parking/fragment/ParkingViewModel.kt
@@ -9,16 +9,15 @@ import es.verdnatura.presentation.base.BaseViewModel
 import retrofit2.Response
 
 class ParkingViewModel(val context: Context) : BaseViewModel(context) {
-    private val _response by lazy { MutableLiveData<Any>() }
-    val response: LiveData<Any>
-        get() = _response
+    private val _responseParking by lazy { MutableLiveData<Boolean>() }
+    val responseParking: LiveData<Boolean> = _responseParking
 
     fun setParking(scanItem: String, parking: String) {
         salix.setParking(arrayListOf(scanItem, parking).formatWithQuotes())
             .enqueue(object :
                 SalixCallback<Any>(context) {
                 override fun onSuccess(response: Response<Any>) {
-                    _response.value = response.message()
+                    _responseParking.value = true
                 }
             })
     }
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/photos/fragment/PhotosFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/photos/fragment/PhotosFragment.kt
index 5756103f..43c93660 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/photos/fragment/PhotosFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/photos/fragment/PhotosFragment.kt
@@ -1,4 +1,5 @@
 package es.verdnatura.presentation.view.feature.photos.fragment
+
 import android.app.Activity.RESULT_OK
 import android.content.Context
 import android.content.Intent
@@ -62,7 +63,6 @@ class PhotosFragment(
         }
     }
 
-
     override fun getLayoutId(): Int = R.layout.fragment_photos
 
     companion object {
@@ -138,7 +138,7 @@ class PhotosFragment(
                         viewModel.getIdFromCodeSalix(originalItem)
 
                     } catch (ex: Exception) {
-                        ma.messageWithSound(ex.message.toString(), isError = true, isPlayed =true)
+                        ma.messageWithSound(ex.message.toString(), isError = true, isPlayed = true)
                     }
                 }
                 binding.editItemFk.setText("")
@@ -155,44 +155,28 @@ class PhotosFragment(
     override fun observeViewModel() {
 
         with(viewModel) {
-            responseinsert.observe(viewLifecycleOwner) {
-                if (it.isError) {
-                    ma.messageWithSound(
-                        it.errorMessage + getString(R.string.user) + title,
-                        isError = true,
-                        true
-                    )
 
+            itemCard.observe(viewLifecycleOwner) {
+
+                if (it.id != 0) {
+                    binding.itemData.text = getString(R.string.itemDataText, it.id, it.longName)
+                    if (!it.urlImage200.isNullOrEmpty()) {
+                        binding.itemcardOriginal.visibility = VISIBLE
+                        binding.itemcardOriginal.loadUrl(it.urlImage200)
+                    }
                 } else {
                     ma.messageWithSound(
-                        getString(R.string.itemUpdated),
-                        isError = it.isError,
-                        true
+                        getString(R.string.itemNotFound),
+                        isError = true,
+                        isPlayed = false,
+                        getString(R.string.noResults)
                     )
+
                 }
 
-            }
-            itemCard.observe(viewLifecycleOwner) {
-
-                    if (it.id != 0) {
-                        binding.itemData.text = getString(R.string.itemDataText, it.id, it.longName)
-                        if (!it.urlImage200.isNullOrEmpty()) {
-                            binding.itemcardOriginal.visibility = VISIBLE
-                            binding.itemcardOriginal.loadUrl(it.urlImage200)
-                        }
-                    } else {
-                        ma.messageWithSound(
-                            getString(R.string.itemNotFound),
-                            isError = true,
-                            isPlayed = false,
-                            getString(R.string.noResults)
-                        )
-
-                    }
-
             }
             responseCode.observe(viewLifecycleOwner) {
-                if (it!=null) {
+                if (it != null) {
                     viewModel.getItemCard(
                         it.toLong(),
                         mobileApplication.dataStoreApp.readDataStoreKey(WAREHOUSEFK)
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/precontrol/PreControladorFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/precontrol/PreControladorFragment.kt
index a88fa0ac..1a2a988d 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/precontrol/PreControladorFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/precontrol/PreControladorFragment.kt
@@ -4,7 +4,6 @@ import android.content.Context
 import android.os.Bundle
 import android.view.View.VISIBLE
 import android.view.inputmethod.EditorInfo
-import androidx.lifecycle.Observer
 import es.verdnatura.R
 import es.verdnatura.databinding.FragmentGeneralBlackBinding
 import es.verdnatura.domain.ConstAndValues
@@ -65,7 +64,11 @@ class PreControladorFragment :
 
                     try {
                         viewModel.getSales(
-                            collectionFk = itemScanValue(binding.scanInput.text.toString(),arrayOf("saleGroup"),"id").toString().toInt(),
+                            collectionFk = itemScanValue(
+                                binding.scanInput.text.toString(),
+                                arrayOf("saleGroup"),
+                                "id"
+                            ).toString().toInt(),
                             print = false,
                             source = type
                         )
@@ -84,12 +87,12 @@ class PreControladorFragment :
 
     override fun observeViewModel() {
         with(viewModel) {
-            collectionTicketList.observe(viewLifecycleOwner, Observer {
+            collectionTicketList.observe(viewLifecycleOwner) {
 
                 if (!goBack) navigateToCollectionList(it)
                 goBack = false
 
-            })
+            }
         }
     }
 
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/precontrol/PreControladorViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/precontrol/PreControladorViewModel.kt
deleted file mode 100644
index f5d8f9e0..00000000
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/precontrol/PreControladorViewModel.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-package es.verdnatura.presentation.view.feature.precontrol
-
-import android.content.Context
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import es.verdnatura.presentation.base.BaseViewModel
-import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO
-
-class PreControladorViewModel(val context: Context) : BaseViewModel(context) {
-
-    private val _collectionTicketList by lazy { MutableLiveData<CollectionVO>() }
-    val collectionTicketList: LiveData<CollectionVO>
-        get() = _collectionTicketList
-    //Tarea 6276
-    //a salix
-
-/*    fun collectionTicketGet(collectionFk: String, sectorFk: String, type: String) {
-        silex.collection_getTickets(collectionFk, sectorFk, "0", type).enqueue(object :
-            SilexCallback<CollectionVO>(context) {
-            override fun onError(t: Throwable) {
-                _collectionTicketList.value = CollectionVO(
-                    0,
-                    isError = true,
-                    errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!)
-                )
-            }
-
-            override fun onSuccess(response: Response<CollectionVO>) {
-                if (response.body() != null) {
-                    _collectionTicketList.value = response.body()?.let { it.map(context) }
-                } else {
-                    _collectionTicketList.value = CollectionVO(
-                        0,
-                        isError = true,
-                        errorMessage = getMessageFromAllResponse(
-                            nameofFunction(this),
-                            response.message()
-                        )
-                    )
-                }
-            }
-        })
-    }*/
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/adapter/PreSacadorAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/adapter/PreSacadorAdapter.kt
index 200cb15b..b914d669 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/adapter/PreSacadorAdapter.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/adapter/PreSacadorAdapter.kt
@@ -72,7 +72,7 @@ class PreSacadorAdapter(
                 itemArticleItemFk.setOnClickListener {
                     onPasillerosItemClickListener.onPasillerosItemClickListener(
                         PasillerosItemVO(
-                            title = binding.root.context.resources.getString(R.string.titleItemConsult)
+                            title = R.string.titleItemConsult
                         ), sale.itemFk.toString()
                     )
                 }
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt
index a5e1c9d4..869f0af5 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt
@@ -152,7 +152,7 @@ class EndSacadorFragment(
                         if ((binding.scanInput.text.toString()).isParking()) {
                             pasillerosItemClickListener?.onPasillerosItemClickListener(
                                 PasillerosItemVO(
-                                    title = getString(R.string.Parking)
+                                    title = R.string.Parking
                                 ), ""
                             )
                         } else {
@@ -949,7 +949,7 @@ class EndSacadorFragment(
                     when (item) {
                         iconParking.drawable -> pasillerosItemClickListener?.onPasillerosItemClickListener(
                             PasillerosItemVO(
-                                title = getString(R.string.parking)
+                                title = R.string.parking
                             ), ""
                         )
 
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt
index 73187966..0bb455aa 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt
@@ -227,7 +227,6 @@ class PreSacadorViewModel(val context: Context) : BaseViewModel(context) {
             })
     }
 
-
     fun collectionIncreaseQuantity(
         saleFk: Int, quantity: Int
     ) {
@@ -300,11 +299,8 @@ class PreSacadorViewModel(val context: Context) : BaseViewModel(context) {
     fun sectorCollectionGetSale(
         sectorCollectionFK: Int, sectorFk: Int
     ) {
-        //Tarea 6276
+
         salix.sectorCollectionGetSale(sectorFk = sectorFk, sectorCollectionFk = sectorCollectionFK)
-            /* silex.sectorCollection_getSale(
-                 sectorCollectionFK, sectorFk.toString()
-             )*/
             .enqueue(object : SalixCallback<List<PreSacadorItemVO>>(context) {
                 override fun onError(t: Throwable) {
                     _salesList.value = listOf()
@@ -457,11 +453,8 @@ class PreSacadorViewModel(val context: Context) : BaseViewModel(context) {
     fun itemShelving_updateFromSale(
         saleFk: Int
     ) {
-        //Tarea 6276 pasar a Salix
-        //09/04/2024
-        salix.itemShelvingUpdateFromSale(hashMapOf("saleFk" to saleFk))
 
-            // silex.itemShelving_updateFromSale(saleFk)
+        salix.itemShelvingUpdateFromSale(hashMapOf("saleFk" to saleFk))
             .enqueue(object : SalixCallback<Any>(context) {
                 override fun onError(t: Throwable) {
 
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/SectorCollectionReserveFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/SectorCollectionReserveFragment.kt
index 49c21221..c7de410b 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/SectorCollectionReserveFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/SectorCollectionReserveFragment.kt
@@ -78,7 +78,7 @@ class SectorCollectionReserveFragment(
                 requireActivity().supportFragmentManager.popBackStack()
             } else {
                 ma.onPasillerosItemClickListener(
-                    PasillerosItemVO(title = "titlePrePickerTest"),
+                    PasillerosItemVO(title = R.string.titleprepickertest),
                     entryPoint = collectionFk.toString()
                 )
             }
@@ -359,7 +359,7 @@ class SectorCollectionReserveFragment(
         if (::customDialogList.isInitialized) customDialogList.dismiss()
 
         ma.onPasillerosItemClickListener(
-            PasillerosItemVO(title = "PREITEMPICKERTEST"), entryPoint = collectionFk.toString()
+            PasillerosItemVO(title =R.string.preitempickertestMayus), entryPoint = collectionFk.toString()
         )
         // onBack = true
     }
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/qr/QrFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/qr/QrFragment.kt
index 4c950a99..4a77096d 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/qr/QrFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/qr/QrFragment.kt
@@ -1,14 +1,11 @@
 package es.verdnatura.presentation.view.feature.qr
 
-
 import android.view.inputmethod.EditorInfo
-import androidx.lifecycle.Observer
 import es.verdnatura.R
 import es.verdnatura.databinding.FragmentQrBinding
 import es.verdnatura.presentation.base.BaseFragment
 import es.verdnatura.presentation.view.component.CustomDialog
 
-
 @Suppress("UNUSED_ANONYMOUS_PARAMETER")
 class QrFragment(
     var entryPoint: String = ""
@@ -23,7 +20,6 @@ class QrFragment(
         fun newInstance(entryPoint: String) = QrFragment(entryPoint)
     }
 
-
     override fun init() {
 
         customDialog = CustomDialog(requireContext())
@@ -42,7 +38,6 @@ class QrFragment(
         super.onPause()
     }
 
-
     private fun setEvents() {
 
         binding.mainToolbar.backButton.setOnClickListener {
@@ -54,12 +49,11 @@ class QrFragment(
 
             if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
 
-
                 goBack = false
                 if (!binding.scanInput.text.isNullOrEmpty()) {
-                  /*  viewModel.qr_getCall(
-                        binding.scanInput.text.toString()
-                    )*/
+                    /*  viewModel.qr_getCall(
+                          binding.scanInput.text.toString()
+                      )*/
                     itemscaned = binding.scanInput.text.toString()
                 }
 
@@ -74,7 +68,7 @@ class QrFragment(
     override fun observeViewModel() {
 
         with(viewModel) {
-            qrresponse.observe(viewLifecycleOwner, Observer {
+            qrresponse.observe(viewLifecycleOwner) {
 
                 if (it.isError) {
 
@@ -95,11 +89,10 @@ class QrFragment(
 
                 }
 
-            })
+            }
         }
 
     }
 
-
 }
 
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/roadmap/fragment/StopMapListFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/roadmap/fragment/StopMapListFragment.kt
index 00d5f763..00c0f2ab 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/roadmap/fragment/StopMapListFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/roadmap/fragment/StopMapListFragment.kt
@@ -138,17 +138,17 @@ class StopMapListFragment(
         with(viewModel) {
             loadStopMapTruckList.observe(viewLifecycleOwner) { event ->
                 event.getContentIfNotHandled().notNull {
-                    for (item in it.list )
-                    {
+                    for (item in it.list) {
                         println("llista")
                         println("llista $item")
                         println("llista addressFk ${item.addressFk}")
                         println("llista id" + item.id)
-                        println("llista address" +item.address)
-                        println("llista client id" +item.address?.address?.client)
-                        println("llista mobile " +item.address?.address?.mobile)
+                        println("llista address" + item.address)
+                        println("llista client id" + item.address?.address?.client)
+                        println("llista mobile " + item.address?.address?.mobile)
                     }
-                        showRoadMapList(it) }
+                    showRoadMapList(it)
+                }
             }
 
         }
@@ -209,21 +209,26 @@ class StopMapListFragment(
                             popupMenu.setOnMenuItemClickListener { itemOption ->
                                 when (itemOption.itemId) {
                                     R.id.maps -> {
-                                        val uri:String
-                                        
+                                        val uri: String
+
                                         if (item.address?.address?.street != null) {
-                                               uri = "geo:0,0?q=" + item.address?.address?.nickname + " " + item.address?.address?.street + " " + item.address?.address?.city + " " + item.address?.address?.postalCode
+                                            uri =
+                                                "geo:0,0?q=" + item.address?.address?.nickname + " " + item.address?.address?.street + " " + item.address?.address?.city + " " + item.address?.address?.postalCode
                                             val locationIntent =
                                                 Intent(Intent.ACTION_VIEW, Uri.parse(uri))
                                             startActivity(locationIntent)
-                                        }else{
-                                            if (item.address?.address?.latitude == null || item.address?.address?.longitude == null){
-                                                getString(R.string.errorLocation).toast(requireContext())
-                                            }else{
-                                             uri = "geo:${item.address?.address?.latitude},${item.address?.address?.longitude}"
+                                        } else {
+                                            if (item.address?.address?.latitude == null || item.address?.address?.longitude == null) {
+                                                getString(R.string.errorLocation).toast(
+                                                    requireContext()
+                                                )
+                                            } else {
+                                                uri =
+                                                    "geo:${item.address?.address?.latitude},${item.address?.address?.longitude}"
                                                 val locationIntent =
                                                     Intent(Intent.ACTION_VIEW, Uri.parse(uri))
-                                                startActivity(locationIntent)}
+                                                startActivity(locationIntent)
+                                            }
                                         }
 
                                         true
@@ -245,7 +250,6 @@ class StopMapListFragment(
 
                 }
 
-
             })
         binding.stopmapTruckRecyclerview.adapter = adapter
         binding.stopmapTruckRecyclerview.layoutManager = lm
@@ -294,7 +298,7 @@ class StopMapListFragment(
         }.hideDialog().show()
 
         val listPhonesAdapter = GeneralAdapter(phones, object : OnGeneralItemRowClickListener {
-            override fun OnGeneralItemRowClickListener(item: GeneralItem) {
+            override fun onGeneralItemRowClickListener(item: GeneralItem) {
                 phones.forEach {
                     if (it.code == item.code) {
                         if (ContextCompat.checkSelfPermission(
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorViewModel.kt
index f1963659..4e809f79 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorViewModel.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorViewModel.kt
@@ -56,7 +56,6 @@ class SacadorViewModel(val context: Context) : BaseViewModel(context) {
 
     val loadPickingOrder: LiveData<Event<ResponseItemVO>> = _responsePickingOrder.map { Event(it) }
 
-
     fun sectorCollectionNew(
         sectorFk: Int
     ) {
@@ -99,7 +98,6 @@ class SacadorViewModel(val context: Context) : BaseViewModel(context) {
     }
 
     fun collection_assign() {
-        //Tarea 6276
         salix.collectionAssign()
             // silex.collection_assign()
             .enqueue(
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/showticket/ShowTicketFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/showticket/ShowTicketFragment.kt
index 86dd2c6a..b19d716e 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/showticket/ShowTicketFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/showticket/ShowTicketFragment.kt
@@ -32,6 +32,7 @@ class ShowTicketFragment() :
     constructor(menuOrigin: String) : this() {
         this.menuOrigin = menuOrigin
     }
+
     companion object {
         private const val ARG_MENU_ORIGIN = "menu_origin"
 
@@ -58,8 +59,8 @@ class ShowTicketFragment() :
         //Tarea 6531
         try {
             viewModel.myLastTickets(mobileApplication.userId!!)
-        }catch (ex:Exception){
-            e("Crashlytics",ex.message.toString())
+        } catch (ex: Exception) {
+            e("Crashlytics", ex.message.toString())
         }
 
         super.init()
@@ -98,11 +99,12 @@ class ShowTicketFragment() :
                 if (!binding.scanInput.text.isNullOrEmpty()) {
 
                     try {
-                        //Tarea 6276
 
                         viewModel.getSales(
                             collectionFk = itemScanValue(
-                                binding.scanInput.text.toString(), arrayOf("ticket","saleGroup"), "id"
+                                binding.scanInput.text.toString(),
+                                arrayOf("ticket", "saleGroup"),
+                                "id"
                             ).toString().toInt(),
                             print = false,
                             source = type
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/model/TicketItemVO.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/model/TicketItemVO.kt
index 14ad011d..2246aa91 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/model/TicketItemVO.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/model/TicketItemVO.kt
@@ -158,8 +158,8 @@ class SaleVO(
     var isParent: Boolean = false,
     var totalSales: Int = 0,
     var sonSales: MutableList<SaleVO> = mutableListOf(),
-    var code: String? = "", //6276 nulable
-    var hasMistake: Any? = false, //modificar a Int 6276
+    var code: String? = "",
+    var hasMistake: Any? = false,
     var sectorFk: Int? = null,
     var packingChecked: Int = 1
 
@@ -225,8 +225,8 @@ class SaleSalix(
     var isParent: Boolean = false,
     var totalSales: Int = 0,
     var sonSales: MutableList<SaleVO> = mutableListOf(),
-    var code: String? = "", //6276 nulable
-    var hasMistake: Any = false, //modificar a Int 6276
+    var code: String? = "",
+    var hasMistake: Any = false,
     var sectorFk: Int? = null,
     var packingChecked: Int = 1
 
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/UbicadorAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/UbicadorAdapter.kt
index b02756fd..d692d78f 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/UbicadorAdapter.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/UbicadorAdapter.kt
@@ -53,9 +53,8 @@ class UbicadorAdapter(
                 imgItem.setOnClickListener {
                     onPasillerosItemClickListener.onPasillerosItemClickListener(
                         PasillerosItemVO(
-                            title = res.getString(
+                            title =
                                 R.string.itemSearch
-                            )
                         ), item.item.toString()
                     )
                 }
@@ -87,7 +86,7 @@ class UbicadorAdapter(
                 namelayout.setOnClickListener {
                     onPasillerosItemClickListener.onPasillerosItemClickListener(
                         PasillerosItemVO(
-                            title = res.getString(R.string.itemSearch)
+                            title = R.string.itemSearch
                         ), item.item.toString()
                     )
                 }
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/UbicadorAdapterNew.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/UbicadorAdapterNew.kt
index 8f553622..6122f75f 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/UbicadorAdapterNew.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/UbicadorAdapterNew.kt
@@ -47,9 +47,9 @@ class UbicadorAdapterNew(
                 imgItem.setOnClickListener {
                     onPasillerosItemClickListener.onPasillerosItemClickListener(
                         PasillerosItemVO(
-                            title = res.getString(
+                            title =
                                 R.string.itemSearch
-                            )
+
                         ), item.item.toString()
                     )
                 }
@@ -81,7 +81,7 @@ class UbicadorAdapterNew(
                 namelayout.setOnClickListener {
                     onPasillerosItemClickListener.onPasillerosItemClickListener(
                         PasillerosItemVO(
-                            title = res.getString(R.string.itemSearch)
+                            title = R.string.itemSearch
                         ), item.item.toString()
                     )
                 }
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemFragment.kt
index ec60809f..c1f2cb1a 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemFragment.kt
@@ -2,7 +2,6 @@ package es.verdnatura.presentation.view.feature.ubicador.fragment
 
 import android.view.View
 import android.view.inputmethod.EditorInfo
-import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.LinearLayoutManager
 import es.verdnatura.R
 import es.verdnatura.databinding.FragmentAutomaticAddItemBinding
@@ -46,7 +45,8 @@ class AutomaticAddItemFragment(
     }
 
     private fun setSubtitle() {
-        binding.mainToolbar.toolbarSubtitle.text = getString(R.string.labels) + contador
+        binding.mainToolbar.toolbarSubtitle.text =
+            getString(R.string.doubleText, getString(R.string.labels), contador.toString())
     }
 
     private fun setViews() {
@@ -56,9 +56,9 @@ class AutomaticAddItemFragment(
                 setSubtitle()
                 if (listItems.size > position) {
                     listItems.removeAt(position)
+                    adapter!!.notifyDataSetChanged()
                 }
 
-                adapter!!.notifyDataSetChanged()
             }
         })
         binding.itemsRecyclerview.adapter = adapter
@@ -71,7 +71,7 @@ class AutomaticAddItemFragment(
         binding.editMatricula.setOnEditorActionListener { v, actionId, event ->
 
             if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) {
-                if (!binding.editMatricula.text.toString().isNullOrEmpty()) {
+                if (binding.editMatricula.text.toString().isNotEmpty()) {
                     contador += 1
                     setSubtitle()
                     try {
@@ -87,14 +87,18 @@ class AutomaticAddItemFragment(
                         adapter!!.notifyItemInserted(0)
                         binding.itemsRecyclerview.scrollToPosition(0)
                     } catch (ex: Exception) {
-                        ma.messageWithSound(ex.message.toString(), true, true)
+                        ma.messageWithSound(ex.message.toString(), isError = true, isPlayed = true)
                     }
                 }
                 binding.editMatricula.setText("")
                 ma.hideKeyboard(binding.editMatricula)
                 return@setOnEditorActionListener true
             } else {
-                ma.messageWithSound("ACTION ID DIFERENTE", true, true)
+                ma.messageWithSound(
+                    getString(R.string.diferentAction),
+                    isError = true,
+                    isPlayed = true
+                )
 
             }
 
@@ -134,9 +138,9 @@ class AutomaticAddItemFragment(
 
     override fun observeViewModel() {
         with(viewModel) {
-            response.observe(viewLifecycleOwner, Observer {
+            response.observe(viewLifecycleOwner) {
                 ma.onMyBackPressed()
-            })
+            }
         }
     }
 
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemViewModel.kt
index bae0f7e3..7b93f37f 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemViewModel.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemViewModel.kt
@@ -6,39 +6,26 @@ import androidx.lifecycle.MutableLiveData
 import es.verdnatura.domain.SalixCallback
 import es.verdnatura.domain.formatWithQuotes
 import es.verdnatura.presentation.base.BaseViewModel
-import es.verdnatura.presentation.base.getMessageFromAllResponse
-import es.verdnatura.presentation.base.nameofFunction
-import es.verdnatura.presentation.common.ResponseItemVO
 import es.verdnatura.presentation.view.feature.workermistake.model.MakeMultiSalix
 import retrofit2.Response
 
 class AutomaticAddItemViewModel(val context: Context) : BaseViewModel(context) {
 
-    private val _response by lazy { MutableLiveData<ResponseItemVO>() }
-    val response: LiveData<ResponseItemVO>
-        get() = _response
+    private val _response by lazy { MutableLiveData<Boolean>() }
+    val response: LiveData<Boolean> = _response
 
     fun itemShelvingMakeMulti(
-        shelvingFk: String,
-        items: List<Long>,
-        warehouseFk: Int
+        shelvingFk: String, items: List<Long>, warehouseFk: Int
     ) {
 
         salix.upsertItem(MakeMultiSalix(shelvingFk, items, warehouseFk))
-            .enqueue(object :
-                SalixCallback<Any>(context) {
+            .enqueue(object : SalixCallback<Any>(context) {
                 override fun onError(t: Throwable) {
-                    _response.value = ResponseItemVO(
-                        isError = true, errorMessage = getMessageFromAllResponse(
-                            nameofFunction(this), t.message!!
-                        )
-                    )
+                    _response.value = false
                 }
 
                 override fun onSuccess(response: Response<Any>) {
-
-                    _response.value =
-                        ResponseItemVO(isError = false, response = response.message()!!)
+                    _response.value = true
 
                 }
             })
@@ -46,27 +33,17 @@ class AutomaticAddItemViewModel(val context: Context) : BaseViewModel(context) {
     }
 
     fun itemShelvingAddList(
-        shelving: String,
-        items: Any,
-        isChecking: Boolean,
-        warehouse: Int
+        shelving: String, items: Any, isChecking: Boolean, warehouse: Int
     ) {
         salix.itemShelvingAddList(
             arrayListOf(shelving, items, isChecking, warehouse).formatWithQuotes()
-        ).enqueue(object :
-            SalixCallback<Any>(context) {
+        ).enqueue(object : SalixCallback<Any>(context) {
             override fun onSuccess(response: Response<Any>) {
-                _response.value =
-                    ResponseItemVO(isError = false, response = response.message()!!)
-
+                _response.value = true
             }
 
             override fun onError(t: Throwable) {
-                _response.value = ResponseItemVO(
-                    isError = true, errorMessage = getMessageFromAllResponse(
-                        nameofFunction(this), t.message!!
-                    )
-                )
+                _response.value = false
             }
 
         })
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragmentNew.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragmentNew.kt
index a860c09d..f4a6c1a8 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragmentNew.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragmentNew.kt
@@ -329,7 +329,7 @@ class UbicadorFragmentNew : BaseFragment<FragmentUbicadorBinding, UbicadorViewMo
 
         binding.automaticImg.setOnClickListener {
             if (shelvingFk.isNotBlank()) ma.onPasillerosItemClickListener(
-                PasillerosItemVO(title = getString(R.string.titleAuto)), entryPoint = shelvingFk
+                PasillerosItemVO(title = R.string.titleAuto), entryPoint = shelvingFk
             )
             else getString(R.string.scanShelving).toast(
                 requireActivity(), Toast.LENGTH_SHORT
@@ -544,13 +544,23 @@ class UbicadorFragmentNew : BaseFragment<FragmentUbicadorBinding, UbicadorViewMo
                     viewModel.itemShelvingListNew(shelvingFk)
                 }
             }
-            response.observe(viewLifecycleOwner) {
+
+            /*response.observe(viewLifecycleOwner) {
                 viewModel.itemShelvingListNew(shelvingFk)
+            }*/
+            //parking, isChecked, responseOlder, responseMake Add
+            responseUbicator.observe(viewLifecycleOwner) {
+
+                if (shelvingFk.isNotEmpty()) {
+                    binding.mainToolbar.toolbarTitle.text = shelvingFk
+                    viewModel.itemShelvingListNew(
+                        shelvingFk
+                    )
+
+                }
             }
             responseLogAdd.observe(viewLifecycleOwner) {
-
                 isShelvinLogfromMainScreen = false
-
             }
             loadResponseCode.observe(viewLifecycleOwner) { event ->
                 event.getContentIfNotHandled().notNull {
@@ -558,7 +568,7 @@ class UbicadorFragmentNew : BaseFragment<FragmentUbicadorBinding, UbicadorViewMo
                 }
             }
 
-            responseMake.observe(viewLifecycleOwner) {
+            loadAddList.observe(viewLifecycleOwner) {
 
                 if (shelvingFk.isNotEmpty()) {
                     binding.mainToolbar.toolbarTitle.text = shelvingFk
@@ -581,21 +591,21 @@ class UbicadorFragmentNew : BaseFragment<FragmentUbicadorBinding, UbicadorViewMo
                         val resultString = formattedList.joinToString(separator = "\n")
                         val finalOutput = "\n$resultString"
                         customDialogOlder.setTitle(getString(R.string.info)).setDescription(
-                                getString(
-                                    R.string.itemOlderInfo, Action.PARKINEAR
-                                ) + getString(R.string.listItems) + finalOutput
-                            ).setOkButton(
-                                getString(R.string.ok)
-                            ) {
-                                viewModel.setParking(
-                                    it.originalShelvingFk, it.originalParking
-                                )
+                            getString(
+                                R.string.itemOlderInfo, Action.PARKINEAR
+                            ) + getString(R.string.listItems) + finalOutput
+                        ).setOkButton(
+                            getString(R.string.ok)
+                        ) {
+                            viewModel.setParking(
+                                it.originalShelvingFk, it.originalParking
+                            )
 
-                                customDialogOlder.dismiss()
+                            customDialogOlder.dismiss()
 
-                            }.setKoButton(getString(R.string.cancel)) {
-                                customDialogOlder.dismiss()
-                            }.show()
+                        }.setKoButton(getString(R.string.cancel)) {
+                            customDialogOlder.dismiss()
+                        }.show()
 
                     }
                 }
@@ -605,27 +615,27 @@ class UbicadorFragmentNew : BaseFragment<FragmentUbicadorBinding, UbicadorViewMo
                 event.getContentIfNotHandled().notNull {
 
                     customDialogOlder.setTitle(getString(R.string.info)).setDescription(
-                            getString(
-                                R.string.itemOlderInfo, responseHasOlder.value!!.action
+                        getString(
+                            R.string.itemOlderInfo, responseHasOlder.value!!.action
+                        )
+                    ).setOkButton(
+                        getString(R.string.ok)
+                    ) {
+                        when (responseHasOlder.value!!.action) {
+                            Action.PARKINEAR -> viewModel.setParking(
+                                responseHasOlder.value!!.shelvingFkIn, parking
                             )
-                        ).setOkButton(
-                            getString(R.string.ok)
-                        ) {
-                            when (responseHasOlder.value!!.action) {
-                                Action.PARKINEAR -> viewModel.setParking(
-                                    responseHasOlder.value!!.shelvingFkIn, parking
-                                )
 
-                                Action.TRANSFERIR -> viewModel.itemShelvingTransfer(
-                                    responseHasOlder.value!!.itemFk!!,
-                                    responseHasOlder.value!!.shelvingFkOut!!
-                                )
-                            }
-                            customDialogOlder.dismiss()
+                            Action.TRANSFERIR -> viewModel.itemShelvingTransfer(
+                                responseHasOlder.value!!.itemFk!!,
+                                responseHasOlder.value!!.shelvingFkOut!!
+                            )
+                        }
+                        customDialogOlder.dismiss()
 
-                        }.setKoButton(getString(R.string.cancel)) {
-                            customDialogOlder.dismiss()
-                        }.show()
+                    }.setKoButton(getString(R.string.cancel)) {
+                        customDialogOlder.dismiss()
+                    }.show()
                 }
             }
 
@@ -759,31 +769,31 @@ class UbicadorFragmentNew : BaseFragment<FragmentUbicadorBinding, UbicadorViewMo
         }
 
         customDialogUbicador.getEditItem().setOnEditorActionListener { v, actionId, event ->
-                if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
+            if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
 
-                    if (customDialogUbicador.getItemValue().isNotEmpty()) {
-                        try {
+                if (customDialogUbicador.getItemValue().isNotEmpty()) {
+                    try {
 
-                            customDialogUbicador.setItemValue(
-                                itemScanValue(
-                                    customDialogUbicador.getItemValue(), arrayOf("buy"), "more"
-                                ).toString()
-                            )
+                        customDialogUbicador.setItemValue(
+                            itemScanValue(
+                                customDialogUbicador.getItemValue(), arrayOf("buy"), "more"
+                            ).toString()
+                        )
 
-                        } catch (ex: Exception) {
-                            ma.messageWithSound(
-                                ex.message.toString(), isError = true, isPlayed = true
-                            )
-                            customDialogUbicador.setItemValue("")
-                        }
+                    } catch (ex: Exception) {
+                        ma.messageWithSound(
+                            ex.message.toString(), isError = true, isPlayed = true
+                        )
+                        customDialogUbicador.setItemValue("")
                     }
-
-                    return@setOnEditorActionListener true
                 }
 
-                customDialogUbicador.getPackingItem().requestFocus()
+                return@setOnEditorActionListener true
             }
 
+            customDialogUbicador.getPackingItem().requestFocus()
+        }
+
 
 
         setWatcher()
@@ -1093,7 +1103,9 @@ class UbicadorFragmentNew : BaseFragment<FragmentUbicadorBinding, UbicadorViewMo
     }
 
     private fun customDialogTransferAction(item: ItemUbicador) {
-        if (customDialogInput.getValue().isNotEmpty()) {/*tearea 6964*//*viewModel.hasItemOlder(
+        if (customDialogInput.getValue().isNotEmpty()) {
+            /*tearea 6964*//*
+            viewModel.hasItemOlder(
                 shelvingFkIn = shelvingFk,
                 shelvingFkOut = customDialogInput.getValue(),
                 itemFk = item.id,
diff --git 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
index 4094906e..7d90a3bf 100644
--- 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
@@ -37,27 +37,22 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) {
     val response: LiveData<ResponseItemVO>
         get() = _response
 
+    private val _responseUbicator by lazy { MutableLiveData<Boolean>() }
+    val responseUbicator: LiveData<Boolean>
+        get() = _responseUbicator
+
     private val _responseHasOlder by lazy { MutableLiveData<ResponseHasOlder>() }
     val responseHasOlder: LiveData<ResponseHasOlder>
         get() = _responseHasOlder
     val loadResponseHasOlder: LiveData<Event<ResponseHasOlder>> =
         _responseHasOlder.map { Event(it) }
 
-    private val _responsepriority by lazy { MutableLiveData<ResponseItemVO>() }
-    val responsepriority: LiveData<ResponseItemVO>
-        get() = _responsepriority
-
-    private val _responseMake by lazy { MutableLiveData<ResponseItemVO>() }
-    val responseMake: LiveData<ResponseItemVO>
-        get() = _responseMake
-
     val loadShelvingList: LiveData<Event<ItemUbicadorListVO>> = _shelvingList.map { Event(it) }
 
     private val _shelvingListNew by lazy { MutableLiveData<ItemUbicadorListNew>() }
     val loadShelvingListNew: LiveData<Event<ItemUbicadorListNew>> =
         _shelvingListNew.map { Event(it) }
 
-
     private val _shelvingListItemNewer by lazy { MutableLiveData<ItemShelvingNewerList>() }
     val loadShelvingListItemNewer: LiveData<Event<ItemShelvingNewerList>> =
         _shelvingListItemNewer.map { Event(it) }
@@ -72,10 +67,10 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) {
 
     val loadResponseCode: LiveData<Event<Int?>> = _responseCode.map { Event(it) }
 
-    private val _responseAddList by lazy { MutableLiveData<ResponseItemVO>() }
-    val responseAddList: LiveData<ResponseItemVO> = _responseAddList
+    private val _responseAddList by lazy { MutableLiveData<Boolean>() }
+    val responseAddList: LiveData<Boolean> = _responseAddList
 
-    val loadAddList: LiveData<Event<ResponseItemVO>> = _responseAddList.map { Event(it) }
+    val loadAddList: LiveData<Event<Boolean>> = _responseAddList.map { Event(it) }
 
     private val _responseLogAdd by lazy { MutableLiveData<Any>() }
     val responseLogAdd: LiveData<Any>
@@ -116,25 +111,9 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) {
             .enqueue(
                 object : SalixCallback<List<ItemUbicador>>(context) {
                     override fun onSuccess(response: Response<List<ItemUbicador>>) {
-
                         _shelvingListNew.value = response.body()?.let { ItemUbicadorListNew(it) }
                     }
 
-                    override fun onError(t: Throwable) {
-                        val listError: ArrayList<ItemUbicador> = ArrayList()
-                        listError.add(
-                            ItemUbicador(
-                                0,
-                                isError = true,
-                                errorMessage = getMessageFromAllResponse(
-                                    nameofFunction(this),
-                                    t.message!!,
-                                ),
-                            ),
-                        )
-                        _shelvingListNew.value = ItemUbicadorListNew(listError)
-                    }
-
                 },
             )
     }
@@ -156,8 +135,8 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) {
             arrayListOf(shelving, items, isChecking, warehouse).formatWithQuotes()
         ).enqueue(object : SalixCallback<Any>(context) {
             override fun onSuccess(response: Response<Any>) {
-                _responseAddList.value =
-                    ResponseItemVO(isError = false, response = response.message()!!)
+                _responseUbicator.value =
+                    true
 
             }
 
@@ -186,18 +165,20 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) {
         ).enqueue(object : SalixCallback<Any>(context) {
             override fun onResponse(call: Call<Any>, response: Response<Any>) {
 
-
-                if (!createdRename.isNullOrBlank() && response.body()!=null) {
+                if (!createdRename.isNullOrBlank() && response.body() != null) {
 
                     val jsonArray = JsonParser().parse(response.body().toString()).asJsonArray
                     val jsonObject = jsonArray.get(0).asJsonObject
-                    itemShelvingUpdateCreated(itemShelvingFk = (jsonObject.get("LAST_INSERT_ID()") as JsonPrimitive).asInt, created = createdRename)
+                    itemShelvingUpdateCreated(
+                        itemShelvingFk = (jsonObject.get("LAST_INSERT_ID()") as JsonPrimitive).asInt,
+                        created = createdRename
+                    )
                 } else {
-                    _responseMake.value =
-                        ResponseItemVO(isError = false, response = response.message()!!)
+                    _responseUbicator.value =
+                        true
                 }
-                _responseMake.value =
-                    ResponseItemVO(isError = false, response = response.message()!!)
+                _responseUbicator.value =
+                    true
                 super.onResponse(call, response)
             }
 
@@ -205,16 +186,21 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) {
     }
 
     fun itemShelvingMakeEdit(
-        quantity: Int, packing: Int?, itemShelvingFk: Int, grouping: Int?, available : Int?
+        quantity: Int, packing: Int?, itemShelvingFk: Int, grouping: Int?, available: Int?
 
     ) {
         salix.itemShelvingUpdate(
-            params = ItemShelvingSalix(visible = quantity, packing = packing, grouping = grouping, available = available),
+            params = ItemShelvingSalix(
+                visible = quantity,
+                packing = packing,
+                grouping = grouping,
+                available = available
+            ),
             id = itemShelvingFk,
         ).enqueue(object : SalixCallback<ItemUbicador?>(context) {
             override fun onSuccess(response: Response<ItemUbicador?>) {
-                _responseMake.value =
-                    ResponseItemVO(isError = false, response = response.message()!!)
+                _responseUbicator.value = true
+
             }
 
         })
@@ -255,7 +241,7 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) {
         salix.setParking(arrayListOf(shelving, parking).formatWithQuotes())
             .enqueue(object : SalixCallback<Any>(context) {
                 override fun onResponse(call: Call<Any>, response: Response<Any>) {
-                    _response.value = ResponseItemVO(isError = false, response = response.message())
+                    _responseUbicator.value = true
                     super.onResponse(call, response)
 
                 }
@@ -320,8 +306,9 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) {
             }
         })
     }
+
     fun itemShelvingUpdateCreated(
-       itemShelvingFk: Int, created:String
+        itemShelvingFk: Int, created: String
 
     ) {
         salix.itemShelvingsUpdate(
@@ -339,7 +326,6 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) {
     fun shelvingLogAdd(
         code: String
     ) {
-        //Tarea 6276 OK
         salix.shelvingLogAdd(hashMapOf("code" to code))
             .enqueue(object : SalixCallback<Any>(context) {
 
@@ -354,7 +340,6 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) {
         shelvingFk: String,
 
         ) {
-        //Tarea 6276
         salix.itemShelvingAlternative(shelvingFk)
             .enqueue(object : SalixCallback<ArrayList<Reubication>>(context) {
 
@@ -367,7 +352,7 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) {
     fun clearShelvingList(
         shelvingFk: String,
 
-    ) {
+        ) {
 
         salix.itemShelvingsUpdate(
             where = JsonObject().apply { addProperty("shelvingFk", shelvingFk) },
@@ -384,8 +369,6 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) {
         })
     }
 
-
-
     fun updateIsChecked(
         itemShelvingFk: Int
 
@@ -397,7 +380,7 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) {
         ).enqueue(object : SalixCallback<ItemUbicador?>(context) {
 
             override fun onSuccess(response: Response<ItemUbicador?>) {
-                _response.value = ResponseItemVO(isError = false, response = response.message())
+                _responseUbicator.value = true
             }
         })
     }
@@ -426,34 +409,18 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) {
         salix.itemShelvingTransfer(arrayListOf(itemFk, shelvingFk).formatWithQuotes())
             .enqueue(object : SalixCallback<Any>(context) {
                 override fun onSuccess(response: Response<Any>) {
-
-                    _response.value =
-                        ResponseItemVO(isError = false, response = response.message()!!)
+                    _responseUbicator.value = true
                     super.onSuccess(response)
-
                 }
 
-                override fun onError(t: Throwable) {
-                    _response.value = ResponseItemVO(
-                        isError = true,
-                        errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!)
-                    )
-                }
             })
     }
 
     fun itemShelvingDelete(itemShelvingFk: Int) {
         salix.itemShelvingsDelete(itemShelvingFk).enqueue(object : SalixCallback<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())
+                _responseUbicator.value = true
 
             }
         })
@@ -466,7 +433,7 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) {
             ).formatWithQuotes()
         ).enqueue(object : SalixCallback<Any>(context) {
             override fun onSuccess(response: Response<Any>) {
-                _response.value = ResponseItemVO(isError = false, response = response.message())
+                _responseUbicator.value = true
             }
         })
     }
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/PackingMistakeFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/PackingMistakeFragment.kt
index 61fc8c82..ebced247 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/PackingMistakeFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/PackingMistakeFragment.kt
@@ -119,7 +119,7 @@ class PackingMistakeFragment(var menuOrigin: String) :
 
         listMistakesAdapter =
             GeneralAdapter(listMistakes, object : OnGeneralItemRowClickListener {
-                override fun OnGeneralItemRowClickListener(item: GeneralItem) {
+                override fun onGeneralItemRowClickListener(item: GeneralItem) {
                     list.forEach {
                         if (it.description == item.text) {
 
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/WorkermistakeFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/WorkermistakeFragment.kt
index dae66fd5..9e6a46c7 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/WorkermistakeFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/WorkermistakeFragment.kt
@@ -161,7 +161,7 @@ class WorkermistakeFragment(
                             viewModel.workerMistakeTypeGet(
                             )
                             workerMistakeName =
-                                WorkerFromMistake(item.id, item.firstName, item.lastName, true, "")
+                                WorkerFromMistake(item.id, item.firstName, item.lastName)
                         }
                     })
                 binding.workermistakeRecyclerview.adapter = adapterworker
@@ -217,12 +217,11 @@ class WorkermistakeFragment(
     private fun createDepartmentList(list: List<DepartmentMistake>) {
         departments.clear()
         list.forEach { department ->
-            if (!department.isError) {
-                try {
-                    departments.add(SearchDepartmentModel(department.name, department.id))
-                } catch (e: Exception) {
-                    e.message!!.toast(requireContext())
-                }
+            try {
+                departments.add(SearchDepartmentModel(department.name, department.id))
+            } catch (e: Exception) {
+                e.message!!.toast(requireContext())
+
             }
         }
     }
@@ -231,12 +230,10 @@ class WorkermistakeFragment(
         listWorker.clear()
 
         list.forEach { worker ->
-            if (!worker.isError) {
-                try {
-                    listWorker.add(worker)
-                } catch (e: Exception) {
-                    e.message!!.toast(requireContext())
-                }
+            try {
+                listWorker.add(worker)
+            } catch (e: Exception) {
+                e.message!!.toast(requireContext())
             }
 
         }
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/model/mistakeWorkerType.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/model/mistakeWorkerType.kt
index 481bde0a..6d63f020 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/model/mistakeWorkerType.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/model/mistakeWorkerType.kt
@@ -1,6 +1,5 @@
 package es.verdnatura.presentation.view.feature.workermistake.model
 
-
 data class MistakeType(
     var code: String = "",
     var description: String = ""
@@ -14,20 +13,14 @@ data class ExpeditionMistakeSalix(
 )
 
 data class DepartmentMistake(
-
     var id: Int? = null,
-    var name: String = "",
-    var isError: Boolean = false,
-    var errorMessage: String = ""
+    var name: String = ""
 )
 
 data class WorkerFromMistake(
-
     var id: Int? = null,
     var firstName: String = "",
-    var lastName: String = "",
-    var isError: Boolean = false,
-    var errorMessage: String = ""
+    var lastName: String = ""
 )
 
 data class WorkerMistakeSalix(
@@ -38,8 +31,9 @@ data class WorkerMistakeSalix(
 data class SaleMistakeSalix(
     var userFk: Number,
     var typeFk: Number,
-    var saleFk :Number
+    var saleFk: Number
 )
+
 data class WorkerMistakeTypeList(
     var list: List<MistakeType> = listOf()
 )
@@ -51,6 +45,7 @@ data class DepartmentMistakeList(
 data class WorkerFromMistakeList(
     var list: List<WorkerFromMistake> = listOf()
 )
+
 data class MakeMultiSalix(
     var shelvingFk: String,
     var items: List<Long>,
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 1711868a..e8890b9d 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -182,7 +182,7 @@
     <string name="deletedLabel">Carro/etiqueta borrada</string>
     <string name="end">Finalizar</string>
     <string name="undone">Deshacer</string>
-    <string name="labels">Etiquetas: </string>
+    <string name="labels">Etiquetas</string>
     <string name="nameApp">warehouse</string>
     <string name="scanSmarttagOrShelving">Escanea matrícula del carro/s</string>
     <string name="scanHighLabel">Escanea etiqueta superior</string>
@@ -860,6 +860,8 @@
     <string name="countNumber">%1$s%2$d</string>
     <string name="diferentAction">ACTION ID DIFERENTE</string>
     <string name="scanExpeditions">Escanear cajas</string>
+    <string name="titleprepickertest">titlePrePickerTest</string>
+    <string name="preitempickertestMayus">PREITEMPICKERTEST</string>
 
 
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index dd72741e..5e23ad68 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -182,7 +182,7 @@
     <string name="deletedLabel">Carro/etiqueta borrada</string>
     <string name="end">Finalizar</string>
     <string name="undone">Deshacer</string>
-    <string name="labels">Etiquetas: </string>
+    <string name="labels">Etiquetas</string>
     <string name="nameApp">warehouse</string>
     <string name="scanSmarttagOrShelving">Escanea matrícula del carro/s</string>
     <string name="scanHighLabel">Escanea etiqueta superior</string>
@@ -860,5 +860,7 @@
     <string name="countNumber">%1$s%2$d</string>
     <string name="diferentAction">ACTION ID DIFERENTE</string>
     <string name="scanExpeditions">Escanear cajas</string>
+    <string name="titleprepickertest">titlePrePickerTest</string>
+    <string name="preitempickertestMayus">PREITEMPICKERTEST</string>
 
 </resources>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 8d606b86..61043423 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -182,7 +182,7 @@
     <string name="deletedLabel">Carro/etiqueta borrada</string>
     <string name="end">Finalizar</string>
     <string name="undone">Deshacer</string>
-    <string name="labels">Etiquetas: </string>
+    <string name="labels">Etiquetas</string>
     <string name="nameApp">warehouse</string>
     <string name="scanSmarttagOrShelving">Escanea matrícula del carro/s</string>
     <string name="scanHighLabel">Escanea etiqueta superior</string>
@@ -860,6 +860,8 @@
     <string name="countNumber">%1$s%2$d</string>
     <string name="diferentAction">ACTION ID DIFERENTE</string>
     <string name="scanExpeditions">Escanear cajas</string>
+    <string name="titleprepickertest">titlePrePickerTest</string>
+    <string name="preitempickertestMayus">PREITEMPICKERTEST</string>
 
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d9584a00..0d72edf5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -215,7 +215,7 @@
     <string name="deletedLabel">Wagon/label deleted</string>
     <string name="end">Finish</string>
     <string name="undone">Undo</string>
-    <string name="labels">Labels:</string>
+    <string name="labels">Labels</string>
     <string name="nameApp">warehouse</string>
     <string name="scanSmarttagOrShelving">Scan wagoon plate</string>
     <string name="scanHighLabel">Scan high label</string>
@@ -862,5 +862,8 @@
     <string name="diferentAction">ACTION ID DIFERENTE</string>
     <string name="scanPreparedExpedition">Escanear cajas preparadas</string>
     <string name="scanExpeditions">Escanear cajas</string>
+    <string name="titleprepickertest">titlePrePickerTest</string>
+    <string name="preitempickertestMayus">PREITEMPICKERTEST</string>
+    <string name="expeditionInfo" translatable="false">%1$s %2$s</string>
 
 </resources>