From 41828a374b117bd369bd8d62c1b6529dc1fd0812 Mon Sep 17 00:00:00 2001
From: Sergio De la torre <sergiodt@verdnatura.es>
Date: Fri, 17 Feb 2023 13:41:00 +0100
Subject: [PATCH 1/8] Modificar pantallas embalajes

---
 .idea/workspace.xml                           | 63 +++++++++------
 .../presentation/base/BaseFragment.kt         |  2 +-
 .../packaging/adapter/ItemSupplierAdapter.kt  |  4 +-
 .../packaging/fragment/ObservFragment.kt      |  5 +-
 .../fragment/PackagingCountFragment.kt        | 77 ++++++++++++++++++-
 .../PackagingViewModel/SupplierViewModel.kt   |  2 +-
 .../packaging/fragment/SupplierFragment.kt    | 54 +++++++++++--
 .../pasillero/fragment/PasilleroViewModel.kt  |  4 +-
 .../main/res/layout/fragment_packaging.xml    | 69 ++++++++++++-----
 .../res/layout/fragment_packaging_count.xml   |  2 +
 .../res/layout/fragment_packaging_obs.xml     | 11 ++-
 app/src/main/res/layout/item_image_row.xml    |  8 +-
 .../main/res/layout/item_itemsupplier_row.xml |  9 ++-
 app/src/main/res/values-es/strings.xml        |  6 ++
 app/src/main/res/values/strings.xml           |  8 +-
 15 files changed, 251 insertions(+), 73 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4540c781..88d0c499 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -83,9 +83,22 @@
     </select>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="Activado impresion labelCount">
+    <list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="Modificar pantallas embalajes">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/ShowTicketFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/ShowTicketFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/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/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/PackagingViewModel/SupplierViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/SupplierFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/SupplierFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/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/res/layout/fragment_packaging.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_packaging.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_packaging_count.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_packaging_count.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_packaging_obs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_packaging_obs.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_image_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_image_row.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_itemsupplier_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_itemsupplier_row.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/res/values-es/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-es/strings.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/res/values/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" />
@@ -96,7 +109,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_2_API_24.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" />
@@ -182,7 +195,7 @@
     </option>
     <option name="RECENT_BRANCH_BY_REPOSITORY">
       <map>
-        <entry key="$PROJECT_DIR$" value="testBeta_5109_qr_Agrupar_sales" />
+        <entry key="$PROJECT_DIR$" value="testBeta" />
       </map>
     </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -228,26 +241,28 @@
     <option name="showLibraryContents" value="true" />
     <option name="showMembers" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;ApkExportedModule&quot;: &quot;Gestor_Almacén.app&quot;,
-    &quot;ExportApk.ApkPathForGestor_Almacén.app&quot;: &quot;C:\\Users\\sergiodt\\AndroidStudioProjects\\vn-warehouseManager\\app&quot;,
-    &quot;RunOnceActivity.cidr.known.project.marker&quot;: &quot;true&quot;,
-    &quot;cidr.known.project.marker&quot;: &quot;true&quot;,
-    &quot;com.google.services.firebase.aqiPopupShown&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;C:/Users/sergiodt/proyectos/Rocket.Chat.ReactNative/android/app&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;reference.settingsdialog.project.gradle&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "ApkExportedModule": "Gestor_Almacén.app",
+    "ExportApk.ApkPathForGestor_Almacén.app": "C:\\Users\\sergiodt\\AndroidStudioProjects\\vn-warehouseManager\\app",
+    "PROJECT_TRUSTED_KEY": "true",
+    "RunOnceActivity.cidr.known.project.marker": "true",
+    "ScreenRecorder.SavePath": "C:\\Users\\sergiodt\\embalajes.mp4",
+    "cidr.known.project.marker": "true",
+    "com.google.services.firebase.aqiPopupShown": "true",
+    "last_opened_file_path": "C:/Users/sergiodt",
+    "project.structure.last.edited": "Modules",
+    "project.structure.proportion": "0.17",
+    "project.structure.side.proportion": "0.2",
+    "run.code.analysis.last.selected.profile": "pProject Default",
+    "settings.editor.selected.configurable": "reference.settingsdialog.project.gradle"
   },
-  &quot;keyToStringList&quot;: {
-    &quot;ExportApk.BuildVariants&quot;: [
-      &quot;release&quot;
+  "keyToStringList": {
+    "ExportApk.BuildVariants": [
+      "release"
     ]
   }
-}</component>
+}]]></component>
   <component name="PsdUISettings">
     <option name="MODULE_TAB" value="Default Config" />
     <option name="LAST_EDITED_SIGNING_CONFIG" value="debug" />
@@ -774,7 +789,7 @@
                   <entry key="branch">
                     <value>
                       <list>
-                        <option value="testBeta_5109_qr" />
+                        <option value="testBeta_embalajes_pantallas" />
                       </list>
                     </value>
                   </entry>
@@ -833,7 +848,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
-    <MESSAGE value="Version 9.2.1 Modificado fragment a fragment_general" />
     <MESSAGE value="Version 9.2.1 añadido error encajado y modificado marcaje" />
     <MESSAGE value="Version 9.2.1 en producción" />
     <MESSAGE value="Version 9.2.1 en producción. Borrada Voz y Ajustes impresora" />
@@ -858,7 +872,8 @@
     <MESSAGE value="Version 23.2 Modificado orden ubicador y revisión anterior falta activar icono" />
     <MESSAGE value="Version 23.2 Modificado actualizar pantalla al transferir en Ubicador. Subida version" />
     <MESSAGE value="Activado impresion labelCount" />
