diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java
index 49a721b9..f1d0b6db 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java
@@ -748,15 +748,27 @@ public class SpedizioneViewModel {
         MtbColr mtbColrToUse = refMtbColr != null ? refMtbColr : scannedMtbColr;
 
         if (mtbColrToUse != null) {
-            if (UtilityBigDecimal.equalsOrLowerThan(mtbColrToUse.getQtaCol(), qtaDaEvadere)) {
-                numCnfDaPrelevare = mtbColrToUse.getNumCnf();
-                qtaColDaPrelevare = mtbColrToUse.getQtaCol();
-            } else {
-                numCnfDaPrelevare = numCnfDaEvadere;
-                qtaColDaPrelevare = qtaDaEvadere;
-            }
+            if(pickingObjectDTO.getMtbAart().isFlagQtaCnfFissaBoolean()) {
+                if (UtilityBigDecimal.equalsOrLowerThan(mtbColrToUse.getQtaCol(), qtaDaEvadere)) {
+                    numCnfDaPrelevare = mtbColrToUse.getNumCnf();
+                    qtaColDaPrelevare = mtbColrToUse.getQtaCol();
+                } else {
+                    numCnfDaPrelevare = numCnfDaEvadere;
+                    qtaColDaPrelevare = qtaDaEvadere;
+                }
 
-            qtaCnfDaPrelevare = mtbColrToUse.getQtaCnf();
+                qtaCnfDaPrelevare = mtbColrToUse.getQtaCnf();
+            } else {
+                if (UtilityBigDecimal.equalsOrLowerThan(mtbColrToUse.getNumCnf(), numCnfDaEvadere)) {
+                    numCnfDaPrelevare = mtbColrToUse.getNumCnf();
+                    qtaCnfDaPrelevare = mtbColrToUse.getQtaCnf();
+                    qtaColDaPrelevare = mtbColrToUse.getQtaCol();
+                } else {
+                    numCnfDaPrelevare = numCnfDaEvadere;
+                    qtaColDaPrelevare = qtaDaEvadere;
+                    qtaCnfDaPrelevare = qtaCnfDaEvadere;
+                }
+            }
 
 
             totalQtaAvailable = mtbColrToUse.getQtaCol();
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 ca178cc7..c3a1c4db 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
@@ -341,7 +341,8 @@ public class DialogInputQuantityV2ViewModel {
             this.mListener.onError(new InvalidExpireDateException());
             return false;
 
-        } else if (!this.canOverflowOrderQuantity && UtilityBigDecimal.greaterThan(this.internalQtaTot, this.totalQtaOrd)) {
+        } else if (!this.canOverflowOrderQuantity && UtilityBigDecimal.greaterThan(this.internalQtaTot, this.totalQtaOrd) &&
+                    this.mtbAart.get().isFlagQtaCnfFissaBoolean()) {
 
             this.mListener.onError(new OverflowQtaTotOrderedQuantityException());
             return false;