From e0ffa0f0ec79a61f187c650e6982bbadf59802db Mon Sep 17 00:00:00 2001
From: Sergio De la torre <sergiodt@verdnatura.es>
Date: Mon, 7 Nov 2022 12:10:04 +0100
Subject: [PATCH] =?UTF-8?q?Version=209.3=20Modificadas=20llamas=20#4696.?=
 =?UTF-8?q?=20A=C3=B1adido=20posibilidad=20de=20revisar=20items.=20A=C3=B1?=
 =?UTF-8?q?adido=20color=20rojo=20Salix.=20Borrados=20comentarios?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  55 ++++---
 app/build.gradle                              |   3 +-
 .../verdnatura/domain/GetItemCardUserCase.kt  | 104 +++++++-------
 .../domain/GetPaletizadoresUserCase.kt        |  10 +-
 .../domain/GetSacadorControladorUserCase.kt   |  32 -----
 .../es/verdnatura/domain/VerdnaturaService.kt |  16 +--
 .../presentation/common/itemScanned.kt        |   4 +-
 .../articulo/fragment/ItemCardFragment.kt     | 134 ++++++------------
 .../articulo/fragment/ItemCardViewModel.kt    |  32 ++---
 .../feature/buffer/fragment/BufferFragment.kt |  58 ++++----
 .../fragment/BufferFragmentViewModel.kt       |   2 +-
 .../inventario/fragment/InventaryFragment.kt  |   8 +-
 .../inventario/fragment/InventaryViewModel.kt |   8 +-
 .../inventario/model/ItemInventaryVO.kt       |   2 +-
 .../feature/main/activity/MainActivity.kt     |   9 +-
 .../fragment/PackagingSummaryFragment.kt      |   3 +-
 .../fragment/CmrExpeditionPalletFragment.kt   |  24 ++--
 .../fragment/CmrExpeditionPalletViewModel.kt  |   2 +-
 .../pasillero/fragment/PasilleroViewModel.kt  |   2 +-
 .../presacador/fragment/EndSacadorFragment.kt |   1 -
 .../presacador/fragment/PreSacadorFragment.kt |   1 -
 .../reposicion/fragment/ReposicionFragment.kt |   1 -
 .../ubicador/adapter/UbicadorAdapter.kt       |   6 +-
 .../fragment/AutomaticAddItemFragment.kt      |  68 +++++----
 .../ubicador/fragment/UbicadorFragment.kt     |   2 +
 .../main/res/layout/item_inventary_row.xml    |   3 +-
 app/src/main/res/values-es/strings.xml        |   6 +-
 app/src/main/res/values/colors.xml            |   1 +
 app/src/main/res/values/strings.xml           |   6 +-
 29 files changed, 278 insertions(+), 325 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 35cfe790..8d12d72e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -82,14 +82,37 @@
     </select>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="Ticket_closure">
-      <change afterPath="$PROJECT_DIR$/app/release/vn-pickingBeta.apk" afterDir="false" />
+    <list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="Modificado control ubicación">
       <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/release/output-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/release/output-metadata.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/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/domain/GetItemCardUserCase.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetItemCardUserCase.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetPaletizadoresUserCase.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetPaletizadoresUserCase.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetSacadorControladorUserCase.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetSacadorControladorUserCase.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/common/itemScanned.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/common/itemScanned.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/BufferFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/BufferFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/BufferFragmentViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/BufferFragmentViewModel.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/inventario/model/ItemInventaryVO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/model/ItemInventaryVO.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/fragment/PackagingSummaryFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingSummaryFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/CmrExpeditionPalletFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/CmrExpeditionPalletFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/CmrExpeditionPalletViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/CmrExpeditionPalletViewModel.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/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/PreSacadorFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/fragment/ReposicionFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/fragment/ReposicionFragment.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/fragment/AutomaticAddItemFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemFragment.kt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_inventary_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_inventary_row.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/res/values-es/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-es/strings.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/res/values/colors.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/colors.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -100,7 +123,7 @@
   <component name="CodeInsightWorkspaceSettings">
     <option name="optimizeImportsOnTheFly" value="true" />
   </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[C:\Users\sergiodt\.android\avd\Pixel_3a_API_30_x86.avd]" />
+  <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[21114523025303]" />
   <component name="ExportToHTMLSettings">
     <option name="OPEN_IN_BROWSER" value="true" />
     <option name="OUTPUT_DIRECTORY" value="C:\Program Files\Android\Android Studio\inspections" />
@@ -407,13 +430,6 @@
       <option name="presentableId" value="Default" />
       <updated>1618825571576</updated>
     </task>
-    <task id="LOCAL-00044" summary="Añadida funcionalidad de recuperar/guardar sector. Refactor Login. Cambiado icono que cerraba app en móviles viejos. Se añade campo prioridad. Pantalla de allo trabajador.">
-      <created>1644911413401</created>
-      <option name="number" value="00044" />
-      <option name="presentableId" value="LOCAL-00044" />
-      <option name="project" value="LOCAL" />
-      <updated>1644911413401</updated>
-    </task>
     <task id="LOCAL-00045" summary="Añadido funcionalidad nueva de PreSacador y solucionado tema de la referencia en ItemCard. Cambiado forma de coger vehículo y arreglado volver atrás en controaldor">
       <created>1646409278855</created>
       <option name="number" value="00045" />
@@ -750,7 +766,14 @@
       <option name="project" value="LOCAL" />
       <updated>1667385476141</updated>
     </task>
-    <option name="localTasksCounter" value="93" />
+    <task id="LOCAL-00093" summary="Modificado control ubicación">
+      <created>1667541612505</created>
+      <option name="number" value="00093" />
+      <option name="presentableId" value="LOCAL-00093" />
+      <option name="project" value="LOCAL" />
+      <updated>1667541612505</updated>
+    </task>
+    <option name="localTasksCounter" value="94" />
     <servers />
   </component>
   <component name="Vcs.Log.History.Properties">
@@ -792,7 +815,7 @@
                   <entry key="branch">
                     <value>
                       <list>
-                        <option value="test" />
+                        <option value="master" />
                       </list>
                     </value>
                   </entry>
@@ -852,7 +875,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
-    <MESSAGE value="Version 8.6.1Beta, añadido ticketColor más grande, quitados colores items y permutado quantity por cel2. Quitados warnings" />
     <MESSAGE value="Version 8.6.1Beta tareas #3601 refactor ivnentario.Tarea #3959(warnings deprecated,typedate,neverused)" />
     <MESSAGE value="Version 8.7 Reubicación, sector = SACADOR V, controlador no puede hacer parking si no están revisados todos los tickets," />
     <MESSAGE value="Version 8.8Beta precio coste artículo, modificar tallos, mensajes error para items sin buyFk y ticket eliminado o viejo" />
@@ -877,7 +899,8 @@
     <MESSAGE value="Version 9.2.1 en producción. Borrada Voz y Ajustes impresora" />
     <MESSAGE value="Version 9.2 Error encajado y en ver Ticket aparece ver la colección" />
     <MESSAGE value="Version 9.4Beta Cmr, Control ubicación, volver atrás de Controlador, botón llamadas, volver pantalla anterior parking," />
