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 c8cad366..c40876bf 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
@@ -22,8 +22,16 @@ import es.verdnatura.domain.notNull
 import es.verdnatura.domain.toInt
 import es.verdnatura.domain.toast
 import es.verdnatura.presentation.base.BaseFragment
-import es.verdnatura.presentation.common.*
-import es.verdnatura.presentation.view.component.*
+import es.verdnatura.presentation.common.OnMoreClickListenerNew
+import es.verdnatura.presentation.common.OnOptionsSelectedListener
+import es.verdnatura.presentation.common.OnPasillerosItemClickListener
+import es.verdnatura.presentation.common.OnVisibleClickListenerNew
+import es.verdnatura.presentation.common.ToolBarAdapterTooltip
+import es.verdnatura.presentation.common.itemScanValue
+import es.verdnatura.presentation.view.component.CustomDialog
+import es.verdnatura.presentation.view.component.CustomDialogInput
+import es.verdnatura.presentation.view.component.CustomDialogTwoButtons
+import es.verdnatura.presentation.view.component.CustomDialogUbicadorNew
 import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO
 import es.verdnatura.presentation.view.feature.ubicador.adapter.UbicadorAdapterNew
 import es.verdnatura.presentation.view.feature.ubicador.model.ItemUbicador
@@ -191,13 +199,14 @@ class UbicadorFragmentNew(
 
                         iconReset.drawable -> {
                             if (!shelvingFk.isNullOrBlank()) {
-                                customDialog.setTitle(getString(R.string.checkItemShelvingDescrip))
+                                var customDialogReset = CustomDialog(requireContext())
+                                customDialogReset.setTitle(getString(R.string.checkItemShelvingDescrip))
                                     .setDescription(getString(R.string.checkItemShelving))
                                     .setOkButton(getString(R.string.ok)) {
                                         viewModel.itemShelvingDeleteChecked(shelvingFk)
-                                        customDialog.dismiss()
+                                        customDialogReset.dismiss()
                                     }.setKoButton(getString(R.string.cancel)) {
-                                        customDialog.dismiss()
+                                        customDialogReset.dismiss()
 
                                     }.show()
                             } else {
@@ -359,33 +368,34 @@ class UbicadorFragmentNew(
         }
 
         binding.deleteImg.setOnClickListener {
-            if (!shelvingFk.isNullOrBlank()) {
-                customDialog.setTitle(getString(R.string.empty))
-                    .setDescription(getString(R.string.operationNoReturn))
-                    .setOkButton(getString(R.string.empty)) {
+               if (!shelvingFk.isNullOrBlank()) {
+            var customDialogDelete = CustomDialog(requireContext())
+            customDialogDelete.setTitle(getString(R.string.empty))
+                .setDescription(getString(R.string.operationNoReturn))
+                .setOkButton(getString(R.string.empty)) {
 
-                        viewModel.clearShelvingList(
-                            shelvingFk
-                        )
-                        listItems.forEach {
-                            it.stickers = 0
-                            it.visible = 0
-                        }
-                        if (adapter != null) {
-                            adapter!!.notifyDataSetChanged()
-                        }
-                        customDialog.dismiss()
+                    viewModel.clearShelvingList(
+                        shelvingFk
+                    )
+                    listItems.forEach {
+                        it.stickers = 0
+                        it.visible = 0
                     }
+                    if (adapter != null) {
+                        adapter!!.notifyDataSetChanged()
+                    }
+                    customDialogDelete.dismiss()
+                }
 
-                customDialog.setKoButton(getString(R.string.cancel)) {
-                    customDialog.dismiss()
-                }.show()
-            } else {
-                getString(R.string.errorShelving).toast(
-                    requireContext()
-                )
+            customDialogDelete.setKoButton(getString(R.string.cancel)) {
+                customDialogDelete.dismiss()
+            }.show()
+               } else {
+                    getString(R.string.errorShelving).toast(
+                        requireContext()
+                    )
 
-            }
+                }
 
         }
     }
@@ -394,9 +404,9 @@ class UbicadorFragmentNew(
         parking = customDialogInput.getValue()
         //Tarea 6964
         /* viewModel.hasItemOlder(shelvingFk,customDialogInput.getValue())*/
-         viewModel.setParking(
-             shelvingFk, customDialogInput.getValue()
-         )
+        viewModel.setParking(
+            shelvingFk, customDialogInput.getValue()
+        )
 
         customDialogInput.dismiss()
     }
@@ -522,16 +532,17 @@ class UbicadorFragmentNew(
 
             responseHasOlder.observe(viewLifecycleOwner, Observer {
 
-                ma.messageWithSound("",true,true,"",false)
+                ma.messageWithSound("", true, true, "", false)
                 customDialogOlder.setTitle(getString(R.string.info))
                     .setDescription(getString(R.string.itemOlderInfo, shelvingFk))
                     .setOkButton(
-                       getString(R.string.ok)
+                        getString(R.string.ok)
                     ) {
                         customDialogOlder.dismiss()
                         //customDialogActionParking()
                         viewModel.setParking(
-                            shelvingFk, parking)
+                            shelvingFk, parking
+                        )
 
                     }.setKoButton(getString(R.string.cancel)) {
                         customDialogOlder.dismiss()
@@ -691,13 +702,18 @@ class UbicadorFragmentNew(
     }
 
     private fun setShowAddItemAction(itemUbicador: ItemUbicador?) {
-        if (customDialogUbicador.getItemValue()
-                .isNullOrEmpty() || customDialogUbicador.getPackingValue().isNullOrBlank()
-        ) {
-            getString(R.string.itemAndPackingMandatory).toast(context)
-        } else {
-            saveItemCall(customDialogUbicador, itemUbicador)
-            customDialogUbicador.dismiss()
+        try {
+
+            if (customDialogUbicador.getItemValue()
+                    .isNullOrEmpty() || customDialogUbicador.getPackingValue().isNullOrBlank()
+            ) {
+                getString(R.string.itemAndPackingMandatory).toast(context)
+            } else {
+                saveItemCall(customDialogUbicador, itemUbicador)
+                customDialogUbicador.dismiss()
+            }
+        } catch(ex:Exception){
+            ex.message!!.toast(requireContext())
         }
     }
 
@@ -777,7 +793,8 @@ class UbicadorFragmentNew(
                 }
                 customDialogTwoButtons.dismiss()
             }.setOkButtonTwo(getString(R.string.delete)) {
-                customDialog.setTitle(getString(R.string.confirm)).setDescription(
+                var customDialogConfirm = CustomDialog(requireContext())
+                customDialogConfirm.setTitle(getString(R.string.confirm)).setDescription(
                     if (!isAutoSelf) {
                         getString(R.string.itemDeleteConfirm) + item.item + "?"
                     } else {
@@ -791,22 +808,26 @@ class UbicadorFragmentNew(
                             item.id
                         )
                         customDialogTwoButtons.dismiss()
-                        customDialog.dismiss()
+                        customDialogConfirm.dismiss()
                     } else {
                         viewModel.itemShelvingSelfConsumption(
                             shelvingFk, item.item.toInt(), 0
                         )
-                        customDialog.dismiss()
+                        customDialogConfirm.dismiss()
                         customDialogTwoButtons.dismiss()
                     }
                 }.setKoButton(getString(R.string.cancel)) {
-                    customDialog.dismiss()
+                    customDialogConfirm.dismiss()
                     customDialogTwoButtons.dismiss()
-                }.show()
+                }
+                customDialogConfirm.show()
+            }
 
-            }.setKoButton(getString(R.string.cancel)) {
-                customDialogTwoButtons.dismiss()
-            }.show()
+        customDialogTwoButtons.setKoButton(getString(R.string.cancel)) {
+            customDialogTwoButtons.dismiss()
+        }
+
+        customDialogTwoButtons.show()
     }
 
     private fun customDialogInputAction(item: ItemUbicador) {