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 67c7861e..3f844932 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
@@ -1116,6 +1116,10 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
             if(item.getTempPickData() != null) {
                 PickingObjectDTO.PickData tmpPickData = item.getTempPickData();
 
+                if(tmpPickData.getQtaCnf() == null && tmpPickData.getNumCnf() != null && tmpPickData.getQtaTot() != null) {
+                    tmpPickData.setQtaCnf(tmpPickData.getQtaTot().divide(tmpPickData.getNumCnf(), 3, RoundingMode.HALF_EVEN));
+                }
+
                 boolean isTakenFromUL = tmpPickData.getSourceMtbColt() != null;
 
                 if(tmpPickData.getMtbPartitaMag() != null) {
@@ -1140,13 +1144,16 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
                         dto.setQtaTot(qtaDaEvadere);
                         dto.setMaxQta(qtaDaEvadere);
 
-                        //Aggiungere calcolo 
+                        if(isTakenFromUL) {
+                            dto.setNumCnf(qtaDaEvadere.divide(tmpPickData.getQtaCnf(), 0, RoundingMode.HALF_UP).intValue());
+                        }
+
                     } else {
                         dto.setQtaTot(tmpPickData.getQtaTot());
                         dto.setMaxQta(tmpPickData.getQtaTot());
 
                         if(tmpPickData.getNumCnf() != null) {
-                            dto.setQtaCnf(tmpPickData.getQtaTot().divide(tmpPickData.getNumCnf()));
+                            dto.setQtaCnf(tmpPickData.getQtaTot().divide(tmpPickData.getNumCnf(), 3, RoundingMode.HALF_UP));
                         } else {
                             dto.setQtaCnf(tmpPickData.getQtaTot());
                         }