diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java
index 5c18c0d1..ca178cc7 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java
@@ -259,7 +259,8 @@ public class DialogInputQuantityV2ViewModel {
     public void setNumCnf(BigDecimal newValue) {
         this.internalNumCnf = newValue;
         this.blockedNumCnf.set(!(UtilityBigDecimal.equalsTo(newValue, BigDecimal.ZERO) || newValue == null));
-        if (UtilityBigDecimal.equalsTo(newValue, BigDecimal.ZERO) || newValue == null) return;
+        if (newValue == null) return;
+//        if (UtilityBigDecimal.equalsTo(newValue, BigDecimal.ZERO))
 
         if (UtilityBigDecimal.greaterThan(newValue, totalNumCnfAvailable))
             newValue = totalNumCnfAvailable;
@@ -283,8 +284,8 @@ public class DialogInputQuantityV2ViewModel {
     public void setQtaCnf(BigDecimal newValue) {
         this.internalQtaCnf = newValue;
         this.blockedQtaCnf.set(!(UtilityBigDecimal.equalsTo(newValue, BigDecimal.ZERO) || newValue == null));
-        if (UtilityBigDecimal.equalsTo(newValue, BigDecimal.ZERO) || newValue == null) return;
-
+        if (newValue == null) return;
+//        if (UtilityBigDecimal.equalsTo(newValue, BigDecimal.ZERO))
 
         if (!this.blockedQtaTot.get() && this.internalNumCnf != null)
             this.internalQtaTot = UtilityBigDecimal.multiply(newValue, this.internalNumCnf);
@@ -297,7 +298,8 @@ public class DialogInputQuantityV2ViewModel {
     public void setQtaTot(BigDecimal newValue) {
         this.internalQtaTot = newValue;
         this.blockedQtaTot.set(!(UtilityBigDecimal.equalsTo(newValue, BigDecimal.ZERO) || newValue == null));
-        if (UtilityBigDecimal.equalsTo(newValue, BigDecimal.ZERO) || newValue == null) return;
+        if (newValue == null) return;
+//        if (UtilityBigDecimal.equalsTo(newValue, BigDecimal.ZERO))
 
         newValue = UtilityBigDecimal.getLowerBetween(newValue, totalQtaAvailable);
 
@@ -359,7 +361,10 @@ public class DialogInputQuantityV2ViewModel {
             this.mListener.onError(new OverflowNumCnfAvailableQuantityException());
             return false;
 
-        } else if (UtilityBigDecimal.lowerThan(this.internalQtaCnf, BigDecimal.ZERO) || UtilityBigDecimal.lowerThan(this.internalNumCnf, BigDecimal.ZERO) || UtilityBigDecimal.lowerThan(this.internalQtaTot, BigDecimal.ZERO)) {
+        } else if (this.internalNumCnf == null || this.internalQtaCnf == null || this.internalQtaTot == null ||
+                UtilityBigDecimal.equalsOrLowerThan(this.internalNumCnf, BigDecimal.ZERO) ||
+                UtilityBigDecimal.equalsOrLowerThan(this.internalQtaCnf, BigDecimal.ZERO) ||
+                UtilityBigDecimal.equalsOrLowerThan(this.internalQtaTot, BigDecimal.ZERO)) {
 
             this.mListener.onError(new InvalidQuantityException());
             return false;
diff --git a/app/src/main/res/layout/dialog_input_quantity_v2.xml b/app/src/main/res/layout/dialog_input_quantity_v2.xml
index df1fde98..1ad1bfcc 100644
--- a/app/src/main/res/layout/dialog_input_quantity_v2.xml
+++ b/app/src/main/res/layout/dialog_input_quantity_v2.xml
@@ -70,6 +70,7 @@
                 android:ellipsize="end"
                 android:textColor="@color/red_600"
                 android:visibility="@{UtilityString.isNullOrEmpty(viewmodel.mtbAart.diacod) ? View.GONE : View.VISIBLE}"
+                android:text="@{viewmodel.mtbAart.diacod}"
                 tools:text="DIACOD" />
 
             <androidx.appcompat.widget.AppCompatTextView