From 76f739437c8c7c8dedd6e48ce5428f398ba3b1ac Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Wed, 8 Jan 2020 10:53:07 +0100
Subject: [PATCH 1/2] Fix qta_tot su barcode peso

---
 .../viewmodel/VenditaOrdineInevasoViewModel.java                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 780efe70..b4569eeb 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
@@ -1150,7 +1150,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
 //                        }
 
                     } else {
-                        dto.setQtaTot(qtaDaEvadere.floatValue() < tmpPickData.getQtaTot().floatValue() ? qtaDaEvadere : tmpPickData.getQtaTot());
+                        dto.setQtaTot(qtaDaEvadere.floatValue() < tmpPickData.getQtaTot().floatValue() && !tmpPickData.isEanPeso() ? qtaDaEvadere : tmpPickData.getQtaTot());
                         dto.setMaxQta(tmpPickData.getQtaTot());
 
                         if(tmpPickData.getNumCnf() != null) {

From f34aa5e0e024abbd5aa56fded6cde7f22312860e Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Wed, 8 Jan 2020 10:53:59 +0100
Subject: [PATCH 2/2] -> v1.11.1 (120)

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

diff --git a/app/build.gradle b/app/build.gradle
index 7767388d..e8c7140c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 119
-    def appVersionName = '1.11.0'
+    def appVersionCode = 120
+    def appVersionName = '1.11.1'
 
     signingConfigs {
         release {