diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 00000000..a7561653
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://maven.google.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://jitpack.io" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenRepo" />
+      <option name="name" value="MavenRepo" />
+      <option name="url" value="https://repo.maven.apache.org/maven2/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven2" />
+      <option name="name" value="maven2" />
+      <option name="url" value="https://maven.fabric.io/public" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
index b89dfd45..a7efc7ff 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
@@ -1034,11 +1034,17 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
 
                 MtbColr withdrawRow = this.mPickingList.get(i).getWithdrawRows().get(k);
 
-                this.mPickingList.get(i).setQtaCollo(this.mPickingList.get(i).getQtaCollo().subtract(withdrawRow.getQtaCol()));
                 this.mPickingList.get(i).setQtaOrd(this.mPickingList.get(i).getQtaOrd().subtract(withdrawRow.getQtaCol()));
-                this.mPickingList.get(i).setNumCnfCollo(this.mPickingList.get(i).getNumCnfCollo().subtract(withdrawRow.getNumCnf()));
                 this.mPickingList.get(i).setNumCnfOrd(this.mPickingList.get(i).getNumCnfOrd().subtract(withdrawRow.getNumCnf()));
 
+                if(this.mPickingList.get(i).getQtaCollo() != null) {
+                    this.mPickingList.get(i).setQtaCollo(this.mPickingList.get(i).getQtaCollo().subtract(withdrawRow.getQtaCol()));
+                }
+
+                if(this.mPickingList.get(i).getNumCnfCollo() != null) {
+                    this.mPickingList.get(i).setNumCnfCollo(this.mPickingList.get(i).getNumCnfCollo().subtract(withdrawRow.getNumCnf()));
+                }
+
             }
 
             this.mPickingList.get(i).getWithdrawRows().clear();
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/pages/page2/DialogBasketLU_Page2_ViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/pages/page2/DialogBasketLU_Page2_ViewModel.java
index ee388813..aa0e863f 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/pages/page2/DialogBasketLU_Page2_ViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/pages/page2/DialogBasketLU_Page2_ViewModel.java
@@ -75,7 +75,7 @@ public class DialogBasketLU_Page2_ViewModel extends DialogBasketLU_BaseViewModel
 
 
     private void initRecyclerView(List<MtbColr> dataset) {
-        mBinding.dialogBasketLuMtbColrList.setNestedScrollingEnabled(false);
+       //mBinding.dialogBasketLuMtbColrList.setNestedScrollingEnabled(false);
         mBinding.dialogBasketLuMtbColrList.setHasFixedSize(true);
         mBinding.dialogBasketLuMtbColrList.setLayoutManager(new LinearLayoutManager(mContext));
 
diff --git a/app/src/main/res/layout/dialog_basket_lu__page2.xml b/app/src/main/res/layout/dialog_basket_lu__page2.xml
index 93d1e48f..54d6bbbb 100644
--- a/app/src/main/res/layout/dialog_basket_lu__page2.xml
+++ b/app/src/main/res/layout/dialog_basket_lu__page2.xml
@@ -7,115 +7,136 @@
         android:orientation="vertical">
 
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/dialog_basket_lu__mtb_colr_list"
+        <androidx.core.widget.NestedScrollView
+            android:id="@+id/myScrollView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content">
 
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/empty_view"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:alpha="0.3"
-            android:visibility="gone">
-
-            <androidx.constraintlayout.widget.Guideline
-                android:id="@+id/guideline_empty_top"
-                android:layout_width="wrap_content"
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                app:layout_constraintGuide_percent="0.2" />
+                android:orientation="vertical">
 
-            <androidx.constraintlayout.widget.Guideline
-                android:id="@+id/guideline_empty_left"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                app:layout_constraintGuide_percent="0.15" />
-
-            <androidx.constraintlayout.widget.Guideline
-                android:id="@+id/guideline_empty_right"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                app:layout_constraintGuide_percent="0.85" />
-
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:gravity="center_horizontal"
-                android:orientation="vertical"
-                app:layout_constraintEnd_toStartOf="@id/guideline_empty_right"
-                app:layout_constraintStart_toEndOf="@id/guideline_empty_left"
-                app:layout_constraintTop_toTopOf="@id/guideline_empty_top">
-
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:layout_width="56dp"
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:adjustViewBounds="true"
-                    android:src="@drawable/ic_box"
-                    android:tint="@android:color/black" />
+                    app:layout_constraintBottom_toTopOf="@+id/buttons">
 
-                <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
-                    android:gravity="center_horizontal"
-                    android:text="@string/no_lu_found_message"
-                    android:textColor="@android:color/black" />
-            </LinearLayout>
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp">
-
-            <androidx.constraintlayout.widget.Guideline
-                android:id="@+id/center_buttons_guideline"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                app:layout_constraintGuide_percent="0.5" />
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/dialog_basket_lu__mtb_colr_list"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
 
 
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/button_abort"
-                style="@style/Button.PrimaryOutline"
-                android:layout_width="0dp"
-                android:layout_height="52dp"
-                android:layout_marginLeft="8dp"
-                android:layout_marginRight="8dp"
-                android:text="@string/back"
-                app:icon="@drawable/ic_black_back"
-                app:iconSize="24dp"
-                app:iconGravity="textStart"
-                app:layout_constraintEnd_toStartOf="@id/center_buttons_guideline"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:strokeColor="@color/colorPrimary" />
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:id="@+id/empty_view"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:alpha="0.3"
+                        android:visibility="gone">
+
+                        <androidx.constraintlayout.widget.Guideline
+                            android:id="@+id/guideline_empty_top"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:orientation="horizontal"
+                            app:layout_constraintGuide_percent="0.2" />
+
+                        <androidx.constraintlayout.widget.Guideline
+                            android:id="@+id/guideline_empty_left"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical"
+                            app:layout_constraintGuide_percent="0.15" />
+
+                        <androidx.constraintlayout.widget.Guideline
+                            android:id="@+id/guideline_empty_right"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical"
+                            app:layout_constraintGuide_percent="0.85" />
+
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:gravity="center_horizontal"
+                            android:orientation="vertical"
+                            app:layout_constraintEnd_toStartOf="@id/guideline_empty_right"
+                            app:layout_constraintStart_toEndOf="@id/guideline_empty_left"
+                            app:layout_constraintTop_toTopOf="@id/guideline_empty_top">
+
+                            <androidx.appcompat.widget.AppCompatImageView
+                                android:layout_width="56dp"
+                                android:layout_height="wrap_content"
+                                android:adjustViewBounds="true"
+                                android:src="@drawable/ic_box"
+                                android:tint="@android:color/black" />
+
+                            <androidx.appcompat.widget.AppCompatTextView
+                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="16dp"
+                                android:gravity="center_horizontal"
+                                android:text="@string/no_lu_found_message"
+                                android:textColor="@android:color/black" />
+                        </LinearLayout>
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="52dp"
+                    android:layout_marginTop="8dp">
+
+                    <androidx.constraintlayout.widget.Guideline
+                        android:id="@+id/center_buttons_guideline"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        app:layout_constraintGuide_percent="0.5" />
 
 
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/button_confirm"
-                style="@style/Button.PrimaryFull"
-                android:layout_width="0dp"
-                android:layout_height="52dp"
-                android:layout_marginLeft="8dp"
-                android:layout_marginRight="8dp"
-                android:text="@string/use"
-                app:icon="@drawable/ic_black_tick"
-                app:iconSize="24dp"
-                app:iconGravity="textStart"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="@id/center_buttons_guideline"
-                app:layout_constraintTop_toTopOf="parent" />
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/button_abort"
+                        style="@style/Button.PrimaryOutline"
+                        android:layout_width="0dp"
+                        android:layout_height="52dp"
+                        android:layout_marginLeft="8dp"
+                        android:layout_marginRight="8dp"
+                        android:text="@string/back"
+                        app:icon="@drawable/ic_black_back"
+                        app:iconGravity="textStart"
+                        app:iconSize="24dp"
+                        app:layout_constraintEnd_toStartOf="@id/center_buttons_guideline"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:strokeColor="@color/colorPrimary" />
 
 
-        </androidx.constraintlayout.widget.ConstraintLayout>
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/button_confirm"
+                        style="@style/Button.PrimaryFull"
+                        android:layout_width="0dp"
+                        android:layout_height="52dp"
+                        android:layout_marginLeft="8dp"
+                        android:layout_marginRight="8dp"
+                        android:text="@string/use"
+                        app:icon="@drawable/ic_black_tick"
+                        app:iconGravity="textStart"
+                        app:iconSize="24dp"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="@id/center_buttons_guideline"
+                        app:layout_constraintTop_toTopOf="parent" />
 
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+            </androidx.appcompat.widget.LinearLayoutCompat>
+        </androidx.core.widget.NestedScrollView>
     </LinearLayout>
 </layout>
\ No newline at end of file