From 4f7d03dea309f2e26bbfc5c5f432d5f2cf825cf7 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Wed, 11 Dec 2019 14:11:33 +0100
Subject: [PATCH 1/2] Modifiche per peso variabile sapori_veri

---
 .../viewmodel/VenditaOrdineInevasoViewModel.java         | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

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 f435041c..aea24f2c 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
@@ -13,6 +13,7 @@ import com.tfb.fbtoast.FBToast;
 import org.jetbrains.annotations.NotNull;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Iterator;
@@ -1131,7 +1132,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
                 boolean useQtaDaEvadere = false;
 
                 if(tmpPickData.getQtaTot() != null) {
-                    useQtaDaEvadere = qtaDaEvadere.floatValue() < tmpPickData.getQtaTot().floatValue();// && item.getMtbAart().isFlagQtaCnfFissa();
+                    useQtaDaEvadere = qtaDaEvadere.floatValue() < tmpPickData.getQtaTot().floatValue() && item.getMtbAart().isFlagQtaCnfFissa();
                     if (useQtaDaEvadere) {
                         dto.setQtaTot(qtaDaEvadere);
                         dto.setMaxQta(qtaDaEvadere);
@@ -1158,9 +1159,13 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
                     if(useQtaDaEvadere && (dto.getQtaDaEvadere() != null && dto.getQtaDaEvadere().floatValue() > 0)) {
                         dto.setNumCnf(dto.getQtaDaEvadere().divide(dto.getQtaCnf()).intValue());
                     } else {
-                        dto.setNumCnf((dto.getQtaTot().compareTo(dto.getQtaDaEvadere()) < 0 ? dto.getQtaTot() : dto.getQtaDaEvadere()).divide(dto.getQtaCnf()).intValue());
+                        dto.setNumCnf((dto.getQtaTot().compareTo(dto.getQtaDaEvadere()) < 0 ? dto.getQtaTot() : dto.getQtaDaEvadere()).divide(dto.getQtaCnf(), RoundingMode.HALF_UP).intValue());
+                        if(dto.getNumCnf() == 0) dto.setNumCnf(1);
                     }
                 }
+//                if(dto.getQtaTot() != null && dto.getQtaTot().floatValue() > 0 && dto.getQtaCnf() != null && dto.getQtaCnf().floatValue() > 0) {
+//                    dto.setNumCnf(dto.getQtaTot().divide(dto.getQtaCnf()).intValue());
+//                }
 
 
                 dto.setCanPartitaMagBeChanged(false);

From f0b44c6fbca70c3768e773987db5329c860f4ebb Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Wed, 11 Dec 2019 14:12:08 +0100
Subject: [PATCH 2/2] -> v1.10.5 (108)

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 332310b4..6da19e10 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 107
-    def appVersionName = '1.10.4'
+    def appVersionCode = 108
+    def appVersionName = '1.10.5'
 
     signingConfigs {
         release {