-    <option name="LAST_COMMIT_MESSAGE" value="Version 9.4Beta Cmr, Control ubicación, volver atrás de Controlador, botón llamadas, volver pantalla anterior parking," />
+    <MESSAGE value="Modificado control ubicación" />
+    <option name="LAST_COMMIT_MESSAGE" value="Modificado control ubicación" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
diff --git a/app/build.gradle b/app/build.gradle
index a3316eb9..1563deeb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,7 +14,8 @@ android {
         minSdkVersion 21 //21
         targetSdkVersion 30
         versionCode 141
-        versionName = "9.4.1Beta"
+        versionName = "9.3"
+        //versionName = "9.4.1Beta" 141
         //versionName = "9.4Beta" versionCode 140
         //versionName = 9.2
         //versionName = "9.3.2Beta" versionCode 139
diff --git a/app/src/main/java/es/verdnatura/domain/GetItemCardUserCase.kt b/app/src/main/java/es/verdnatura/domain/GetItemCardUserCase.kt
index 0b6c7bae..7aac30fc 100644
--- a/app/src/main/java/es/verdnatura/domain/GetItemCardUserCase.kt
+++ b/app/src/main/java/es/verdnatura/domain/GetItemCardUserCase.kt
@@ -8,7 +8,6 @@ import es.verdnatura.presentation.view.feature.articulo.model.ItemPackingType
 import es.verdnatura.presentation.view.feature.articulo.model.ItemProposal
 import es.verdnatura.presentation.view.feature.historicoarticulo.model.ItemHistoricoVO
 import retrofit2.Call
-import java.security.AuthProvider
 
 class GetItemCardUserCase(context: Context) : RestClient(context) {
 
@@ -16,9 +15,9 @@ class GetItemCardUserCase(context: Context) : RestClient(context) {
         usuario: String,
         password: String,
         itemFk: String,
-        warehouseFk: String
+        warehouseFk: Int
     ): Call<ItemCardVO> {
-        val params: ArrayList<String> = ArrayList()
+        val params: ArrayList<Any> = ArrayList()
         params.add(itemFk)
         params.add(warehouseFk)
         return restClient!!.getItemCard(
@@ -67,7 +66,7 @@ class GetItemCardUserCase(context: Context) : RestClient(context) {
         )
     }
 
-    fun getItemPackingTypeSalix(token:String): Call<List<ItemPackingType>> {
+    fun getItemPackingTypeSalix(token: String): Call<List<ItemPackingType>> {
         return salixClient!!.get_ItemPackingType(
             content_type = "application/json",
             authorization = token
@@ -104,12 +103,12 @@ class GetItemCardUserCase(context: Context) : RestClient(context) {
     fun itemTrash(
         usuario: String,
         password: String,
-        itemFk: String,
-        warehouseFk: String,
-        newVisible: String,
-        isTrash: String
+        itemFk: Int,
+        warehouseFk: Int,
+        newVisible: Int,
+        isTrash: Boolean
     ): Call<Any> {
-        val params: ArrayList<String> = ArrayList()
+        val params: ArrayList<Any> = ArrayList()
         params.add(itemFk)
         params.add(warehouseFk)
         params.add(newVisible)
@@ -124,35 +123,35 @@ class GetItemCardUserCase(context: Context) : RestClient(context) {
         )
     }
 
-  /*  fun itemPlacementSave(
-        usuario: String,
-        password: String,
-        itemFk: String,
-        warehouseFk: String,
-        value: String
-    ): Call<String> {
-        val params: ArrayList<String> = ArrayList()
-        params.add(itemFk)
-        params.add(warehouseFk)
-        params.add(value)
-        return restClient!!.itemPlacementSave(
-            "json",
-            "1",
-            usuario,
-            password,
-            "application/json",
-            params = params
-        )
-    }*/
+    /*  fun itemPlacementSave(
+          usuario: String,
+          password: String,
+          itemFk: String,
+          warehouseFk: String,
+          value: String
+      ): Call<String> {
+          val params: ArrayList<String> = ArrayList()
+          params.add(itemFk)
+          params.add(warehouseFk)
+          params.add(value)
+          return restClient!!.itemPlacementSave(
+              "json",
+              "1",
+              usuario,
+              password,
+              "application/json",
+              params = params
+          )
+      }*/
 
     fun updateGrouping(
         usuario: String,
         password: String,
-        itemFk: String,
-        value: String,
-        warehouseFk: String
+        itemFk: Int,
+        value: Int,
+        warehouseFk: Int
     ): Call<Any> {
-        val params: ArrayList<String> = ArrayList()
+        val params: ArrayList<Int> = ArrayList()
         params.add(itemFk)
         params.add(value)
         params.add(warehouseFk)
@@ -169,11 +168,11 @@ class GetItemCardUserCase(context: Context) : RestClient(context) {
     fun updatePacking(
         usuario: String,
         password: String,
-        itemFk: String,
-        value: String,
-        warehouseFk: String
+        itemFk: Int,
+        value: Int,
+        warehouseFk: Int
     ): Call<Any> {
-        val params: ArrayList<String> = ArrayList()
+        val params: ArrayList<Any> = ArrayList()
         params.add(itemFk)
         params.add(value)
         params.add(warehouseFk)
@@ -207,26 +206,27 @@ class GetItemCardUserCase(context: Context) : RestClient(context) {
     }*/
 
     fun updatePackingTypeSalix(
-        token:String,
+        token: String,
         itemFk: String,
         ItemPackingType: String
     ): Call<Any> {
-        val params=itemPackingTypeSalix(ItemPackingType)
+        val params = itemPackingTypeSalix(ItemPackingType)
 
         return salixClient!!.update_ItemPackingType(
-            content_type ="application/json",
+            content_type = "application/json",
             authorization = token,
             itemFk = itemFk,
             params = params
         )
     }
+
     fun item_saveStems(
         usuario: String,
         password: String,
-        itemFk: String,
-        value: String
+        itemFk: Int,
+        value: Int
     ): Call<Any> {
-        val params: ArrayList<String> = ArrayList()
+        val params: ArrayList<Int> = ArrayList()
         params.add(itemFk)
         params.add(value)
         return restClient!!.item_saveStems(
@@ -242,10 +242,10 @@ class GetItemCardUserCase(context: Context) : RestClient(context) {
     fun item_saveReference(
         usuario: String,
         password: String,
-        itemFk: String,
-        value: String
-                   ): Call<Unit> {
-        val params: ArrayList<String> = ArrayList()
+        itemFk: Int,
+        value: Int
+    ): Call<Unit> {
+        val params: ArrayList<Int> = ArrayList()
         params.add(itemFk)
         params.add(value)
         return restClient!!.item_saveReference(
@@ -255,7 +255,7 @@ class GetItemCardUserCase(context: Context) : RestClient(context) {
             password,
             "application/json",
             params = params
-                                       )
+        )
     }
 
 
@@ -282,16 +282,16 @@ class GetItemCardUserCase(context: Context) : RestClient(context) {
 
 
     fun barcodes_editSalix(
-        token:String,
+        token: String,
         itemFk: String,
         value: String,
 
-    ): Call<Any> {
+        ): Call<Any> {
 
         return salixClient!!.barcodes_edit(
             content_type = "application/json",
-            authorization=token,
-            itemBarCodeSalix(itemFk,value)
+            authorization = token,
+            itemBarCodeSalix(itemFk, value)
         )
     }
 
diff --git a/app/src/main/java/es/verdnatura/domain/GetPaletizadoresUserCase.kt b/app/src/main/java/es/verdnatura/domain/GetPaletizadoresUserCase.kt
index 7f56897e..911f6865 100644
--- a/app/src/main/java/es/verdnatura/domain/GetPaletizadoresUserCase.kt
+++ b/app/src/main/java/es/verdnatura/domain/GetPaletizadoresUserCase.kt
@@ -11,10 +11,10 @@ class GetPaletizadoresUserCase(context: Context) : RestClient(context) {
     fun buffer_setTypeByName(
         usuario: String,
         password: String,
-        vBufferFk: String,
+        vBufferFk: Int,
         vType: String
     ): Call<Boolean> {
-        val params: ArrayList<String> = ArrayList()
+        val params: ArrayList<Any> = ArrayList()
         params.add(vBufferFk)
         params.add(vType)
         return restClient!!.buffer_setTypeByName(
@@ -45,10 +45,10 @@ class GetPaletizadoresUserCase(context: Context) : RestClient(context) {
     fun cmrExpeditionPallet_add(
         usuario: String,
         password: String,
-        vExpeditionPallet: String?,
-        vCmrId: String?
+        vExpeditionPallet: Int,
+        vCmrId: Int
     ): Call<Void> {
-        val params: ArrayList<String?> = ArrayList()
+        val params: ArrayList<Int> = ArrayList()
         params.add(vExpeditionPallet)
         params.add(vCmrId)
 
diff --git a/app/src/main/java/es/verdnatura/domain/GetSacadorControladorUserCase.kt b/app/src/main/java/es/verdnatura/domain/GetSacadorControladorUserCase.kt
index d9486872..28cd7b11 100644
--- a/app/src/main/java/es/verdnatura/domain/GetSacadorControladorUserCase.kt
+++ b/app/src/main/java/es/verdnatura/domain/GetSacadorControladorUserCase.kt
@@ -68,38 +68,6 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) {
     }
 
 
-
-  /*  fun sip_getExtensionSalix(
-        token:String,
-        WorkerId: String
-    ): Call<Any> {
-        val params: ArrayList<String> = ArrayList()
-        params.add(WorkerId)
-        return salixClient!!.sip_getExtension(
-            content_type = "application/json",
-            authorization = token,
-            idWorker=WorkerId
-        )
-    }
-
-    fun sip_getExtension(
-        usuario: String,
-        password: String,
-        WorkerId: String
-    ): Call<String> {
-        val params: ArrayList<String> = ArrayList()
-        params.add(WorkerId)
-        return restClient!!.sip_getExtension(
-            "json",
-            "1",
-            usuario,
-            password,
-            "application/json",
-            params
-        )
-    }
-*/
-
     fun ticket_checkFullyControlled(
         usuario: String,
         password: String,
diff --git a/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt b/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt
index e335a7cc..ee8c8a08 100644
--- a/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt
+++ b/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt
@@ -807,7 +807,7 @@ interface VerdnaturaService {
         @Header("user") user: String,
         @Header("pass") pass: String,
         @Header("Content-Type") content_type: String,
-        @Body params: List<String>
+        @Body params: List<Any>
     ):
             Call<ItemCardVO>
 
@@ -851,7 +851,7 @@ interface VerdnaturaService {
         @Header("user") user: String,
         @Header("pass") pass: String,
         @Header("Content-Type") content_type: String,
-        @Body params: List<String>
+        @Body params: List<Any>
     ):
             Call<Any>
 
@@ -873,7 +873,7 @@ interface VerdnaturaService {
         @Header("user") user: String,
         @Header("pass") pass: String,
         @Header("Content-Type") content_type: String,
-        @Body params: List<String>
+        @Body params: List<Int>
     ):
             Call<Any>
 
@@ -884,7 +884,7 @@ interface VerdnaturaService {
         @Header("user") user: String,
         @Header("pass") pass: String,
         @Header("Content-Type") content_type: String,
-        @Body params: List<String>
+        @Body params: List<Any>
     ):
             Call<Any>
 
@@ -906,7 +906,7 @@ interface VerdnaturaService {
         @Header("user") user: String,
         @Header("pass") pass: String,
         @Header("Content-Type") content_type: String,
-        @Body params: List<String>
+        @Body params: List<Int>
     ):
             Call<Any>
 
@@ -917,7 +917,7 @@ interface VerdnaturaService {
         @Header("user") user: String,
         @Header("pass") pass: String,
         @Header("Content-Type") content_type: String,
-        @Body params: List<String>
+        @Body params: List<Int>
     ):
             Call<Unit>
 
@@ -1262,7 +1262,7 @@ interface VerdnaturaService {
         @Header("user") user: String,
         @Header("pass") pass: String,
         @Header("Content-Type") content_type: String,
-        @Body params: List<String>
+        @Body params: List<Any>
     ):
             Call<Boolean>
 
@@ -1299,7 +1299,7 @@ interface VerdnaturaService {
         @Header("user") user: String,
         @Header("pass") pass: String,
         @Header("Content-Type") content_type: String,
-        @Body params: List<String?>
+        @Body params: List<Int>
     ):
             Call<Void>
 
diff --git a/app/src/main/java/es/verdnatura/presentation/common/itemScanned.kt b/app/src/main/java/es/verdnatura/presentation/common/itemScanned.kt
index d22840b2..42ee1a46 100644
--- a/app/src/main/java/es/verdnatura/presentation/common/itemScanned.kt
+++ b/app/src/main/java/es/verdnatura/presentation/common/itemScanned.kt
@@ -3,6 +3,6 @@ package es.verdnatura.presentation.common
 import org.json.JSONObject
 
 data class itemScanned(var scanned: JSONObject) {
-    var table: String? = scanned.get("table").toString()
-    var id: String? = scanned.get("id").toString()
+    var table: String = scanned.get("table").toString()
+    var id: Int = scanned.get("id").toString().toInt()
 }
\ No newline at end of file
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 fd222386..f492d854 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
@@ -37,7 +37,7 @@ class ItemCardFragment(
     private var titleImage: String = ""
     private var user = ""
     private var password = ""
-    private var warehouseFk = ""
+    private var warehouseFk:Int? = null
     private var adapter: ItemCardAdapter? = null
     private var barcodeAdapter: BarcodeAdapter? = null
     private var listItemsRow: ArrayList<ItemCardRowVO> = ArrayList()
@@ -51,7 +51,6 @@ class ItemCardFragment(
         fun newInstance(entryPoint: String) = ItemCardFragment(entryPoint)
     }
 
-    // private lateinit var customDialog: CustomDialog
     private lateinit var customDialogInput: CustomDialogInput
     private lateinit var customDialogList: CustomDialogList
     private lateinit var customDialogTwo: CustomDialogTwoButtons
@@ -185,12 +184,12 @@ class ItemCardFragment(
 
         user = getData(USER)
         password = getData(PASSWORD)
-        warehouseFk = getData(WAREHOUSEFK)
+        warehouseFk = getData(WAREHOUSEFK).toInt()
 
-        this.itemFk = itemFk
+        this.itemFk = itemFk.toString()
 
         binding.splashProgressTwo.visibility = View.VISIBLE
-        viewModel.getItemCard(itemFk, warehouseFk, user, password)
+        viewModel.getItemCard(itemFk, warehouseFk!!, user, password)
         binding.splashProgress.visibility = View.VISIBLE
 
 
@@ -456,7 +455,7 @@ class ItemCardFragment(
                                 .setDescription(getString(R.string.currentVAlue) + if(item.value.isNullOrEmpty()) "" else{item.value})
                                 .setOkButton(getString(R.string.save)) {
                                     ma.hideKeyboard(customDialogInput.getEditText())
-                                    editItemCardRow(item, customDialogInput.getValue())
+                                    editItemCardRow(item, customDialogInput.getValue().toInt())
                                     customDialogInput.dismiss()
 
                                 }.setKoButton(getString(R.string.cancel)) {
@@ -469,7 +468,7 @@ class ItemCardFragment(
 
                                     if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
                                         if (!customDialogInput.getValue().isNullOrEmpty())
-                                            editItemCardRow(item, customDialogInput.getValue())
+                                            editItemCardRow(item, customDialogInput.getValue().toInt())
                                         customDialogInput.setValue("")
                                         customDialogInput.dismiss()
                                         ma.hideKeyboard(customDialogInput.getEditText())
@@ -491,7 +490,7 @@ class ItemCardFragment(
                                 .setDescription(getString(R.string.quantityToRegister))
                                 .setOkButton(getString(R.string.save)) {
                                     ma.hideKeyboard(customDialogInput.getEditText())
-                                    editItemCardRow(item, customDialogInput.getValue())
+                                    editItemCardRow(item, customDialogInput.getValue().toInt())
                                     customDialogInput.dismiss()
 
                                 }.setKoButton(getString(R.string.cancel)) {
@@ -503,7 +502,7 @@ class ItemCardFragment(
                                 .setOnEditorActionListener { _, actionId, _ ->
                                     if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
                                         if (!customDialogInput.getValue().isNullOrEmpty())
-                                            editItemCardRow(item, customDialogInput.getValue())
+                                            editItemCardRow(item, customDialogInput.getValue().toInt())
                                         customDialogInput.setValue("")
                                         customDialogInput.dismiss()
                                         ma.hideKeyboard(customDialogInput.getEditText())
@@ -516,7 +515,7 @@ class ItemCardFragment(
                                 .setDescription(getString(R.string.quantityToUnregister))
                                 .setOkButton(getString(R.string.save)) {
                                     ma.hideKeyboard(customDialogInput.getEditText())
-                                    editItemCardRow(item, customDialogInput.getValue())
+                                    editItemCardRow(item, customDialogInput.getValue().toInt())
                                     customDialogInput.dismiss()
 
                                 }.setKoButton(getString(R.string.cancel)) {
@@ -528,7 +527,7 @@ class ItemCardFragment(
                                 .setOnEditorActionListener { _, actionId, _ ->
                                     if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
                                         if (!customDialogInput.getValue().isNullOrEmpty())
-                                            editItemCardRow(item, customDialogInput.getValue())
+                                            editItemCardRow(item, customDialogInput.getValue().toInt())
                                         customDialogInput.setValue("")
                                         customDialogInput.dismiss()
                                         ma.hideKeyboard(customDialogInput.getEditText())
@@ -554,7 +553,7 @@ class ItemCardFragment(
         binding.splashProgressTwo.visibility = GONE
     }
 
-    private fun editItemCardRow(item: ItemCardRowVO, value: String) {
+    private fun editItemCardRow(item: ItemCardRowVO, value: Int) {
 
         when (item.action) {
             // cau:sergio itemTrash x itemStock Update . No se utiliza esta funicón
@@ -570,27 +569,27 @@ class ItemCardFragment(
                  "itemPlacementSave"
              )*/
             "updateGrouping" -> viewModel.updateGrouping(
-                itemFk = itemFk,
+                itemFk = itemFk.toInt(),
                 user = user,
                 password = password,
                 value = value,
-                warehouseFk = warehouseFk
+                warehouseFk = warehouseFk!!
             )
             "updatePacking" -> viewModel.updatePacking(
-                itemFk = itemFk,
+                itemFk = itemFk.toInt(),
                 user = user,
                 password = password,
                 value = value,
-                warehouseFk = warehouseFk
+                warehouseFk = warehouseFk!!
             )
             "itemSaveStem" -> viewModel.item_saveStems(
-                itemFk = itemFk,
+                itemFk = itemFk.toInt(),
                 user = user,
                 password = password,
                 value = value
             )
             "item_saveReference" -> viewModel.item_saveReference(
-                itemFk = itemFk,
+                itemFk = itemFk.toInt(),
                 user = user,
                 password = password,
                 value = value
@@ -609,58 +608,7 @@ class ItemCardFragment(
         binding.splashProgress.visibility = View.VISIBLE
     }
 
-    /* private fun changeOfflineValue(item:ItemCardRowVO,newValue:String, barcodes:List<BarcodeVO>){
-
-         binding.splashProgress.visibility = View.VISIBLE
-
-        //sergio: esta parte ya estaba comentada
-          /*var i = 0
-         var position = 0
-         listItemsRow.forEach {
-             if (it.title == item.title) {
-                 position = i
-             }
-             i = i.plus(1)
-         }
-         if (listItemsRow.get(position).title != "BARCODE") listItemsRow.get(position).value = newValue
-         else listItemsRow.get(position).barcodes = barcodes
-         adapter?.notifyDataSetChanged()*/
-     }*/
-
-    /* private fun prepareItemStockUpdate(itemB:ItemCardRowVO,value:String){
-
-         //sergio: cau: no se llama a esta función itemTrash itemStockUpdate
-         try{
-
-             if (itemB.value!!.toInt() > value.toInt()) {
-                 customDialogTwo.setTitle(itemB.title!!).setDescription("Indica la causa de eliminar stock:").setOkButton("Falta"){
-                     viewModel.itemStockUpdate(itemFk = itemFk,warehouseFk = warehouseFk,user = user,password = password,newValue = value,isTrash = "0")
-                     changeOfflineValue(itemB,value, listBarcodes)
-                     customDialogTwo.dismiss()
-
-                 }.setOkButtonTwo("Basura"){
-                     viewModel.itemStockUpdate(itemFk = itemFk,warehouseFk = warehouseFk,user = user,password = password,newValue = value,isTrash = "1")
-                     changeOfflineValue(itemB,value, listBarcodes)
-                     customDialogTwo.dismiss()
-
-                 }.setKoButton(getString(R.string.cancel)){
-
-                     customDialogTwo.dismiss()
-                 }.show()
-             }else{
-                 changeOfflineValue(itemB,value, listBarcodes)
-                 viewModel.itemStockUpdate(itemFk = itemFk,warehouseFk = warehouseFk,user = user,password = password,newValue = value,isTrash = "0")
-             }
-         }catch (e:Exception){
-             binding.itemcardLayout.visibility = View.GONE
-             customDialog.setTitle(getString(R.string.error)).setDescription("El elemento introducido no es un número").setKoButton(getString(R.string.cancel)){
-                 customDialog.dismiss()
-             }.show()
-         }
-
-     }*/
-
-    private fun prepareItemStockUpdate2(itemB: ItemCardRowVO, value: String) {
+    private fun prepareItemStockUpdate2(itemB: ItemCardRowVO, value: Int) {
         try {
             value.toInt()
 
@@ -669,12 +617,12 @@ class ItemCardFragment(
                     .setDescription(getString(R.string.deleteStock))
                     .setOkButton(getString(R.string.fault)) {
                         viewModel.itemTrash(
-                            itemFk = itemFk,
-                            warehouseFk = warehouseFk,
+                            itemFk = itemFk.toInt(),
+                            warehouseFk = warehouseFk!!,
                             user = user,
                             password = password,
                             newValue = value,
-                            isTrash = "0"
+                            isTrash = false
 
                         )
                         //changeOfflineValue(itemB,value, listBarcodes)
@@ -683,12 +631,12 @@ class ItemCardFragment(
 
                     }.setOkButtonTwo(getString(R.string.trash)) {
                         viewModel.itemTrash(
-                            itemFk = itemFk,
-                            warehouseFk = warehouseFk,
+                            itemFk = itemFk.toInt(),
+                            warehouseFk = warehouseFk!!,
                             user = user,
                             password = password,
                             newValue = value,
-                            isTrash = "1"
+                            isTrash = true
 
                         )
                         //changeOfflineValue(itemB,value, listBarcodes)
@@ -703,12 +651,12 @@ class ItemCardFragment(
                 //changeOfflineValue(itemB,value, listBarcodes)
                 showProgress()
                 viewModel.itemTrash(
-                    itemFk = itemFk,
-                    warehouseFk = warehouseFk,
+                    itemFk = itemFk.toInt(),
+                    warehouseFk = warehouseFk!!,
                     user = user,
                     password = password,
-                    newValue = (value.toInt() * -1).toString(),
-                    isTrash = "0"
+                    newValue = (value * -1),
+                    isTrash = false
 
                 )
             }
@@ -749,6 +697,8 @@ class ItemCardFragment(
         barcodeAdapter = BarcodeAdapter(listBarcodes, object : OnBarcodeRowClickListener {
             override fun onBarcodeRowClickListener(item: BarcodeVO) {
                 updateBarcode(item.code!!, "1", itemB)
+                customDialogList.setValue("")
+                customDialogList.dismiss()
             }
         })
         customDialogList.getRecyclerView().adapter = barcodeAdapter
@@ -767,20 +717,6 @@ class ItemCardFragment(
                 i += 1
             }
             listBarcodes.removeAt(posDelete)
-        } else {
-            listBarcodes.add(BarcodeVO(code))
-        }
-
-        // var working_in_test=false //sergio:Revisar como borrar directamente en Salix o crear proc en back para borrar.
-
-        if (delete == "0") {
-            viewModel.barcodesEditSalix(
-                token = getData(TOKEN),
-                itemFk = itemInfoG!!.id,
-                barCodeValue = code,
-
-                )
-        } else {
             viewModel.barcodesEdit(
                 itemFk = itemInfoG!!.id,
                 user = user,
@@ -788,7 +724,17 @@ class ItemCardFragment(
                 value = code,
                 delete = delete,
             )
+        } else {
+            listBarcodes.add(BarcodeVO(code))
+            viewModel.barcodesEditSalix(
+                token = getData(TOKEN),
+                itemFk = itemInfoG!!.id,
+                barCodeValue = code)
+
         }
+
+        // var working_in_test=false //sergio:Revisar como borrar directamente en Salix o crear proc en back para borrar.
+
         barcodeAdapter!!.notifyDataSetChanged()
 
         showProgress()
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 d1df4261..e1ed69c9 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
@@ -38,7 +38,7 @@ class ItemCardViewModel(context: Context) : BaseViewModel() {
 
     fun getItemCard(
         itemFk: String,
-        warehouseFk: String,
+        warehouseFk: Int,
         user: String,
         password: String
 
@@ -212,12 +212,12 @@ class ItemCardViewModel(context: Context) : BaseViewModel() {
 
 
     fun itemTrash(
-        itemFk: String,
-        warehouseFk: String,
+        itemFk: Int,
+        warehouseFk: Int,
         user: String,
         password: String,
-        newValue: String,
-        isTrash: String
+        newValue: Int,
+        isTrash: Boolean
     ) {
         getItemCardUserCase.itemTrash(user, password, itemFk, warehouseFk, newValue, isTrash)
             .enqueue(object : Callback<Any> {
@@ -249,11 +249,11 @@ class ItemCardViewModel(context: Context) : BaseViewModel() {
 
 
     fun updateGrouping(
-        itemFk: String,
+        itemFk: Int,
         user: String,
         password: String,
-        value: String,
-        warehouseFk: String
+        value: Int,
+        warehouseFk: Int
 
     ) {
         getItemCardUserCase.updateGrouping(user, password, itemFk, value, warehouseFk)
@@ -285,11 +285,11 @@ class ItemCardViewModel(context: Context) : BaseViewModel() {
     }
 
     fun updatePacking(
-        itemFk: String,
+        itemFk: Int,
         user: String,
         password: String,
-        value: String,
-        warehouseFk: String
+        value: Int,
+        warehouseFk: Int
 
     ) {
         getItemCardUserCase.updatePacking(user, password, itemFk, value, warehouseFk)
@@ -351,10 +351,10 @@ class ItemCardViewModel(context: Context) : BaseViewModel() {
     }
 
     fun item_saveStems(
-        itemFk: String,
+        itemFk: Int,
         user: String,
         password: String,
-        value: String
+        value: Int
 
     ) {
         getItemCardUserCase.item_saveStems(user, password, itemFk, value)
@@ -386,10 +386,10 @@ class ItemCardViewModel(context: Context) : BaseViewModel() {
     }
 
     fun item_saveReference(
-        itemFk: String,
+        itemFk: Int,
         user: String,
         password: String,
-        value: String
+        value: Int
 
     ) {
         getItemCardUserCase.item_saveReference(user, password, itemFk, value)
@@ -439,7 +439,7 @@ class ItemCardViewModel(context: Context) : BaseViewModel() {
                 override fun onResponse(call: Call<Any>, response: Response<Any>) {
                     if (response.isSuccessful) {
                         _response.value = ResponseItemVO(
-                            isError = true,
+                            isError = false,
                             errorMessage = getMessageFromAllResponse(
                                 nameofFunction(this),
                                 response.message()
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/BufferFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/BufferFragment.kt
index c67fa555..69df637f 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/BufferFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/BufferFragment.kt
@@ -1,6 +1,5 @@
 package es.verdnatura.presentation.view.feature.buffer.fragment
 
-import android.os.Bundle
 import android.view.View
 import android.view.inputmethod.EditorInfo
 import androidx.lifecycle.Observer
@@ -12,8 +11,6 @@ class BufferFragment(
     var entryPoint: String = ""
 ) : BaseFragment<FragmentBufferBinding, BufferFragmentViewModel>(BufferFragmentViewModel::class) {
 
-    private var password = ""
-    //private var goBack: Boolean = false
     override fun getLayoutId(): Int = R.layout.fragment_buffer
 
     companion object {
@@ -22,7 +19,7 @@ class BufferFragment(
 
 
     override fun init() {
-        
+
         binding.splashProgress.visibility = View.GONE
         setToolbar()
         setEvents()
@@ -30,16 +27,9 @@ class BufferFragment(
     }
 
     private fun setToolbar() {
-
         binding.mainToolbar.toolbarTitle.text = entryPoint
     }
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-
-        password = getData(PASSWORD)
-        super.onCreate(savedInstanceState)
-    }
-
     private fun setEvents() {
 
         binding.mainToolbar.backButton.setOnClickListener {
@@ -47,34 +37,31 @@ class BufferFragment(
         }
 
         binding.scanInput.requestFocus()
-         binding.scanInput.setOnEditorActionListener { _, actionId, _ ->
+        binding.scanInput.setOnEditorActionListener { _, actionId, _ ->
             if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
-               // goBack = false
-                if (! binding.scanInput.text.isNullOrEmpty()) {
+                if (!binding.scanInput.text.isNullOrEmpty()) {
                     binding.splashProgress.visibility = View.VISIBLE
 
+                    when (entryPoint) {
 
-                    when (entryPoint){
-
-                        getString(R.string.titleBufferEmpty)->entryPoint="UNLOADING"
-                        getString(R.string.titleBufferFill)-> entryPoint="LOADING"
-                        getString(R.string.titleBufferAccumulate)->entryPoint="ACCUMULATION"
-                        getString(R.string.titleBufferOff)->entryPoint="DISABLED"
-                        getString(R.string.titleBufferStrapping)->entryPoint="STRAPPING"
+                        getString(R.string.titleBufferEmpty) -> entryPoint = "UNLOADING"
+                        getString(R.string.titleBufferFill) -> entryPoint = "LOADING"
+                        getString(R.string.titleBufferAccumulate) -> entryPoint = "ACCUMULATION"
+                        getString(R.string.titleBufferOff) -> entryPoint = "DISABLED"
+                        getString(R.string.titleBufferStrapping) -> entryPoint = "STRAPPING"
                     }
 
-                        viewModel.buffer_setTypeByName(
-                            getData(USER),
-                            getData(PASSWORD),
-                            binding.scanInput.text.toString(),
-                            entryPoint
-
-                        )
+                    viewModel.buffer_setTypeByName(
+                        getData(USER),
+                        getData(PASSWORD),
+                        binding.scanInput.text.toString().toInt(),
+                        entryPoint
 
+                    )
 
                 }
-                 binding.scanInput.setText("")
-                ma.hideKeyboard( binding.scanInput)
+                binding.scanInput.setText("")
+                ma.hideKeyboard(binding.scanInput)
                 return@setOnEditorActionListener true
             }
             false
@@ -89,11 +76,18 @@ class BufferFragment(
                 if (it.isError) {
 
                     ma.messageWithSound(
-                        getString(R.string.errorOperation)+ it.errorMessage,it.isError,isPlayed = true)
+                        getString(R.string.errorOperation) + it.errorMessage,
+                        it.isError,
+                        isPlayed = true
+                    )
 
                 } else {
 
-                    ma.messageWithSound(entryPoint.lowercase() + getString (R.string.operationSuccess),false,isPlayed = true)
+                    ma.messageWithSound(
+                        entryPoint.lowercase() + "." + getString(R.string.operationSuccess),
+                        false,
+                        isPlayed = true
+                    )
                     binding.mainToolbar.backButton.performClick()
 
                 }
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/BufferFragmentViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/BufferFragmentViewModel.kt
index cad03ea1..b0ba9a58 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/BufferFragmentViewModel.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/BufferFragmentViewModel.kt
@@ -32,7 +32,7 @@ class BufferFragmentViewModel(context: Context) : BaseViewModel() {
 
 
 
-    fun buffer_setTypeByName(user: String, password: String, vBufferFk: String, vType: String){
+    fun buffer_setTypeByName(user: String, password: String, vBufferFk: Int, vType: String){
         GetPaletizadoresUserCase.buffer_setTypeByName(user, password, vBufferFk, vType)
             .enqueue(object : Callback<Boolean> {
                 override fun onFailure(call: Call<Boolean>, t: Throwable) {
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 236d2eee..6f5f9184 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
@@ -211,7 +211,7 @@ class InventaryFragment :
                 listInvetory = ArrayList()
                 listInvetoryAux = ArrayList()
                 it.list.forEach {
-                    if (it.nicho != "0") {
+                    if (it.nicho != 0) {
                         listInvetory.add(it)
                         listInvetoryAux.add(it)
                     }
@@ -225,12 +225,12 @@ class InventaryFragment :
                             .setOkButton(getString(R.string.pull)) {
                                 binding.splashProgress.visibility = View.VISIBLE
                                 viewModel.itemTrash(
-                                    item.itemFk,
-                                    getData(WAREHOUSEFK),
+                                    item.itemFk.toInt(),
+                                    getData(WAREHOUSEFK).toInt(),
                                     getData(USER),
                                     getData(PASSWORD),
                                     item.nicho,
-                                    "0"
+                                    false
                                 )
                                 itemClicked = item
                                 customDialog.dismiss()
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 82bc529a..73ce1627 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
@@ -174,12 +174,12 @@ class InventaryViewModel(context: Context) : BaseViewModel() {
 
     //sergio: se modifica por CAU a itemTrash
     fun itemTrash(
-        itemFk: String,
-        warehouseFk: String,
+        itemFk: Int,
+        warehouseFk: Int,
         user: String,
         password: String,
-        newValue: String,
-        isTrash: String
+        newValue: Int,
+        isTrash: Boolean
     ) {
 
 
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/model/ItemInventaryVO.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/model/ItemInventaryVO.kt
index f0c46078..966918f7 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/model/ItemInventaryVO.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/model/ItemInventaryVO.kt
@@ -7,7 +7,7 @@ class ItemInventaryVO(
     var producer: String = "",
     var downstairs: String = "",
     var upstairs: String = "",
-    var nicho: String = "",
+    var nicho: Int = 0,
     var isError: Boolean = false,
     var errorMessage: String = ""
 )
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 e457d192..ccacbdb8 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
@@ -319,9 +319,6 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
 
     override fun onPasillerosItemClickListener(item: PasillerosItemVO, entryPoint: String) {
 
-        /*  d("VERDNATURA::","El title es "+item.title)
-          d("VERDNATURA::","El titleTOsHOW es "+item.titleToShow)
-          d("VERDNATURA::","El entryPoint es "+entryPoint)*/
         when (item.title) {
 
             getString(R.string.titleSmarttagPickerAssociate) -> {
@@ -445,7 +442,11 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
                 addFragmentOnTop(UbicadorFragment.newInstance(entryPoint))
             }
             getString(R.string.titleAuto) -> {
-                addFragmentOnTop(AutomaticAddItemFragment.newInstance(entryPoint))
+                addFragmentOnTop(AutomaticAddItemFragment.newInstance(entryPoint,item.title))
+            }
+
+            getString(R.string.titlechecker) -> {
+                addFragmentOnTop(AutomaticAddItemFragment.newInstance(entryPoint,item.title))
             }
 
             getString(R.string.titleQuality) -> {
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingSummaryFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingSummaryFragment.kt
index 89200b73..e407394c 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingSummaryFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingSummaryFragment.kt
@@ -61,7 +61,6 @@ class PackagingSummaryFragment(
 
     override fun init() {
 
-        binding.splashProgress.visibility = View.VISIBLE
         binding.totalImages.text = getData("ENTRYNUMBERIMAGES")
         binding.observations.text=getData("ENTRYOBSERVATIONS")
 
@@ -82,7 +81,7 @@ class PackagingSummaryFragment(
         customDialogInput = CustomDialogInput(requireContext())
         customDialog = CustomDialog(requireContext())
         ma.hideBottomNavigation(View.GONE)
-        binding.splashProgress.visibility = View.VISIBLE
+        binding.splashProgress.visibility = View.GONE
         setToolBar()
         setEvents()
         super.init()
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/CmrExpeditionPalletFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/CmrExpeditionPalletFragment.kt
index 2535f025..7911a75a 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/CmrExpeditionPalletFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/CmrExpeditionPalletFragment.kt
@@ -40,15 +40,15 @@ class CmrExpeditionPalletFragment(
         binding.mainToolbar.toolbarTitle.text = title
     }
 
-    private fun cmrExpeditionPallet_add(vExpeditionPallet: String?, vCmrId: String?) {
+    private fun cmrExpeditionPallet_add(vExpeditionPallet: Int?, vCmrId: Int?) {
 
         customDialogList.dismiss()
         binding.splashProgress.visibility = View.VISIBLE
         viewModel.cmrExpeditionPallet_add(
             getData(USER),
             getData(PASSWORD),
-            vExpeditionPallet,
-            vCmrId
+            vExpeditionPallet!!,
+            vCmrId!!
         )
 
     }
@@ -98,9 +98,9 @@ class CmrExpeditionPalletFragment(
         customDialogList.setHint(true)
         customDialogList.setValue("")
         customDialogList.setValueTwo("")
-        customDialogList.setInfoTex("Código QR o PALLET")
-        customDialogList.setInfoTextTwo("Código QR o CMR")
-        customDialogList.setTitle("Escanea los valores : ")
+        customDialogList.setInfoTex(getString(R.string.codeQrORPallet))
+        customDialogList.setInfoTextTwo(getString(R.string.codeQrOrCMR))
+        customDialogList.setTitle(getString(R.string.scanValues))
         customDialogList.setHint(false)
 
         customDialogList.setOkButton(getString(R.string.end)) {
@@ -130,7 +130,7 @@ class CmrExpeditionPalletFragment(
 
                     } else {
                         // action = false
-                        customDialogList.setValue(dataScanned!!.id!!)
+                        customDialogList.setValue(dataScanned!!.id.toString())
                         customDialogList.setHint(true)
                         if (dataScanned!!.table == "cmr") {
                             customDialogList.setInfoTextTwo(getString(R.string.scanLabelPallet))
@@ -156,8 +156,8 @@ class CmrExpeditionPalletFragment(
                     dataScannedTwo = itemScan(customDialogList.getValueTwo())
                     if (dataScannedTwo == null) {
                         cmrExpeditionPallet_add(
-                            customDialogList.getValue(),
-                            customDialogList.getValueTwo()
+                            customDialogList.getValue().toInt(),
+                            customDialogList.getValueTwo().toInt()
                         )
 
                         /* var messageLabel = ""
@@ -196,7 +196,7 @@ class CmrExpeditionPalletFragment(
                                 )
                                 customDialogList.setValueTwo("")
                             } else {
-                                customDialogList.setValueTwo(dataScanned!!.id!!)
+                                customDialogList.setValueTwo(dataScanned!!.id.toString())
                                 cmrExpeditionPallet_add(
                                     if (dataScannedTwo!!.table == "cmr") {
                                         dataScanned!!.id
@@ -212,8 +212,8 @@ class CmrExpeditionPalletFragment(
                             }
                         } else {
                             cmrExpeditionPallet_add(
-                                customDialogList.getValue(),
-                                    dataScannedTwo!!.id
+                                customDialogList.getValue().toInt(),
+                                dataScannedTwo!!.id
 
                             )
                         }
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/CmrExpeditionPalletViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/CmrExpeditionPalletViewModel.kt
index 4ae90a23..7e41f8f5 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/CmrExpeditionPalletViewModel.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/CmrExpeditionPalletViewModel.kt
@@ -23,7 +23,7 @@ import retrofit2.Response
             get() = _responsescan
 
 
-        fun cmrExpeditionPallet_add(usuario: String, password: String, vExpeditionPallet: String?,vCmrId:String?) {
+        fun cmrExpeditionPallet_add(usuario: String, password: String, vExpeditionPallet: Int,vCmrId:Int) {
             GetPaletizadoresUserCase.cmrExpeditionPallet_add(usuario, password,  vExpeditionPallet, vCmrId)
                 .enqueue(object : Callback<Void> {
                     override fun onFailure(call: Call<Void>, t: Throwable) {
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt
index 3b0149d5..41fd0ab8 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt
@@ -500,7 +500,7 @@ class PasilleroViewModel(context: Context) : BaseViewModel() {
 
 
     //#tarea4021
-   /*  _pasillerositem.add(
+    /*  _pasillerositem.add(
             PasillerosItemVO(
                 6,
                 R.drawable.ic_packaging,
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 0db5d9ac..00215ce2 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
@@ -411,7 +411,6 @@ class EndSacadorFragment(
                             onQuantityOfShelvingSelected(itemShelvingFkStored)
                         } else {
                             customDialogList.setValueTwo("")
-                            //showErrorMessage("El resultado del procedimiento barcodeToItem de la etiqueta escaneada es: " +it.response)
                             showErrorMessage(getString(R.string.lineNotExist))
                             if (mperror != null) {
                                 mperror?.start()
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorFragment.kt
index fd2273ae..97c84e13 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorFragment.kt
@@ -263,7 +263,6 @@ class PreSacadorFragment :
                             onQuantityOfShelvingSelected(itemShelvingFkStored)
                         } else {
                             customDialogList.setValueTwo("")
-                            //showErrorMessage("El resultado del procedimiento barcodeToItem de la etiqueta escaneada es: " +it.response)
                             showErrorMessage(getString(R.string.lineNotExists))
                             if (mperror != null) {
                                 mperror?.start()
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/fragment/ReposicionFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/fragment/ReposicionFragment.kt
index b90ab634..8d786021 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/fragment/ReposicionFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/fragment/ReposicionFragment.kt
@@ -206,7 +206,6 @@ class ReposicionFragment : BaseFragment<ReposicionFragmentBinding, ReposicionVie
                             onQuantityOfShelvingSelected(itemShelvingFkStored)
                         } else {
                             customDialogList.setValueTwo("")
-                            // showErrorMessage("El resultado del procedimiento barcodeToItem de la etiqueta escaneada es: " +it.response)
                             showErrorMessage(getString(R.string.lineNotExist))
                             mperror?.start()
                         }
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 41cc4655..91e2d91c 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
@@ -105,8 +105,10 @@ class UbicadorAdapter(
                 }
                 if (item.isNew) {
                     itemRowLayout.setBackgroundColor(
-                        RED
-                    )
+                    ContextCompat.getColor(
+                        visibleText.context,
+                        R.color.verdnatura_red_salix
+                    ))
                 }
 
             }
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 9c541113..1ab0631f 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
@@ -1,5 +1,6 @@
 package es.verdnatura.presentation.view.feature.ubicador.fragment
 
+import android.util.Log.d
 import android.view.View
 import android.view.inputmethod.EditorInfo
 import androidx.lifecycle.Observer
@@ -8,26 +9,25 @@ import es.verdnatura.R
 import es.verdnatura.databinding.FragmentAutomaticAddItemBinding
 import es.verdnatura.presentation.base.BaseFragment
 import es.verdnatura.presentation.common.OnAutomaticItemClickListener
-import es.verdnatura.presentation.view.component.CustomDialog
-import es.verdnatura.presentation.view.component.CustomDialogInput
-import es.verdnatura.presentation.view.component.CustomDialogUbicador
-import es.verdnatura.presentation.view.feature.main.activity.MainActivity
 import es.verdnatura.presentation.view.feature.ubicador.adapter.AutomaticAdapter
 import es.verdnatura.presentation.view.feature.ubicador.model.ItemEscanerVO
 
 
 @Suppress("UNUSED_ANONYMOUS_PARAMETER")
 class AutomaticAddItemFragment(
-    var shelvingFk : String = ""
-) : BaseFragment<FragmentAutomaticAddItemBinding,AutomaticAddItemViewModel>(AutomaticAddItemViewModel::class) {
+    var shelvingFk: String = "",
+    var titleAction: String ?= null
+) : BaseFragment<FragmentAutomaticAddItemBinding, AutomaticAddItemViewModel>(
+    AutomaticAddItemViewModel::class
+) {
 
-    private var adapter : AutomaticAdapter? = null
-    private var listItems:ArrayList<ItemEscanerVO> = ArrayList()
-    private var deep:Int = 1
+    private var adapter: AutomaticAdapter? = null
+    private var listItems: ArrayList<ItemEscanerVO> = ArrayList()
+    private var deep: Int = 1
     private var contador = 0
 
     companion object {
-        fun newInstance(entryPoint:String) = AutomaticAddItemFragment(entryPoint)
+        fun newInstance(entryPoint: String,titleAction:String)= AutomaticAddItemFragment(entryPoint,titleAction)
     }
 
     override fun getLayoutId(): Int = R.layout.fragment_automatic_add_item
@@ -35,27 +35,30 @@ class AutomaticAddItemFragment(
     override fun init() {
 
         ma.hideBottomNavigation(View.GONE)
-        binding.mainToolbar.toolbarTitle.text = "itemShelvingMake"
+
+        binding.mainToolbar.toolbarTitle.text = titleAction
+
+
         setEvents()
         setViews()
         setToolBar()
         super.init()
     }
 
-    private fun setToolBar(){
+    private fun setToolBar() {
         binding.mainToolbar.toolbarSubtitle.visibility = View.VISIBLE
     }
 
-    private fun setSubtitle(){
-        binding.mainToolbar.toolbarSubtitle.text = getString(R.string.labels)+contador
+    private fun setSubtitle() {
+        binding.mainToolbar.toolbarSubtitle.text = getString(R.string.labels) + contador
     }
 
-    private fun setViews(){
-        adapter = AutomaticAdapter(listItems,object: OnAutomaticItemClickListener{
+    private fun setViews() {
+        adapter = AutomaticAdapter(listItems, object : OnAutomaticItemClickListener {
             override fun onAutomaticItemClickListener(position: Int) {
                 contador -= 1
                 setSubtitle()
-                if (listItems.size > position){
+                if (listItems.size > position) {
                     listItems.removeAt(position)
                 }
 
@@ -63,17 +66,18 @@ class AutomaticAddItemFragment(
             }
         })
         binding.itemsRecyclerview.adapter = adapter
-        binding.itemsRecyclerview.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
+        binding.itemsRecyclerview.layoutManager =
+            LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
     }
 
-    private fun setEvents(){
+    private fun setEvents() {
         binding.editMatricula.requestFocus()
         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().isNullOrEmpty()) {
                     contador += 1
                     setSubtitle()
-                    listItems.add(0,ItemEscanerVO(binding.editMatricula.text.toString()))
+                    listItems.add(0, ItemEscanerVO(binding.editMatricula.text.toString()))
                     adapter!!.notifyDataSetChanged()
                 }
                 binding.editMatricula.setText("")
@@ -85,13 +89,21 @@ class AutomaticAddItemFragment(
         }
 
         binding.buttonFinalizar.setOnClickListener {
-            val listString:ArrayList<String> = ArrayList()
+            val listString: ArrayList<String> = ArrayList()
             listItems.forEach {
                 listString.add(it.item)
             }
             listItems = ArrayList()
             binding.splashProgress.visibility = View.VISIBLE
-            viewModel.itemShelvingMake_multi( getData(USER),getData(PASSWORD),shelvingFk,listString,getData(WAREHOUSEFK))
+
+
+            viewModel.itemShelvingMake_multi(
+                getData(USER),
+                getData(PASSWORD),
+                shelvingFk,
+                listString,
+                getData(WAREHOUSEFK)
+            )
         }
 
         binding.mainToolbar.backButton.setOnClickListener {
@@ -100,12 +112,12 @@ class AutomaticAddItemFragment(
     }
 
     override fun observeViewModel() {
-        with(viewModel){
+        with(viewModel) {
             response.observe(viewLifecycleOwner, Observer {
-               binding.splashProgress.visibility = View.GONE
-                if (it.isError){
-                    ma.messageWithSound(it.errorMessage,true,false)
-                }else{
+                binding.splashProgress.visibility = View.GONE
+                if (it.isError) {
+                    ma.messageWithSound(it.errorMessage, true, false)
+                } else {
                     requireActivity().onBackPressed()
                 }
             })
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt
index 1557c096..1330837f 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt
@@ -222,6 +222,8 @@ class UbicadorFragment(
 
         binding.automaticImg.setOnClickListener {
             if (!shelvingFk.isNullOrEmpty())
+
+                //Tarea #4696 Para llamar a Revisar items poner R.string.titleChecker
                 ma.onPasillerosItemClickListener(
                     PasillerosItemVO(title = getString(R.string.titleAuto)),
                     entryPoint = shelvingFk
diff --git a/app/src/main/res/layout/item_inventary_row.xml b/app/src/main/res/layout/item_inventary_row.xml
index 9bf203c1..ff342059 100644
--- a/app/src/main/res/layout/item_inventary_row.xml
+++ b/app/src/main/res/layout/item_inventary_row.xml
@@ -139,12 +139,11 @@
                 android:layout_weight="1"
                 android:gravity="center"
                 tool:text="0" />
-
             <TextView
                 android:id="@+id/item_nicho"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@{item.nicho}"
+                android:text="@{Integer.toString(item.nicho)}"
                 android:textSize="@dimen/h6"
                 android:textStyle="bold"
                 android:textColor="@color/verdnatura_red"
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index c1416cbb..40947b1d 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -347,7 +347,8 @@
     <string name="titleInventory">Inventario</string>
     <string name="titleFaults">Faltas</string>
     <string name="titleShelvingParking">Shelving Parking</string>
-    <string name="titleAuto">Automatic</string>
+    <string name="titleAuto">Añadir ítems</string>
+    <string name="titlechecker">Revisar ítems</string>
     <string name="titleQuality">Calidad</string>
     <string name="titlePickers">Sacadores</string>
     <string name="titleWebViewer">Visor web</string>
@@ -519,5 +520,8 @@
     <string name="urgentWarning">Aviso urgente</string>
     <string name="aware">ENTERADO</string>
     <string name="scanPreviousTicket">Escanea ticket de previa</string>
+    <string name="codeQrORPallet">Código QR o PALLET</string>
+    <string name="codeQrOrCMR">Código QR o CMR</string>
+    <string name="scanValues">Escanea los valores:</string>
 
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f5e6115d..75ab73f1 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -27,6 +27,7 @@
     <color name="verdnatura_light_teal">#b8ecd6</color>
     <color name="verdnatura_white">#ffffff</color>
     <color name="verdnatura_black_8_alpha_6">#991A1A1A</color>
+    <color name="verdnatura_red_salix">#FB5252</color>
 
 
     <color name="verdnatura_background_item_picker">#4d4d4d</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 64645523..fed377a2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -381,7 +381,7 @@
     <string name="titleItemConsult">Consult item</string>
     <string name="titleUbicator">Ubicator</string>
     <string name="titleReUbicator">Reubication</string>
-    <string name="titleAuto">Automatic</string>
+    <string name="titleAuto">Add Automatically items to shelving</string>
     <string name="titleQuality">Quality</string>
     <string name="titleWebViewer">Web viewer</string>
     <string name="titlePreControl">Pre Control</string>
@@ -517,6 +517,10 @@
     <string name="urgentWarning">Aviso urgente</string>
     <string name="aware">AWARE</string>
     <string name="scanPreviousTicket">Scan previous ticket</string>
+    <string name="codeQrORPallet">Code QR or PALLET</string>
+    <string name="codeQrOrCMR">Code QR or CMR</string>
+    <string name="scanValues">Scan values : </string>
+    <string name="titlechecker">Check items</string>
 
 
 </resources>