-    <option name="LAST_COMMIT_MESSAGE" value="Activado impresion labelCount" />
+    <MESSAGE value="Modificar pantallas embalajes" />
+    <option name="LAST_COMMIT_MESSAGE" value="Modificar pantallas embalajes" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
diff --git a/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt b/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt
index e4531375..f4bfaa13 100644
--- a/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt
@@ -534,7 +534,7 @@ abstract class BaseFragment<T : ViewDataBinding, V : BaseViewModel>(viewModelCla
             ITEMPACKINGFK -> prefs.getString(name, "").toString()
             WORKFORMSELECTED -> prefs.getString(name, "Producción").toString()
             "SUPPLIERNAME" -> prefs.getString(name, "").toString()
-            "SUPPLIERID" -> prefs.getInt(name, 0).toString()
+            "SUPPLIERID" -> prefs.getString(name, "").toString()
             "ENTRYTYPE" -> prefs.getString(name, "").toString()
             "ENTRYNUMBERIMAGES" -> prefs.getString(name, "0").toString()
             "ENTRYOBSERVATIONS" -> prefs.getString(name, "").toString()
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 ba68fb0f..08bf81c8 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
@@ -42,11 +42,11 @@ class ItemSupplierAdapter(
             binding.apply {
                 this.item = item
 
-                itemImageUpdate.setOnClickListener {
+                itemAdd.setOnClickListener {
                     onImageUpdateClickListener.OnImageUpdateClickListener(
                         item
                     )
-                    itemImageTrash.setOnClickListener {
+                    itemRemove.setOnClickListener {
                         onImageTrashClickListener.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 7cc59efe..92fb73c6 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
@@ -79,7 +79,7 @@ class ObservFragment(
                                     listImages!!.size.toString()
                                 }
                             )
-                            saveData("ENTRYOBSERVATIONS",binding.observations.text.toString())
+                            saveData("ENTRYOBSERVATIONS", binding.observations.text.toString())
                             ma.onPasillerosItemClickListener(
                                 PasillerosItemVO(title = getString(R.string.titlePackagingSummary)),
                                 getString(R.string.titlePackagingSummary)
@@ -105,7 +105,8 @@ class ObservFragment(
                 d("VERDNATURA::", "el nombre es " + image.uri)
                 //binding.imageView30.setImageURI(image.uri)
             }
-            listImages = it as MutableList<Image>
+            if (listImages != null)
+                listImages = it as MutableList<Image>
             setAdapter(listImages!!)
         }
 
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 488e53c5..838396e5 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
@@ -41,10 +41,12 @@ class PackagingCountFragment(
 
     override fun onCreate(savedInstanceState: Bundle?) {
 
+
         viewModel.supplier_getItems(
-            getData("SUPPLIERID") as Int
+            getData("SUPPLIERID")
         )
 
+
         super.onCreate(savedInstanceState)
     }
 
@@ -56,7 +58,7 @@ class PackagingCountFragment(
                 getString(R.string.titlePackagingObs)
             )
         }
-        binding.splashProgress.visibility = View.VISIBLE
+        // binding.splashProgress.visibility = View.VISIBLE
 
         customDialogInput = CustomDialogInput(requireContext())
         customDialog = CustomDialog(requireContext())
@@ -117,16 +119,37 @@ class PackagingCountFragment(
 
                         override fun OnImageUpdateClickListener(item: Any) {
                             d("VERDNATURA::", "Seleccionado update" + (item as ItemSupplier).name)
+                            printCustomDialog("quantity")
+                            customDialogInput.setTitle(getString(R.string.quantityReviewed))
+                                .setDescription(getString(R.string.quantityToReview))
+                                .setOkButton(getString(R.string.accept)) {
+                                    if (!customDialogInput.getValue().isNullOrEmpty()) {
+                                        requireActivity().hideKeyboard()
+                                    }
+                                    customDialogInput.setValue("")
+                                    customDialogInput.dismiss()
+
+                                }.setKoButton(getString(R.string.cancel)) {
+
+                                    customDialogInput.dismiss()
+
+                                }.setValue("").show()
+
+
                         }
 
                     }, object : OnImageTrashClickListener {
                         override fun OnImageUpdateClickListener(item: Any) {
                             d("VERDNATURA::", "Seleccionado trash" + (item as ItemSupplier).name)
+                            printCustomDialog("delete")
                         }
 
                     }, object : OnEditSubQuantityListener {
                         override fun OnEditSubQuantityListener(item: Any, text: String) {
-                            d("VERDNATURA::", "la subquantity es " + (item as ItemSupplier).name+"el valor es :"+text)
+                            d(
+                                "VERDNATURA::",
+                                "la subquantity es " + (item as ItemSupplier).name + "el valor es :" + text
+                            )
                             hideKeyboard()
                         }
                     })
@@ -141,6 +164,54 @@ class PackagingCountFragment(
         }
     }
 
+    private fun printCustomDialog(action: String) {
+
+        when (action) {
+            "quantity" -> {
+                customDialogInput.setTitle(getString(R.string.quantityReviewed))
+                    .setDescription(getString(R.string.Indicanuevacantidad))
+                    .setOkButton(getString(R.string.accept)) {
+                        if (!customDialogInput.getValue().isNullOrEmpty()) {
+                            requireActivity().hideKeyboard()
+                        }
+                        customDialogInput.setValue("")
+                        customDialogInput.dismiss()
+                        requireActivity().showKeyboard()
+                    }.setKoButton(getString(R.string.cancel)) {
+                        customDialogInput.dismiss()
+                        requireActivity().showKeyboard()
+                    }.setValue("").show()
+
+                customDialogInput.setInputText()
+                customDialogInput.currentFocus
+                customDialogInput.setFocusText()
+                requireActivity().showKeyboard()
+            }
+            "delete" -> {
+                customDialog.setTitle(getString(R.string.deleteEntryReviewed))
+                    .setDescription(getString(R.string.sure))
+                    .setOkButton(
+                        getString(
+                            R.string.delete
+                        )
+                    ) {
+                        d("VERDNATURA::", "borrado")
+                    }
+
+                    .setKoButton(getString(R.string.cancel)) {
+                        customDialog.cancel()
+                        customDialog.dismiss()
+
+
+                    }
+            }
+
+        }
+        customDialog.show()
+    }
+
 
 }
 
+
+
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt
index 6ffb91af..5155b3d3 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt
@@ -72,7 +72,7 @@ class PackagingViewModel(val context: Context) : BaseViewModel(context) {
             })
     }
 
-    fun supplier_getItems(supplierFk: Int) {
+    fun supplier_getItems(supplierFk: Any) {
 
         silex.supplier_getItems(supplierFk)
             .enqueue(object : SilexCallback<List<ItemSupplier>>(context) {
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 254d4b5b..4ceeebc7 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
@@ -1,13 +1,16 @@
 package es.verdnatura.presentation.view.feature.packaging.fragment
 
+import android.app.AlertDialog
 import android.content.Context
 import android.os.Bundle
+import android.util.Log.d
 import android.view.View
 import androidx.recyclerview.widget.LinearLayoutManager
 import es.verdnatura.R
 import es.verdnatura.databinding.FragmentPackagingBinding
 import es.verdnatura.presentation.base.BaseFragment
 import es.verdnatura.presentation.common.OnPasillerosItemClickListener
+import es.verdnatura.presentation.view.component.CustomDialog
 import es.verdnatura.presentation.view.feature.inventario.fragment.SearchSupplierModel
 import es.verdnatura.presentation.view.feature.packaging.fragment.PackagingViewModel.PackagingViewModel
 import es.verdnatura.presentation.view.feature.packaging.model.EntrySalix
@@ -28,6 +31,7 @@ class SupplierFragment(
     private var layoutManager: LinearLayoutManager? = null
     private var onBack = false
     private val suppliers = ArrayList<SearchSupplierModel>()
+    private lateinit var customDialog: CustomDialog
 
 
     companion object {
@@ -79,7 +83,7 @@ class SupplierFragment(
         setEvents()
 
         val entry = EntrySalix(supplierFk = "591", travelFk = "186025", companyFk = "442")
-        viewModel.entry_addSalix(entry)
+        // viewModel.entry_addSalix(entry)
 
         super.init()
     }
@@ -93,7 +97,46 @@ class SupplierFragment(
         binding.mainToolbar.backButton.setOnClickListener {
             requireActivity().onBackPressed()
         }
+        binding.filterEntry.setOnClickListener {
 
+            val builder = AlertDialog.Builder(context)
+            builder.setTitle(getString(R.string.selectEntryToFill))
+            val labelCount = arrayOf("Entrada 1", "Entrada 2", "Añadir Nueva")
+            builder.setItems(labelCount) { dialog, which ->
+
+                if (labelCount[which] == "Añadir Nueva") {
+                    customDialog = CustomDialog(requireContext())
+                    customDialog.setTitle(getString(R.string.newEntry))
+                        .setDescription(getString(R.string.confirmEntry))
+                        .setOkButton(
+                            getString(
+                                R.string.createEntry
+                            )
+                        ) {
+                            d("VERDNATURA::", "borrado")
+                        }
+
+                        .setKoButton(getString(R.string.cancel)) {
+                            customDialog.cancel()
+                            customDialog.dismiss()
+
+
+                        }
+                    customDialog.show()
+
+                }
+
+
+                ma.onPasillerosItemClickListener(
+                    PasillerosItemVO(title = getString(R.string.titlePackagingCount)),
+                    getString(R.string.titlePackagingCount)
+                )
+
+            }
+            val dialog = builder.create()
+            dialog.show()
+
+        }
         binding.radiobuttonTypePackaging.setOnCheckedChangeListener { buttonView, isChecked ->
             when (isChecked) {
                 R.id.radioButtonRec -> {
@@ -105,11 +148,12 @@ class SupplierFragment(
                 }
 
             }
+            binding.filterEntry.visibility = View.VISIBLE
             if (!onBack) {
-                ma.onPasillerosItemClickListener(
-                    PasillerosItemVO(title = getString(R.string.titlePackagingCount)),
-                    getString(R.string.titlePackagingCount)
-                )
+                /* ma.onPasillerosItemClickListener(
+                     PasillerosItemVO(title = getString(R.string.titlePackagingCount)),
+                     getString(R.string.titlePackagingCount)
+                 )*/
 
             }
             onBack = false
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 ccfbbd76..b9ddcb82 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
@@ -512,7 +512,7 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
 
 
     //#tarea4021
-  /*   _pasillerositem.add(
+     _pasillerositem.add(
             PasillerosItemVO(
                 6,
                 R.drawable.ic_packaging,
@@ -520,7 +520,7 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
                 R.string.titlePackaging,
                 contextApp.getString(R.string.titlePackagingDescrip)
             )
-        )*/
+        )
 
         val working_in_test=false
         if (working_in_test){
diff --git a/app/src/main/res/layout/fragment_packaging.xml b/app/src/main/res/layout/fragment_packaging.xml
index ffad3bbb..e9065065 100644
--- a/app/src/main/res/layout/fragment_packaging.xml
+++ b/app/src/main/res/layout/fragment_packaging.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:tools="http://schemas.android.com/tools"
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
 
@@ -12,11 +11,11 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="vertical"
+            android:paddingTop="@dimen/toolbar_height"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            android:paddingTop="@dimen/toolbar_height">
+            app:layout_constraintTop_toTopOf="parent">
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/textinputlayout_username"
@@ -40,10 +39,10 @@
                         android:inputType="text"
                         android:lines="1"
                         android:maxLines="1"
-                        android:visibility="gone"
                         android:textAlignment="center"
                         android:textColor="@color/verdnatura_white"
-                        android:textColorHint="@android:color/darker_gray" />
+                        android:textColorHint="@android:color/darker_gray"
+                        android:visibility="gone" />
 
                     <TextView
                         android:id="@+id/filter_supplier"
@@ -73,11 +72,12 @@
                 android:id="@+id/radiobuttonTypePackaging"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:visibility="invisible"
                 android:layout_marginTop="25dp"
                 android:gravity="center_horizontal"
+                android:visibility="invisible"
 
                 >
+
                 <RadioButton
                     android:id="@+id/radioButtonRec"
                     android:layout_width="wrap_content"
@@ -99,32 +99,63 @@
 
             </RadioGroup>
 
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
 
+                <TextView
+                    android:id="@+id/filter_entry"
+                    style="@style/InputLineTextSearch"
+                    android:layout_width="match_parent"
+                    android:layout_weight="1"
+
+                    android:layout_marginTop="24dp"
+                    android:backgroundTint="@android:color/white"
+                    android:drawableEnd="@drawable/ic_arrow_drop_down_black_24dp"
+                    android:focusable="false"
+                    android:hint="@string/Entrada"
+                    android:inputType="text"
+                    android:lines="1"
+                    android:maxLines="1"
+                    android:textAlignment="center"
+                    android:textColor="@color/verdnatura_pumpkin_orange"
+                    android:textColorHint="@android:color/darker_gray"
+                    android:visibility="gone" />
+
+                <ImageView
+                    android:id="@+id/addEntry"
+                    style="@style/InputLineTextSearch"
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:focusable="false"
+                    android:visibility="gone"
+                    app:srcCompat="@drawable/ic_add_black_24dp" />
+
+
+            </LinearLayout>
         </LinearLayout>
 
-
-
         <include
-        android:id="@+id/main_toolbar"
-        layout="@layout/toolbar_fragment"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
+            android:id="@+id/main_toolbar"
+            layout="@layout/toolbar_fragment"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
 
         <LinearLayout
             android:id="@+id/splash_progress"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical"
             android:background="@color/verdnatura_black_8_alpha_6"
+            android:gravity="center"
+            android:orientation="vertical"
             android:visibility="visible"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            android:gravity="center">
+            app:layout_constraintTop_toTopOf="parent">
 
             <com.airbnb.lottie.LottieAnimationView
 
@@ -138,7 +169,5 @@
         </LinearLayout>
 
 
-
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_packaging_count.xml b/app/src/main/res/layout/fragment_packaging_count.xml
index 5d7518dc..aa54b8ed 100644
--- a/app/src/main/res/layout/fragment_packaging_count.xml
+++ b/app/src/main/res/layout/fragment_packaging_count.xml
@@ -90,6 +90,7 @@
                         android:layout_weight="1"
                         android:gravity="center"
                         android:text="@string/Cantidad"
+                        android:visibility="gone"
                         android:textColor="@color/verdnatura_white"
                         android:textSize="@dimen/body2" />
 
@@ -103,6 +104,7 @@
                         android:paddingStart="@dimen/layout_margin_3"
                         android:textSize="@dimen/body2" />
 
+
                 </LinearLayout>
 
             </com.google.android.material.textfield.TextInputLayout>
diff --git a/app/src/main/res/layout/fragment_packaging_obs.xml b/app/src/main/res/layout/fragment_packaging_obs.xml
index b56c9cb5..b81ee973 100644
--- a/app/src/main/res/layout/fragment_packaging_obs.xml
+++ b/app/src/main/res/layout/fragment_packaging_obs.xml
@@ -32,12 +32,13 @@
             app:layout_constraintTop_toBottomOf="@+id/textObs" />
 
         <TextView
-            android:id="@+id/textImage"
+            android:id="@+id/openPickerImages"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Imágenes : "
             android:textColor="#FFF"
             android:textSize="18dp"
+            android:drawableEnd="@drawable/ic_add_black_24dp"
             app:layout_constraintStart_toEndOf="@+id/observations"
             app:layout_constraintTop_toBottomOf="@+id/observations" />
         <LinearLayout
@@ -49,16 +50,18 @@
             android:layout_marginBottom="@dimen/layout_margin_1"
             android:paddingLeft="@dimen/layout_margin_min"
             android:paddingRight="@dimen/layout_margin_min"
-            app:layout_constraintStart_toEndOf="@+id/textImage"
-            app:layout_constraintTop_toBottomOf="@+id/textImage" >
+            app:layout_constraintTop_toBottomOf="@+id/openPickerImages" >
+
+
 
                 <TextView
-                android:id="@+id/openPickerImages"
+                android:id="@+id/openPickerImagesOld"
                 android:layout_width="match_parent"
                 android:layout_height="48dp"
                 android:layout_weight="1"
                 android:gravity="center"
                 android:text="Añadir nueva..."
+                    android:visibility="gone"
                 android:textColor="@color/verdnatura_white"
                 android:textSize="@dimen/body2" />
                   </LinearLayout>
diff --git a/app/src/main/res/layout/item_image_row.xml b/app/src/main/res/layout/item_image_row.xml
index d0ed16d3..8734a188 100644
--- a/app/src/main/res/layout/item_image_row.xml
+++ b/app/src/main/res/layout/item_image_row.xml
@@ -45,16 +45,16 @@
 
 
             <ImageView
-                android:layout_marginLeft="@dimen/default_layout_margin"
                 android:id="@+id/item_image_update"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginLeft="@dimen/default_layout_margin"
                 android:layout_weight="1"
                 android:gravity="center_vertical"
                 android:scaleType="centerCrop"
-                android:layout_gravity="center"
-                android:visibility="visible"
-                android:src="@drawable/ic_history_black_24dp" />
+                android:src="@drawable/ic_history_black_24dp"
+                android:visibility="gone" />
 
             <ImageView
                 android:layout_marginLeft="@dimen/default_layout_margin"
diff --git a/app/src/main/res/layout/item_itemsupplier_row.xml b/app/src/main/res/layout/item_itemsupplier_row.xml
index 092f6bfc..ddb3a930 100644
--- a/app/src/main/res/layout/item_itemsupplier_row.xml
+++ b/app/src/main/res/layout/item_itemsupplier_row.xml
@@ -49,13 +49,14 @@
             <EditText
                 android:id="@+id/item_subquantity"
                 android:layout_width="match_parent"
+
                 android:layout_height="wrap_content"
                 android:layout_weight="1.25"
                 android:text="@{Integer.toString(item.subquantity)}"
                 android:textColor="@color/verdnatura_white"
                 android:textSize="@dimen/h8"
                 android:gravity="center_vertical"
-                android:visibility="visible"
+                android:visibility="gone"
                 android:imeOptions="actionDone"
                 android:singleLine="true"
                 android:layout_gravity="center"
@@ -77,18 +78,18 @@
 
             <ImageView
                 android:layout_marginLeft="@dimen/default_layout_margin"
-                android:id="@+id/item_image_update"
+                android:id="@+id/item_add"
                 android:layout_width="24dp"
                 android:gravity="center_vertical"
                 android:layout_height="24dp"
                 android:scaleType="centerCrop"
                 android:layout_gravity="center"
                 android:visibility="visible"
-                android:src="@drawable/ic_history_black_24dp" />
+                android:src="@drawable/ic_add_black_24dp" />
 
             <ImageView
                 android:layout_marginLeft="@dimen/default_layout_margin"
-                android:id="@+id/item_image_trash"
+                android:id="@+id/item_remove"
                 android:layout_width="24dp"
                 android:gravity="center_vertical"
                 android:layout_height="24dp"
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 640a51f3..eefc8fa1 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -271,6 +271,7 @@
     <string name="deleteStock">Indica la causa de eliminar stock:</string>
     <string name="quantityToRegister">Indica la cantidad a dar de alta</string>
     <string name="quantityToUnregister">"Indica la cantidad a dar de baja "</string>
+    <string name="quantityToReview">"Indica la cantidad a sumar a la cantidad total revisada"</string>
     <string name="fault">Falta</string>
     <string name="trash">Basura</string>
     <string name="errorNotNumber">El elemento introducido no es un número</string>
@@ -319,6 +320,7 @@
     <string name="shlevesNumber">Número de baldas del ticket</string>
     <string name="shlevesNumberTicket">Indica el número de baldas que ocupa el ticket</string>
     <string name="packetNumberShelves">Número de paquetes en balda</string>
+    <string name="quantityReviewed">Cantidad revisada</string>
     <string name="packetIndicate">Indica el número de paquetes que caben en una balda</string>
     <string name="test">Comprobar</string>
     <string name="expeditionsError">No ha escaneado expediciones</string>
@@ -530,5 +532,9 @@
     <string name="selfConsumption">Autoconsumo</string>
     <string name="titleSelfConsumption">Autoconsumo</string>
     <string name="titleSelfDescription">Permite consumo de materiales del almacén</string>
+    <string name="selectEntryToFill">Selecciona la entrada</string>
+    <string name="deleteEntryReviewed">Va a borrar el ítem y cantidad revisada.</string>
+    <string name="newEntry">Va a crear una nueva entrada</string>
+    <string name="createEntry">Crear entrada</string>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9f4910ea..49e59365 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -229,7 +229,8 @@
     <string name="fillFields">Fill required fields</string>
     <string name="mandatoryPacking">Packing required</string>
     <string name="selectAction">Select an action</string>
-    <string name="delete">Delete</string>
+    <string name="deleteEntryReviewed">"You are going to delete quantity and item "</string>
+    <string name="newEntry">"You are going to create a new entry"</string>
     <string name="lookWithpermission">You can only view when you have taken the vehicle yourself unless you have permission to do so.</string>
     <string name="info">Information</string>
     <string name="accept">Accept</string>
@@ -251,6 +252,7 @@
     <string name="unmarkLine">Unmark line</string>
     <string name="goUnmark">You are going to unmark the line: </string>
     <string name="sure">are you sure?</string>
+    <string name="createEntry">New entry</string>
     <string name="unmark">Unmark</string>
     <string name="sectorALGEMESI">ALGEMESI V</string>
     <string name="sectorALGEMESINEW">SACADOR V</string>
@@ -524,9 +526,13 @@
     <string name="scanValues">Scan values : </string>
     <string name="titleChecker">Check items</string>
     <string name="selectLabeltoPrint">Select label to print</string>
+    <string name="selectEntryToFill">Select entry to fill</string>
     <string name="formatError">Expedition format no valid</string>
     <string name="errorQuantity">Insert the amount correctly</string>
     <string name="operationSuccessful">Operación realizada correctamente</string>
     <string name="selfConsumption">Self-consumption</string>
+    <string name="quantityReviewed">Quantity Reviewed</string>
+    <string name="quantityToReview">Put the reviewed quantity</string>
+    <string name="delete">Delete</string>
 
 </resources>

From 7b1508eed00d8045b5e319e1f778861a9e7ac395 Mon Sep 17 00:00:00 2001
From: Sergio De la torre <sergiodt@verdnatura.es>
Date: Thu, 23 Mar 2023 13:48:30 +0100
Subject: [PATCH 2/8] EntrySalix

---
 .idea/workspace.xml                           | 13 +++---
 .../java/es/verdnatura/domain/SalixService.kt | 10 +++++
 .../PackagingViewModel/SupplierViewModel.kt   | 40 +++++++++++++++++++
 .../feature/packaging/model/EntrySalix.kt     |  8 ++--
 4 files changed, 60 insertions(+), 11 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0f3e0ce5..f9f3badc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -83,12 +83,11 @@
     </select>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="refs #4923 previas">
+    <list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="Version 23.10Beta">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/model/LoginItemVO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/model/LoginItemVO.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/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SalixService.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SalixService.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/model/EntrySalix.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/model/EntrySalix.kt" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -185,7 +184,7 @@
     </option>
     <option name="RECENT_BRANCH_BY_REPOSITORY">
       <map>
-        <entry key="$PROJECT_DIR$" value="testBeta_5336" />
+        <entry key="$PROJECT_DIR$" value="testBeta" />
       </map>
     </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -783,7 +782,7 @@
                   <entry key="branch">
                     <value>
                       <list>
-                        <option value="testBeta_5109_Agrupar_sales_exandible_simple" />
+                        <option value="4021_embalajes" />
                       </list>
                     </value>
                   </entry>
diff --git a/app/src/main/java/es/verdnatura/domain/SalixService.kt b/app/src/main/java/es/verdnatura/domain/SalixService.kt
index 67a6f29d..fee5068a 100644
--- a/app/src/main/java/es/verdnatura/domain/SalixService.kt
+++ b/app/src/main/java/es/verdnatura/domain/SalixService.kt
@@ -124,6 +124,16 @@ interface SalixService {
     ):
             Call<List<Supplier>>
 
+    fun getEntries(
+        //@Body params:JSONObject=JSONObject("""filter"={"fields":{"id":true,"name":true},"include":[{"relation":"contacts","scope":{"fields":["email"],"order":"id DESC","limit":1,"where":{"email":{"neq":null}}}}]}""")
+        /* @Query("filter") filter:String="{\"fields\":{\"id\":true,\"name\":true},\"include\":[{\"relation\":\"contacts\"," +
+                 "\"scope\":{" +
+                 "\"fields\":[\"email\"],\"order\":\"id DESC\",\"limit\":1," +
+                 "\"where\":{ \"email\":{\"neq\":null } }}}]})"*/
+
+    ):
+            Call<List<EntrySalix>>
+
     @PUT("Entries")//REVISADA
     fun Entries(
         @Body entry: EntrySalix
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt
index 5155b3d3..80fda3b3 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt
@@ -72,6 +72,46 @@ class PackagingViewModel(val context: Context) : BaseViewModel(context) {
             })
     }
 
+    fun getEntries() {
+        salix.getSuppliers()
+            .enqueue(object :
+                SilexCallback<List<Supplier>>(context) {
+                override fun onError(t: Throwable) {
+                    val listError: ArrayList<Supplier> = ArrayList()
+                    listError.add(
+                        Supplier(
+                            isError = true,
+                            errorMessage = getMessageFromAllResponse(
+                                nameofFunction(this),
+                                t.message!!
+                            )
+                        )
+                    )
+                    _supplierList.value = SupplierList(listError)
+                }
+
+                override fun onSuccess(response: Response<List<Supplier>>) {
+                    if (response.body() != null) {
+                        _supplierList.value = response.body()?.let { SupplierList(it) }
+                    } else {
+                        val listError: ArrayList<Supplier> = ArrayList()
+                        listError.add(
+                            Supplier(
+                                isError = true,
+                                errorMessage = getMessageFromAllResponse(
+                                    nameofFunction(this),
+                                    response.message()
+                                )
+                            )
+                        )
+                        _supplierList.value = SupplierList(listError)
+
+                    }
+                }
+
+            })
+    }
+
     fun supplier_getItems(supplierFk: Any) {
 
         silex.supplier_getItems(supplierFk)
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/model/EntrySalix.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/model/EntrySalix.kt
index 051f06bb..aa7fce98 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/model/EntrySalix.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/model/EntrySalix.kt
@@ -1,10 +1,10 @@
 package es.verdnatura.presentation.view.feature.packaging.model
 
 class EntrySalix(
-    var id: String? = null,
-    var supplierFk: String? = null,
-    var travelFk: String? = null,
-    var companyFk: String? = null,
+    var id: Int? = null,
+    var supplierFk: Int? = null,
+    var travelFk: Int? = null,
+    var companyFk: Int? = null,
     var isError: Boolean? = null,
     var errorMessage: String? = null
 )

From c50e8039935d82e00e95f157eb031d0feb124eed Mon Sep 17 00:00:00 2001
From: Sergio De la torre <sergiodt@verdnatura.es>
Date: Fri, 24 Mar 2023 16:18:37 +0100
Subject: [PATCH 3/8] refs #4021

---
 .../java/es/verdnatura/domain/SalixService.kt |  19 ++-
 .../PackagingViewModel/SupplierViewModel.kt   |  36 +++---
 .../packaging/fragment/SupplierFragment.kt    | 115 ++++++++++++------
 .../feature/packaging/model/EntrySalix.kt     |  22 +++-
 .../view/feature/packaging/model/Supplier.kt  |   4 +-
 .../feature/sacador/mapper/SacadoresMapper.kt |   2 +-
 6 files changed, 136 insertions(+), 62 deletions(-)

diff --git a/app/src/main/java/es/verdnatura/domain/SalixService.kt b/app/src/main/java/es/verdnatura/domain/SalixService.kt
index fee5068a..8896f1e7 100644
--- a/app/src/main/java/es/verdnatura/domain/SalixService.kt
+++ b/app/src/main/java/es/verdnatura/domain/SalixService.kt
@@ -120,25 +120,32 @@ interface SalixService {
                  "\"scope\":{" +
                  "\"fields\":[\"email\"],\"order\":\"id DESC\",\"limit\":1," +
                  "\"where\":{ \"email\":{\"neq\":null } }}}]})"*/
+    //@Query("filter") filter:String? = """""\"order\":\"name DESC\""""
 
     ):
             Call<List<Supplier>>
 
-    fun getEntries(
+   /* fun getEntries(
         //@Body params:JSONObject=JSONObject("""filter"={"fields":{"id":true,"name":true},"include":[{"relation":"contacts","scope":{"fields":["email"],"order":"id DESC","limit":1,"where":{"email":{"neq":null}}}}]}""")
-        /* @Query("filter") filter:String="{\"fields\":{\"id\":true,\"name\":true},\"include\":[{\"relation\":\"contacts\"," +
+        *//* @Query("filter") filter:String="{\"fields\":{\"id\":true,\"name\":true},\"include\":[{\"relation\":\"contacts\"," +
                  "\"scope\":{" +
                  "\"fields\":[\"email\"],\"order\":\"id DESC\",\"limit\":1," +
-                 "\"where\":{ \"email\":{\"neq\":null } }}}]})"*/
+                 "\"where\":{ \"email\":{\"neq\":null } }}}]})"*//*
 
     ):
-            Call<List<EntrySalix>>
+            Call<List<EntrySalix>>*/
 
     @PUT("Entries")//REVISADA
     fun Entries(
-        @Body entry: EntrySalix
+        @Body supplier: Any
     ):
-            Call<EntrySalix>
+            Call<List<EntrySalix>>
+
+    @GET("Entries")//REVISADA
+    fun getEntries_fromSupplier(
+        @Query("filter") filter:String
+    ):
+            Call<List<EntrySalix>>
 
     @GET("Shelvings")
     fun Shelvings(
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt
index 80fda3b3..54189db4 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt
@@ -9,8 +9,6 @@ import es.verdnatura.presentation.base.getMessageFromAllResponse
 import es.verdnatura.presentation.base.nameofFunction
 import es.verdnatura.presentation.common.ResponseItemVO
 import es.verdnatura.presentation.view.feature.packaging.model.*
-import retrofit2.Call
-import retrofit2.Callback
 import retrofit2.Response
 
 class PackagingViewModel(val context: Context) : BaseViewModel(context) {
@@ -24,6 +22,10 @@ class PackagingViewModel(val context: Context) : BaseViewModel(context) {
     val supplierList: LiveData<SupplierList>
         get() = _supplierList
 
+    private val _entryList by lazy { MutableLiveData<EntryList>() }
+    val entryList: LiveData<EntryList>
+        get() = _entryList
+
     private val _entry by lazy { MutableLiveData<EntrySalix>() }
     val entry: LiveData<EntrySalix>
         get() = _entry
@@ -72,14 +74,14 @@ class PackagingViewModel(val context: Context) : BaseViewModel(context) {
             })
     }
 
-    fun getEntries() {
-        salix.getSuppliers()
+    fun getEntries_fromSupplier(supplier: Int) {
+        salix.getEntries_fromSupplier("""{"where": {"supplierFk": "$supplier","isReceived":"false"},"limit":5}""")
             .enqueue(object :
-                SilexCallback<List<Supplier>>(context) {
+                SilexCallback<List<EntrySalix>>(context) {
                 override fun onError(t: Throwable) {
-                    val listError: ArrayList<Supplier> = ArrayList()
+                    val listError: ArrayList<EntrySalix> = ArrayList()
                     listError.add(
-                        Supplier(
+                        EntrySalix(
                             isError = true,
                             errorMessage = getMessageFromAllResponse(
                                 nameofFunction(this),
@@ -87,16 +89,16 @@ class PackagingViewModel(val context: Context) : BaseViewModel(context) {
                             )
                         )
                     )
-                    _supplierList.value = SupplierList(listError)
+                    _entryList.value = EntryList(listError)
                 }
 
-                override fun onSuccess(response: Response<List<Supplier>>) {
+                override fun onSuccess(response: Response<List<EntrySalix>>) {
                     if (response.body() != null) {
-                        _supplierList.value = response.body()?.let { SupplierList(it) }
+                        _entryList.value = response.body()?.let { EntryList(it) }
                     } else {
-                        val listError: ArrayList<Supplier> = ArrayList()
+                        val listError: ArrayList<EntrySalix> = ArrayList()
                         listError.add(
-                            Supplier(
+                            EntrySalix(
                                 isError = true,
                                 errorMessage = getMessageFromAllResponse(
                                     nameofFunction(this),
@@ -104,7 +106,7 @@ class PackagingViewModel(val context: Context) : BaseViewModel(context) {
                                 )
                             )
                         )
-                        _supplierList.value = SupplierList(listError)
+                        _entryList.value = EntryList(listError)
 
                     }
                 }
@@ -144,10 +146,10 @@ class PackagingViewModel(val context: Context) : BaseViewModel(context) {
             })
     }
 
-    fun entry_addSalix(entry: EntrySalix) {
-        salix.Entries(entry = entry)
+   /* fun entry_addSalix(entry: EntrySalix) {
+        salix.getEntries(entry)
             .enqueue(object :
-                SilexCallback<EntrySalix> (context){
+                SilexCallback<EntrySalix>(context) {
                 override fun onError(t: Throwable) {
                     _entry.value = EntrySalix(
                         isError = true,
@@ -173,5 +175,5 @@ class PackagingViewModel(val context: Context) : BaseViewModel(context) {
 
                 }
             })
-    }
+    }*/
 }
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 4ceeebc7..2814f4b7 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
@@ -1,6 +1,5 @@
 package es.verdnatura.presentation.view.feature.packaging.fragment
 
-import android.app.AlertDialog
 import android.content.Context
 import android.os.Bundle
 import android.util.Log.d
@@ -10,12 +9,12 @@ import es.verdnatura.R
 import es.verdnatura.databinding.FragmentPackagingBinding
 import es.verdnatura.presentation.base.BaseFragment
 import es.verdnatura.presentation.common.OnPasillerosItemClickListener
+import es.verdnatura.presentation.common.convertToDateString
 import es.verdnatura.presentation.view.component.CustomDialog
 import es.verdnatura.presentation.view.feature.inventario.fragment.SearchSupplierModel
 import es.verdnatura.presentation.view.feature.packaging.fragment.PackagingViewModel.PackagingViewModel
 import es.verdnatura.presentation.view.feature.packaging.model.EntrySalix
 import es.verdnatura.presentation.view.feature.packaging.model.Supplier
-import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO
 import ir.mirrajabi.searchdialog.SimpleSearchDialogCompat
 
 
@@ -31,6 +30,7 @@ class SupplierFragment(
     private var layoutManager: LinearLayoutManager? = null
     private var onBack = false
     private val suppliers = ArrayList<SearchSupplierModel>()
+    private val entries = ArrayList<SearchSupplierModel>()
     private lateinit var customDialog: CustomDialog
 
 
@@ -47,8 +47,8 @@ class SupplierFragment(
 
     override fun onCreate(savedInstanceState: Bundle?) {
 
-        viewModel.getSuppliers(
-        )
+        viewModel.getSuppliers()
+
 
         super.onCreate(savedInstanceState)
     }
@@ -74,15 +74,17 @@ class SupplierFragment(
                 binding.radiobuttonTypePackaging.visibility = View.VISIBLE
                 saveData("SUPPLIERNAME", nombre.getName())
                 saveData("SUPPLIERID", nombre.getId())
+                viewModel.getEntries_fromSupplier(nombre.getId().toInt())
                 baseSearchDialogCompat.dismiss()
             }.show()
         }
 
+
         ma.hideBottomNavigation(View.GONE)
         setToolBar()
         setEvents()
 
-        val entry = EntrySalix(supplierFk = "591", travelFk = "186025", companyFk = "442")
+        val entry = EntrySalix(supplierFk = 591, travelFk = 186025, companyFk = 442)
         // viewModel.entry_addSalix(entry)
 
         super.init()
@@ -97,46 +99,47 @@ class SupplierFragment(
         binding.mainToolbar.backButton.setOnClickListener {
             requireActivity().onBackPressed()
         }
-        binding.filterEntry.setOnClickListener {
+        /*binding.filterEntry.setOnClickListener {
 
-            val builder = AlertDialog.Builder(context)
-            builder.setTitle(getString(R.string.selectEntryToFill))
-            val labelCount = arrayOf("Entrada 1", "Entrada 2", "Añadir Nueva")
-            builder.setItems(labelCount) { dialog, which ->
+              val builder = AlertDialog.Builder(context)
+              builder.setTitle(getString(R.string.selectEntryToFill))
+              val labelCount = arrayOf("Entrada 1", "Entrada 2", "Añadir Nueva")
+              builder.setItems(labelCount) { dialog, which ->
 
-                if (labelCount[which] == "Añadir Nueva") {
-                    customDialog = CustomDialog(requireContext())
-                    customDialog.setTitle(getString(R.string.newEntry))
-                        .setDescription(getString(R.string.confirmEntry))
-                        .setOkButton(
-                            getString(
-                                R.string.createEntry
-                            )
-                        ) {
-                            d("VERDNATURA::", "borrado")
-                        }
+                  if (labelCount[which] == "Añadir Nueva") {
+                      customDialog = CustomDialog(requireContext())
+                      customDialog.setTitle(getString(R.string.newEntry))
+                          .setDescription(getString(R.string.confirmEntry))
+                          .setOkButton(
+                              getString(
+                                  R.string.createEntry
+                              )
+                          ) {
+                              d("VERDNATURA::", "borrado")
+                          }
 
-                        .setKoButton(getString(R.string.cancel)) {
-                            customDialog.cancel()
-                            customDialog.dismiss()
+                          .setKoButton(getString(R.string.cancel)) {
+                              customDialog.cancel()
+                              customDialog.dismiss()
 
 
-                        }
-                    customDialog.show()
+                          }
+                      customDialog.show()
 
-                }
+                  }
 
 
-                ma.onPasillerosItemClickListener(
-                    PasillerosItemVO(title = getString(R.string.titlePackagingCount)),
-                    getString(R.string.titlePackagingCount)
-                )
+                  ma.onPasillerosItemClickListener(
+                      PasillerosItemVO(title = getString(R.string.titlePackagingCount)),
+                      getString(R.string.titlePackagingCount)
+                  )
 
-            }
-            val dialog = builder.create()
-            dialog.show()
+              }
+              val dialog = builder.create()
+              dialog.show()
+
+          }*/
 
-        }
         binding.radiobuttonTypePackaging.setOnCheckedChangeListener { buttonView, isChecked ->
             when (isChecked) {
                 R.id.radioButtonRec -> {
@@ -161,6 +164,24 @@ class SupplierFragment(
         }
     }
 
+    private fun setEntryDialog() {
+        binding.filterEntry.setOnClickListener {
+            SimpleSearchDialogCompat(
+                context,
+                getString(R.string.Entrada),
+                getString(R.string.escribirparteNombre),
+                null,
+                entries
+            ) { baseSearchDialogCompat, nombre, position ->
+                binding.filterEntry.setText((nombre.getName()))
+                binding.radiobuttonTypePackaging.visibility = View.VISIBLE
+                saveData("ENTRYID", nombre.getId())
+                baseSearchDialogCompat.dismiss()
+            }.show()
+        }
+
+    }
+
 
     override fun observeViewModel() {
         with(viewModel) {
@@ -168,6 +189,10 @@ class SupplierFragment(
                 binding.splashProgress.visibility = View.GONE
                 createSupplierList(it.list)
             }
+            entryList.observe(viewLifecycleOwner) {
+                binding.splashProgress.visibility = View.GONE
+                createEntryList(it.list)
+            }
 
             response.observe(viewLifecycleOwner) {
                 if (it.isError) {
@@ -191,5 +216,25 @@ class SupplierFragment(
         }
     }
 
+    private fun createEntryList(list: List<EntrySalix>) {
+        entries.clear()
+        list.forEach { entry ->
+            if (!entry.isError!!) {
+                try {
+                    entries.add(
+                        SearchSupplierModel(
+                            entry.id.toString() + "->" + convertToDateString( entry.dated.toString()),
+                                id = entry.id.toString()
+                        )
+                    )
+                } catch (e: Exception) {
+                }
+            }
+        }
+
+        entries.add(SearchSupplierModel("Añadir Nueva", ""))
+        setEntryDialog()
+    }
+
 }
 
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/model/EntrySalix.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/model/EntrySalix.kt
index aa7fce98..32d8bf09 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/model/EntrySalix.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/model/EntrySalix.kt
@@ -1,10 +1,28 @@
 package es.verdnatura.presentation.view.feature.packaging.model
 
+import android.content.Context
+import es.verdnatura.presentation.common.convertToDateString
+import java.util.ArrayList
+
 class EntrySalix(
     var id: Int? = null,
+    var dated: String? = null,
     var supplierFk: Int? = null,
     var travelFk: Int? = null,
     var companyFk: Int? = null,
-    var isError: Boolean? = null,
-    var errorMessage: String? = null
+    var isError: Boolean = false,
+    var errorMessage: String = ""
 )
+
+fun List<EntrySalix>.toDateFormat(): ArrayList<EntrySalix> {
+    val entries: ArrayList<EntrySalix> = ArrayList()
+    this.forEach {
+        entries.add(
+            EntrySalix(
+                dated = convertToDateString(it.dated),
+            )
+        )
+
+    }
+    return entries.sortedBy{it.dated} as ArrayList
+}
\ No newline at end of file
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/model/Supplier.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/model/Supplier.kt
index f946ffe8..ecee8269 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/model/Supplier.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/model/Supplier.kt
@@ -13,7 +13,9 @@ data class Supplier(
 class SupplierList(
     var list: List<Supplier> = listOf()
 )
-
+class EntryList(
+    var list: List<EntrySalix> = listOf()
+)
 class itemSupplierList(
     var list: List<ItemSupplier> = listOf()
 )
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/mapper/SacadoresMapper.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/mapper/SacadoresMapper.kt
index f9f8dc8c..015318dd 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/mapper/SacadoresMapper.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/mapper/SacadoresMapper.kt
@@ -28,4 +28,4 @@ private fun getCalendarFromDate(date: String, context: Context): Calendar {
     val cal = Calendar.getInstance()
     cal.time = sdf.parse(date)!!
     return cal
-}
\ No newline at end of file
+}

From 0996a390ec319b62975e7a30d1c2a8a327776e11 Mon Sep 17 00:00:00 2001
From: Sergio De la torre <sergiodt@verdnatura.es>
Date: Fri, 24 Mar 2023 16:19:21 +0100
Subject: [PATCH 4/8] refs #4021

---
 .../verdnatura/presentation/common/UIExtensions.kt   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/app/src/main/java/es/verdnatura/presentation/common/UIExtensions.kt b/app/src/main/java/es/verdnatura/presentation/common/UIExtensions.kt
index 8c6fce4f..859fd19f 100644
--- a/app/src/main/java/es/verdnatura/presentation/common/UIExtensions.kt
+++ b/app/src/main/java/es/verdnatura/presentation/common/UIExtensions.kt
@@ -21,6 +21,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.target.CustomTarget
 import com.bumptech.glide.request.transition.Transition
+import java.text.SimpleDateFormat
 import java.util.*
 
 
@@ -89,6 +90,17 @@ fun ImageView.loadUrl(url: String) {
 inline val <reified T> T.TAG: String
     get() = T::class.java.canonicalName ?: T::class.simpleName ?: T::class.java.simpleName
 
+fun convertToDateString(date: String?): String? {
+
+    if (date.isNullOrEmpty()) {
+        return date
+    }
+    val formatoEntrada = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'") // Formato de entrada
+    val formatoSalida = SimpleDateFormat("yyyy-MM-dd") // Formato de salida
+    val fechaDate = formatoEntrada.parse(date) // Convertir fecha de String a objeto Date
+    return formatoSalida.format(fechaDate) // Convertir fecha a String con formato deseado
+}
+
 fun Calendar.convertToDateString(): String {
     var dayOfWeek = ""
     var dayOfMonth = ""

From 59b06bea019d19d825bbba2862ac721f83bd0008 Mon Sep 17 00:00:00 2001
From: Sergio De la torre <sergiodt@verdnatura.es>
Date: Thu, 30 Mar 2023 07:24:16 +0200
Subject: [PATCH 5/8] Pantalla embalajes

---
 .idea/workspace.xml                                 |  7 ++++---
 .../main/java/es/verdnatura/domain/SalixService.kt  |  6 ++++++
 .../es/verdnatura/presentation/base/BaseFragment.kt |  1 +
 .../PackagingViewModel/SupplierViewModel.kt         |  4 ++--
 .../feature/packaging/fragment/SupplierFragment.kt  | 13 ++++++++++---
 5 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f9f3badc..7eb1b9ac 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -83,11 +83,12 @@
     </select>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="Version 23.10Beta">
+    <list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="version 23.10.1 Modificar controlador orden">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/base/BaseFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/model/EntrySalix.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/model/EntrySalix.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/SupplierFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/SupplierFragment.kt" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -98,7 +99,7 @@
   <component name="CodeInsightWorkspaceSettings">
     <option name="optimizeImportsOnTheFly" value="true" />
   </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[21114523025303]" />
+  <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[C:\Users\sergiodt\.android\avd\Pixel_2_API_24.avd]" />
   <component name="ExportToHTMLSettings">
     <option name="OPEN_IN_BROWSER" value="true" />
     <option name="OUTPUT_DIRECTORY" value="C:\Program Files\Android\Android Studio\inspections" />
diff --git a/app/src/main/java/es/verdnatura/domain/SalixService.kt b/app/src/main/java/es/verdnatura/domain/SalixService.kt
index 8896f1e7..f2392923 100644
--- a/app/src/main/java/es/verdnatura/domain/SalixService.kt
+++ b/app/src/main/java/es/verdnatura/domain/SalixService.kt
@@ -147,6 +147,12 @@ interface SalixService {
     ):
             Call<List<EntrySalix>>
 
+    @GET("Entries")//REVISADA
+    fun add_entry(
+        @Query("filter") filter:String
+    ):
+            Call<List<EntrySalix>>
+
     @GET("Shelvings")
     fun Shelvings(
         @Query("filter") filter: String
diff --git a/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt b/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt
index 6c91190f..65cbbc0b 100644
--- a/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt
@@ -541,6 +541,7 @@ abstract class BaseFragment<T : ViewDataBinding, V : BaseViewModel>(viewModelCla
             "ENTRYOBSERVATIONS" -> prefs.getString(name, "").toString()
 
 
+
             "base_url" -> {
                 val preferences = PreferenceManager.getDefaultSharedPreferences(context)
                 preferences.getString(getString(R.string.baseurl), "").toString()
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt
index 54189db4..9464ea37 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt
@@ -146,7 +146,7 @@ class PackagingViewModel(val context: Context) : BaseViewModel(context) {
             })
     }
 
-   /* fun entry_addSalix(entry: EntrySalix) {
+   fun entry_addSalix(entry: EntrySalix) {
         salix.getEntries(entry)
             .enqueue(object :
                 SilexCallback<EntrySalix>(context) {
@@ -175,5 +175,5 @@ class PackagingViewModel(val context: Context) : BaseViewModel(context) {
 
                 }
             })
-    }*/
+    }
 }
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 2814f4b7..a2472ea0 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
@@ -84,9 +84,6 @@ class SupplierFragment(
         setToolBar()
         setEvents()
 
-        val entry = EntrySalix(supplierFk = 591, travelFk = 186025, companyFk = 442)
-        // viewModel.entry_addSalix(entry)
-
         super.init()
     }
 
@@ -236,5 +233,15 @@ class SupplierFragment(
         setEntryDialog()
     }
 
+    private fun addEntry(){
+
+
+        if   (getData("ENTRYTYPE" )=="Rec"){
+            viewModel.entry_addSalix(EntrySalix(supplierFk = getData("SUPPLIERID").toInt(), travelFk = 186025, companyFk = 442))
+        }else{
+            viewModel.entry_addSalix(EntrySalix(supplierFk = getData("SUPPLIERID").toInt(), travelFk = 186025, companyFk = 442))
+        }
+
+    }
 }
 

From 6be191c9458a840c87a667265f118a43211197aa Mon Sep 17 00:00:00 2001
From: Sergio De la torre <sergiodt@verdnatura.es>
Date: Thu, 6 Apr 2023 09:05:25 +0200
Subject: [PATCH 6/8] Add ic_delivery

---
 .../drawable/delivery/ic_launcher_foreground.xml    | 13 +++++++++++++
 app/src/main/res/drawable/ic_delivery.xml           | 10 ++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 app/src/main/res/drawable/delivery/ic_launcher_foreground.xml
 create mode 100644 app/src/main/res/drawable/ic_delivery.xml

diff --git a/app/src/main/res/drawable/delivery/ic_launcher_foreground.xml b/app/src/main/res/drawable/delivery/ic_launcher_foreground.xml
new file mode 100644
index 00000000..2a47255d
--- /dev/null
+++ b/app/src/main/res/drawable/delivery/ic_launcher_foreground.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="61.760166"
+    android:viewportHeight="61.760166"
+    android:tint="#FFFFFF">
+  <group android:translateX="18.880083"
+      android:translateY="18.880083">
+      <path
+          android:fillColor="#FF000000"
+          android:pathData="M20,8h-3L17,4L3,4c-1.1,0 -2,0.9 -2,2v11h2c0,1.66 1.34,3 3,3s3,-1.34 3,-3h6c0,1.66 1.34,3 3,3s3,-1.34 3,-3h2v-5l-3,-4zM6,18.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM19.5,9.5l1.96,2.5L17,12L17,9.5h2.5zM18,18.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z"/>
+  </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_delivery.xml b/app/src/main/res/drawable/ic_delivery.xml
new file mode 100644
index 00000000..b607ccc9
--- /dev/null
+++ b/app/src/main/res/drawable/ic_delivery.xml
@@ -0,0 +1,10 @@
+<vector android:height="24dp"
+    android:viewportHeight="30"
+    android:viewportWidth="32"
+    android:width="24dp"
+    android:tint="#FFF"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFF" android:pathData="M24.667,21.733c-1.733,0 -3.2,1.467 -3.2,3.2s1.467,3.2 3.2,3.2 3.2,-1.467 3.2,-3.2c0,-1.867 -1.467,-3.2 -3.2,-3.2zM24.667,26.533c-0.933,0 -1.6,-0.667 -1.6,-1.6s0.667,-1.6 1.6,-1.6 1.6,0.667 1.6,1.6c0,0.8 -0.8,1.6 -1.6,1.6z"/>
+    <path android:fillColor="#FFF" android:pathData="M7.867,21.733c-1.733,0 -3.2,1.467 -3.2,3.2s1.467,3.2 3.2,3.2c1.733,0 3.2,-1.467 3.2,-3.2 0,-1.867 -1.467,-3.2 -3.2,-3.2zM7.867,26.533c-0.933,0 -1.6,-0.667 -1.6,-1.6s0.667,-1.6 1.6,-1.6c0.933,0 1.6,0.667 1.6,1.6 0,0.8 -0.8,1.6 -1.6,1.6z"/>
+    <path android:fillColor="#FFF" android:pathData="M31.467,13.2l-6.133,-6c-0.4,-0.4 -0.933,-0.533 -1.467,-0.533h-3.067v-1.2c0,-0.8 -0.667,-1.6 -1.6,-1.6h-17.6c-0.933,0 -1.6,0.667 -1.6,1.6v17.333c0,0.933 0.8,1.6 1.6,1.6h2.133c0.267,-2 2,-3.6 4.133,-3.6 2,0 3.867,1.6 4.133,3.6h8.4c0.267,-2 2,-3.6 4.133,-3.6s4,1.6 4.267,3.6h1.6c0.933,0 1.6,-0.8 1.6,-1.6v-8.133c0,-0.533 -0.267,-1.067 -0.533,-1.467zM22.667,8.667c0,-0.133 0.133,-0.267 0.267,-0.267h1.067c0,0 0.133,0 0.133,0.133l4.8,4.533c0.133,0 0,0.4 -0.133,0.4h-5.867c-0.267,0 -0.267,-0.133 -0.267,-0.267v-4.533z"/>
+</vector>

From a63446f86b85805511010c48a3ef239d7be1f680 Mon Sep 17 00:00:00 2001
From: Sergio De la torre <sergiodt@verdnatura.es>
Date: Wed, 12 Apr 2023 13:33:04 +0200
Subject: [PATCH 7/8] refs #4021

---
 .idea/workspace.xml                             | 13 +++++++++----
 .../java/es/verdnatura/domain/SalixService.kt   |  4 ++--
 .../presentation/common/UICallbacks.kt          |  2 +-
 .../packaging/adapter/ItemSupplierAdapter.kt    |  2 +-
 .../packaging/adapter/ListImageAdapter.kt       |  2 +-
 .../packaging/fragment/ObservFragment.kt        |  8 +++++---
 .../fragment/PackagingCountFragment.kt          | 17 ++++++++++++-----
 .../PackagingViewModel/SupplierViewModel.kt     |  2 +-
 .../packaging/fragment/SupplierFragment.kt      |  6 ++++++
 .../delivery/ic_launcher_foreground.xml         | 13 -------------
 10 files changed, 38 insertions(+), 31 deletions(-)
 delete mode 100644 app/src/main/res/drawable/delivery/ic_launcher_foreground.xml

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7eb1b9ac..e73f9d02 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -83,12 +83,17 @@
     </select>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="version 23.10.1 Modificar controlador orden">
+    <list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="Strings y serialNumber">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/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/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/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/PackagingViewModel/SupplierViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/SupplierFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/SupplierFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/res/drawable/delivery/ic_launcher_foreground.xml" beforeDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -99,7 +104,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_2_API_24.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" />
@@ -185,7 +190,7 @@
     </option>
     <option name="RECENT_BRANCH_BY_REPOSITORY">
       <map>
-        <entry key="$PROJECT_DIR$" value="testBeta" />
+        <entry key="$PROJECT_DIR$" value="testBeta_embalajes_pantallas" />
       </map>
     </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
diff --git a/app/src/main/java/es/verdnatura/domain/SalixService.kt b/app/src/main/java/es/verdnatura/domain/SalixService.kt
index f2392923..a7b3dca4 100644
--- a/app/src/main/java/es/verdnatura/domain/SalixService.kt
+++ b/app/src/main/java/es/verdnatura/domain/SalixService.kt
@@ -149,9 +149,9 @@ interface SalixService {
 
     @GET("Entries")//REVISADA
     fun add_entry(
-        @Query("filter") filter:String
+        @Body entry:EntrySalix
     ):
-            Call<List<EntrySalix>>
+            Call<EntrySalix>
 
     @GET("Shelvings")
     fun Shelvings(
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 bc251d01..1d7d64bb 100644
--- a/app/src/main/java/es/verdnatura/presentation/common/UICallbacks.kt
+++ b/app/src/main/java/es/verdnatura/presentation/common/UICallbacks.kt
@@ -64,7 +64,7 @@ interface OnGeneralItemRowClickListener {
 }
 
 interface OnImageTrashClickListener {
-    fun OnImageUpdateClickListener(item: Any)
+    fun OnImageTrashClickListener(item: Any)
 }
 
 interface OnEditSubQuantityListener {
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 08bf81c8..761a4558 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
@@ -47,7 +47,7 @@ class ItemSupplierAdapter(
                         item
                     )
                     itemRemove.setOnClickListener {
-                        onImageTrashClickListener.OnImageUpdateClickListener(item)
+                        onImageTrashClickListener.OnImageTrashClickListener(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 c9c4076f..2ce723a5 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
@@ -41,7 +41,7 @@ class ListImageAdapter(
                         item
                     )
                     itemImageTrash.setOnClickListener {
-                        onImageTrashClickListener.OnImageUpdateClickListener(item)
+                        onImageTrashClickListener.OnImageTrashClickListener(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 92fb73c6..ca1f8d3f 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
@@ -99,14 +99,16 @@ class ObservFragment(
     }
 
     private fun setEvents() {
+
         val launcher = registerImagePicker {
             for (image in it) {
                 d("VERDNATURA::", "el nombre es " + image.name)
                 d("VERDNATURA::", "el nombre es " + image.uri)
                 //binding.imageView30.setImageURI(image.uri)
             }
-            if (listImages != null)
-                listImages = it as MutableList<Image>
+            listImages?.clear()
+            listImages = it as MutableList<Image>
+
             setAdapter(listImages!!)
         }
 
@@ -159,7 +161,7 @@ class ObservFragment(
                     d("VERDNATURA::", "Seleccionado update" + (item as Image).name)
                 }
             }, object : OnImageTrashClickListener {
-                override fun OnImageUpdateClickListener(item: Any) {
+                override fun OnImageTrashClickListener(item: Any) {
                     d("VERDNATURA::", "Seleccionado trash" + (item as Image).name)
                     list.remove(item)
                     adapterListImage!!.notifyDataSetChanged()
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 838396e5..bb633712 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
@@ -120,7 +120,7 @@ class PackagingCountFragment(
                         override fun OnImageUpdateClickListener(item: Any) {
                             d("VERDNATURA::", "Seleccionado update" + (item as ItemSupplier).name)
                             printCustomDialog("quantity")
-                            customDialogInput.setTitle(getString(R.string.quantityReviewed))
+                           /* customDialogInput.setTitle(getString(R.string.quantityReviewed))
                                 .setDescription(getString(R.string.quantityToReview))
                                 .setOkButton(getString(R.string.accept)) {
                                     if (!customDialogInput.getValue().isNullOrEmpty()) {
@@ -134,7 +134,7 @@ class PackagingCountFragment(
                                     customDialogInput.dismiss()
 
                                 }.setValue("").show()
-
+*/
 
                         }
 
@@ -175,17 +175,20 @@ class PackagingCountFragment(
                             requireActivity().hideKeyboard()
                         }
                         customDialogInput.setValue("")
+                        customDialog.cancel()
                         customDialogInput.dismiss()
                         requireActivity().showKeyboard()
                     }.setKoButton(getString(R.string.cancel)) {
+                        customDialog.cancel()
                         customDialogInput.dismiss()
                         requireActivity().showKeyboard()
-                    }.setValue("").show()
+                    }.setValue("")
+                    .show()
 
                 customDialogInput.setInputText()
                 customDialogInput.currentFocus
                 customDialogInput.setFocusText()
-                requireActivity().showKeyboard()
+                //requireActivity().showKeyboard()
             }
             "delete" -> {
                 customDialog.setTitle(getString(R.string.deleteEntryReviewed))
@@ -194,7 +197,10 @@ class PackagingCountFragment(
                         getString(
                             R.string.delete
                         )
+
                     ) {
+                        customDialog.cancel()
+                        customDialog.dismiss()
                         d("VERDNATURA::", "borrado")
                     }
 
@@ -204,10 +210,11 @@ class PackagingCountFragment(
 
 
                     }
+                    .show()
             }
 
         }
-        customDialog.show()
+
     }
 
 
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt
index 9464ea37..34d20004 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt
@@ -147,7 +147,7 @@ class PackagingViewModel(val context: Context) : BaseViewModel(context) {
     }
 
    fun entry_addSalix(entry: EntrySalix) {
-        salix.getEntries(entry)
+        salix.add_entry(entry)
             .enqueue(object :
                 SilexCallback<EntrySalix>(context) {
                 override fun onError(t: Throwable) {
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 a2472ea0..7a237a56 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
@@ -15,6 +15,7 @@ import es.verdnatura.presentation.view.feature.inventario.fragment.SearchSupplie
 import es.verdnatura.presentation.view.feature.packaging.fragment.PackagingViewModel.PackagingViewModel
 import es.verdnatura.presentation.view.feature.packaging.model.EntrySalix
 import es.verdnatura.presentation.view.feature.packaging.model.Supplier
+import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO
 import ir.mirrajabi.searchdialog.SimpleSearchDialogCompat
 
 
@@ -173,6 +174,11 @@ class SupplierFragment(
                 binding.filterEntry.setText((nombre.getName()))
                 binding.radiobuttonTypePackaging.visibility = View.VISIBLE
                 saveData("ENTRYID", nombre.getId())
+                d("VERDNATURA::","Ha seleccionado:"+nombre.getId())
+                 ma.onPasillerosItemClickListener(
+                    PasillerosItemVO(title = getString(R.string.titlePackagingCount)),
+                    getString(R.string.titlePackagingCount)
+                )
                 baseSearchDialogCompat.dismiss()
             }.show()
         }
diff --git a/app/src/main/res/drawable/delivery/ic_launcher_foreground.xml b/app/src/main/res/drawable/delivery/ic_launcher_foreground.xml
deleted file mode 100644
index 2a47255d..00000000
--- a/app/src/main/res/drawable/delivery/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="61.760166"
-    android:viewportHeight="61.760166"
-    android:tint="#FFFFFF">
-  <group android:translateX="18.880083"
-      android:translateY="18.880083">
-      <path
-          android:fillColor="#FF000000"
-          android:pathData="M20,8h-3L17,4L3,4c-1.1,0 -2,0.9 -2,2v11h2c0,1.66 1.34,3 3,3s3,-1.34 3,-3h6c0,1.66 1.34,3 3,3s3,-1.34 3,-3h2v-5l-3,-4zM6,18.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM19.5,9.5l1.96,2.5L17,12L17,9.5h2.5zM18,18.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z"/>
-  </group>
-</vector>

From d4403cecc0a9b9e1701c9be9ab9ed8edfa31faf4 Mon Sep 17 00:00:00 2001
From: Sergio De la torre <sergiodt@verdnatura.es>
Date: Wed, 12 Apr 2023 14:10:13 +0200
Subject: [PATCH 8/8] refs #4021

---
 .../fragment/PackagingCountFragment.kt        |  2 +-
 .../res/layout/fragment_packaging_summary.xml | 50 ++-----------------
 2 files changed, 4 insertions(+), 48 deletions(-)

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 bb633712..34ecf540 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
@@ -139,7 +139,7 @@ class PackagingCountFragment(
                         }
 
                     }, object : OnImageTrashClickListener {
-                        override fun OnImageUpdateClickListener(item: Any) {
+                        override fun OnImageTrashClickListener(item: Any) {
                             d("VERDNATURA::", "Seleccionado trash" + (item as ItemSupplier).name)
                             printCustomDialog("delete")
                         }
diff --git a/app/src/main/res/layout/fragment_packaging_summary.xml b/app/src/main/res/layout/fragment_packaging_summary.xml
index 7f3a5f71..7de4b878 100644
--- a/app/src/main/res/layout/fragment_packaging_summary.xml
+++ b/app/src/main/res/layout/fragment_packaging_summary.xml
@@ -89,6 +89,7 @@
                         android:textSize="@dimen/body2" />
 
                     <ImageButton
+                        android:visibility="gone"
                         android:layout_width="25dp"
                         android:layout_height="25dp"
                         android:background="@drawable/ic_delete_black_24dp" />
@@ -134,6 +135,7 @@
                         android:textSize="@dimen/body2" />
 
                     <ImageButton
+                        android:visibility="gone"
                         android:layout_width="25dp"
                         android:layout_height="25dp"
                         android:background="@drawable/ic_delete_black_24dp" />
@@ -211,55 +213,9 @@
 
                 </LinearLayout>
 
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/layout_margin_min"
-                    android:layout_marginBottom="@dimen/layout_margin_1"
-                    android:orientation="horizontal"
-                    android:paddingLeft="@dimen/layout_margin_min"
-                    android:paddingRight="@dimen/layout_margin_min">
-
-                    <TextView
-                        android:id="@+id/sign"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="left"
-                        android:text="Firma:"
-                        android:textColor="@color/verdnatura_white"
-                        android:textSize="@dimen/body2"
-                        android:textStyle="bold" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/layout_margin_min"
-                    android:layout_marginBottom="@dimen/layout_margin_1"
-                    android:orientation="horizontal"
-                    android:paddingLeft="@dimen/layout_margin_min"
-                    android:paddingRight="@dimen/layout_margin_min">
-
-                    <com.simplify.ink.InkView
-                        android:id="@+id/ink"
-                        android:layout_width="wrap_content"
-                        android:layout_height="102dp"
-                        android:layout_marginStart="8dp"
-                        android:layout_marginTop="8dp"
-                        android:layout_marginEnd="8dp"
-                        android:layout_marginBottom="8dp"
-                        android:background="@color/verdnatura_white"
-                        app:inkFlags="interpolation|responsiveWeight"
-                        app:layout_constraintBottom_toTopOf="@+id/textView36"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintHorizontal_bias="0.0"
-                        app:layout_constraintStart_toStartOf="@+id/sign"
-                        app:layout_constraintTop_toBottomOf="@+id/sign"
-                        app:layout_constraintVertical_bias="0.0" />
 
 
-                </LinearLayout>
+
 
             </com.google.android.material.textfield.TextInputLayout>